@zat-design/sisyphus-react 3.6.7 → 3.6.8
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/es/ProEditTable/components/ActionButton/index.js +6 -6
- package/es/ProEditTable/components/RcTable/BaseTable.js +2 -2
- package/es/ProEditTable/components/RcTable/DraggableTable.d.ts +2 -2
- package/es/ProEditTable/components/RcTable/DraggableTable.js +109 -11
- package/es/ProEditTable/components/RcTable/VirtualTable.js +2 -2
- package/es/ProEditTable/components/RenderField/index.js +2 -2
- package/es/ProEditTable/components/index.d.ts +0 -1
- package/es/ProEditTable/components/index.js +0 -1
- package/es/ProForm/components/combination/ProModalSelect/index.js +7 -1
- package/es/ProSelect/index.js +13 -34
- package/es/ProTable/{utils.d.ts → components/FormatColumn/index.d.ts} +1 -11
- package/es/ProTable/{utils.js → components/FormatColumn/index.js} +7 -57
- package/es/ProTable/components/RcTable/components/BaseTable/index.d.ts +11 -0
- package/es/ProTable/components/RcTable/components/BaseTable/index.js +43 -0
- package/es/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/index.js +1 -4
- package/es/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/utils/index.js +2 -2
- package/es/ProTable/components/RcTable/components/DraggableTable/index.d.ts +11 -0
- package/es/ProTable/components/RcTable/components/DraggableTable/index.js +52 -0
- package/es/ProTable/components/RcTable/index.d.ts +4 -0
- package/es/ProTable/components/RcTable/index.js +4 -0
- package/es/ProTable/components/RenderEmptyText/index.d.ts +3 -0
- package/es/ProTable/components/RenderEmptyText/index.js +22 -0
- package/es/ProTable/components/RenderFooter/index.d.ts +2 -0
- package/es/ProTable/components/RenderFooter/index.js +12 -0
- package/es/ProTable/components/RenderSummary/index.d.ts +3 -0
- package/es/ProTable/components/RenderSummary/index.js +55 -0
- package/es/ProTable/components/RenderTableHeader/index.d.ts +2 -0
- package/es/ProTable/components/RenderTableHeader/index.js +61 -0
- package/es/ProTable/components/TableResizable/index.js +1 -9
- package/es/ProTable/components/index.d.ts +4 -2
- package/es/ProTable/components/index.js +4 -2
- package/{lib/ProTable → es/ProTable/hooks}/useAntdTable.d.ts +2 -1
- package/es/ProTable/{useAntdTable.js → hooks/useAntdTable.js} +15 -4
- package/es/ProTable/index.d.ts +1 -1
- package/es/ProTable/index.js +114 -174
- package/es/ProTable/propsType.d.ts +3 -1
- package/es/ProTable/utils/index.d.ts +26 -0
- package/es/ProTable/utils/index.js +51 -0
- package/lib/ProEditTable/components/ActionButton/index.js +6 -6
- package/lib/ProEditTable/components/RcTable/BaseTable.js +2 -2
- package/lib/ProEditTable/components/RcTable/DraggableTable.d.ts +2 -2
- package/lib/ProEditTable/components/RcTable/DraggableTable.js +111 -12
- package/lib/ProEditTable/components/RcTable/VirtualTable.js +2 -2
- package/lib/ProEditTable/components/RenderField/index.js +2 -2
- package/lib/ProEditTable/components/index.d.ts +0 -1
- package/lib/ProEditTable/components/index.js +0 -14
- package/lib/ProForm/components/combination/ProModalSelect/index.js +5 -1
- package/lib/ProSelect/index.js +12 -35
- package/lib/ProTable/{utils.d.ts → components/FormatColumn/index.d.ts} +1 -11
- package/lib/ProTable/{utils.js → components/FormatColumn/index.js} +17 -68
- package/lib/ProTable/components/RcTable/components/BaseTable/index.d.ts +11 -0
- package/lib/ProTable/components/RcTable/components/BaseTable/index.js +49 -0
- package/lib/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/index.js +1 -4
- package/lib/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/utils/index.js +2 -2
- package/lib/ProTable/components/RcTable/components/DraggableTable/index.d.ts +11 -0
- package/lib/ProTable/components/RcTable/components/DraggableTable/index.js +59 -0
- package/lib/ProTable/components/RcTable/index.d.ts +4 -0
- package/lib/ProTable/components/RcTable/index.js +20 -0
- package/lib/ProTable/components/RenderEmptyText/index.d.ts +3 -0
- package/lib/ProTable/components/RenderEmptyText/index.js +28 -0
- package/lib/ProTable/components/RenderFooter/index.d.ts +2 -0
- package/lib/ProTable/components/RenderFooter/index.js +18 -0
- package/lib/ProTable/components/RenderSummary/index.d.ts +3 -0
- package/lib/ProTable/components/RenderSummary/index.js +61 -0
- package/lib/ProTable/components/RenderTableHeader/index.d.ts +2 -0
- package/lib/ProTable/components/RenderTableHeader/index.js +66 -0
- package/lib/ProTable/components/TableResizable/index.js +3 -11
- package/lib/ProTable/components/index.d.ts +4 -2
- package/lib/ProTable/components/index.js +16 -9
- package/{es/ProTable → lib/ProTable/hooks}/useAntdTable.d.ts +2 -1
- package/lib/ProTable/{useAntdTable.js → hooks/useAntdTable.js} +15 -4
- package/lib/ProTable/index.d.ts +1 -1
- package/lib/ProTable/index.js +118 -175
- package/lib/ProTable/propsType.d.ts +3 -1
- package/lib/ProTable/utils/index.d.ts +26 -0
- package/lib/ProTable/utils/index.js +57 -0
- package/package.json +1 -1
- package/es/ProEditTable/components/DndWrapper/index.d.ts +0 -17
- package/es/ProEditTable/components/DndWrapper/index.js +0 -104
- package/es/ProTable/components/ResizableLine/index.d.ts +0 -2
- package/es/ProTable/components/ResizableLine/index.js +0 -10
- package/lib/ProEditTable/components/DndWrapper/index.d.ts +0 -17
- package/lib/ProEditTable/components/DndWrapper/index.js +0 -111
- package/lib/ProTable/components/ResizableLine/index.d.ts +0 -2
- package/lib/ProTable/components/ResizableLine/index.js +0 -16
- /package/es/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/index.d.ts +0 -0
- /package/es/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/utils/index.d.ts +0 -0
- /package/es/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/utils/propsType.d.ts +0 -0
- /package/es/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/utils/propsType.js +0 -0
- /package/lib/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/index.d.ts +0 -0
- /package/lib/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/utils/index.d.ts +0 -0
- /package/lib/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/utils/propsType.d.ts +0 -0
- /package/lib/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/utils/propsType.js +0 -0
|
@@ -44,7 +44,9 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
|
|
|
44
44
|
quickConfig?: boolean;
|
|
45
45
|
resizeColumn?: boolean;
|
|
46
46
|
sortRow?: boolean | 'drag' | 'move';
|
|
47
|
-
columnConfig?: boolean
|
|
47
|
+
columnConfig?: boolean | {
|
|
48
|
+
onColumnOk: (cacheColumns: any, columns: ProTableColumn[]) => Promise<void>;
|
|
49
|
+
};
|
|
48
50
|
cacheTime?: number | boolean;
|
|
49
51
|
sortColumnText?: string;
|
|
50
52
|
storage?: 'localStorage' | 'sessionStorage';
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 获取小数点后的位数
|
|
3
|
+
* @param num 数字
|
|
4
|
+
* @returns 位数
|
|
5
|
+
*/
|
|
6
|
+
export declare const getDecimalDigits: (num?: number) => number;
|
|
7
|
+
/**
|
|
8
|
+
* @description: 获取初始值
|
|
9
|
+
* @author: xiangchengli
|
|
10
|
+
* @param {any} rowKey
|
|
11
|
+
* @param any value
|
|
12
|
+
* @param any originalObj
|
|
13
|
+
* @param {any} dataIndex
|
|
14
|
+
* @return {any}
|
|
15
|
+
*/
|
|
16
|
+
export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => any;
|
|
17
|
+
export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
|
|
18
|
+
/**
|
|
19
|
+
* 判断数据是否为Response<List<any>>结构
|
|
20
|
+
* @param data { [key: string]: any } 需要判断数据
|
|
21
|
+
* @returns boolean 是否
|
|
22
|
+
*/
|
|
23
|
+
export declare const isListResult: (data: {
|
|
24
|
+
[key: string]: any;
|
|
25
|
+
}) => boolean;
|
|
26
|
+
export declare const getRowKey: (rowKey: any, record: any) => any;
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { get, isEqual } from 'lodash';
|
|
2
|
+
/**
|
|
3
|
+
* 获取小数点后的位数
|
|
4
|
+
* @param num 数字
|
|
5
|
+
* @returns 位数
|
|
6
|
+
*/
|
|
7
|
+
export var getDecimalDigits = function getDecimalDigits() {
|
|
8
|
+
var num = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
|
|
9
|
+
var match = Number(num).toString().match(/\.(\d+)/);
|
|
10
|
+
return match ? match[1].length : 0;
|
|
11
|
+
};
|
|
12
|
+
/**
|
|
13
|
+
* @description: 获取初始值
|
|
14
|
+
* @author: xiangchengli
|
|
15
|
+
* @param {any} rowKey
|
|
16
|
+
* @param any value
|
|
17
|
+
* @param any originalObj
|
|
18
|
+
* @param {any} dataIndex
|
|
19
|
+
* @return {any}
|
|
20
|
+
*/
|
|
21
|
+
export var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
|
|
22
|
+
if (!originalObj) {
|
|
23
|
+
return undefined;
|
|
24
|
+
}
|
|
25
|
+
var originalRecord = get(originalObj, get(record, rowKey));
|
|
26
|
+
var originalValue = get(originalRecord, dataIndex);
|
|
27
|
+
if (!isEqual(originalValue, value)) {
|
|
28
|
+
return originalValue;
|
|
29
|
+
}
|
|
30
|
+
return undefined;
|
|
31
|
+
};
|
|
32
|
+
export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {
|
|
33
|
+
return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');
|
|
34
|
+
};
|
|
35
|
+
/**
|
|
36
|
+
* 判断数据是否为Response<List<any>>结构
|
|
37
|
+
* @param data { [key: string]: any } 需要判断数据
|
|
38
|
+
* @returns boolean 是否
|
|
39
|
+
*/
|
|
40
|
+
export var isListResult = function isListResult(data) {
|
|
41
|
+
return data.hasOwnProperty('total') && data.hasOwnProperty('list');
|
|
42
|
+
};
|
|
43
|
+
export var getRowKey = function getRowKey(rowKey, record) {
|
|
44
|
+
// 默认取id
|
|
45
|
+
var key = record.rowKey || 'id';
|
|
46
|
+
if (rowKey) {
|
|
47
|
+
var _ref;
|
|
48
|
+
key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
|
|
49
|
+
}
|
|
50
|
+
return key;
|
|
51
|
+
};
|
|
@@ -86,24 +86,24 @@ var ActionButton = function ActionButton(_ref) {
|
|
|
86
86
|
disabled: isDisabled,
|
|
87
87
|
okText: _locale.default.ProEditTable.confirm,
|
|
88
88
|
cancelText: _locale.default.ProEditTable.cancel,
|
|
89
|
-
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
|
|
89
|
+
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
|
90
90
|
record: record,
|
|
91
91
|
index: index,
|
|
92
92
|
disabled: isDisabled
|
|
93
|
-
}))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
|
|
93
|
+
}))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
|
94
94
|
disabled: isDisabled,
|
|
95
95
|
type: "link",
|
|
96
96
|
children: btnConfig.label
|
|
97
97
|
}))
|
|
98
98
|
}) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
|
99
|
-
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
|
|
99
|
+
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
|
100
100
|
record: record,
|
|
101
101
|
index: index,
|
|
102
102
|
disabled: isDisabled,
|
|
103
103
|
onClick: function onClick() {
|
|
104
104
|
btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
|
|
105
105
|
}
|
|
106
|
-
}))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
|
|
106
|
+
}))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
|
107
107
|
disabled: isDisabled,
|
|
108
108
|
type: "link",
|
|
109
109
|
onClick: function onClick() {
|
|
@@ -113,12 +113,12 @@ var ActionButton = function ActionButton(_ref) {
|
|
|
113
113
|
}))
|
|
114
114
|
})
|
|
115
115
|
}) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
|
116
|
-
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
|
|
116
|
+
children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
|
117
117
|
record: record,
|
|
118
118
|
index: index
|
|
119
119
|
}))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
|
120
120
|
className: "action-button"
|
|
121
|
-
}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
|
|
121
|
+
}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
|
122
122
|
type: "link",
|
|
123
123
|
icon: (_btnConfig$icon = btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.icon) !== null && _btnConfig$icon !== void 0 ? _btnConfig$icon : _config.iconMap[btnConfig.type],
|
|
124
124
|
children: btnConfig.label
|
|
@@ -49,8 +49,8 @@ var BaseTable = function BaseTable(_ref) {
|
|
|
49
49
|
return {
|
|
50
50
|
disabled: disabled || virtualKey && !!editingKeys.length,
|
|
51
51
|
'data-hide': isHideCheckBox,
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
'data-row-draggable': rowDraggable,
|
|
53
|
+
onClick: function onClick() {}
|
|
54
54
|
};
|
|
55
55
|
}
|
|
56
56
|
}, resetProps), {}, {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
declare const _default:
|
|
1
|
+
import React from 'react';
|
|
2
|
+
declare const _default: React.MemoExoticComponent<({ tableProps, draggableProps, ...resetProps }: {
|
|
3
3
|
[x: string]: any;
|
|
4
4
|
tableProps: any;
|
|
5
5
|
draggableProps: any;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
+
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
|
|
4
5
|
Object.defineProperty(exports, "__esModule", {
|
|
5
6
|
value: true
|
|
6
7
|
});
|
|
@@ -9,14 +10,112 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
|
|
|
9
10
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
10
11
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
11
12
|
var _antd = require("antd");
|
|
12
|
-
var _react = require("react");
|
|
13
|
-
var
|
|
14
|
-
var
|
|
15
|
-
var
|
|
13
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
14
|
+
var _core = require("@dnd-kit/core");
|
|
15
|
+
var _sortable = require("@dnd-kit/sortable");
|
|
16
|
+
var _utilities = require("@dnd-kit/utilities");
|
|
17
|
+
var _ProIcon = _interopRequireDefault(require("../../../ProIcon"));
|
|
18
|
+
var _excluded = ["disabled", "children"],
|
|
19
|
+
_excluded2 = ["tableProps", "draggableProps"];
|
|
20
|
+
var Row = function Row(props) {
|
|
21
|
+
var disabled = props.disabled,
|
|
22
|
+
children = props.children,
|
|
23
|
+
restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
|
|
24
|
+
var data = (0, _sortable.useSortable)({
|
|
25
|
+
id: props['data-row-key'],
|
|
26
|
+
disabled: disabled
|
|
27
|
+
});
|
|
28
|
+
var attributes = data.attributes,
|
|
29
|
+
listeners = data.listeners,
|
|
30
|
+
setNodeRef = data.setNodeRef,
|
|
31
|
+
transform = data.transform,
|
|
32
|
+
transition = data.transition,
|
|
33
|
+
isDragging = data.isDragging;
|
|
34
|
+
var style = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.style), {}, {
|
|
35
|
+
transform: _utilities.CSS.Transform.toString(transform && (0, _objectSpread2.default)((0, _objectSpread2.default)({}, transform), {}, {
|
|
36
|
+
scaleY: 1
|
|
37
|
+
})),
|
|
38
|
+
transition: transition
|
|
39
|
+
}, isDragging ? {
|
|
40
|
+
position: 'relative',
|
|
41
|
+
zIndex: 2
|
|
42
|
+
} : {});
|
|
43
|
+
return (0, _jsxRuntime.jsx)("tr", (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
|
|
44
|
+
ref: setNodeRef,
|
|
45
|
+
style: style
|
|
46
|
+
}, attributes), {}, {
|
|
47
|
+
children: _react.default.Children.map(children, function (child) {
|
|
48
|
+
if (child.key === 'RC_TABLE_KEY' && !disabled) {
|
|
49
|
+
var _restProps$dataRowD;
|
|
50
|
+
var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
|
|
51
|
+
render = _ref.render,
|
|
52
|
+
record = _ref.record,
|
|
53
|
+
renderIndex = _ref.renderIndex;
|
|
54
|
+
var isDrag = restProps['data-row-draggable'] ? (_restProps$dataRowD = restProps['data-row-draggable']) === null || _restProps$dataRowD === void 0 ? void 0 : _restProps$dataRowD.call(restProps, record) : true;
|
|
55
|
+
return /*#__PURE__*/_react.default.cloneElement(child, {
|
|
56
|
+
children: (0, _jsxRuntime.jsxs)("span", {
|
|
57
|
+
className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
|
|
58
|
+
children: [isDrag ? (0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
|
|
59
|
+
className: "drag-icon",
|
|
60
|
+
style: {
|
|
61
|
+
touchAction: 'none',
|
|
62
|
+
cursor: disabled ? 'no-drop' : 'move'
|
|
63
|
+
},
|
|
64
|
+
type: "drag",
|
|
65
|
+
size: 20
|
|
66
|
+
}, listeners)) : (0, _jsxRuntime.jsx)(_ProIcon.default, {
|
|
67
|
+
size: 20
|
|
68
|
+
}), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
|
|
69
|
+
})
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
return child;
|
|
73
|
+
})
|
|
74
|
+
}));
|
|
75
|
+
};
|
|
76
|
+
var DndWrapper = function DndWrapper(_ref2) {
|
|
16
77
|
var _value$;
|
|
17
|
-
var
|
|
18
|
-
|
|
19
|
-
|
|
78
|
+
var draggable = _ref2.draggable,
|
|
79
|
+
value = _ref2.value,
|
|
80
|
+
onChange = _ref2.onChange,
|
|
81
|
+
onDrag = _ref2.onDrag,
|
|
82
|
+
disabled = _ref2.disabled,
|
|
83
|
+
children = _ref2.children;
|
|
84
|
+
var onDragEnd = function onDragEnd(event) {
|
|
85
|
+
var active = event.active,
|
|
86
|
+
over = event.over;
|
|
87
|
+
if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
|
|
88
|
+
if (onDrag) {
|
|
89
|
+
var nextList = onDrag(event, value);
|
|
90
|
+
onChange(nextList);
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
var activeIndex = value.findIndex(function (i) {
|
|
94
|
+
return i.rowKey === active.id;
|
|
95
|
+
});
|
|
96
|
+
var overIndex = value.findIndex(function (i) {
|
|
97
|
+
return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
|
|
98
|
+
});
|
|
99
|
+
var nextValue = (0, _sortable.arrayMove)(value, activeIndex, overIndex);
|
|
100
|
+
onChange(nextValue);
|
|
101
|
+
}
|
|
102
|
+
};
|
|
103
|
+
return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
|
|
104
|
+
onDragEnd: onDragEnd,
|
|
105
|
+
children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {
|
|
106
|
+
items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
|
|
107
|
+
return i.rowKey;
|
|
108
|
+
}) : [],
|
|
109
|
+
strategy: _sortable.verticalListSortingStrategy,
|
|
110
|
+
children: children
|
|
111
|
+
})
|
|
112
|
+
}) : children;
|
|
113
|
+
};
|
|
114
|
+
var DraggableTable = function DraggableTable(_ref3) {
|
|
115
|
+
var _value$2;
|
|
116
|
+
var tableProps = _ref3.tableProps,
|
|
117
|
+
draggableProps = _ref3.draggableProps,
|
|
118
|
+
resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
|
|
20
119
|
var value = tableProps.value,
|
|
21
120
|
headerRender = tableProps.headerRender,
|
|
22
121
|
tableRef = tableProps.tableRef,
|
|
@@ -39,7 +138,7 @@ var DraggableTable = function DraggableTable(_ref) {
|
|
|
39
138
|
var onChange = draggableProps.onChange,
|
|
40
139
|
onDrag = draggableProps.onDrag,
|
|
41
140
|
draggable = draggableProps.draggable;
|
|
42
|
-
return (0, _jsxRuntime.jsxs)(
|
|
141
|
+
return (0, _jsxRuntime.jsxs)(DndWrapper, {
|
|
43
142
|
value: value,
|
|
44
143
|
onChange: onChange,
|
|
45
144
|
onDrag: onDrag,
|
|
@@ -51,21 +150,21 @@ var DraggableTable = function DraggableTable(_ref) {
|
|
|
51
150
|
}) : null, (0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
|
52
151
|
ref: tableRef,
|
|
53
152
|
className: className,
|
|
54
|
-
dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value
|
|
153
|
+
dataSource: (value === null || value === void 0 ? void 0 : (_value$2 = value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.rowKey) ? value : undefined,
|
|
55
154
|
columns: columns,
|
|
56
155
|
rowSelection: renderRowSelection(),
|
|
57
156
|
rowClassName: rowClassName,
|
|
58
157
|
components: {
|
|
59
158
|
body: {
|
|
60
|
-
row:
|
|
159
|
+
row: Row
|
|
61
160
|
}
|
|
62
161
|
},
|
|
63
162
|
onRow: function onRow() {
|
|
64
163
|
return {
|
|
65
164
|
disabled: disabled || virtualKey && !!editingKeys.length,
|
|
66
165
|
'data-hide': isHideCheckBox,
|
|
67
|
-
|
|
68
|
-
|
|
166
|
+
'data-row-draggable': rowDraggable,
|
|
167
|
+
onClick: function onClick() {}
|
|
69
168
|
};
|
|
70
169
|
}
|
|
71
170
|
}, resetProps), {}, {
|
|
@@ -154,8 +154,8 @@ var VirtualTable = function VirtualTable(_ref) {
|
|
|
154
154
|
return {
|
|
155
155
|
disabled: disabled || virtualKey && !!editingKeys.length,
|
|
156
156
|
'data-hide': isHideCheckBox,
|
|
157
|
-
|
|
158
|
-
|
|
157
|
+
'data-row-draggable': rowDraggable,
|
|
158
|
+
onClick: function onClick() {}
|
|
159
159
|
};
|
|
160
160
|
}
|
|
161
161
|
}, resetProps), {}, {
|
|
@@ -64,7 +64,7 @@ var RenderField = function RenderField(_ref) {
|
|
|
64
64
|
trim = column.trim,
|
|
65
65
|
confirm = column.confirm,
|
|
66
66
|
_column$validateTrigg = column.validateTrigger,
|
|
67
|
-
validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', '
|
|
67
|
+
validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _column$validateTrigg,
|
|
68
68
|
resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
|
|
69
69
|
// editRender弃用使用component同ProForm
|
|
70
70
|
var _editRender = component || editRender;
|
|
@@ -558,7 +558,7 @@ var RenderField = function RenderField(_ref) {
|
|
|
558
558
|
var FormItem = null;
|
|
559
559
|
FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
|
560
560
|
validateFirst: true
|
|
561
|
-
}, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
|
|
561
|
+
}, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell'])), {}, {
|
|
562
562
|
className: _className,
|
|
563
563
|
name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
|
|
564
564
|
children: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) ? (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
@@ -11,12 +10,6 @@ Object.defineProperty(exports, "ActionButton", {
|
|
|
11
10
|
return _ActionButton.default;
|
|
12
11
|
}
|
|
13
12
|
});
|
|
14
|
-
Object.defineProperty(exports, "DndWrapper", {
|
|
15
|
-
enumerable: true,
|
|
16
|
-
get: function get() {
|
|
17
|
-
return _DndWrapper.default;
|
|
18
|
-
}
|
|
19
|
-
});
|
|
20
13
|
Object.defineProperty(exports, "RenderField", {
|
|
21
14
|
enumerable: true,
|
|
22
15
|
get: function get() {
|
|
@@ -29,12 +22,6 @@ Object.defineProperty(exports, "RenderToolbar", {
|
|
|
29
22
|
return _RenderToolbar.default;
|
|
30
23
|
}
|
|
31
24
|
});
|
|
32
|
-
Object.defineProperty(exports, "Row", {
|
|
33
|
-
enumerable: true,
|
|
34
|
-
get: function get() {
|
|
35
|
-
return _DndWrapper.Row;
|
|
36
|
-
}
|
|
37
|
-
});
|
|
38
25
|
Object.defineProperty(exports, "Summary", {
|
|
39
26
|
enumerable: true,
|
|
40
27
|
get: function get() {
|
|
@@ -47,7 +34,6 @@ Object.defineProperty(exports, "Validator", {
|
|
|
47
34
|
return _Validator.default;
|
|
48
35
|
}
|
|
49
36
|
});
|
|
50
|
-
var _DndWrapper = _interopRequireWildcard(require("./DndWrapper"));
|
|
51
37
|
var _RenderField = _interopRequireDefault(require("./RenderField"));
|
|
52
38
|
var _Validator = _interopRequireDefault(require("./Validator"));
|
|
53
39
|
var _Summary = _interopRequireDefault(require("./Summary"));
|
|
@@ -138,7 +138,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
138
138
|
});
|
|
139
139
|
}
|
|
140
140
|
})),
|
|
141
|
-
run = _useRequestList.run
|
|
141
|
+
run = _useRequestList.run,
|
|
142
|
+
selectLoading = _useRequestList.loading;
|
|
142
143
|
var _useRequestList2 = (0, _useRequestList3.default)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
|
|
143
144
|
withPagination: withPagination,
|
|
144
145
|
transformParams: transformParams,
|
|
@@ -681,6 +682,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
681
682
|
optionRender: optionRender,
|
|
682
683
|
scrollFollowParent: false,
|
|
683
684
|
mode: isMultiple ? 'multiple' : undefined,
|
|
685
|
+
notFoundContent: selectLoading ? (0, _jsxRuntime.jsx)(_antd.Spin, {
|
|
686
|
+
size: "small"
|
|
687
|
+
}) : null,
|
|
684
688
|
onFocus: function onFocus() {
|
|
685
689
|
if (useRequest) {
|
|
686
690
|
var _useRequest$options9;
|
package/lib/ProSelect/index.js
CHANGED
|
@@ -21,15 +21,14 @@ var _ = require("..");
|
|
|
21
21
|
var _locale = _interopRequireDefault(require("../locale"));
|
|
22
22
|
var _utils = require("./utils");
|
|
23
23
|
require("./index.less");
|
|
24
|
-
var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"
|
|
24
|
+
var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
|
|
25
25
|
var Option = _antd.Select.Option;
|
|
26
26
|
var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
27
27
|
var _selectProps$showCode, _locale$ProSelect;
|
|
28
28
|
var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
|
|
29
29
|
_ref$fieldNames = _ref.fieldNames,
|
|
30
30
|
proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
|
|
31
|
-
showCodeName = _ref.showCodeName
|
|
32
|
-
gViewportReady = _ref.viewportReady;
|
|
31
|
+
showCodeName = _ref.showCodeName;
|
|
33
32
|
var label = 'label';
|
|
34
33
|
var code = 'value';
|
|
35
34
|
if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
|
|
@@ -56,18 +55,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
|
56
55
|
updateDataSource = props.updateDataSource,
|
|
57
56
|
transformResponse = props.transformResponse,
|
|
58
57
|
isViewPro = props.isView,
|
|
59
|
-
__viewportReady = props.viewportReady,
|
|
60
58
|
selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
|
|
61
|
-
var viewportReady = __viewportReady || gViewportReady;
|
|
62
|
-
/** 是否在可视区域出现过 */
|
|
63
|
-
var _useState = (0, _react.useState)(false),
|
|
64
|
-
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
65
|
-
viewFlag = _useState2[0],
|
|
66
|
-
setViewFlag = _useState2[1];
|
|
67
59
|
var refSelect1 = (0, _react.useRef)();
|
|
68
|
-
var _useInViewport = (0, _ahooks.useInViewport)(refSelect1),
|
|
69
|
-
_useInViewport2 = (0, _slicedToArray2.default)(_useInViewport, 1),
|
|
70
|
-
inViewport = _useInViewport2[0];
|
|
71
60
|
selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
|
|
72
61
|
var value = props.value;
|
|
73
62
|
var _ref2 = _.ProForm.useFieldProps() || {},
|
|
@@ -78,15 +67,15 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
|
78
67
|
code = fieldNames.value;
|
|
79
68
|
label = fieldNames.label;
|
|
80
69
|
}
|
|
81
|
-
var
|
|
82
|
-
|
|
83
|
-
selectList =
|
|
84
|
-
setSelectList =
|
|
70
|
+
var _useState = (0, _react.useState)(dataSource || []),
|
|
71
|
+
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
72
|
+
selectList = _useState2[0],
|
|
73
|
+
setSelectList = _useState2[1];
|
|
85
74
|
// 用来控制只有第一次才会设置 defaultOne 属性、🔒
|
|
86
|
-
var
|
|
87
|
-
|
|
88
|
-
isDefaultOne =
|
|
89
|
-
setIsDefaultOne =
|
|
75
|
+
var _useState3 = (0, _react.useState)(false),
|
|
76
|
+
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
77
|
+
isDefaultOne = _useState4[0],
|
|
78
|
+
setIsDefaultOne = _useState4[1];
|
|
90
79
|
var OptionRender = optionRender;
|
|
91
80
|
var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
|
|
92
81
|
var _res$status = res.status,
|
|
@@ -147,16 +136,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
|
147
136
|
if (manual) {
|
|
148
137
|
return;
|
|
149
138
|
}
|
|
150
|
-
if (viewportReady && !viewFlag) {
|
|
151
|
-
return;
|
|
152
|
-
}
|
|
153
139
|
fetchFunction.run(defaultParams);
|
|
154
|
-
}, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue
|
|
155
|
-
(0, _react.useEffect)(function () {
|
|
156
|
-
if (inViewport && !viewFlag && viewportReady) {
|
|
157
|
-
setViewFlag(true);
|
|
158
|
-
}
|
|
159
|
-
}, [inViewport]);
|
|
140
|
+
}, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
|
|
160
141
|
// disable默认值
|
|
161
142
|
if (defaultDisableValue) {
|
|
162
143
|
return (0, _jsxRuntime.jsx)("span", {
|
|
@@ -302,13 +283,9 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
|
302
283
|
});
|
|
303
284
|
}
|
|
304
285
|
return (0, _jsxRuntime.jsx)("div", {
|
|
305
|
-
ref: refSelect1,
|
|
306
286
|
style: props.style,
|
|
307
287
|
className: "ant-select-compact-item-div",
|
|
308
|
-
children: (0, _jsxRuntime.jsx)(_antd.Select
|
|
309
|
-
// id={refSelect1.current}
|
|
310
|
-
, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
|
311
|
-
// id={refSelect1.current}
|
|
288
|
+
children: (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
|
312
289
|
placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
|
|
313
290
|
allowClear: true,
|
|
314
291
|
showArrow: true,
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { ProTableColumn } from '
|
|
2
|
+
import { ProTableColumn } from '../../propsType';
|
|
3
3
|
export declare const formatColumn: (column: ProTableColumn, originalObj: any, dataSourceObj: any, rowKey: any) => void;
|
|
4
|
-
export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
|
|
5
4
|
/**
|
|
6
5
|
* 查找最近的父级className
|
|
7
6
|
* @param element 当前node节点
|
|
@@ -10,12 +9,3 @@ export declare const getColumnDataIndex: (dataIndex: string | string[]) => strin
|
|
|
10
9
|
* @returns ReactNode 父级element
|
|
11
10
|
*/
|
|
12
11
|
export declare const getParentElement: (element: any, name: any, type?: string) => React.ReactNode;
|
|
13
|
-
/**
|
|
14
|
-
* 判断数据是否为Response<List<any>>结构
|
|
15
|
-
* @param data { [key: string]: any } 需要判断数据
|
|
16
|
-
* @returns boolean 是否
|
|
17
|
-
*/
|
|
18
|
-
export declare const isListResult: (data: {
|
|
19
|
-
[key: string]: any;
|
|
20
|
-
}) => boolean;
|
|
21
|
-
export declare const getRowKey: (rowKey: any, record: any) => any;
|