@arco-design/mobile-react 2.31.2 → 2.31.3
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/CHANGELOG.md +11 -0
- package/README.en-US.md +3 -3
- package/README.md +3 -3
- package/cjs/date-picker/index.js +7 -7
- package/cjs/date-picker/type.d.ts +7 -1
- package/cjs/form/form-item.d.ts +0 -3
- package/cjs/form/form-item.js +19 -30
- package/cjs/form/index.js +6 -2
- package/cjs/form/linked-container.d.ts +8 -0
- package/cjs/form/linked-container.js +72 -0
- package/cjs/form/style/index.less +3 -3
- package/cjs/form/type.d.ts +7 -11
- package/cjs/form/useForm.js +36 -48
- package/cjs/picker/index.js +1 -1
- package/dist/index.js +1824 -1827
- package/dist/index.min.js +4 -4
- package/esm/date-picker/index.js +8 -8
- package/esm/date-picker/type.d.ts +7 -1
- package/esm/form/form-item.d.ts +0 -3
- package/esm/form/form-item.js +14 -25
- package/esm/form/index.js +7 -3
- package/esm/form/linked-container.d.ts +8 -0
- package/esm/form/linked-container.js +54 -0
- package/esm/form/style/index.less +3 -3
- package/esm/form/type.d.ts +7 -11
- package/esm/form/useForm.js +31 -42
- package/esm/picker/index.js +1 -1
- package/package.json +3 -3
- package/umd/date-picker/index.js +7 -7
- package/umd/date-picker/type.d.ts +7 -1
- package/umd/form/form-item.d.ts +0 -3
- package/umd/form/form-item.js +19 -34
- package/umd/form/index.js +6 -2
- package/umd/form/linked-container.d.ts +8 -0
- package/umd/form/linked-container.js +78 -0
- package/umd/form/style/index.less +3 -3
- package/umd/form/type.d.ts +7 -11
- package/umd/form/useForm.js +38 -50
- package/umd/picker/index.js +1 -1
package/esm/date-picker/index.js
CHANGED
@@ -1,18 +1,14 @@
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
2
2
|
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
|
3
|
-
var _excluded = ["currentTs", "className", "visible", "onOk", "onChange", "onValueChange", "mode", "typeArr", "minTs", "maxTs", "formatter", "valueFilter", "columnsProcessor", "touchToStop", "useUTC"];
|
3
|
+
var _excluded = ["currentTs", "className", "visible", "onOk", "onChange", "onValueChange", "mode", "typeArr", "minTs", "maxTs", "formatter", "valueFilter", "columnsProcessor", "touchToStop", "useUTC", "renderLinkedContainer"];
|
4
4
|
import React, { useEffect, useRef, useState, useMemo, forwardRef, useImperativeHandle } from 'react';
|
5
|
-
import { cls, componentWrapper } from '@arco-design/mobile-utils';
|
5
|
+
import { cls, componentWrapper, formatDateNumber } from '@arco-design/mobile-utils';
|
6
6
|
import Picker from '../picker';
|
7
7
|
import { ContextLayout } from '../context-provider';
|
8
8
|
import { convertTsToDateObj, oneOf, judgeObj, convertObjToTs } from './helper';
|
9
9
|
export * from './type';
|
10
10
|
var allTypes = ['year', 'month', 'date', 'hour', 'minute', 'second'];
|
11
|
-
|
12
|
-
var defaultFormatter = function defaultFormatter(value) {
|
13
|
-
return value < 10 ? "0" + value : String(value);
|
14
|
-
};
|
15
|
-
|
11
|
+
var defaultFormatter = formatDateNumber;
|
16
12
|
export var YEAR = 12 * 30 * 24 * 60 * 60 * 1000;
|
17
13
|
var initMinDate = Date.now() - 10 * YEAR;
|
18
14
|
var initMaxDate = Date.now() + 10 * YEAR;
|
@@ -45,6 +41,7 @@ var DatePicker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
45
41
|
touchToStop = props.touchToStop,
|
46
42
|
_props$useUTC = props.useUTC,
|
47
43
|
useUTC = _props$useUTC === void 0 ? false : _props$useUTC,
|
44
|
+
renderLinkedContainer = props.renderLinkedContainer,
|
48
45
|
otherProps = _objectWithoutPropertiesLoose(props, _excluded);
|
49
46
|
|
50
47
|
var currentTs = Math.min(maxTs, Math.max(minTs, userSetCurrentTs));
|
@@ -318,7 +315,10 @@ var DatePicker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
318
315
|
value: value,
|
319
316
|
onPickerChange: _handlePickerChange,
|
320
317
|
onOk: _handlePickerConfirm,
|
321
|
-
touchToStop: touchToStop
|
318
|
+
touchToStop: touchToStop,
|
319
|
+
renderLinkedContainer: renderLinkedContainer ? function () {
|
320
|
+
return renderLinkedContainer(currentTs, keyOptions);
|
321
|
+
} : undefined
|
322
322
|
}));
|
323
323
|
});
|
324
324
|
});
|
@@ -1,3 +1,4 @@
|
|
1
|
+
import { ReactNode } from 'react';
|
1
2
|
import { PickerProps } from '../picker';
|
2
3
|
import { PickerData } from '../picker-view';
|
3
4
|
export declare type ItemType = 'year' | 'month' | 'date' | 'hour' | 'minute' | 'second';
|
@@ -34,7 +35,7 @@ export interface IDateObj {
|
|
34
35
|
second: number;
|
35
36
|
}
|
36
37
|
export declare type mode = 'date' | 'time' | 'datetime';
|
37
|
-
export interface DatePickerProps extends Omit<PickerProps, 'data' | 'cascade' | 'cols' | 'value' | 'onChange' | 'onPickerChange' | 'onOk'> {
|
38
|
+
export interface DatePickerProps extends Omit<PickerProps, 'data' | 'cascade' | 'cols' | 'value' | 'onChange' | 'onPickerChange' | 'onOk' | 'renderLinkedContainer'> {
|
38
39
|
/**
|
39
40
|
* 点击选中时执行的回调
|
40
41
|
* @en Callback when clicking OK
|
@@ -105,4 +106,9 @@ export interface DatePickerProps extends Omit<PickerProps, 'data' | 'cascade' |
|
|
105
106
|
* @en Selector list item intervention to insert custom options.
|
106
107
|
*/
|
107
108
|
columnsProcessor?: (columns: PickerData[][], currentDateObj: IDateObj) => PickerData[][];
|
109
|
+
/**
|
110
|
+
* 将选择器的展现隐藏状态及选中值的展示与某个容器关联,传入后将同时渲染该容器和选择器组件,此时选择器组件的 visible 和 onHide 属性可不传,点击该容器会唤起选择器
|
111
|
+
* @en Associate the hidden state of the picker and the display of the selected value with a container. After passing it in, the container and the picker component will be rendered at the same time. At this time, the visible and onHide attributes of the picker component are optional values. Clicking the container will evoke the picker
|
112
|
+
*/
|
113
|
+
renderLinkedContainer?: (currentTs: number, itemTypes: ItemType[]) => ReactNode;
|
108
114
|
}
|
package/esm/form/form-item.d.ts
CHANGED
@@ -1,7 +1,4 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { FormItemProps, FormItemRef } from './type';
|
3
|
-
export declare function DefaultPickerLinkedContainer({ value }: {
|
4
|
-
value: (string | number)[];
|
5
|
-
}): JSX.Element;
|
6
3
|
declare const _default: React.ForwardRefExoticComponent<FormItemProps & React.RefAttributes<FormItemRef>>;
|
7
4
|
export default _default;
|
package/esm/form/form-item.js
CHANGED
@@ -6,24 +6,12 @@ var _excluded = ["label", "field", "disabled", "layout", "style", "extra", "requ
|
|
6
6
|
/* eslint-disable react/no-unused-class-component-methods */
|
7
7
|
import React, { forwardRef, PureComponent, useContext, useImperativeHandle, useRef, useState } from 'react';
|
8
8
|
import { cls, Validator, ValidatorType } from '@arco-design/mobile-utils';
|
9
|
+
import { Promise } from 'es6-promise';
|
9
10
|
import { FormItemContext } from './form-item-context';
|
10
11
|
import { GlobalContext } from '../context-provider';
|
11
12
|
import { FormInternalComponentType } from './type';
|
12
13
|
import { getErrorAndWarnings, isFieldRequired } from './utils';
|
13
|
-
|
14
|
-
var value = _ref.value;
|
15
|
-
|
16
|
-
var _useContext = useContext(GlobalContext),
|
17
|
-
prefixCls = _useContext.prefixCls,
|
18
|
-
locale = _useContext.locale;
|
19
|
-
|
20
|
-
var className = prefixCls + "-form-picker-link-container";
|
21
|
-
return /*#__PURE__*/React.createElement("div", {
|
22
|
-
className: className
|
23
|
-
}, value && value.length ? value.join('-') : /*#__PURE__*/React.createElement("span", {
|
24
|
-
className: className + "-placeholder"
|
25
|
-
}, locale == null ? void 0 : locale.Form.pickerDefaultHint));
|
26
|
-
}
|
14
|
+
import { DefaultDatePickerLinkedContainer, DefaultPickerLinkedContainer } from './linked-container';
|
27
15
|
|
28
16
|
var FormItemInner = /*#__PURE__*/function (_PureComponent) {
|
29
17
|
_inheritsLoose(FormItemInner, _PureComponent);
|
@@ -38,14 +26,14 @@ var FormItemInner = /*#__PURE__*/function (_PureComponent) {
|
|
38
26
|
_this._errors = [];
|
39
27
|
_this._touched = false;
|
40
28
|
|
41
|
-
_this.onValueChange = function (
|
29
|
+
_this.onValueChange = function (curValue, preValue) {
|
42
30
|
_this._touched = true;
|
43
31
|
var shouldUpdate = _this.props.shouldUpdate;
|
44
32
|
|
45
33
|
if (typeof shouldUpdate === 'function') {
|
46
34
|
shouldUpdate({
|
47
|
-
|
48
|
-
|
35
|
+
preValue: preValue,
|
36
|
+
curValue: curValue
|
49
37
|
}) && _this.forceUpdate();
|
50
38
|
return;
|
51
39
|
}
|
@@ -255,9 +243,10 @@ var FormItemInner = /*#__PURE__*/function (_PureComponent) {
|
|
255
243
|
currentTs: getFieldValue(field),
|
256
244
|
onChange: this.innerTriggerFunctionWithValueFirst,
|
257
245
|
disabled: this.props.disabled,
|
258
|
-
renderLinkedContainer: ((_children$props7 = children.props) == null ? void 0 : _children$props7.renderLinkedContainer) || function (
|
259
|
-
return /*#__PURE__*/React.createElement(
|
260
|
-
|
246
|
+
renderLinkedContainer: ((_children$props7 = children.props) == null ? void 0 : _children$props7.renderLinkedContainer) || function (ts, types) {
|
247
|
+
return /*#__PURE__*/React.createElement(DefaultDatePickerLinkedContainer, {
|
248
|
+
ts: ts,
|
249
|
+
types: types
|
261
250
|
});
|
262
251
|
}
|
263
252
|
};
|
@@ -336,12 +325,12 @@ export default /*#__PURE__*/forwardRef(function (props, ref) {
|
|
336
325
|
className = _props$className === void 0 ? '' : _props$className,
|
337
326
|
rest = _objectWithoutPropertiesLoose(props, _excluded);
|
338
327
|
|
339
|
-
var
|
340
|
-
prefixCls =
|
328
|
+
var _useContext = useContext(GlobalContext),
|
329
|
+
prefixCls = _useContext.prefixCls;
|
341
330
|
|
342
|
-
var
|
343
|
-
layout =
|
344
|
-
propsDisabled =
|
331
|
+
var _useContext2 = useContext(FormItemContext),
|
332
|
+
layout = _useContext2.layout,
|
333
|
+
propsDisabled = _useContext2.disabled;
|
345
334
|
|
346
335
|
var _useState = useState(null),
|
347
336
|
errors = _useState[0],
|
package/esm/form/index.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
2
2
|
import { componentWrapper, defaultLocale } from '@arco-design/mobile-utils';
|
3
|
-
import React, { useRef, forwardRef, useImperativeHandle
|
3
|
+
import React, { useRef, forwardRef, useImperativeHandle } from 'react';
|
4
4
|
import { ContextLayout } from '../context-provider';
|
5
5
|
import Item from './form-item';
|
6
6
|
import { FormItemContext } from './form-item-context';
|
@@ -21,6 +21,7 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
21
21
|
onSubmitFailed = props.onSubmitFailed,
|
22
22
|
disabled = props.disabled;
|
23
23
|
var domRef = useRef(null);
|
24
|
+
var initRef = useRef(false);
|
24
25
|
|
25
26
|
var _useForm = useForm(formInstance),
|
26
27
|
form = _useForm[0];
|
@@ -34,9 +35,12 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
34
35
|
onSubmit: onSubmit,
|
35
36
|
onSubmitFailed: onSubmitFailed
|
36
37
|
});
|
37
|
-
|
38
|
+
|
39
|
+
if (!initRef.current) {
|
38
40
|
setInitialValues(initialValues || {});
|
39
|
-
|
41
|
+
initRef.current = true;
|
42
|
+
}
|
43
|
+
|
40
44
|
useImperativeHandle(ref, function () {
|
41
45
|
return {
|
42
46
|
dom: domRef.current,
|
@@ -0,0 +1,8 @@
|
|
1
|
+
/// <reference types="react" />
|
2
|
+
export declare function DefaultPickerLinkedContainer({ value }: {
|
3
|
+
value: (string | number)[];
|
4
|
+
}): JSX.Element;
|
5
|
+
export declare function DefaultDatePickerLinkedContainer({ ts, types }: {
|
6
|
+
ts: number;
|
7
|
+
types: string[];
|
8
|
+
}): JSX.Element;
|
@@ -0,0 +1,54 @@
|
|
1
|
+
import _extends from "@babel/runtime/helpers/extends";
|
2
|
+
import React, { useContext, useMemo } from 'react';
|
3
|
+
import { formatDateNumber } from '@arco-design/mobile-utils';
|
4
|
+
import { convertTsToDateObj } from '../date-picker/helper';
|
5
|
+
import { GlobalContext } from '../context-provider';
|
6
|
+
export function DefaultPickerLinkedContainer(_ref) {
|
7
|
+
var value = _ref.value;
|
8
|
+
|
9
|
+
var _useContext = useContext(GlobalContext),
|
10
|
+
prefixCls = _useContext.prefixCls,
|
11
|
+
locale = _useContext.locale;
|
12
|
+
|
13
|
+
var className = prefixCls + "-form-picker-link-container";
|
14
|
+
return /*#__PURE__*/React.createElement("div", {
|
15
|
+
className: className
|
16
|
+
}, value && value.length ? value.join('-') : /*#__PURE__*/React.createElement("span", {
|
17
|
+
className: className + "-placeholder"
|
18
|
+
}, locale == null ? void 0 : locale.Form.pickerDefaultHint));
|
19
|
+
}
|
20
|
+
export function DefaultDatePickerLinkedContainer(_ref2) {
|
21
|
+
var ts = _ref2.ts,
|
22
|
+
types = _ref2.types;
|
23
|
+
|
24
|
+
var _useContext2 = useContext(GlobalContext),
|
25
|
+
prefixCls = _useContext2.prefixCls,
|
26
|
+
locale = _useContext2.locale;
|
27
|
+
|
28
|
+
var className = prefixCls + "-form-picker-link-container";
|
29
|
+
var dateTimeStr = useMemo(function () {
|
30
|
+
return formatDateTimeStr(ts, types);
|
31
|
+
}, [ts, types]);
|
32
|
+
|
33
|
+
function formatDateTimeStr(timestamp, itemTypes) {
|
34
|
+
var dateObj = convertTsToDateObj(timestamp);
|
35
|
+
var validDateObj = Object.keys(dateObj).reduce(function (acc, key) {
|
36
|
+
var _ref3;
|
37
|
+
|
38
|
+
return _extends({}, acc, itemTypes.includes(key) ? (_ref3 = {}, _ref3[key] = formatDateNumber(dateObj[key]), _ref3) : {});
|
39
|
+
}, {});
|
40
|
+
var dateStr = [validDateObj.year, validDateObj.month, validDateObj.date].filter(function (v) {
|
41
|
+
return v;
|
42
|
+
}).join('-');
|
43
|
+
var timeStr = [validDateObj.hour, validDateObj.minute, validDateObj.second].filter(function (v) {
|
44
|
+
return v;
|
45
|
+
}).join(':');
|
46
|
+
return dateStr + " " + timeStr;
|
47
|
+
}
|
48
|
+
|
49
|
+
return /*#__PURE__*/React.createElement("div", {
|
50
|
+
className: className
|
51
|
+
}, ts ? dateTimeStr : /*#__PURE__*/React.createElement("span", {
|
52
|
+
className: className + "-placeholder"
|
53
|
+
}, locale == null ? void 0 : locale.Form.pickerDefaultHint));
|
54
|
+
}
|
@@ -39,14 +39,14 @@
|
|
39
39
|
}
|
40
40
|
&-item-control {
|
41
41
|
padding: 16px 0;
|
42
|
-
|
42
|
+
.@{prefix}-input-wrap, .@{prefix}-input {
|
43
43
|
padding: 0;
|
44
44
|
}
|
45
45
|
&-wrapper {
|
46
46
|
width: 100%;
|
47
47
|
flex: 1;
|
48
48
|
position: relative;
|
49
|
-
|
49
|
+
.@{prefix}-input-wrap {
|
50
50
|
.use-var(height, input-text-line-height);
|
51
51
|
}
|
52
52
|
}
|
@@ -75,7 +75,7 @@
|
|
75
75
|
|
76
76
|
&-item.@{prefix}-form-item-vertical {
|
77
77
|
display: block;
|
78
|
-
|
78
|
+
.@{prefix}-input-wrap {
|
79
79
|
.set-prop-with-rtl(padding-left, 0);
|
80
80
|
}
|
81
81
|
.@{prefix}-form-label-item {
|
package/esm/form/type.d.ts
CHANGED
@@ -1,5 +1,6 @@
|
|
1
1
|
import { IRules } from '@arco-design/mobile-utils';
|
2
2
|
import { ReactNode } from 'react';
|
3
|
+
import { Promise } from 'es6-promise';
|
3
4
|
export declare type FieldValue = any;
|
4
5
|
export declare type FieldItem = Record<string, any>;
|
5
6
|
export declare type ILayout = 'horizontal' | 'vertical' | 'inline';
|
@@ -169,19 +170,14 @@ export interface IFormInstance {
|
|
169
170
|
* 校验所有表单项
|
170
171
|
* @en Validate all fields
|
171
172
|
*/
|
172
|
-
validateFields: () => Promise<
|
173
|
+
validateFields: () => Promise<IFieldError[]>;
|
173
174
|
/**
|
174
175
|
* 提交表单
|
175
176
|
* @en Submit all fields
|
176
177
|
*/
|
177
178
|
submit: () => void;
|
178
179
|
}
|
179
|
-
export declare type InternalFormInstance =
|
180
|
-
/**
|
181
|
-
* 校验所有表单项
|
182
|
-
* @en Validate all fields
|
183
|
-
*/
|
184
|
-
validateFields: () => Promise<FieldItem>;
|
180
|
+
export declare type InternalFormInstance = IFormInstance & {
|
185
181
|
/**
|
186
182
|
* 获取内部方法
|
187
183
|
* @en Get internal methods
|
@@ -223,8 +219,8 @@ export interface IFormItemContext {
|
|
223
219
|
validateMessages?: Record<string, unknown>;
|
224
220
|
}
|
225
221
|
export declare type IShouldUpdateFunc = (data: {
|
226
|
-
|
227
|
-
|
222
|
+
preValue: any;
|
223
|
+
curValue: any;
|
228
224
|
}) => boolean;
|
229
225
|
export interface FormItemProps {
|
230
226
|
/**
|
@@ -272,7 +268,7 @@ export interface FormItemProps {
|
|
272
268
|
* 表单项是否刷新
|
273
269
|
* @en Form item is updated
|
274
270
|
*/
|
275
|
-
shouldUpdate?:
|
271
|
+
shouldUpdate?: IShouldUpdateFunc;
|
276
272
|
/**
|
277
273
|
* 表单项规则
|
278
274
|
* @en Form item rules
|
@@ -327,7 +323,7 @@ export interface IFormItemInnerProps {
|
|
327
323
|
* 表单项是否刷新
|
328
324
|
* @en Form item is updated
|
329
325
|
*/
|
330
|
-
shouldUpdate?:
|
326
|
+
shouldUpdate?: IShouldUpdateFunc;
|
331
327
|
/**
|
332
328
|
* 表单项下方节点
|
333
329
|
* @en Form item extra node
|
package/esm/form/useForm.js
CHANGED
@@ -1,9 +1,8 @@
|
|
1
|
-
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
2
1
|
import _extends from "@babel/runtime/helpers/extends";
|
3
|
-
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
4
2
|
|
5
3
|
/* eslint-disable no-console */
|
6
4
|
import { useRef } from 'react';
|
5
|
+
import { Promise } from 'es6-promise';
|
7
6
|
|
8
7
|
var defaultFunc = function defaultFunc() {};
|
9
8
|
|
@@ -47,40 +46,41 @@ var FormData = function FormData() {
|
|
47
46
|
this._callbacks = {};
|
48
47
|
|
49
48
|
this.setFieldsValue = function (values) {
|
50
|
-
|
49
|
+
var oldValues = Object.keys(values).reduce(function (acc, key) {
|
50
|
+
var _extends2;
|
51
51
|
|
52
|
-
|
52
|
+
return _extends({}, acc, (_extends2 = {}, _extends2[key] = _this.getFieldValue(key), _extends2));
|
53
|
+
}, {});
|
54
|
+
_this._formData = _extends({}, _this._formData, values);
|
55
|
+
var onValuesChange = _this._callbacks.onValuesChange;
|
56
|
+
onValuesChange && onValuesChange(values, _this._formData);
|
53
57
|
|
54
|
-
|
55
|
-
if (key in _this._fieldsList) {
|
56
|
-
var _this$_fieldsList$key;
|
58
|
+
_this.notifyField(values, oldValues);
|
57
59
|
|
58
|
-
(_this$_fieldsList$key = _this._fieldsList[key]) == null ? void 0 : _this$_fieldsList$key.onValueChange();
|
59
|
-
}
|
60
|
-
});
|
61
60
|
return true;
|
62
61
|
};
|
63
62
|
|
64
63
|
this.setFieldValue = function (name, value) {
|
65
|
-
var
|
64
|
+
var _oldValues, _extends3, _onValuesChange, _this$notifyField;
|
66
65
|
|
67
|
-
|
66
|
+
var oldValues = (_oldValues = {}, _oldValues[name] = _this.getFieldValue(name), _oldValues);
|
67
|
+
_this._formData = _extends({}, _this._formData, (_extends3 = {}, _extends3[name] = value, _extends3));
|
68
68
|
var onValuesChange = _this._callbacks.onValuesChange;
|
69
69
|
onValuesChange && onValuesChange((_onValuesChange = {}, _onValuesChange[name] = value, _onValuesChange), _this._formData);
|
70
70
|
|
71
|
-
_this.notifyField((_this$notifyField = {}, _this$notifyField[name] = value, _this$notifyField));
|
71
|
+
_this.notifyField((_this$notifyField = {}, _this$notifyField[name] = value, _this$notifyField), oldValues);
|
72
72
|
|
73
73
|
return true;
|
74
74
|
};
|
75
75
|
|
76
|
-
this.notifyField = function (values) {
|
76
|
+
this.notifyField = function (values, oldValues) {
|
77
77
|
Object.keys(values).map(function (fieldName) {
|
78
78
|
var _this$_fieldsList;
|
79
79
|
|
80
80
|
var fieldObj = ((_this$_fieldsList = _this._fieldsList) == null ? void 0 : _this$_fieldsList[fieldName]) || null;
|
81
81
|
|
82
82
|
if (fieldObj) {
|
83
|
-
fieldObj.onValueChange(values[fieldName]);
|
83
|
+
fieldObj.onValueChange(values[fieldName], oldValues[fieldName]);
|
84
84
|
}
|
85
85
|
});
|
86
86
|
};
|
@@ -145,11 +145,11 @@ var FormData = function FormData() {
|
|
145
145
|
var initialValue = self.props.initialValue;
|
146
146
|
|
147
147
|
if (initialValue !== undefined && name) {
|
148
|
-
var
|
148
|
+
var _extends4, _extends5;
|
149
149
|
|
150
|
-
_this._initialValues = _extends({}, _this._initialValues, (
|
150
|
+
_this._initialValues = _extends({}, _this._initialValues, (_extends4 = {}, _extends4[name] = initialValue, _extends4));
|
151
151
|
|
152
|
-
_this.setFieldsValue(_extends({}, _this._formData, (
|
152
|
+
_this.setFieldsValue(_extends({}, _this._formData, (_extends5 = {}, _extends5[name] = initialValue, _extends5)));
|
153
153
|
}
|
154
154
|
|
155
155
|
return function () {
|
@@ -196,31 +196,20 @@ var FormData = function FormData() {
|
|
196
196
|
return summaryPromise;
|
197
197
|
};
|
198
198
|
|
199
|
-
this.submit =
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
var onSubmitFailed = _this._callbacks.onSubmitFailed;
|
209
|
-
|
210
|
-
if (!onSubmitFailed) {
|
211
|
-
return;
|
212
|
-
}
|
213
|
-
|
214
|
-
onSubmitFailed(_this._formData, e);
|
215
|
-
});
|
216
|
-
|
217
|
-
case 1:
|
218
|
-
case "end":
|
219
|
-
return _context.stop();
|
220
|
-
}
|
199
|
+
this.submit = function () {
|
200
|
+
_this.validateFields().then(function (result) {
|
201
|
+
var onSubmit = _this._callbacks.onSubmit;
|
202
|
+
onSubmit == null ? void 0 : onSubmit(_this._formData, result);
|
203
|
+
}).catch(function (e) {
|
204
|
+
var onSubmitFailed = _this._callbacks.onSubmitFailed;
|
205
|
+
|
206
|
+
if (!onSubmitFailed) {
|
207
|
+
return;
|
221
208
|
}
|
222
|
-
|
223
|
-
|
209
|
+
|
210
|
+
onSubmitFailed(_this._formData, e);
|
211
|
+
});
|
212
|
+
};
|
224
213
|
|
225
214
|
this.setCallbacks = function (callbacks) {
|
226
215
|
_this._callbacks = callbacks;
|
package/esm/picker/index.js
CHANGED
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@arco-design/mobile-react",
|
3
|
-
"version": "2.31.
|
3
|
+
"version": "2.31.3",
|
4
4
|
"description": "",
|
5
5
|
"main": "cjs/index.js",
|
6
6
|
"module": "esm/index.js",
|
@@ -15,7 +15,7 @@
|
|
15
15
|
"author": "taoyiyue@bytedance.com",
|
16
16
|
"license": "ISC",
|
17
17
|
"dependencies": {
|
18
|
-
"@arco-design/mobile-utils": "2.18.
|
18
|
+
"@arco-design/mobile-utils": "2.18.3",
|
19
19
|
"@arco-design/transformable": "^1.0.0",
|
20
20
|
"@babel/runtime": "^7",
|
21
21
|
"lodash.throttle": "^4.1.1",
|
@@ -47,5 +47,5 @@
|
|
47
47
|
"publishConfig": {
|
48
48
|
"access": "public"
|
49
49
|
},
|
50
|
-
"gitHead": "
|
50
|
+
"gitHead": "6eab3e99e70f5fed7994acbf3d8bb01800310635"
|
51
51
|
}
|
package/umd/date-picker/index.js
CHANGED
@@ -30,18 +30,14 @@
|
|
30
30
|
if (key in _exports && _exports[key] === _type[key]) return;
|
31
31
|
_exports[key] = _type[key];
|
32
32
|
});
|
33
|
-
var _excluded = ["currentTs", "className", "visible", "onOk", "onChange", "onValueChange", "mode", "typeArr", "minTs", "maxTs", "formatter", "valueFilter", "columnsProcessor", "touchToStop", "useUTC"];
|
33
|
+
var _excluded = ["currentTs", "className", "visible", "onOk", "onChange", "onValueChange", "mode", "typeArr", "minTs", "maxTs", "formatter", "valueFilter", "columnsProcessor", "touchToStop", "useUTC", "renderLinkedContainer"];
|
34
34
|
|
35
35
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
36
36
|
|
37
37
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
38
38
|
|
39
39
|
var allTypes = ['year', 'month', 'date', 'hour', 'minute', 'second'];
|
40
|
-
|
41
|
-
var defaultFormatter = function defaultFormatter(value) {
|
42
|
-
return value < 10 ? "0" + value : String(value);
|
43
|
-
};
|
44
|
-
|
40
|
+
var defaultFormatter = _mobileUtils.formatDateNumber;
|
45
41
|
var YEAR = 12 * 30 * 24 * 60 * 60 * 1000;
|
46
42
|
_exports.YEAR = YEAR;
|
47
43
|
var initMinDate = Date.now() - 10 * YEAR;
|
@@ -75,6 +71,7 @@
|
|
75
71
|
touchToStop = props.touchToStop,
|
76
72
|
_props$useUTC = props.useUTC,
|
77
73
|
useUTC = _props$useUTC === void 0 ? false : _props$useUTC,
|
74
|
+
renderLinkedContainer = props.renderLinkedContainer,
|
78
75
|
otherProps = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
|
79
76
|
var currentTs = Math.min(maxTs, Math.max(minTs, userSetCurrentTs));
|
80
77
|
|
@@ -346,7 +343,10 @@
|
|
346
343
|
value: value,
|
347
344
|
onPickerChange: _handlePickerChange,
|
348
345
|
onOk: _handlePickerConfirm,
|
349
|
-
touchToStop: touchToStop
|
346
|
+
touchToStop: touchToStop,
|
347
|
+
renderLinkedContainer: renderLinkedContainer ? function () {
|
348
|
+
return renderLinkedContainer(currentTs, keyOptions);
|
349
|
+
} : undefined
|
350
350
|
}));
|
351
351
|
});
|
352
352
|
});
|
@@ -1,3 +1,4 @@
|
|
1
|
+
import { ReactNode } from 'react';
|
1
2
|
import { PickerProps } from '../picker';
|
2
3
|
import { PickerData } from '../picker-view';
|
3
4
|
export declare type ItemType = 'year' | 'month' | 'date' | 'hour' | 'minute' | 'second';
|
@@ -34,7 +35,7 @@ export interface IDateObj {
|
|
34
35
|
second: number;
|
35
36
|
}
|
36
37
|
export declare type mode = 'date' | 'time' | 'datetime';
|
37
|
-
export interface DatePickerProps extends Omit<PickerProps, 'data' | 'cascade' | 'cols' | 'value' | 'onChange' | 'onPickerChange' | 'onOk'> {
|
38
|
+
export interface DatePickerProps extends Omit<PickerProps, 'data' | 'cascade' | 'cols' | 'value' | 'onChange' | 'onPickerChange' | 'onOk' | 'renderLinkedContainer'> {
|
38
39
|
/**
|
39
40
|
* 点击选中时执行的回调
|
40
41
|
* @en Callback when clicking OK
|
@@ -105,4 +106,9 @@ export interface DatePickerProps extends Omit<PickerProps, 'data' | 'cascade' |
|
|
105
106
|
* @en Selector list item intervention to insert custom options.
|
106
107
|
*/
|
107
108
|
columnsProcessor?: (columns: PickerData[][], currentDateObj: IDateObj) => PickerData[][];
|
109
|
+
/**
|
110
|
+
* 将选择器的展现隐藏状态及选中值的展示与某个容器关联,传入后将同时渲染该容器和选择器组件,此时选择器组件的 visible 和 onHide 属性可不传,点击该容器会唤起选择器
|
111
|
+
* @en Associate the hidden state of the picker and the display of the selected value with a container. After passing it in, the container and the picker component will be rendered at the same time. At this time, the visible and onHide attributes of the picker component are optional values. Clicking the container will evoke the picker
|
112
|
+
*/
|
113
|
+
renderLinkedContainer?: (currentTs: number, itemTypes: ItemType[]) => ReactNode;
|
108
114
|
}
|
package/umd/form/form-item.d.ts
CHANGED
@@ -1,7 +1,4 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { FormItemProps, FormItemRef } from './type';
|
3
|
-
export declare function DefaultPickerLinkedContainer({ value }: {
|
4
|
-
value: (string | number)[];
|
5
|
-
}): JSX.Element;
|
6
3
|
declare const _default: React.ForwardRefExoticComponent<FormItemProps & React.RefAttributes<FormItemRef>>;
|
7
4
|
export default _default;
|