@teamix/pro 1.1.29 → 1.1.33
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 +1329 -892
- package/dist/pro.min.css +1 -1
- package/dist/pro.min.js +1 -1
- package/es/actions/dialog-form.js +3 -1
- package/es/actions/dialog.d.ts +0 -2
- package/es/actions/dialog.js +16 -23
- package/es/actions/index.js +13 -8
- package/es/actions/link.d.ts +2 -8
- package/es/actions/link.js +2 -22
- package/es/actions/request.d.ts +1 -1
- package/es/actions/request.js +6 -3
- package/es/form/Components/FormGroup/index.scss +1 -1
- package/es/form/Components/ProField/index.d.ts +4 -0
- package/es/form/Components/Query/index.scss +1 -6
- package/es/form/Components/Text/index.scss +4 -2
- package/es/form/ProForm/index.js +3 -16
- package/es/form/ProForm/index.scss +4 -11
- package/es/form/ProForm/useAutoSubmit.js +3 -1
- package/es/form/ProForm/useFormDisplayValues.d.ts +6 -0
- package/es/form/ProForm/useFormDisplayValues.js +65 -0
- package/es/form/SchemaForm/adapterType.js +2 -1
- package/es/form/SchemaForm/index.js +5 -15
- package/es/form/SchemaForm/initializeProField.js +1 -0
- package/es/form/SchemaForm/initializeReactions.d.ts +2 -0
- package/es/form/SchemaForm/initializeReactions.js +89 -0
- package/es/form/SchemaForm/reactions.js +10 -2
- package/es/form/global.scss +12 -0
- package/es/form/index.d.ts +3 -3
- package/es/form/index.js +3 -3
- package/es/form/typing.d.ts +2 -2
- package/es/form/utils.d.ts +31 -8
- package/es/form/utils.js +27 -44
- package/es/index.d.ts +1 -1
- package/es/index.js +1 -1
- package/es/info/components/ProInfoItem/index.js +4 -2
- package/es/table/components/Filter/index.js +6 -2
- package/es/table/index.js +15 -3
- package/es/table/typing.d.ts +8 -4
- package/es/table/utils/columnRender.js +38 -11
- package/lib/actions/dialog-form.js +4 -1
- package/lib/actions/dialog.d.ts +0 -2
- package/lib/actions/dialog.js +15 -23
- package/lib/actions/index.js +12 -7
- package/lib/actions/link.d.ts +2 -8
- package/lib/actions/link.js +2 -25
- package/lib/actions/request.d.ts +1 -1
- package/lib/actions/request.js +7 -3
- package/lib/form/Components/FormGroup/index.scss +1 -1
- package/lib/form/Components/ProField/index.d.ts +4 -0
- package/lib/form/Components/Query/index.scss +1 -6
- package/lib/form/Components/Text/index.scss +4 -2
- package/lib/form/ProForm/index.js +2 -15
- package/lib/form/ProForm/index.scss +4 -11
- package/lib/form/ProForm/useAutoSubmit.js +4 -1
- package/lib/form/ProForm/useFormDisplayValues.d.ts +6 -0
- package/lib/form/ProForm/useFormDisplayValues.js +74 -0
- package/lib/form/SchemaForm/adapterType.js +2 -1
- package/lib/form/SchemaForm/index.js +5 -14
- package/lib/form/SchemaForm/initializeProField.js +1 -0
- package/lib/form/SchemaForm/initializeReactions.d.ts +2 -0
- package/lib/form/SchemaForm/initializeReactions.js +101 -0
- package/lib/form/SchemaForm/reactions.js +10 -2
- package/lib/form/global.scss +12 -0
- package/lib/form/index.d.ts +3 -3
- package/lib/form/index.js +15 -8
- package/lib/form/typing.d.ts +2 -2
- package/lib/form/utils.d.ts +31 -8
- package/lib/form/utils.js +28 -54
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/info/components/ProInfoItem/index.js +3 -1
- package/lib/table/components/Filter/index.js +6 -2
- package/lib/table/index.js +15 -3
- package/lib/table/typing.d.ts +8 -4
- package/lib/table/utils/columnRender.js +38 -11
- package/package.json +4 -4
@@ -55,10 +55,18 @@ var useAsyncDataSource = function useAsyncDataSource(services, onComplete) {
|
|
55
55
|
loading: true
|
56
56
|
});
|
57
57
|
return services(field).then(function (res) {
|
58
|
-
|
58
|
+
var _res$map;
|
59
|
+
|
60
|
+
var isValueInDataSource = res === null || res === void 0 ? void 0 : (_res$map = res.map(function (v) {
|
61
|
+
return v.value;
|
62
|
+
})) === null || _res$map === void 0 ? void 0 : _res$map.includes(field.value);
|
63
|
+
var clearValue = isValueInDataSource ? {} : {
|
64
|
+
value: undefined
|
65
|
+
};
|
66
|
+
field.setState(_objectSpread({
|
59
67
|
dataSource: res,
|
60
68
|
loading: false
|
61
|
-
});
|
69
|
+
}, clearValue));
|
62
70
|
return onComplete && onComplete(res, field);
|
63
71
|
}).catch(function () {
|
64
72
|
field.setState({
|
@@ -0,0 +1,12 @@
|
|
1
|
+
@import '~@alicloudfe/components/lib/common-var.scss';
|
2
|
+
|
3
|
+
$form-item-cls: #{$css-prefix}formily-item;
|
4
|
+
$teamix-pro-form: teamix-pro-form;
|
5
|
+
|
6
|
+
$inset-font-weight-medium: calc(
|
7
|
+
var(--form-element-medium-height, 32px) - var(--input-border-width, 1px) * 2
|
8
|
+
);
|
9
|
+
|
10
|
+
$noborder-font-weight-medium: calc(
|
11
|
+
var(--form-element-medium-height, 32px) - var(--input-border-width, 1px) * 2
|
12
|
+
);
|
package/lib/form/index.d.ts
CHANGED
@@ -13,10 +13,10 @@ export * as formilyTeamix from '@teamix/formily';
|
|
13
13
|
* 导出常用formily内容,需谨慎限制
|
14
14
|
*/
|
15
15
|
import { createForm, registerValidateRules as registerRules, registerValidateFormats as registerFormats, registerValidateLocale, setValidateLanguage } from '@formily/core';
|
16
|
-
import { FormConsumer } from '@formily/react';
|
16
|
+
import { FormConsumer, useForm } from '@formily/react';
|
17
17
|
import { FormDialog, FormDrawer, FormStep, FormTab, FormCollapse } from '@teamix/formily';
|
18
|
-
import
|
19
|
-
export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage,
|
18
|
+
import useFormDisplayValues from './ProForm/useFormDisplayValues';
|
19
|
+
export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, useForm, useFormDisplayValues, };
|
20
20
|
/**
|
21
21
|
* 导出 Filter 组件
|
22
22
|
*/
|
package/lib/form/index.js
CHANGED
@@ -13,6 +13,7 @@ var _exportNames = {
|
|
13
13
|
setValidateLanguage: true,
|
14
14
|
formilyCore: true,
|
15
15
|
FormConsumer: true,
|
16
|
+
useForm: true,
|
16
17
|
formilyReact: true,
|
17
18
|
formilyReactive: true,
|
18
19
|
FormDialog: true,
|
@@ -21,7 +22,7 @@ var _exportNames = {
|
|
21
22
|
FormTab: true,
|
22
23
|
FormCollapse: true,
|
23
24
|
formilyTeamix: true,
|
24
|
-
|
25
|
+
useFormDisplayValues: true,
|
25
26
|
AdvancedFilter: true,
|
26
27
|
SimpleFilter: true,
|
27
28
|
QueryFilter: true
|
@@ -87,12 +88,6 @@ Object.defineProperty(exports, "createForm", {
|
|
87
88
|
}
|
88
89
|
});
|
89
90
|
exports.formilyTeamix = exports.formilyReactive = exports.formilyReact = exports.formilyCore = exports.default = void 0;
|
90
|
-
Object.defineProperty(exports, "getDisplayValues", {
|
91
|
-
enumerable: true,
|
92
|
-
get: function get() {
|
93
|
-
return _utils.getDisplayValues;
|
94
|
-
}
|
95
|
-
});
|
96
91
|
Object.defineProperty(exports, "registerFormats", {
|
97
92
|
enumerable: true,
|
98
93
|
get: function get() {
|
@@ -117,6 +112,18 @@ Object.defineProperty(exports, "setValidateLanguage", {
|
|
117
112
|
return _formilyCore.setValidateLanguage;
|
118
113
|
}
|
119
114
|
});
|
115
|
+
Object.defineProperty(exports, "useForm", {
|
116
|
+
enumerable: true,
|
117
|
+
get: function get() {
|
118
|
+
return _formilyReact.useForm;
|
119
|
+
}
|
120
|
+
});
|
121
|
+
Object.defineProperty(exports, "useFormDisplayValues", {
|
122
|
+
enumerable: true,
|
123
|
+
get: function get() {
|
124
|
+
return _useFormDisplayValues.default;
|
125
|
+
}
|
126
|
+
});
|
120
127
|
|
121
128
|
var _typing = require("./typing");
|
122
129
|
|
@@ -148,7 +155,7 @@ var _formilyTeamix = _interopRequireWildcard(require("@teamix/formily"));
|
|
148
155
|
|
149
156
|
exports.formilyTeamix = _formilyTeamix;
|
150
157
|
|
151
|
-
var
|
158
|
+
var _useFormDisplayValues = _interopRequireDefault(require("./ProForm/useFormDisplayValues"));
|
152
159
|
|
153
160
|
var _Filter = require("./Filter");
|
154
161
|
|
package/lib/form/typing.d.ts
CHANGED
@@ -6,7 +6,7 @@ export interface anyObject {
|
|
6
6
|
[propName: string]: any;
|
7
7
|
}
|
8
8
|
declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
|
9
|
-
export declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'Range' | 'Search';
|
9
|
+
export declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search';
|
10
10
|
export declare type IButtonComponent = 'Submit' | 'Reset';
|
11
11
|
export declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
|
12
12
|
export declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
|
@@ -57,7 +57,7 @@ export interface IFormProps extends IFormLayoutProps {
|
|
57
57
|
initialValues?: anyObject;
|
58
58
|
initialRequest?: CommonRequestConfig;
|
59
59
|
previewTextPlaceholder?: ReactNode;
|
60
|
-
onChange?: (values: any, displayValues
|
60
|
+
onChange?: (values: any, displayValues?: any) => any;
|
61
61
|
onSubmit?: ((values: any) => any) | CommonRequestConfig;
|
62
62
|
onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
|
63
63
|
}
|
package/lib/form/utils.d.ts
CHANGED
@@ -1,14 +1,37 @@
|
|
1
|
-
|
1
|
+
/**
|
2
|
+
* 映射字段size,主要是default转medium
|
3
|
+
* @param props component的props
|
4
|
+
* @param field 当前字段实例
|
5
|
+
* @returns 映射后的字段属性
|
6
|
+
*/
|
7
|
+
declare const mapSize: (props: any, field: any) => any;
|
8
|
+
/**
|
9
|
+
* 映射字段state
|
10
|
+
* @param props component的props
|
11
|
+
* @param field 当前字段实例
|
12
|
+
* @returns 映射后的字段属性
|
13
|
+
*/
|
14
|
+
declare const mapStatus: (props: any, field: any) => any;
|
15
|
+
/**
|
16
|
+
* 为未配置name的字段添加随机字段名称
|
17
|
+
* @param prefix 随机字段名称前缀,默认为name
|
18
|
+
* @returns 随机字段名称
|
19
|
+
*/
|
2
20
|
interface IGetRandomName {
|
3
21
|
(prefix?: string): string;
|
4
22
|
}
|
5
|
-
declare const mapSize: (props: any, field: any) => any;
|
6
|
-
declare const mapStatus: (props: any, field: any) => any;
|
7
23
|
declare const getRandomName: IGetRandomName;
|
24
|
+
/**
|
25
|
+
* 将ProForm的key映射为formily的key,然后筛除掉无效的key/value
|
26
|
+
* @param obj
|
27
|
+
* @returns
|
28
|
+
*/
|
8
29
|
declare const mapSchemaName: (obj: any) => any;
|
30
|
+
/**
|
31
|
+
* 合并数组或非数组,不移除无效值
|
32
|
+
* @param arr 数组
|
33
|
+
* @param v 数组或其他
|
34
|
+
* @returns 合并数组或合并其他值
|
35
|
+
*/
|
9
36
|
declare const mergeArrayValue: (arr: any[], v?: any) => any[];
|
10
|
-
|
11
|
-
(form: any, values: any, prefix?: string): any;
|
12
|
-
}
|
13
|
-
declare const getDisplayValues: IGetDisplayValues;
|
14
|
-
export { getRandomName, getValueByValue, getDisplayValues, mapSize, mapStatus, mergeArrayValue, mapSchemaName, };
|
37
|
+
export { getRandomName, mapSize, mapStatus, mergeArrayValue, mapSchemaName };
|
package/lib/form/utils.js
CHANGED
@@ -3,14 +3,7 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
5
|
});
|
6
|
-
exports.
|
7
|
-
Object.defineProperty(exports, "getValueByValue", {
|
8
|
-
enumerable: true,
|
9
|
-
get: function get() {
|
10
|
-
return _utils.getValueByValue;
|
11
|
-
}
|
12
|
-
});
|
13
|
-
exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = void 0;
|
6
|
+
exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = exports.getRandomName = void 0;
|
14
7
|
|
15
8
|
var _formily = require("@teamix/formily");
|
16
9
|
|
@@ -46,6 +39,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
46
39
|
|
47
40
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
48
41
|
|
42
|
+
/**
|
43
|
+
* 映射字段size,主要是default转medium
|
44
|
+
* @param props component的props
|
45
|
+
* @param field 当前字段实例
|
46
|
+
* @returns 映射后的字段属性
|
47
|
+
*/
|
49
48
|
var mapSize = function mapSize(props, field) {
|
50
49
|
var layout = _objectSpread(_objectSpread({}, (0, _formily.useFormShallowLayout)()), (0, _formily.useFormLayout)());
|
51
50
|
|
@@ -57,6 +56,13 @@ var mapSize = function mapSize(props, field) {
|
|
57
56
|
size: props.size || takeSize()
|
58
57
|
});
|
59
58
|
};
|
59
|
+
/**
|
60
|
+
* 映射字段state
|
61
|
+
* @param props component的props
|
62
|
+
* @param field 当前字段实例
|
63
|
+
* @returns 映射后的字段属性
|
64
|
+
*/
|
65
|
+
|
60
66
|
|
61
67
|
exports.mapSize = mapSize;
|
62
68
|
|
@@ -88,7 +94,12 @@ exports.mapStatus = mapStatus;
|
|
88
94
|
var getRandomName = function getRandomName() {
|
89
95
|
var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'name';
|
90
96
|
return "".concat(prefix, "_").concat(Math.floor(Math.random() * Math.pow(10, 18)));
|
91
|
-
};
|
97
|
+
};
|
98
|
+
/**
|
99
|
+
* 将ProForm的key映射为formily的key,然后筛除掉无效的key/value
|
100
|
+
* @param obj
|
101
|
+
* @returns
|
102
|
+
*/
|
92
103
|
|
93
104
|
|
94
105
|
exports.getRandomName = getRandomName;
|
@@ -121,6 +132,13 @@ var mapSchemaName = function mapSchemaName(obj) {
|
|
121
132
|
});
|
122
133
|
return temp;
|
123
134
|
};
|
135
|
+
/**
|
136
|
+
* 合并数组或非数组,不移除无效值
|
137
|
+
* @param arr 数组
|
138
|
+
* @param v 数组或其他
|
139
|
+
* @returns 合并数组或合并其他值
|
140
|
+
*/
|
141
|
+
|
124
142
|
|
125
143
|
exports.mapSchemaName = mapSchemaName;
|
126
144
|
|
@@ -130,50 +148,6 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
|
|
130
148
|
}
|
131
149
|
|
132
150
|
return [].concat(_toConsumableArray(arr), [v]);
|
133
|
-
}; // 获取form的displayValues
|
134
|
-
|
135
|
-
|
136
|
-
exports.mergeArrayValue = mergeArrayValue;
|
137
|
-
|
138
|
-
var getDisplayValues = function getDisplayValues(form, values) {
|
139
|
-
var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
|
140
|
-
var displayValues = {}; // 在form实例中,通过name获取该field的值在dataSource对应的label
|
141
|
-
|
142
|
-
var getLabelByKey = function getLabelByKey(name, value) {
|
143
|
-
var address = form.indexes[name] || '';
|
144
|
-
var field = form.query(address).take() || {};
|
145
|
-
var dataSource = field.dataSource;
|
146
|
-
return (0, _utils.getValueByValue)(dataSource, value);
|
147
|
-
};
|
148
|
-
|
149
|
-
Object.entries(values).forEach(function (_ref3) {
|
150
|
-
var _ref4 = _slicedToArray(_ref3, 2),
|
151
|
-
key = _ref4[0],
|
152
|
-
value = _ref4[1];
|
153
|
-
|
154
|
-
var label;
|
155
|
-
|
156
|
-
if ((0, _utils.isArr)(value)) {
|
157
|
-
value.map(function (v, i) {
|
158
|
-
if ((0, _utils.isObj)(v)) {
|
159
|
-
// 值是对象数组
|
160
|
-
label = getDisplayValues(form, v, "".concat(prefix).concat(key, ".").concat(i, "."));
|
161
|
-
} else if ((0, _utils.isArr)(v)) {
|
162
|
-
// 值是多重数组
|
163
|
-
console.warn('Multiple array, Please dingding qilou.zhl.');
|
164
|
-
} else if (v !== undefined && v !== null) {
|
165
|
-
label = getLabelByKey("".concat(prefix).concat(key, ".").concat(i), value);
|
166
|
-
}
|
167
|
-
});
|
168
|
-
} else if ((0, _utils.isObj)(value)) {
|
169
|
-
label = getDisplayValues(form, value, "".concat(key, "."));
|
170
|
-
} else {
|
171
|
-
label = getLabelByKey("".concat(prefix).concat(key), value);
|
172
|
-
}
|
173
|
-
|
174
|
-
displayValues[key] = label;
|
175
|
-
});
|
176
|
-
return displayValues;
|
177
151
|
};
|
178
152
|
|
179
|
-
exports.
|
153
|
+
exports.mergeArrayValue = mergeArrayValue;
|
package/lib/index.d.ts
CHANGED
@@ -21,5 +21,5 @@ export * from './page-container';
|
|
21
21
|
export * from './page-header';
|
22
22
|
export * from './skeleton';
|
23
23
|
export * from './table';
|
24
|
-
declare const version = "1.1.
|
24
|
+
declare const version = "1.1.32";
|
25
25
|
export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };
|
package/lib/index.js
CHANGED
@@ -38,11 +38,13 @@ var ProInfoItem = function ProInfoItem(prop) {
|
|
38
38
|
}, /*#__PURE__*/_react.default.createElement(Row, null, /*#__PURE__*/_react.default.createElement(Col, {
|
39
39
|
span: labelCol === null || labelCol === void 0 ? void 0 : labelCol.span,
|
40
40
|
className: cls('label')
|
41
|
+
}, /*#__PURE__*/_react.default.createElement(_utils.Ellipsis, {
|
42
|
+
tooltip: label
|
41
43
|
}, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
|
42
44
|
label: label,
|
43
45
|
tooltip: tooltip,
|
44
46
|
icon: tooltipIcon
|
45
|
-
})), /*#__PURE__*/_react.default.createElement(Col, {
|
47
|
+
}))), /*#__PURE__*/_react.default.createElement(Col, {
|
46
48
|
span: wrapperCol === null || wrapperCol === void 0 ? void 0 : wrapperCol.span,
|
47
49
|
className: cls('value')
|
48
50
|
}, loading && /*#__PURE__*/_react.default.createElement("div", {
|
@@ -106,9 +106,11 @@ var Filter = function Filter(props) {
|
|
106
106
|
|
107
107
|
var renderSingle = function renderSingle() {
|
108
108
|
return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref3) {
|
109
|
+
var _value$toString;
|
110
|
+
|
109
111
|
var label = _ref3.label,
|
110
112
|
value = _ref3.value;
|
111
|
-
var valueStr = value.toString();
|
113
|
+
var valueStr = (_value$toString = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString !== void 0 ? _value$toString : '';
|
112
114
|
return /*#__PURE__*/_react.default.createElement(RadioItem, {
|
113
115
|
id: valueStr,
|
114
116
|
checked: selected.includes(valueStr),
|
@@ -123,9 +125,11 @@ var Filter = function Filter(props) {
|
|
123
125
|
|
124
126
|
var renderMultiple = function renderMultiple() {
|
125
127
|
return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref4) {
|
128
|
+
var _value$toString2;
|
129
|
+
|
126
130
|
var label = _ref4.label,
|
127
131
|
value = _ref4.value;
|
128
|
-
var valueStr = value.toString();
|
132
|
+
var valueStr = (_value$toString2 = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString2 !== void 0 ? _value$toString2 : '';
|
129
133
|
return /*#__PURE__*/_react.default.createElement(CheckboxItem, {
|
130
134
|
key: valueStr,
|
131
135
|
checked: selected.includes(valueStr),
|
package/lib/table/index.js
CHANGED
@@ -637,11 +637,22 @@ var ProTable = function ProTable(props) {
|
|
637
637
|
var defaultContext = {
|
638
638
|
action: actionRef.current,
|
639
639
|
rowSelection: rowSelection
|
640
|
-
};
|
640
|
+
}; // 未选择的时候所有 button 默认 disabled
|
641
|
+
|
642
|
+
var targetActions = footerAction.actions.map(function (action) {
|
643
|
+
return _objectSpread(_objectSpread({}, action), {}, {
|
644
|
+
disabled: action.disabled || selectedCount === 0
|
645
|
+
});
|
646
|
+
});
|
647
|
+
|
648
|
+
var targetFooterActions = _objectSpread(_objectSpread({}, footerAction), {}, {
|
649
|
+
actions: targetActions
|
650
|
+
});
|
651
|
+
|
641
652
|
return /*#__PURE__*/_react.default.createElement("div", {
|
642
653
|
className: cls('footer-action')
|
643
|
-
}, /*#__PURE__*/_react.default.createElement(_actions.ActionGroup, _objectSpread(_objectSpread({},
|
644
|
-
context: _objectSpread(_objectSpread({}, defaultContext),
|
654
|
+
}, /*#__PURE__*/_react.default.createElement(_actions.ActionGroup, _objectSpread(_objectSpread({}, targetFooterActions), {}, {
|
655
|
+
context: _objectSpread(_objectSpread({}, defaultContext), targetFooterActions === null || targetFooterActions === void 0 ? void 0 : targetFooterActions.context)
|
645
656
|
})));
|
646
657
|
} else return footerAction;
|
647
658
|
};
|
@@ -656,6 +667,7 @@ var ProTable = function ProTable(props) {
|
|
656
667
|
|
657
668
|
function onChangePaginationSize(currentPageSize) {
|
658
669
|
setPageSize(currentPageSize);
|
670
|
+
setCurrentPage(1);
|
659
671
|
|
660
672
|
_request(_defineProperty({}, targetPageSizeKey, currentPageSize));
|
661
673
|
}
|
package/lib/table/typing.d.ts
CHANGED
@@ -11,8 +11,10 @@ import { Method } from 'axios';
|
|
11
11
|
import React from 'react';
|
12
12
|
import type { Form as FormType } from '@formily/core';
|
13
13
|
declare type IFieldRenderProps = keyof IProFieldFormatterProps;
|
14
|
+
/** 列record函数 */
|
15
|
+
declare type ProTableCellFunProp = (value: any, index: number, record: any) => any;
|
14
16
|
declare type ITableCellRender = {
|
15
|
-
[key in IFieldRenderProps]?: IProFieldFormatterProps[key] |
|
17
|
+
[key in IFieldRenderProps]?: IProFieldFormatterProps[key] | ProTableCellFunProp;
|
16
18
|
} | ((...other: any) => React.ReactNode);
|
17
19
|
declare type TDataService = {
|
18
20
|
/** 翻页器总数 */
|
@@ -31,14 +33,14 @@ export declare type ProColumnProps = {
|
|
31
33
|
tooltipIcon?: React.ReactNode;
|
32
34
|
/** 对应 ProField 里面的 type */
|
33
35
|
valueType?: IProFieldType;
|
34
|
-
/**
|
36
|
+
/** 【列配置】是否默认隐藏列 */
|
35
37
|
columnFilters?: boolean;
|
36
|
-
/**
|
38
|
+
/** 【列配置】是否禁用隐藏列 */
|
37
39
|
columnFiltersDisabled?: boolean;
|
38
40
|
/** 渲染单元格内容字段 */
|
39
41
|
render?: ITableCellRender;
|
40
42
|
/** 枚举值 */
|
41
|
-
dataSource?: IProFieldOptionItem[];
|
43
|
+
dataSource?: IProFieldOptionItem[] | ProTableCellFunProp;
|
42
44
|
/** 表头的过滤菜单项,当值为 true 时,自动使用 dataSource 生成 */
|
43
45
|
filters?: boolean | ProTableColumnsFilterItemProps[];
|
44
46
|
/** 表头的过滤菜单项过滤方式 single 单选 multiple 多选 */
|
@@ -49,6 +51,8 @@ export declare type ProColumnProps = {
|
|
49
51
|
actionSchema?: ActionGroupProps;
|
50
52
|
/** 指定列对应的字段,支持`a.b`形式的快速取值 和 数组取值 */
|
51
53
|
dataIndex?: string | string[];
|
54
|
+
/** 指定 valueType 为日期时间格式时,可以格式化日期时间 */
|
55
|
+
format?: string;
|
52
56
|
} & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode'>;
|
53
57
|
export declare type ProTableProps = {
|
54
58
|
/** ProColums 定义,取代 Table 的 columns */
|
@@ -70,7 +70,8 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
|
|
70
70
|
valueType = _item$valueType === void 0 ? 'text' : _item$valueType,
|
71
71
|
render = item.render,
|
72
72
|
actionSchema = item.actionSchema,
|
73
|
-
dataIndex = item.dataIndex
|
73
|
+
dataIndex = item.dataIndex,
|
74
|
+
format = item.format; // 如果没传 dataIndex,返回 null
|
74
75
|
|
75
76
|
if (!dataIndex) {
|
76
77
|
value = null;
|
@@ -85,7 +86,8 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
|
|
85
86
|
});
|
86
87
|
}
|
87
88
|
|
88
|
-
var newRender = null;
|
89
|
+
var newRender = null;
|
90
|
+
var newDataSource = null; // 如果 render 直接传函数
|
89
91
|
|
90
92
|
if (typeof render === 'function') {
|
91
93
|
newRender = function newRender() {
|
@@ -109,6 +111,29 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
|
|
109
111
|
}, actionSchema), {}, {
|
110
112
|
context: _objectSpread(_objectSpread({}, defaultContext), actionSchema.context)
|
111
113
|
}));
|
114
|
+
} // dataSource可传函数
|
115
|
+
|
116
|
+
|
117
|
+
if (typeof item.dataSource === 'function') {
|
118
|
+
var _item$dataSource;
|
119
|
+
|
120
|
+
newDataSource = (_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.call(item, value, index, record);
|
121
|
+
} else {
|
122
|
+
var _item$dataSource2;
|
123
|
+
|
124
|
+
newDataSource = ((_item$dataSource2 = item.dataSource) !== null && _item$dataSource2 !== void 0 ? _item$dataSource2 : []).map(function (item) {
|
125
|
+
return Object.fromEntries(Object.entries(item).map(function (_ref) {
|
126
|
+
var _ref2 = _slicedToArray(_ref, 2),
|
127
|
+
k = _ref2[0],
|
128
|
+
v = _ref2[1];
|
129
|
+
|
130
|
+
return [k, (0, _utils.getTargetValue)(v, _objectSpread(_objectSpread({}, record), {}, {
|
131
|
+
record: record,
|
132
|
+
value: value,
|
133
|
+
index: index
|
134
|
+
}))];
|
135
|
+
}));
|
136
|
+
});
|
112
137
|
} // 渲染 ProField
|
113
138
|
|
114
139
|
|
@@ -116,7 +141,8 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
|
|
116
141
|
type: valueType || 'text',
|
117
142
|
value: value,
|
118
143
|
render: newRender,
|
119
|
-
dataSource:
|
144
|
+
dataSource: newDataSource,
|
145
|
+
format: format
|
120
146
|
});
|
121
147
|
};
|
122
148
|
/**
|
@@ -137,10 +163,10 @@ var processRenderFunction = function processRenderFunction() {
|
|
137
163
|
var index = arguments.length > 2 ? arguments[2] : undefined;
|
138
164
|
var record = arguments.length > 3 ? arguments[3] : undefined;
|
139
165
|
var external = ['linkOnClick', 'link', 'value'];
|
140
|
-
return Object.fromEntries(Object.entries(render).map(function (
|
141
|
-
var
|
142
|
-
k =
|
143
|
-
v =
|
166
|
+
return Object.fromEntries(Object.entries(render).map(function (_ref3) {
|
167
|
+
var _ref4 = _slicedToArray(_ref3, 2),
|
168
|
+
k = _ref4[0],
|
169
|
+
v = _ref4[1];
|
144
170
|
|
145
171
|
if (typeof v === 'function') {
|
146
172
|
var _v;
|
@@ -175,10 +201,11 @@ var processBuriedPoint = function processBuriedPoint() {
|
|
175
201
|
var value = arguments.length > 2 ? arguments[2] : undefined;
|
176
202
|
var index = arguments.length > 3 ? arguments[3] : undefined;
|
177
203
|
return Object.fromEntries([// 默认 ellipsis、descriptionEllipsis 为 true
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
204
|
+
// emptyText 默认为 '-'
|
205
|
+
['ellipsis', true], ['descriptionEllipsis', true], ['emptyText', '-']].concat(_toConsumableArray(Object.entries(render).map(function (_ref5) {
|
206
|
+
var _ref6 = _slicedToArray(_ref5, 2),
|
207
|
+
k = _ref6[0],
|
208
|
+
v = _ref6[1];
|
182
209
|
|
183
210
|
return [k, (0, _utils.getTargetValue)(v, _objectSpread(_objectSpread({}, record), {}, {
|
184
211
|
record: record,
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@teamix/pro",
|
3
|
-
"version": "1.1.
|
3
|
+
"version": "1.1.33",
|
4
4
|
"description": "TeamixPro大包",
|
5
5
|
"repository": "http://gitlab.alibaba-inc.com/teamix/pro",
|
6
6
|
"author": "Velociraptor(迅猛龙)",
|
@@ -22,9 +22,9 @@
|
|
22
22
|
],
|
23
23
|
"private": false,
|
24
24
|
"dependencies": {
|
25
|
-
"@formily/core": "2.0.0-rc.
|
26
|
-
"@formily/react": "2.0.0-rc.
|
27
|
-
"@teamix/formily": "2.0.0-rc.
|
25
|
+
"@formily/core": "2.0.0-rc.20",
|
26
|
+
"@formily/react": "2.0.0-rc.20",
|
27
|
+
"@teamix/formily": "2.0.0-rc.20",
|
28
28
|
"@teamix/hooks": "^0.1.0",
|
29
29
|
"@teamix/pop-confirm": "^1.2.2",
|
30
30
|
"@teamix/pro-field": "^1.0.0",
|