@teamix/pro 1.3.1 → 1.3.2
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 +734 -113
- package/dist/pro.min.css +1 -1
- package/dist/pro.min.js +1 -1
- package/es/form/Components/ProField/mapDateFormat.d.ts +3 -0
- package/es/form/Components/ProField/mapDateFormat.js +113 -0
- package/es/form/ProForm/customComponent.js +2 -1
- package/es/form/SchemaForm/index.js +2 -2
- package/es/form/SchemaForm/initializeDataSource.d.ts +1 -1
- package/es/form/SchemaForm/initializeDataSource.js +2 -2
- package/es/form/SchemaForm/reactions.d.ts +1 -1
- package/es/form/SchemaForm/reactions.js +33 -33
- package/es/form/fieldTypeMap.d.ts +3 -0
- package/es/form/fieldTypeMap.js +3 -0
- package/es/index.d.ts +1 -1
- package/es/index.js +1 -1
- package/es/table/components/ToolBar/DensityIcon.js +5 -3
- package/es/table/components/ToolBar/FilterColumnIcon.js +12 -3
- package/es/table/components/ToolBar/index.scss +2 -2
- package/es/table/index.js +8 -4
- package/es/table/index.scss +1 -1
- package/es/table/typing.d.ts +4 -0
- package/es/table/utils/columnRender.js +6 -0
- package/lib/form/Components/ProField/mapDateFormat.d.ts +3 -0
- package/lib/form/Components/ProField/mapDateFormat.js +125 -0
- package/lib/form/ProForm/customComponent.js +3 -1
- package/lib/form/SchemaForm/index.js +2 -2
- package/lib/form/SchemaForm/initializeDataSource.d.ts +1 -1
- package/lib/form/SchemaForm/initializeDataSource.js +2 -2
- package/lib/form/SchemaForm/reactions.d.ts +1 -1
- package/lib/form/SchemaForm/reactions.js +33 -33
- package/lib/form/fieldTypeMap.d.ts +3 -0
- package/lib/form/fieldTypeMap.js +5 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/table/components/ToolBar/DensityIcon.js +5 -3
- package/lib/table/components/ToolBar/FilterColumnIcon.js +11 -2
- package/lib/table/components/ToolBar/index.scss +2 -2
- package/lib/table/index.js +8 -4
- package/lib/table/index.scss +1 -1
- package/lib/table/typing.d.ts +4 -0
- package/lib/table/utils/columnRender.js +6 -0
- package/package.json +1 -1
@@ -0,0 +1,113 @@
|
|
1
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
2
|
+
|
3
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
4
|
+
|
5
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
6
|
+
|
7
|
+
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; }
|
8
|
+
|
9
|
+
function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
|
10
|
+
|
11
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
12
|
+
|
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
|
+
|
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
|
+
|
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
|
+
|
19
|
+
import { isEmpty } from '@formily/shared';
|
20
|
+
import { isArr, isFn } from '@teamix/utils';
|
21
|
+
import Moment from 'moment';
|
22
|
+
|
23
|
+
var moment = function moment(date, format) {
|
24
|
+
return Moment((date === null || date === void 0 ? void 0 : date.toDate) ? date.toDate() : date, format);
|
25
|
+
};
|
26
|
+
|
27
|
+
var momentable = function momentable(value, format) {
|
28
|
+
return Array.isArray(value) ? value.map(function (val) {
|
29
|
+
return moment(val, format);
|
30
|
+
}) : value ? moment(value, format) : value;
|
31
|
+
};
|
32
|
+
|
33
|
+
var formatMomentValue = function formatMomentValue(value, format, placeholder) {
|
34
|
+
var formatDate = function formatDate(date, format) {
|
35
|
+
var i = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
36
|
+
if (!date) return placeholder;
|
37
|
+
|
38
|
+
if (isArr(format)) {
|
39
|
+
var _format = format[i];
|
40
|
+
|
41
|
+
if (isFn(_format)) {
|
42
|
+
return _format(date);
|
43
|
+
}
|
44
|
+
|
45
|
+
if (isEmpty(_format)) {
|
46
|
+
return date;
|
47
|
+
}
|
48
|
+
|
49
|
+
return moment(date).format(_format);
|
50
|
+
} else {
|
51
|
+
if (isFn(format)) {
|
52
|
+
return format(date);
|
53
|
+
}
|
54
|
+
|
55
|
+
if (isEmpty(format)) {
|
56
|
+
return date;
|
57
|
+
}
|
58
|
+
|
59
|
+
return moment(date).format(format);
|
60
|
+
}
|
61
|
+
};
|
62
|
+
|
63
|
+
if (isArr(value)) {
|
64
|
+
return value.map(function (val, index) {
|
65
|
+
return formatDate(val, format, index);
|
66
|
+
});
|
67
|
+
} else {
|
68
|
+
return value ? formatDate(value, format) : value || placeholder;
|
69
|
+
}
|
70
|
+
};
|
71
|
+
|
72
|
+
var mapDateFormatDatePicker2 = function mapDateFormatDatePicker2(type) {
|
73
|
+
var getDefaultFormat = function getDefaultFormat(props) {
|
74
|
+
var _type = props['type'] || type;
|
75
|
+
|
76
|
+
if (_type === 'month') {
|
77
|
+
return 'YYYY-MM';
|
78
|
+
} else if (_type === 'quarter') {
|
79
|
+
return 'YYYY-\\QQ';
|
80
|
+
} else if (_type === 'year') {
|
81
|
+
return 'YYYY';
|
82
|
+
} else if (_type === 'week') {
|
83
|
+
return 'YYYY-wo';
|
84
|
+
}
|
85
|
+
|
86
|
+
return props['showTime'] ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD';
|
87
|
+
};
|
88
|
+
|
89
|
+
return function (props) {
|
90
|
+
var format = props['format'] || getDefaultFormat(props);
|
91
|
+
var _onChange = props.onChange;
|
92
|
+
return _objectSpread(_objectSpread({}, props), {}, {
|
93
|
+
format: format === 'YYYY-MM-DD HH:mm:ss' ? 'YYYY-MM-DD' : format,
|
94
|
+
value: momentable(props.value, format === 'YYYY-wo' ? 'YYYY-w' : format),
|
95
|
+
onChange: function onChange(value) {
|
96
|
+
if (_onChange) {
|
97
|
+
_onChange(formatMomentValue(value, format));
|
98
|
+
}
|
99
|
+
}
|
100
|
+
});
|
101
|
+
};
|
102
|
+
};
|
103
|
+
|
104
|
+
var mapDateFormat = function mapDateFormat(props, field) {
|
105
|
+
var _ref = field.component || [],
|
106
|
+
_ref2 = _slicedToArray(_ref, 1),
|
107
|
+
component = _ref2[0];
|
108
|
+
|
109
|
+
console.log(component);
|
110
|
+
return {};
|
111
|
+
};
|
112
|
+
|
113
|
+
export default mapDateFormat;
|
@@ -6,6 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
|
6
6
|
|
7
7
|
import { connect, mapProps } from '@formily/react';
|
8
8
|
import { toJS } from '@formily/reactive';
|
9
|
+
import { mapSize, mapStatus, mapDataSource } from '../utils';
|
9
10
|
|
10
11
|
var customComponent = function customComponent(component) {
|
11
12
|
return connect(component, mapProps(function (props, field) {
|
@@ -14,7 +15,7 @@ var customComponent = function customComponent(component) {
|
|
14
15
|
form: field.form,
|
15
16
|
values: toJS(field.form.values)
|
16
17
|
});
|
17
|
-
}));
|
18
|
+
}, mapSize, mapStatus, mapDataSource));
|
18
19
|
};
|
19
20
|
|
20
21
|
export { customComponent };
|
@@ -200,10 +200,10 @@ export default /*#__PURE__*/memo(function (_ref) {
|
|
200
200
|
|
201
201
|
var _initializeRequest = initializeRequest(request, "".concat(suffix, "r")),
|
202
202
|
requestReactions = _initializeRequest.reactions,
|
203
|
-
requestScope = _initializeRequest.scope; // 初始化dataSource
|
203
|
+
requestScope = _initializeRequest.scope; // 初始化dataSource
|
204
204
|
|
205
205
|
|
206
|
-
var _initializeDataSource = initializeDataSource(dataSource, "".concat(suffix, "d")
|
206
|
+
var _initializeDataSource = initializeDataSource(dataSource, "".concat(suffix, "d")),
|
207
207
|
defaultDataSource = _initializeDataSource.dataSource,
|
208
208
|
dataSourceReactions = _initializeDataSource.reactions,
|
209
209
|
dataSourceScope = _initializeDataSource.scope; // 初始化rules validator
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import type { ProFormRequestConfig } from '../typing';
|
2
2
|
interface IInitializeDataSource {
|
3
|
-
(requestConfig?: ProFormRequestConfig | any, suffix?: string
|
3
|
+
(requestConfig?: ProFormRequestConfig | any, suffix?: string): {
|
4
4
|
dataSource?: any[];
|
5
5
|
reactions: any[];
|
6
6
|
scope: {
|
@@ -2,12 +2,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
|
2
2
|
|
3
3
|
import { isPlainObj } from '@teamix/utils';
|
4
4
|
|
5
|
-
var initializeDataSource = function initializeDataSource(dataSource, suffix
|
5
|
+
var initializeDataSource = function initializeDataSource(dataSource, suffix) {
|
6
6
|
if (isPlainObj(dataSource)) {
|
7
7
|
var requestConfig = dataSource;
|
8
8
|
var requestConfigName = "$requestConfig_".concat(suffix);
|
9
9
|
return {
|
10
|
-
reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context
|
10
|
+
reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
|
11
11
|
scope: _defineProperty({}, requestConfigName, requestConfig)
|
12
12
|
};
|
13
13
|
}
|
@@ -2,5 +2,5 @@ import type { ProFormRequestConfig } from '../typing';
|
|
2
2
|
declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any, type: 'request' | 'validator' | 'dataSource') => Promise<unknown>;
|
3
3
|
declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
|
4
4
|
declare const $validator: (services: any, requestConfig: ProFormRequestConfig, context: any) => (value: any, rules: any, { field }: any) => any;
|
5
|
-
declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any
|
5
|
+
declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
|
6
6
|
export { $request, $common, $dataSource, $validator };
|
@@ -9,18 +9,19 @@ import { isFn, isPureObj, doCommonRequest, getValueByValue } from '@teamix/utils
|
|
9
9
|
var $request = function $request(field, requestConfig, context, type) {
|
10
10
|
var _field$data;
|
11
11
|
|
12
|
-
var
|
12
|
+
var params = requestConfig.params,
|
13
|
+
beforeRequest = requestConfig.beforeRequest,
|
13
14
|
onSuccess = requestConfig.onSuccess;
|
14
15
|
var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {};
|
15
16
|
/**
|
16
|
-
*
|
17
|
+
* 主动触发的请求刷新
|
17
18
|
*/
|
18
19
|
// 触发所有配置的请求
|
19
20
|
|
20
21
|
var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
|
21
22
|
var refreshResult = isPureObj(refresh) ? refresh : {};
|
22
23
|
return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
|
23
|
-
params: _objectSpread(_objectSpread(_objectSpread({},
|
24
|
+
params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
|
24
25
|
beforeRequest: function beforeRequest() {
|
25
26
|
return beforeRequestResult;
|
26
27
|
},
|
@@ -34,7 +35,9 @@ var $request = function $request(field, requestConfig, context, type) {
|
|
34
35
|
var $common = function $common(services, requestConfig, context) {
|
35
36
|
return function (field) {
|
36
37
|
return services(field, requestConfig, context, 'request').then(function (res) {
|
37
|
-
|
38
|
+
var _requestConfig$onComp;
|
39
|
+
|
40
|
+
return (_requestConfig$onComp = requestConfig.onComplete) === null || _requestConfig$onComp === void 0 ? void 0 : _requestConfig$onComp.call(requestConfig, res, field, context);
|
38
41
|
});
|
39
42
|
};
|
40
43
|
}; // 配置校验
|
@@ -44,47 +47,44 @@ var $validator = function $validator(services, requestConfig, context) {
|
|
44
47
|
return function (value, rules, _ref) {
|
45
48
|
var field = _ref.field;
|
46
49
|
return services(field, requestConfig, context, 'validator').then(function (res) {
|
47
|
-
|
50
|
+
var _requestConfig$onComp2;
|
51
|
+
|
52
|
+
return (_requestConfig$onComp2 = requestConfig.onComplete) === null || _requestConfig$onComp2 === void 0 ? void 0 : _requestConfig$onComp2.call(requestConfig, res, field, context);
|
48
53
|
});
|
49
54
|
};
|
50
55
|
}; // 配置DataSource
|
51
56
|
|
52
57
|
|
53
|
-
var $dataSource = function $dataSource(services, requestConfig, context
|
58
|
+
var $dataSource = function $dataSource(services, requestConfig, context) {
|
54
59
|
return function (field) {
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
}
|
61
|
-
|
60
|
+
field.setState({
|
61
|
+
loading: true
|
62
|
+
});
|
63
|
+
field.setComponentProps({
|
64
|
+
readOnly: true
|
65
|
+
});
|
62
66
|
return services(field, requestConfig, context, 'dataSource').then(function (res) {
|
67
|
+
var _requestConfig$onComp3;
|
68
|
+
|
63
69
|
var isValueInDataSource = getValueByValue(res, field.value);
|
64
70
|
var clearValue = isValueInDataSource ? {} : {
|
65
71
|
value: undefined
|
66
72
|
};
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
field.setState({
|
76
|
-
dataSource: res
|
77
|
-
});
|
78
|
-
}
|
79
|
-
|
80
|
-
return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
|
73
|
+
field.setState(_objectSpread({
|
74
|
+
dataSource: res,
|
75
|
+
loading: false
|
76
|
+
}, clearValue));
|
77
|
+
field.setComponentProps({
|
78
|
+
readOnly: false
|
79
|
+
});
|
80
|
+
return (_requestConfig$onComp3 = requestConfig.onComplete) === null || _requestConfig$onComp3 === void 0 ? void 0 : _requestConfig$onComp3.call(requestConfig, res, field, context);
|
81
81
|
}).catch(function () {
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
}
|
82
|
+
field.setState({
|
83
|
+
loading: false
|
84
|
+
});
|
85
|
+
field.setComponentProps({
|
86
|
+
readOnly: false
|
87
|
+
});
|
88
88
|
});
|
89
89
|
};
|
90
90
|
};
|
package/es/form/fieldTypeMap.js
CHANGED
@@ -40,4 +40,7 @@ var fieldTypeMap = {
|
|
40
40
|
Search: 'search',
|
41
41
|
SelectGroup: 'selectGroup'
|
42
42
|
};
|
43
|
+
var datePicker2TypeArray = ['DatePicker', 'DateTimePicker', 'WeekPicker', 'MonthPicker', 'YearPicker', 'QuarterPicker', 'DateRangePicker', 'DateTimeRangePicker', 'WeekRangePicker', 'MonthRangePicker', 'YearRangePicker', 'QuarterRangePicker'];
|
44
|
+
var timePicker2TypeArray = ['TimePicker', 'TimeRangePicker'];
|
45
|
+
export { datePicker2TypeArray, timePicker2TypeArray };
|
43
46
|
export default fieldTypeMap;
|
package/es/index.d.ts
CHANGED
@@ -24,5 +24,5 @@ export * from './skeleton';
|
|
24
24
|
export * from './table';
|
25
25
|
export * from './utils';
|
26
26
|
export * from './timeline';
|
27
|
-
declare const version = "1.3.
|
27
|
+
declare const version = "1.3.2";
|
28
28
|
export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };
|
package/es/index.js
CHANGED
@@ -30,7 +30,7 @@ export * from './table';
|
|
30
30
|
export * from './utils'; // export * from './sidebar';
|
31
31
|
|
32
32
|
export * from './timeline';
|
33
|
-
var version = '1.3.
|
33
|
+
var version = '1.3.2';
|
34
34
|
export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
|
35
35
|
ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
|
36
36
|
ProTimeline, hooks, nocode, templates, utils };
|
@@ -22,9 +22,11 @@ var RadioItem = Menu.RadioItem;
|
|
22
22
|
var cls = baseClass('teamix-pro-table-toolbar-icon');
|
23
23
|
|
24
24
|
var DensityIcon = function DensityIcon(props) {
|
25
|
+
var _actionRef$current;
|
26
|
+
|
25
27
|
var actionRef = props.actionRef;
|
26
28
|
|
27
|
-
var _useState = useState('medium'),
|
29
|
+
var _useState = useState(((_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.size) || 'medium'),
|
28
30
|
_useState2 = _slicedToArray(_useState, 2),
|
29
31
|
size = _useState2[0],
|
30
32
|
setSize = _useState2[1]; // const [fullscreen, setFullscreen] = useState<boolean>(false);
|
@@ -44,10 +46,10 @@ var DensityIcon = function DensityIcon(props) {
|
|
44
46
|
|
45
47
|
|
46
48
|
var radioOnchange = function radioOnchange(mode) {
|
47
|
-
var _actionRef$
|
49
|
+
var _actionRef$current2, _actionRef$current2$s;
|
48
50
|
|
49
51
|
setSize(mode);
|
50
|
-
(_actionRef$
|
52
|
+
(_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setSize) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, mode);
|
51
53
|
}; // // 销毁监听函数
|
52
54
|
// useEffect(() => {
|
53
55
|
// return () => {
|
@@ -33,13 +33,22 @@ import { baseClass, getMessage } from '@teamix/utils';
|
|
33
33
|
import React, { useState, useEffect } from 'react';
|
34
34
|
import { cloneDeep, off, on } from '../../utils';
|
35
35
|
import './index.scss';
|
36
|
-
import { Ellipsis } from '@teamix/utils';
|
36
|
+
import { Ellipsis, getCookie } from '@teamix/utils';
|
37
37
|
var CheckboxItem = Menu.CheckboxItem;
|
38
38
|
var Row = Grid.Row,
|
39
39
|
Col = Grid.Col;
|
40
|
-
var cls = baseClass('teamix-pro-table-toolbar-filter-column');
|
40
|
+
var cls = baseClass('teamix-pro-table-toolbar-filter-column'); // 判断是否是 root 组织
|
41
|
+
|
42
|
+
var isRoot = getCookie('organizationId') === '1';
|
41
43
|
|
42
44
|
var processColumns = function processColumns(columns) {
|
45
|
+
if (isRoot) {
|
46
|
+
// root 组织下不显示标签管理
|
47
|
+
columns = columns.filter(function (item) {
|
48
|
+
return item.valueType !== 'selectGroup';
|
49
|
+
});
|
50
|
+
}
|
51
|
+
|
43
52
|
return columns.map(function (item) {
|
44
53
|
if (item.columnFilters === false) {
|
45
54
|
return item;
|
@@ -296,7 +305,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
296
305
|
return onChangeColumns(check, dataIndex);
|
297
306
|
},
|
298
307
|
disabled: columnFiltersDisabled
|
299
|
-
}, title, !lock && /*#__PURE__*/React.createElement("div", {
|
308
|
+
}, title, !lock && !columnFiltersDisabled && /*#__PURE__*/React.createElement("div", {
|
300
309
|
className: cls({
|
301
310
|
sort: true
|
302
311
|
})
|
@@ -29,7 +29,7 @@
|
|
29
29
|
}
|
30
30
|
&-reset {
|
31
31
|
position: absolute;
|
32
|
-
right:
|
32
|
+
right: 0px;
|
33
33
|
top: 6px;
|
34
34
|
}
|
35
35
|
// .next-menu {
|
@@ -59,7 +59,7 @@
|
|
59
59
|
.teamix-pro-table-toolbar-filter-column-sort {
|
60
60
|
visibility: hidden;
|
61
61
|
position: absolute;
|
62
|
-
right:
|
62
|
+
right: 0px;
|
63
63
|
top: 0;
|
64
64
|
color: var(--color-text1-7);
|
65
65
|
i {
|
package/es/table/index.js
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords"];
|
1
|
+
var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll"];
|
2
2
|
|
3
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
|
|
@@ -178,6 +178,9 @@ var ProTable = function ProTable(props) {
|
|
178
178
|
defaultFilterParams = props.defaultFilterParams,
|
179
179
|
_props$reserveSelecte = props.reserveSelectedRecords,
|
180
180
|
reserveSelectedRecords = _props$reserveSelecte === void 0 ? false : _props$reserveSelecte,
|
181
|
+
_props$size = props.size,
|
182
|
+
propsSize = _props$size === void 0 ? 'medium' : _props$size,
|
183
|
+
disableSelectAll = props.disableSelectAll,
|
181
184
|
otherProps = _objectWithoutProperties(props, _excluded);
|
182
185
|
|
183
186
|
var targetPageKey = pageKey || globalPageKey;
|
@@ -231,7 +234,7 @@ var ProTable = function ProTable(props) {
|
|
231
234
|
filteredColumns = _useState16[0],
|
232
235
|
setFilteredColumns = _useState16[1];
|
233
236
|
|
234
|
-
var _useState17 = useState(
|
237
|
+
var _useState17 = useState(propsSize),
|
235
238
|
_useState18 = _slicedToArray(_useState17, 2),
|
236
239
|
size = _useState18[0],
|
237
240
|
_setSize = _useState18[1];
|
@@ -354,7 +357,7 @@ var ProTable = function ProTable(props) {
|
|
354
357
|
result = propsRowSelection.titleProps();
|
355
358
|
}
|
356
359
|
|
357
|
-
if (showSkeleton) {
|
360
|
+
if (showSkeleton || disableSelectAll) {
|
358
361
|
result.disabled = true;
|
359
362
|
}
|
360
363
|
|
@@ -389,7 +392,7 @@ var ProTable = function ProTable(props) {
|
|
389
392
|
return selectedRowKeys.includes(k);
|
390
393
|
});
|
391
394
|
return {
|
392
|
-
disabled: showLoading && !showSkeleton && (getData.loading || props.loading),
|
395
|
+
disabled: disableSelectAll || showLoading && !showSkeleton && (getData.loading || props.loading),
|
393
396
|
onChange: function onChange(check) {
|
394
397
|
if (check) {
|
395
398
|
var result = selectedRowKeys.concat([]);
|
@@ -493,6 +496,7 @@ var ProTable = function ProTable(props) {
|
|
493
496
|
emit('refreshFilterState', newColumns);
|
494
497
|
}
|
495
498
|
},
|
499
|
+
size: size,
|
496
500
|
setSize: function setSize(mode) {
|
497
501
|
_setSize(mode);
|
498
502
|
},
|
package/es/table/index.scss
CHANGED
package/es/table/typing.d.ts
CHANGED
@@ -135,6 +135,8 @@ export declare type ProTableProps = {
|
|
135
135
|
defaultFilterParams?: {
|
136
136
|
[key: string]: any[] | any;
|
137
137
|
};
|
138
|
+
/** 禁用掉批量选择中的全选 */
|
139
|
+
disableSelectAll?: boolean;
|
138
140
|
} & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
|
139
141
|
export declare type rowSelectionType = {
|
140
142
|
getProps?: (record: any, index: number) => any;
|
@@ -160,6 +162,8 @@ export declare type ProTableActionType = {
|
|
160
162
|
fullScreen?: () => boolean;
|
161
163
|
/** 设置显示列 */
|
162
164
|
setColumn?: (newColumns: ProColumnProps[], update?: boolean) => void;
|
165
|
+
/** 表格尺寸 */
|
166
|
+
size?: 'small' | 'medium';
|
163
167
|
/** 设置表格大小 */
|
164
168
|
setSize?: (mode: 'small' | 'medium') => void;
|
165
169
|
/** 刷新表格 */
|
@@ -158,6 +158,12 @@ export var renderCell = function renderCell(value, item, index, record, actionRe
|
|
158
158
|
}
|
159
159
|
}, props);
|
160
160
|
}
|
161
|
+
|
162
|
+
if ((render === null || render === void 0 ? void 0 : render.type) === 'step') {
|
163
|
+
newRender = _objectSpread(_objectSpread({}, newRender), {}, {
|
164
|
+
ellipsis: false
|
165
|
+
});
|
166
|
+
}
|
161
167
|
} // 渲染操作组
|
162
168
|
|
163
169
|
|
@@ -0,0 +1,125 @@
|
|
1
|
+
"use strict";
|
2
|
+
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
4
|
+
value: true
|
5
|
+
});
|
6
|
+
exports.default = void 0;
|
7
|
+
|
8
|
+
var _shared = require("@formily/shared");
|
9
|
+
|
10
|
+
var _utils = require("@teamix/utils");
|
11
|
+
|
12
|
+
var _moment = _interopRequireDefault(require("moment"));
|
13
|
+
|
14
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
15
|
+
|
16
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
17
|
+
|
18
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
19
|
+
|
20
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
21
|
+
|
22
|
+
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; }
|
23
|
+
|
24
|
+
function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
|
25
|
+
|
26
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
27
|
+
|
28
|
+
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; }
|
29
|
+
|
30
|
+
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; }
|
31
|
+
|
32
|
+
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; }
|
33
|
+
|
34
|
+
var moment = function moment(date, format) {
|
35
|
+
return (0, _moment.default)((date === null || date === void 0 ? void 0 : date.toDate) ? date.toDate() : date, format);
|
36
|
+
};
|
37
|
+
|
38
|
+
var momentable = function momentable(value, format) {
|
39
|
+
return Array.isArray(value) ? value.map(function (val) {
|
40
|
+
return moment(val, format);
|
41
|
+
}) : value ? moment(value, format) : value;
|
42
|
+
};
|
43
|
+
|
44
|
+
var formatMomentValue = function formatMomentValue(value, format, placeholder) {
|
45
|
+
var formatDate = function formatDate(date, format) {
|
46
|
+
var i = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
47
|
+
if (!date) return placeholder;
|
48
|
+
|
49
|
+
if ((0, _utils.isArr)(format)) {
|
50
|
+
var _format = format[i];
|
51
|
+
|
52
|
+
if ((0, _utils.isFn)(_format)) {
|
53
|
+
return _format(date);
|
54
|
+
}
|
55
|
+
|
56
|
+
if ((0, _shared.isEmpty)(_format)) {
|
57
|
+
return date;
|
58
|
+
}
|
59
|
+
|
60
|
+
return moment(date).format(_format);
|
61
|
+
} else {
|
62
|
+
if ((0, _utils.isFn)(format)) {
|
63
|
+
return format(date);
|
64
|
+
}
|
65
|
+
|
66
|
+
if ((0, _shared.isEmpty)(format)) {
|
67
|
+
return date;
|
68
|
+
}
|
69
|
+
|
70
|
+
return moment(date).format(format);
|
71
|
+
}
|
72
|
+
};
|
73
|
+
|
74
|
+
if ((0, _utils.isArr)(value)) {
|
75
|
+
return value.map(function (val, index) {
|
76
|
+
return formatDate(val, format, index);
|
77
|
+
});
|
78
|
+
} else {
|
79
|
+
return value ? formatDate(value, format) : value || placeholder;
|
80
|
+
}
|
81
|
+
};
|
82
|
+
|
83
|
+
var mapDateFormatDatePicker2 = function mapDateFormatDatePicker2(type) {
|
84
|
+
var getDefaultFormat = function getDefaultFormat(props) {
|
85
|
+
var _type = props['type'] || type;
|
86
|
+
|
87
|
+
if (_type === 'month') {
|
88
|
+
return 'YYYY-MM';
|
89
|
+
} else if (_type === 'quarter') {
|
90
|
+
return 'YYYY-\\QQ';
|
91
|
+
} else if (_type === 'year') {
|
92
|
+
return 'YYYY';
|
93
|
+
} else if (_type === 'week') {
|
94
|
+
return 'YYYY-wo';
|
95
|
+
}
|
96
|
+
|
97
|
+
return props['showTime'] ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD';
|
98
|
+
};
|
99
|
+
|
100
|
+
return function (props) {
|
101
|
+
var format = props['format'] || getDefaultFormat(props);
|
102
|
+
var _onChange = props.onChange;
|
103
|
+
return _objectSpread(_objectSpread({}, props), {}, {
|
104
|
+
format: format === 'YYYY-MM-DD HH:mm:ss' ? 'YYYY-MM-DD' : format,
|
105
|
+
value: momentable(props.value, format === 'YYYY-wo' ? 'YYYY-w' : format),
|
106
|
+
onChange: function onChange(value) {
|
107
|
+
if (_onChange) {
|
108
|
+
_onChange(formatMomentValue(value, format));
|
109
|
+
}
|
110
|
+
}
|
111
|
+
});
|
112
|
+
};
|
113
|
+
};
|
114
|
+
|
115
|
+
var mapDateFormat = function mapDateFormat(props, field) {
|
116
|
+
var _ref = field.component || [],
|
117
|
+
_ref2 = _slicedToArray(_ref, 1),
|
118
|
+
component = _ref2[0];
|
119
|
+
|
120
|
+
console.log(component);
|
121
|
+
return {};
|
122
|
+
};
|
123
|
+
|
124
|
+
var _default = mapDateFormat;
|
125
|
+
exports.default = _default;
|
@@ -9,6 +9,8 @@ var _react = require("@formily/react");
|
|
9
9
|
|
10
10
|
var _reactive = require("@formily/reactive");
|
11
11
|
|
12
|
+
var _utils = require("../utils");
|
13
|
+
|
12
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; }
|
13
15
|
|
14
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; }
|
@@ -22,7 +24,7 @@ var customComponent = function customComponent(component) {
|
|
22
24
|
form: field.form,
|
23
25
|
values: (0, _reactive.toJS)(field.form.values)
|
24
26
|
});
|
25
|
-
}));
|
27
|
+
}, _utils.mapSize, _utils.mapStatus, _utils.mapDataSource));
|
26
28
|
};
|
27
29
|
|
28
30
|
exports.customComponent = customComponent;
|