@arco-design/mobile-react 2.30.9 → 2.30.10
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 +13 -0
- package/README.en-US.md +70 -2
- package/README.md +69 -2
- package/cjs/carousel/index.js +3 -0
- package/cjs/picker/index.js +3 -2
- package/cjs/picker/type.d.ts +1 -1
- package/cjs/picker-view/components/cascader.d.ts +1 -0
- package/cjs/picker-view/components/cascader.js +8 -1
- package/cjs/picker-view/components/picker-cell.d.ts +1 -0
- package/cjs/picker-view/components/picker-cell.js +6 -1
- package/cjs/picker-view/index.d.ts +6 -1
- package/cjs/picker-view/index.js +25 -13
- package/cjs/tabs/tab-cell.js +54 -29
- package/cjs/tabs/type.d.ts +5 -0
- package/dist/index.js +102 -48
- package/dist/index.min.js +1 -1
- package/esm/carousel/index.js +3 -0
- package/esm/picker/index.js +3 -2
- package/esm/picker/type.d.ts +1 -1
- package/esm/picker-view/components/cascader.d.ts +1 -0
- package/esm/picker-view/components/cascader.js +8 -1
- package/esm/picker-view/components/picker-cell.d.ts +1 -0
- package/esm/picker-view/components/picker-cell.js +6 -1
- package/esm/picker-view/index.d.ts +6 -1
- package/esm/picker-view/index.js +26 -13
- package/esm/tabs/tab-cell.js +55 -29
- package/esm/tabs/type.d.ts +5 -0
- package/package.json +3 -3
- package/umd/carousel/index.js +3 -0
- package/umd/picker/index.js +3 -2
- package/umd/picker/type.d.ts +1 -1
- package/umd/picker-view/components/cascader.d.ts +1 -0
- package/umd/picker-view/components/cascader.js +8 -1
- package/umd/picker-view/components/picker-cell.d.ts +1 -0
- package/umd/picker-view/components/picker-cell.js +6 -1
- package/umd/picker-view/index.d.ts +6 -1
- package/umd/picker-view/index.js +25 -13
- package/umd/tabs/tab-cell.js +54 -29
- package/umd/tabs/type.d.ts +5 -0
package/esm/carousel/index.js
CHANGED
@@ -640,6 +640,9 @@ var Carousel = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
640
640
|
|
641
641
|
function getFakeChild() {
|
642
642
|
if (noLoop) {
|
643
|
+
// 循环状态从有到无时,重置 transforms
|
644
|
+
// @en reset transforms when loop status changes to false
|
645
|
+
setTransforms([]);
|
643
646
|
return;
|
644
647
|
}
|
645
648
|
|
package/esm/picker/index.js
CHANGED
@@ -95,12 +95,13 @@ var Picker = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
95
95
|
|
96
96
|
(_pickerViewRef$curren6 = pickerViewRef.current) == null ? void 0 : _pickerViewRef$curren6.scrollToCurrentIndex();
|
97
97
|
nextTick(function () {
|
98
|
-
var _pickerViewRef$curren7;
|
98
|
+
var _pickerViewRef$curren7, _pickerViewRef$curren8;
|
99
99
|
|
100
100
|
var val = ((_pickerViewRef$curren7 = pickerViewRef.current) == null ? void 0 : _pickerViewRef$curren7.getAllColumnValues()) || scrollValueRef.current || [];
|
101
|
+
var selectedData = ((_pickerViewRef$curren8 = pickerViewRef.current) == null ? void 0 : _pickerViewRef$curren8.getAllColumnData()) || [];
|
101
102
|
|
102
103
|
if (onOk) {
|
103
|
-
onOk(val);
|
104
|
+
onOk(val, selectedData);
|
104
105
|
}
|
105
106
|
|
106
107
|
if (onChange) {
|
package/esm/picker/type.d.ts
CHANGED
@@ -81,7 +81,7 @@ export interface PickerProps extends Omit<PopupProps, 'visible' | 'close' | 'chi
|
|
81
81
|
* 点击选中时执行的回调
|
82
82
|
* @en Callback when clicking on Ok
|
83
83
|
*/
|
84
|
-
onOk?: (value: ValueType[]) => void;
|
84
|
+
onOk?: (value: ValueType[], data: PickerData[]) => void;
|
85
85
|
/**
|
86
86
|
* 点击取消时执行的回调
|
87
87
|
* @en Callback when clicking to cancel
|
@@ -19,6 +19,7 @@ export interface CascaderRef {
|
|
19
19
|
getCellMovingStatus: () => PickerCellMovingStatus[];
|
20
20
|
scrollToCurrentIndex: () => void;
|
21
21
|
getAllCellsValue: () => ValueType[];
|
22
|
+
getAllCellsData: () => PickerData[];
|
22
23
|
}
|
23
24
|
declare const Cascader: React.ForwardRefExoticComponent<CascaderProps & React.RefAttributes<CascaderRef>>;
|
24
25
|
export default Cascader;
|
@@ -22,7 +22,8 @@ var Cascader = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
22
22
|
return {
|
23
23
|
getCellMovingStatus: getCellMovingStatus,
|
24
24
|
scrollToCurrentIndex: scrollToCurrentIndex,
|
25
|
-
getAllCellsValue: getAllCellsValue
|
25
|
+
getAllCellsValue: getAllCellsValue,
|
26
|
+
getAllCellsData: getAllCellsData
|
26
27
|
};
|
27
28
|
});
|
28
29
|
|
@@ -44,6 +45,12 @@ var Cascader = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
44
45
|
});
|
45
46
|
}
|
46
47
|
|
48
|
+
function getAllCellsData() {
|
49
|
+
return pickerCellsRef.current.map(function (cell) {
|
50
|
+
return cell.getCurrentCellData();
|
51
|
+
});
|
52
|
+
}
|
53
|
+
|
47
54
|
function _onValueChange(value, index, newData) {
|
48
55
|
var children = arrayTreeFilter(data, function (item, level) {
|
49
56
|
return level <= index && item.value === value[level];
|
@@ -22,6 +22,7 @@ export interface PickerCellRef {
|
|
22
22
|
movingStatus: PickerCellMovingStatus;
|
23
23
|
scrollToCurrentIndex: () => void;
|
24
24
|
getCurrentCellValue: () => ValueType;
|
25
|
+
getCurrentCellData: () => PickerData;
|
25
26
|
}
|
26
27
|
declare const PickerCell: React.ForwardRefExoticComponent<PickerCellProps & React.RefAttributes<PickerCellRef>>;
|
27
28
|
export default PickerCell;
|
@@ -289,6 +289,10 @@ var PickerCell = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
289
289
|
return (_data$currentIndex = data[currentIndex]) == null ? void 0 : _data$currentIndex.value;
|
290
290
|
}
|
291
291
|
|
292
|
+
function getCurrentCellData() {
|
293
|
+
return data[currentIndex];
|
294
|
+
}
|
295
|
+
|
292
296
|
function _clearTimer() {
|
293
297
|
timeRef.current && clearTimeout(timeRef.current);
|
294
298
|
timeRef.current = null;
|
@@ -354,7 +358,8 @@ var PickerCell = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
354
358
|
return {
|
355
359
|
movingStatus: movingStatusRef.current,
|
356
360
|
scrollToCurrentIndex: scrollToCurrentIndex,
|
357
|
-
getCurrentCellValue: getCurrentCellValue
|
361
|
+
getCurrentCellValue: getCurrentCellValue,
|
362
|
+
getCurrentCellData: getCurrentCellData
|
358
363
|
};
|
359
364
|
});
|
360
365
|
return !hideEmptyCols || data && data.length ? /*#__PURE__*/React.createElement("div", {
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
2
2
|
import MultiPicker from '../picker-view/components/multi-picker';
|
3
3
|
import PickerCell from '../picker-view/components/picker-cell';
|
4
4
|
import Cascader from '../picker-view/components/cascader';
|
5
|
-
import { PickerViewProps, ValueType, PickerCellMovingStatus } from './type';
|
5
|
+
import { PickerViewProps, ValueType, PickerData, PickerCellMovingStatus } from './type';
|
6
6
|
export * from './type';
|
7
7
|
export { MultiPicker, PickerCell, Cascader };
|
8
8
|
export interface PickerViewRef {
|
@@ -41,6 +41,11 @@ export interface PickerViewRef {
|
|
41
41
|
* @en Jump directly to the current most recent line (will break scrolling when called)
|
42
42
|
*/
|
43
43
|
scrollToCurrentIndex: () => void;
|
44
|
+
/**
|
45
|
+
* 获取所有列的 data
|
46
|
+
* @en Get all column data
|
47
|
+
*/
|
48
|
+
getAllColumnData: () => PickerData[];
|
44
49
|
}
|
45
50
|
declare const _default: React.ForwardRefExoticComponent<PickerViewProps & React.RefAttributes<PickerViewRef>> & {
|
46
51
|
displayName?: string | undefined;
|
package/esm/picker-view/index.js
CHANGED
@@ -8,6 +8,15 @@ import Cascader from '../picker-view/components/cascader';
|
|
8
8
|
import { useMountedState } from '../_helpers';
|
9
9
|
export * from './type';
|
10
10
|
export { MultiPicker, PickerCell, Cascader };
|
11
|
+
|
12
|
+
var isArray = function isArray(dt) {
|
13
|
+
return dt ? Array.isArray(dt[0]) : false;
|
14
|
+
};
|
15
|
+
|
16
|
+
var isStrOrNum = function isStrOrNum(dt) {
|
17
|
+
return typeof dt[0][0] === 'string' || typeof dt[0][0] === 'number';
|
18
|
+
};
|
19
|
+
|
11
20
|
var PickerView = /*#__PURE__*/forwardRef(function (props, ref) {
|
12
21
|
var _props$className = props.className,
|
13
22
|
className = _props$className === void 0 ? '' : _props$className,
|
@@ -57,14 +66,6 @@ var PickerView = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
57
66
|
var innerData = useMemo(function () {
|
58
67
|
var newData;
|
59
68
|
|
60
|
-
var isArray = function isArray(dt) {
|
61
|
-
return dt ? Array.isArray(dt[0]) : false;
|
62
|
-
};
|
63
|
-
|
64
|
-
var isStrOrNum = function isStrOrNum(dt) {
|
65
|
-
return typeof dt[0][0] === 'string' || typeof dt[0][0] === 'number';
|
66
|
-
};
|
67
|
-
|
68
69
|
if (isArray(data)) {
|
69
70
|
if (isStrOrNum(data)) {
|
70
71
|
newData = data.map(function (item) {
|
@@ -98,6 +99,17 @@ var PickerView = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
98
99
|
});
|
99
100
|
};
|
100
101
|
|
102
|
+
var getAllColumnData = function getAllColumnData() {
|
103
|
+
var _cascaderRef$current2;
|
104
|
+
|
105
|
+
var curValues = cascade ? ((_cascaderRef$current2 = cascaderRef.current) == null ? void 0 : _cascaderRef$current2.getAllCellsData()) || [] : pickerCellsRef.current.map(function (cell) {
|
106
|
+
return cell.getCurrentCellData();
|
107
|
+
});
|
108
|
+
return curValues.filter(function (v) {
|
109
|
+
return v !== undefined;
|
110
|
+
});
|
111
|
+
};
|
112
|
+
|
101
113
|
function getColumnValue(index) {
|
102
114
|
if (index === void 0) {
|
103
115
|
index = 0;
|
@@ -107,18 +119,18 @@ var PickerView = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
107
119
|
}
|
108
120
|
|
109
121
|
function getCellMovingStatus() {
|
110
|
-
var _cascaderRef$
|
122
|
+
var _cascaderRef$current3;
|
111
123
|
|
112
|
-
return cascade ? ((_cascaderRef$
|
124
|
+
return cascade ? ((_cascaderRef$current3 = cascaderRef.current) == null ? void 0 : _cascaderRef$current3.getCellMovingStatus()) || [] : pickerCellsRef.current.map(function (cell) {
|
113
125
|
return cell.movingStatus;
|
114
126
|
});
|
115
127
|
}
|
116
128
|
|
117
129
|
function scrollToCurrentIndex() {
|
118
130
|
if (cascade) {
|
119
|
-
var _cascaderRef$
|
131
|
+
var _cascaderRef$current4;
|
120
132
|
|
121
|
-
(_cascaderRef$
|
133
|
+
(_cascaderRef$current4 = cascaderRef.current) == null ? void 0 : _cascaderRef$current4.scrollToCurrentIndex();
|
122
134
|
return;
|
123
135
|
}
|
124
136
|
|
@@ -135,7 +147,8 @@ var PickerView = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
135
147
|
getColumnValue: getColumnValue,
|
136
148
|
updateLayout: updateLayout,
|
137
149
|
resetValue: resetValue,
|
138
|
-
scrollToCurrentIndex: scrollToCurrentIndex
|
150
|
+
scrollToCurrentIndex: scrollToCurrentIndex,
|
151
|
+
getAllColumnData: getAllColumnData
|
139
152
|
};
|
140
153
|
});
|
141
154
|
|
package/esm/tabs/tab-cell.js
CHANGED
@@ -73,14 +73,18 @@ var TabCell = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
73
73
|
return tabs.length < overflowThreshold ? tabBarArrange : 'start';
|
74
74
|
}),
|
75
75
|
originArrange = _useState3[0],
|
76
|
-
setOriginArrange = _useState3[1];
|
76
|
+
setOriginArrange = _useState3[1];
|
77
77
|
|
78
|
+
var _useState4 = useState(false),
|
79
|
+
forceUpdate = _useState4[0],
|
80
|
+
setForceUpdate = _useState4[1]; // 默认tab小于overflowThreshold个时不开启加载前隐藏,大于overflowThreshold个时开启
|
78
81
|
|
79
|
-
|
82
|
+
|
83
|
+
var _useState5 = useState(function () {
|
80
84
|
return hideTabBarBeforeMounted === void 0 ? tabs.length < overflowThreshold || activeIndex === 0 : !hideTabBarBeforeMounted;
|
81
85
|
}),
|
82
|
-
showTab =
|
83
|
-
setShowTab =
|
86
|
+
showTab = _useState5[0],
|
87
|
+
setShowTab = _useState5[1];
|
84
88
|
|
85
89
|
var isVertical = tabDirection === 'vertical';
|
86
90
|
var isLine = (type || '').indexOf('line') !== -1;
|
@@ -95,6 +99,15 @@ var TabCell = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
95
99
|
var hasDivider = tabBarHasDivider === void 0 ? isLine : tabBarHasDivider;
|
96
100
|
var wrapSize = isVertical ? wrapWidth : wrapHeight;
|
97
101
|
var system = useSystem();
|
102
|
+
|
103
|
+
var updateScrollPosition = function updateScrollPosition() {
|
104
|
+
if (wrapSize && tabBarScrollChance !== 'none') {
|
105
|
+
setTimeout(function () {
|
106
|
+
scrollToCenter();
|
107
|
+
}, tabBarScrollChance === 'after-jump' ? Math.max(transitionDuration || 0, duration || 0) : 0);
|
108
|
+
}
|
109
|
+
};
|
110
|
+
|
98
111
|
useEffect(function () {
|
99
112
|
nextTick(function () {
|
100
113
|
setCellOverflow(); // dom出来之后originArrange置空,交由tabBarArrange控制
|
@@ -114,31 +127,16 @@ var TabCell = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
114
127
|
(_underlineRef$current = underlineRef.current) == null ? void 0 : _underlineRef$current.resetUnderlineStyle();
|
115
128
|
});
|
116
129
|
}, [activeIndex, tabs, getCellPadding('left'), getCellPadding('right'), tabBarGutter, tabDirection]);
|
117
|
-
useImperativeHandle(ref, function () {
|
118
|
-
return {
|
119
|
-
dom: domRef.current,
|
120
|
-
scrollTo: scrollTo,
|
121
|
-
scrollToCenter: scrollToCenter,
|
122
|
-
hasOverflow: hasOverflow,
|
123
|
-
setCaterpillarAnimate: function setCaterpillarAnimate(ratio) {
|
124
|
-
var _underlineRef$current2;
|
125
|
-
|
126
|
-
return (_underlineRef$current2 = underlineRef.current) == null ? void 0 : _underlineRef$current2.setCaterpillarAnimate(ratio);
|
127
|
-
},
|
128
|
-
resetUnderlineStyle: function resetUnderlineStyle() {
|
129
|
-
var _underlineRef$current3;
|
130
|
-
|
131
|
-
return (_underlineRef$current3 = underlineRef.current) == null ? void 0 : _underlineRef$current3.resetUnderlineStyle();
|
132
|
-
}
|
133
|
-
};
|
134
|
-
}, [scrollToCenter, scrollTo, hasOverflow]);
|
135
130
|
useEffect(function () {
|
136
|
-
|
137
|
-
setTimeout(function () {
|
138
|
-
scrollToCenter();
|
139
|
-
}, tabBarScrollChance === 'after-jump' ? Math.max(transitionDuration || 0, duration || 0) : 0);
|
140
|
-
}
|
131
|
+
updateScrollPosition();
|
141
132
|
}, [activeIndex, wrapSize]);
|
133
|
+
useEffect(function () {
|
134
|
+
var _underlineRef$current2;
|
135
|
+
|
136
|
+
setCellOverflow();
|
137
|
+
(_underlineRef$current2 = underlineRef.current) == null ? void 0 : _underlineRef$current2.resetUnderlineStyle();
|
138
|
+
updateScrollPosition();
|
139
|
+
}, [forceUpdate]);
|
142
140
|
useEffect(function () {
|
143
141
|
tabBarScrollChance !== 'none' && scrollToCenter(true); // TabCell左右可滚动时,防止触发父级touchmove事件导致滚不动
|
144
142
|
// @en When the TabCell can be scrolled left and right, prevent the parent touchmove event from being triggered which result in inability to scroll
|
@@ -279,7 +277,7 @@ var TabCell = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
279
277
|
return typeof tab === 'string' ? tab : tab.title;
|
280
278
|
}
|
281
279
|
|
282
|
-
function renderTabUnderline() {
|
280
|
+
var renderTabUnderline = function renderTabUnderline() {
|
283
281
|
if (!showUnderline || !isLine) {
|
284
282
|
return null;
|
285
283
|
}
|
@@ -310,7 +308,7 @@ var TabCell = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
310
308
|
getTabCenterLeft: getTabCenterLeft,
|
311
309
|
getTabRect: getTabRect
|
312
310
|
}, lineProps));
|
313
|
-
}
|
311
|
+
};
|
314
312
|
|
315
313
|
var cellInner = /*#__PURE__*/React.createElement(React.Fragment, null, tabs.map(function (tab, index) {
|
316
314
|
return /*#__PURE__*/React.createElement("div", {
|
@@ -352,6 +350,34 @@ var TabCell = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
352
350
|
height: '100%'
|
353
351
|
}
|
354
352
|
}) : null);
|
353
|
+
|
354
|
+
var _updateLayout = function updateLayout() {
|
355
|
+
setForceUpdate(function (val) {
|
356
|
+
return !val;
|
357
|
+
});
|
358
|
+
};
|
359
|
+
|
360
|
+
useImperativeHandle(ref, function () {
|
361
|
+
return {
|
362
|
+
dom: domRef.current,
|
363
|
+
scrollTo: scrollTo,
|
364
|
+
scrollToCenter: scrollToCenter,
|
365
|
+
hasOverflow: hasOverflow,
|
366
|
+
setCaterpillarAnimate: function setCaterpillarAnimate(ratio) {
|
367
|
+
var _underlineRef$current3;
|
368
|
+
|
369
|
+
return (_underlineRef$current3 = underlineRef.current) == null ? void 0 : _underlineRef$current3.setCaterpillarAnimate(ratio);
|
370
|
+
},
|
371
|
+
resetUnderlineStyle: function resetUnderlineStyle() {
|
372
|
+
var _underlineRef$current4;
|
373
|
+
|
374
|
+
return (_underlineRef$current4 = underlineRef.current) == null ? void 0 : _underlineRef$current4.resetUnderlineStyle();
|
375
|
+
},
|
376
|
+
updateLayout: function updateLayout() {
|
377
|
+
return _updateLayout();
|
378
|
+
}
|
379
|
+
};
|
380
|
+
}, [scrollToCenter, scrollTo, hasOverflow]);
|
355
381
|
return /*#__PURE__*/React.createElement("div", {
|
356
382
|
className: cls(prefix + "-container-wrap", tabDirection, "type-" + type, tabBarClass, system),
|
357
383
|
style: tabBarStyle
|
package/esm/tabs/type.d.ts
CHANGED
@@ -565,6 +565,11 @@ export interface TabCellRef {
|
|
565
565
|
* @en Recalculate underline style
|
566
566
|
*/
|
567
567
|
resetUnderlineStyle: () => void;
|
568
|
+
/**
|
569
|
+
* 强制更新 tab-cell
|
570
|
+
* @en Force update tab-cell
|
571
|
+
*/
|
572
|
+
updateLayout: () => void;
|
568
573
|
}
|
569
574
|
export interface TabPaneProps extends Pick<TabsProps, 'duration' | 'transitionDuration' | 'lazyloadCount' | 'hideContentStyle' | 'renderHideContent' | 'mode' | 'tabPaneClass' | 'tabPaneStyle' | 'tabPaneExtra' | 'getScrollContainer' | 'scrollThrottle' | 'scrollOffset' | 'goLastWhenScrollBottom' | 'scrollVertical' | 'translateZ' | 'fullScreen' | 'autoHeight' | 'onScroll' | 'swipeEnergySaving'> {
|
570
575
|
prefixCls?: string;
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@arco-design/mobile-react",
|
3
|
-
"version": "2.30.
|
3
|
+
"version": "2.30.10",
|
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.17.
|
18
|
+
"@arco-design/mobile-utils": "2.17.10",
|
19
19
|
"@arco-design/transformable": "^1.0.0",
|
20
20
|
"lodash.throttle": "^4.1.1",
|
21
21
|
"resize-observer-polyfill": "^1.5.1"
|
@@ -49,5 +49,5 @@
|
|
49
49
|
"publishConfig": {
|
50
50
|
"access": "public"
|
51
51
|
},
|
52
|
-
"gitHead": "
|
52
|
+
"gitHead": "70e0f287b7e294b0d2d8e1516e4ff614f212f7dd"
|
53
53
|
}
|
package/umd/carousel/index.js
CHANGED
package/umd/picker/index.js
CHANGED
@@ -127,12 +127,13 @@
|
|
127
127
|
|
128
128
|
(_pickerViewRef$curren6 = pickerViewRef.current) == null ? void 0 : _pickerViewRef$curren6.scrollToCurrentIndex();
|
129
129
|
(0, _mobileUtils.nextTick)(function () {
|
130
|
-
var _pickerViewRef$curren7;
|
130
|
+
var _pickerViewRef$curren7, _pickerViewRef$curren8;
|
131
131
|
|
132
132
|
var val = ((_pickerViewRef$curren7 = pickerViewRef.current) == null ? void 0 : _pickerViewRef$curren7.getAllColumnValues()) || scrollValueRef.current || [];
|
133
|
+
var selectedData = ((_pickerViewRef$curren8 = pickerViewRef.current) == null ? void 0 : _pickerViewRef$curren8.getAllColumnData()) || [];
|
133
134
|
|
134
135
|
if (onOk) {
|
135
|
-
onOk(val);
|
136
|
+
onOk(val, selectedData);
|
136
137
|
}
|
137
138
|
|
138
139
|
if (onChange) {
|
package/umd/picker/type.d.ts
CHANGED
@@ -81,7 +81,7 @@ export interface PickerProps extends Omit<PopupProps, 'visible' | 'close' | 'chi
|
|
81
81
|
* 点击选中时执行的回调
|
82
82
|
* @en Callback when clicking on Ok
|
83
83
|
*/
|
84
|
-
onOk?: (value: ValueType[]) => void;
|
84
|
+
onOk?: (value: ValueType[], data: PickerData[]) => void;
|
85
85
|
/**
|
86
86
|
* 点击取消时执行的回调
|
87
87
|
* @en Callback when clicking to cancel
|
@@ -19,6 +19,7 @@ export interface CascaderRef {
|
|
19
19
|
getCellMovingStatus: () => PickerCellMovingStatus[];
|
20
20
|
scrollToCurrentIndex: () => void;
|
21
21
|
getAllCellsValue: () => ValueType[];
|
22
|
+
getAllCellsData: () => PickerData[];
|
22
23
|
}
|
23
24
|
declare const Cascader: React.ForwardRefExoticComponent<CascaderProps & React.RefAttributes<CascaderRef>>;
|
24
25
|
export default Cascader;
|
@@ -45,7 +45,8 @@
|
|
45
45
|
return {
|
46
46
|
getCellMovingStatus: getCellMovingStatus,
|
47
47
|
scrollToCurrentIndex: scrollToCurrentIndex,
|
48
|
-
getAllCellsValue: getAllCellsValue
|
48
|
+
getAllCellsValue: getAllCellsValue,
|
49
|
+
getAllCellsData: getAllCellsData
|
49
50
|
};
|
50
51
|
});
|
51
52
|
|
@@ -67,6 +68,12 @@
|
|
67
68
|
});
|
68
69
|
}
|
69
70
|
|
71
|
+
function getAllCellsData() {
|
72
|
+
return pickerCellsRef.current.map(function (cell) {
|
73
|
+
return cell.getCurrentCellData();
|
74
|
+
});
|
75
|
+
}
|
76
|
+
|
70
77
|
function _onValueChange(value, index, newData) {
|
71
78
|
var children = (0, _mobileUtils.arrayTreeFilter)(data, function (item, level) {
|
72
79
|
return level <= index && item.value === value[level];
|
@@ -22,6 +22,7 @@ export interface PickerCellRef {
|
|
22
22
|
movingStatus: PickerCellMovingStatus;
|
23
23
|
scrollToCurrentIndex: () => void;
|
24
24
|
getCurrentCellValue: () => ValueType;
|
25
|
+
getCurrentCellData: () => PickerData;
|
25
26
|
}
|
26
27
|
declare const PickerCell: React.ForwardRefExoticComponent<PickerCellProps & React.RefAttributes<PickerCellRef>>;
|
27
28
|
export default PickerCell;
|
@@ -311,6 +311,10 @@
|
|
311
311
|
return (_data$currentIndex = data[currentIndex]) == null ? void 0 : _data$currentIndex.value;
|
312
312
|
}
|
313
313
|
|
314
|
+
function getCurrentCellData() {
|
315
|
+
return data[currentIndex];
|
316
|
+
}
|
317
|
+
|
314
318
|
function _clearTimer() {
|
315
319
|
timeRef.current && clearTimeout(timeRef.current);
|
316
320
|
timeRef.current = null;
|
@@ -376,7 +380,8 @@
|
|
376
380
|
return {
|
377
381
|
movingStatus: movingStatusRef.current,
|
378
382
|
scrollToCurrentIndex: scrollToCurrentIndex,
|
379
|
-
getCurrentCellValue: getCurrentCellValue
|
383
|
+
getCurrentCellValue: getCurrentCellValue,
|
384
|
+
getCurrentCellData: getCurrentCellData
|
380
385
|
};
|
381
386
|
});
|
382
387
|
return !hideEmptyCols || data && data.length ? /*#__PURE__*/_react.default.createElement("div", {
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
2
2
|
import MultiPicker from '../picker-view/components/multi-picker';
|
3
3
|
import PickerCell from '../picker-view/components/picker-cell';
|
4
4
|
import Cascader from '../picker-view/components/cascader';
|
5
|
-
import { PickerViewProps, ValueType, PickerCellMovingStatus } from './type';
|
5
|
+
import { PickerViewProps, ValueType, PickerData, PickerCellMovingStatus } from './type';
|
6
6
|
export * from './type';
|
7
7
|
export { MultiPicker, PickerCell, Cascader };
|
8
8
|
export interface PickerViewRef {
|
@@ -41,6 +41,11 @@ export interface PickerViewRef {
|
|
41
41
|
* @en Jump directly to the current most recent line (will break scrolling when called)
|
42
42
|
*/
|
43
43
|
scrollToCurrentIndex: () => void;
|
44
|
+
/**
|
45
|
+
* 获取所有列的 data
|
46
|
+
* @en Get all column data
|
47
|
+
*/
|
48
|
+
getAllColumnData: () => PickerData[];
|
44
49
|
}
|
45
50
|
declare const _default: React.ForwardRefExoticComponent<PickerViewProps & React.RefAttributes<PickerViewRef>> & {
|
46
51
|
displayName?: string | undefined;
|
package/umd/picker-view/index.js
CHANGED
@@ -41,6 +41,14 @@
|
|
41
41
|
|
42
42
|
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; }
|
43
43
|
|
44
|
+
var isArray = function isArray(dt) {
|
45
|
+
return dt ? Array.isArray(dt[0]) : false;
|
46
|
+
};
|
47
|
+
|
48
|
+
var isStrOrNum = function isStrOrNum(dt) {
|
49
|
+
return typeof dt[0][0] === 'string' || typeof dt[0][0] === 'number';
|
50
|
+
};
|
51
|
+
|
44
52
|
var PickerView = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
45
53
|
var _props$className = props.className,
|
46
54
|
className = _props$className === void 0 ? '' : _props$className,
|
@@ -90,14 +98,6 @@
|
|
90
98
|
var innerData = (0, _react.useMemo)(function () {
|
91
99
|
var newData;
|
92
100
|
|
93
|
-
var isArray = function isArray(dt) {
|
94
|
-
return dt ? Array.isArray(dt[0]) : false;
|
95
|
-
};
|
96
|
-
|
97
|
-
var isStrOrNum = function isStrOrNum(dt) {
|
98
|
-
return typeof dt[0][0] === 'string' || typeof dt[0][0] === 'number';
|
99
|
-
};
|
100
|
-
|
101
101
|
if (isArray(data)) {
|
102
102
|
if (isStrOrNum(data)) {
|
103
103
|
newData = data.map(function (item) {
|
@@ -131,6 +131,17 @@
|
|
131
131
|
});
|
132
132
|
};
|
133
133
|
|
134
|
+
var getAllColumnData = function getAllColumnData() {
|
135
|
+
var _cascaderRef$current2;
|
136
|
+
|
137
|
+
var curValues = cascade ? ((_cascaderRef$current2 = cascaderRef.current) == null ? void 0 : _cascaderRef$current2.getAllCellsData()) || [] : pickerCellsRef.current.map(function (cell) {
|
138
|
+
return cell.getCurrentCellData();
|
139
|
+
});
|
140
|
+
return curValues.filter(function (v) {
|
141
|
+
return v !== undefined;
|
142
|
+
});
|
143
|
+
};
|
144
|
+
|
134
145
|
function getColumnValue(index) {
|
135
146
|
if (index === void 0) {
|
136
147
|
index = 0;
|
@@ -140,18 +151,18 @@
|
|
140
151
|
}
|
141
152
|
|
142
153
|
function getCellMovingStatus() {
|
143
|
-
var _cascaderRef$
|
154
|
+
var _cascaderRef$current3;
|
144
155
|
|
145
|
-
return cascade ? ((_cascaderRef$
|
156
|
+
return cascade ? ((_cascaderRef$current3 = cascaderRef.current) == null ? void 0 : _cascaderRef$current3.getCellMovingStatus()) || [] : pickerCellsRef.current.map(function (cell) {
|
146
157
|
return cell.movingStatus;
|
147
158
|
});
|
148
159
|
}
|
149
160
|
|
150
161
|
function scrollToCurrentIndex() {
|
151
162
|
if (cascade) {
|
152
|
-
var _cascaderRef$
|
163
|
+
var _cascaderRef$current4;
|
153
164
|
|
154
|
-
(_cascaderRef$
|
165
|
+
(_cascaderRef$current4 = cascaderRef.current) == null ? void 0 : _cascaderRef$current4.scrollToCurrentIndex();
|
155
166
|
return;
|
156
167
|
}
|
157
168
|
|
@@ -168,7 +179,8 @@
|
|
168
179
|
getColumnValue: getColumnValue,
|
169
180
|
updateLayout: updateLayout,
|
170
181
|
resetValue: resetValue,
|
171
|
-
scrollToCurrentIndex: scrollToCurrentIndex
|
182
|
+
scrollToCurrentIndex: scrollToCurrentIndex,
|
183
|
+
getAllColumnData: getAllColumnData
|
172
184
|
};
|
173
185
|
});
|
174
186
|
|