@nutui/nutui-react-taro 2.0.0-alpha.13 → 2.0.0-alpha.15
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 +30 -0
- package/dist/esm/ActionSheet/style/style.css +1 -1
- package/dist/esm/Address/style/style.css +1 -1
- package/dist/esm/Address.js +2 -2
- package/dist/esm/Audio.js +4 -4
- package/dist/esm/Avatar.js +3 -3
- package/dist/esm/Barrage/style/style.css +1 -1
- package/dist/esm/Barrage.js +2 -3
- package/dist/esm/Calendar/style/style.css +1 -1
- package/dist/esm/Calendar.js +3 -3
- package/dist/esm/CalendarItem.js +2 -2
- package/dist/esm/Card/style/style.css +1 -1
- package/dist/esm/Card.js +2 -4
- package/dist/esm/Cascader/style/style.css +1 -1
- package/dist/esm/CircleProgress.js +2 -2
- package/dist/esm/ConfigProvider.js +2 -2
- package/dist/esm/CountDown.js +2 -2
- package/dist/esm/DatePicker/style/style.css +1 -1
- package/dist/esm/DatePicker.js +4 -4
- package/dist/esm/Dialog.js +2 -2
- package/dist/esm/Ellipsis.js +2 -2
- package/dist/esm/Empty.js +2 -2
- package/dist/esm/FixedNav.js +2 -2
- package/dist/esm/Grid.js +3 -3
- package/dist/esm/GridItem.js +2 -2
- package/dist/esm/Image.js +2 -2
- package/dist/esm/ImagePreview/style/style.css +1 -1
- package/dist/esm/ImagePreview.js +1 -1
- package/dist/esm/InfiniteLoading/style/style.css +1 -0
- package/dist/esm/InfiniteLoading.js +10 -0
- package/dist/esm/Input.js +2 -2
- package/dist/esm/Menu.js +1 -1
- package/dist/esm/MenuItem.js +2 -2
- package/dist/esm/NoticeBar.js +2 -2
- package/dist/esm/NumberKeyboard/style/style.css +1 -1
- package/dist/esm/NumberKeyboard.js +2 -2
- package/dist/esm/Pagination.js +2 -2
- package/dist/esm/Picker/style/style.css +1 -1
- package/dist/esm/Picker.js +3 -3
- package/dist/esm/Popover/style/index.js +1 -1
- package/dist/esm/Popover/style/style.css +1 -1
- package/dist/esm/Popover.js +9 -3
- package/dist/esm/Popup/style/style.css +1 -1
- package/dist/esm/PullToRefresh.js +2 -2
- package/dist/esm/Range.js +2 -2
- package/dist/esm/SearchBar.js +2 -2
- package/dist/esm/ShortPassword/style/style.css +1 -1
- package/dist/esm/ShortPassword.js +2 -2
- package/dist/esm/SideNavBar/style/style.css +1 -1
- package/dist/esm/SideNavBar.js +3 -3
- package/dist/esm/SideNavBarItem/style/style.css +1 -1
- package/dist/esm/SideNavBarItem.js +1 -1
- package/dist/esm/Signature/style/index.js +1 -1
- package/dist/esm/Signature/style/style.css +1 -1
- package/dist/esm/Signature.js +1 -7
- package/dist/esm/Skeleton.js +4 -4
- package/dist/esm/Sticky.js +2 -2
- package/dist/esm/SubSideNavBar/style/style.css +1 -1
- package/dist/esm/SubSideNavBar.js +2 -2
- package/dist/esm/Swipe.js +2 -2
- package/dist/esm/Table.js +2 -2
- package/dist/esm/Tag/style/style.css +1 -1
- package/dist/esm/Tag.js +1 -1
- package/dist/esm/TextArea/style/style.css +1 -1
- package/dist/esm/TextArea.js +2 -2
- package/dist/esm/TimeDetail/style/style.css +1 -1
- package/dist/esm/TimeDetail.js +3 -4
- package/dist/esm/TimeSelect/style/index.js +0 -1
- package/dist/esm/TimeSelect/style/style.css +1 -1
- package/dist/esm/TimeSelect.js +4 -7
- package/dist/esm/Uploader.js +3 -3
- package/dist/esm/WaterMark.js +2 -2
- package/dist/esm/{address.taro-1a8ab3f1.js → address.taro-cc879a1d.js} +1 -1
- package/dist/esm/{audio.taro-bbd39f93.js → audio.taro-64b15071.js} +4 -4
- package/dist/esm/{avatar.taro-01536aff.js → avatar.taro-8a26cd6c.js} +1 -1
- package/dist/esm/{barrage.taro-c8cb9864.js → barrage.taro-e87bc58e.js} +32 -32
- package/dist/esm/{calendar.taro-10a6cb11.js → calendar.taro-02195ddb.js} +2 -2
- package/dist/esm/{calendaritem.taro-3e5f114e.js → calendaritem.taro-4230e5c4.js} +1 -1
- package/dist/esm/card.taro-92fe9733.js +64 -0
- package/dist/esm/{circleprogress.taro-7149e09d.js → circleprogress.taro-9064d69c.js} +1 -1
- package/dist/esm/{configprovider.taro-25758d9f.js → configprovider.taro-372b1525.js} +1 -1
- package/dist/esm/{countdown.taro-c399cc08.js → countdown.taro-8f19d21b.js} +1 -1
- package/dist/esm/{datepicker.taro-65dbeceb.js → datepicker.taro-8c9230b6.js} +2 -2
- package/dist/esm/{dialog.taro-290eb9a6.js → dialog.taro-e5c2cb03.js} +1 -1
- package/dist/esm/{ellipsis.taro-f423affa.js → ellipsis.taro-5653d0b2.js} +12 -12
- package/dist/esm/{empty.taro-ca792f57.js → empty.taro-8345ac72.js} +1 -1
- package/dist/esm/{fixednav.taro-b9ecf0d5.js → fixednav.taro-6c69ad79.js} +1 -1
- package/dist/esm/{grid.taro-fbbd8618.js → grid.taro-9b63aca5.js} +1 -1
- package/dist/esm/{griditem.taro-b0c37077.js → griditem.taro-48971911.js} +1 -1
- package/dist/esm/{image.taro-767aa000.js → image.taro-fde6e649.js} +1 -1
- package/dist/esm/{imagepreview.taro-daa5a84f.js → imagepreview.taro-cfe0a4cc.js} +3 -2
- package/dist/esm/{index-e3184f19.js → index-0a89a47b.js} +7 -1
- package/dist/esm/{infiniteloading.taro-f8f23ac6.js → infiniteloading.taro-53eeb1ec.js} +17 -33
- package/dist/esm/{input.taro-27d686c9.js → input.taro-69c08268.js} +1 -1
- package/dist/esm/{menu.taro-cd0fef41.js → menu.taro-40d36e0a.js} +3 -3
- package/dist/esm/{menuitem.taro-6076bffa.js → menuitem.taro-6aa35a00.js} +1 -1
- package/dist/esm/{noticebar.taro-2f02b2ad.js → noticebar.taro-8d496dd6.js} +1 -1
- package/dist/esm/{numberkeyboard.taro-ad8afaf9.js → numberkeyboard.taro-18879f04.js} +1 -1
- package/dist/esm/nutui-react.es.js +53 -55
- package/dist/esm/{pagination.taro-63607c3b.js → pagination.taro-592bca05.js} +1 -1
- package/dist/esm/{picker.taro-0570ec32.js → picker.taro-6b672469.js} +45 -41
- package/dist/esm/popover.taro-ba6c323a.js +229 -0
- package/dist/esm/{pulltorefresh.taro-5b36a881.js → pulltorefresh.taro-3719fdfb.js} +1 -1
- package/dist/esm/{range.taro-615e193a.js → range.taro-a1d1ad25.js} +1 -1
- package/dist/esm/{searchbar.taro-09468fff.js → searchbar.taro-39351331.js} +1 -1
- package/dist/esm/{shortpassword.taro-eabbde1b.js → shortpassword.taro-cff61e4e.js} +1 -1
- package/dist/esm/{sidenavbar.taro-9f210df4.js → sidenavbar.taro-1aefdd3c.js} +13 -10
- package/dist/esm/sidenavbaritem.taro-7d805f92.js +13 -0
- package/dist/esm/{signature.taro-c57469aa.js → signature.taro-4f68516a.js} +20 -21
- package/dist/esm/{skeleton.taro-0552c2ec.js → skeleton.taro-ce714b06.js} +1 -1
- package/dist/esm/{sticky.taro-f8ae8d5e.js → sticky.taro-6bc62a96.js} +2 -2
- package/dist/esm/{subsidenavbar.taro-abe07673.js → subsidenavbar.taro-47bb6e74.js} +10 -9
- package/dist/esm/{swipe.taro-de80fcd8.js → swipe.taro-966af6d3.js} +1 -1
- package/dist/esm/{table.taro-15a55c5d.js → table.taro-a20f15f2.js} +1 -1
- package/dist/esm/tag.taro-614758eb.js +76 -0
- package/dist/esm/{textarea.taro-c110565e.js → textarea.taro-593cd471.js} +1 -1
- package/dist/esm/timedetail.taro-d7aa4c1b.js +48 -0
- package/dist/esm/timeselect.taro-9e37e648.js +114 -0
- package/dist/esm/types/src/locales/base.d.ts +1 -1
- package/dist/esm/types/src/packages/barrage/barrage.d.ts +6 -7
- package/dist/esm/types/src/packages/barrage/barrage.taro.d.ts +6 -7
- package/dist/esm/types/src/packages/barrage/index.d.ts +1 -0
- package/dist/esm/types/src/packages/barrage/index.taro.d.ts +1 -0
- package/dist/esm/types/src/packages/button/button.d.ts +1 -0
- package/dist/esm/types/src/packages/card/card.d.ts +8 -9
- package/dist/esm/types/src/packages/card/card.taro.d.ts +8 -9
- package/dist/esm/types/src/packages/card/index.d.ts +1 -0
- package/dist/esm/types/src/packages/card/index.taro.d.ts +1 -0
- package/dist/esm/types/src/packages/configprovider/types.d.ts +1 -1
- package/dist/esm/types/src/packages/imagepreview/imagepreview.taro.d.ts +1 -0
- package/dist/esm/types/src/packages/infiniteloading/demo.taro.d.ts +2 -2
- package/dist/esm/types/src/packages/infiniteloading/index.d.ts +3 -2
- package/dist/esm/types/src/packages/infiniteloading/index.taro.d.ts +3 -2
- package/dist/esm/types/src/packages/infiniteloading/infiniteloading.d.ts +9 -14
- package/dist/esm/types/src/packages/infiniteloading/infiniteloading.taro.d.ts +8 -12
- package/dist/esm/types/src/packages/input/input.taro.d.ts +1 -1
- package/dist/esm/types/src/packages/menu/menu.taro.d.ts +1 -1
- package/dist/esm/types/src/packages/nutui.react.build.d.ts +2 -3
- package/dist/esm/types/src/packages/nutui.react.d.ts +2 -4
- package/dist/esm/types/src/packages/nutui.react.scss.d.ts +0 -1
- package/dist/esm/types/src/packages/nutui.react.taro.d.ts +2 -4
- package/dist/esm/types/src/packages/nutui.react.taro.scss.d.ts +0 -1
- package/dist/esm/types/src/packages/nutui.taro.react.build.d.ts +2 -3
- package/dist/esm/types/src/packages/picker/doc.en.d.ts +9 -9
- package/dist/esm/types/src/packages/popover/demo.d.ts +3 -2
- package/dist/esm/types/src/packages/popover/demo.taro.d.ts +2 -2
- package/dist/esm/types/src/packages/popover/index.d.ts +1 -0
- package/dist/esm/types/src/packages/popover/index.taro.d.ts +1 -0
- package/dist/esm/types/src/packages/popover/popover.d.ts +20 -9
- package/dist/esm/types/src/packages/popover/popover.taro.d.ts +20 -10
- package/dist/esm/types/src/packages/sidenavbar/index.d.ts +1 -0
- package/dist/esm/types/src/packages/sidenavbar/index.taro.d.ts +1 -0
- package/dist/esm/types/src/packages/sidenavbar/sidenavbar.d.ts +5 -9
- package/dist/esm/types/src/packages/sidenavbar/sidenavbar.taro.d.ts +5 -9
- package/dist/esm/types/src/packages/sidenavbaritem/index.d.ts +1 -0
- package/dist/esm/types/src/packages/sidenavbaritem/index.taro.d.ts +1 -0
- package/dist/esm/types/src/packages/sidenavbaritem/sidenavbaritem.d.ts +3 -3
- package/dist/esm/types/src/packages/sidenavbaritem/sidenavbaritem.taro.d.ts +3 -3
- package/dist/esm/types/src/packages/signature/index.d.ts +1 -0
- package/dist/esm/types/src/packages/signature/index.taro.d.ts +1 -0
- package/dist/esm/types/src/packages/signature/signature.d.ts +10 -8
- package/dist/esm/types/src/packages/signature/signature.taro.d.ts +7 -12
- package/dist/esm/types/src/packages/subsidenavbar/index.d.ts +1 -0
- package/dist/esm/types/src/packages/subsidenavbar/index.taro.d.ts +1 -0
- package/dist/esm/types/src/packages/subsidenavbar/subsidenavbar.d.ts +3 -3
- package/dist/esm/types/src/packages/subsidenavbar/subsidenavbar.taro.d.ts +3 -3
- package/dist/esm/types/src/packages/tag/index.d.ts +1 -0
- package/dist/esm/types/src/packages/tag/index.taro.d.ts +1 -0
- package/dist/esm/types/src/packages/tag/tag.d.ts +4 -6
- package/dist/esm/types/src/packages/tag/tag.taro.d.ts +4 -6
- package/dist/esm/types/src/packages/timedetail/index.d.ts +1 -2
- package/dist/esm/types/src/packages/timedetail/timedetail.d.ts +9 -11
- package/dist/esm/types/src/packages/timedetail/timedetail.taro.d.ts +9 -11
- package/dist/esm/types/src/packages/timeselect/demo.taro.d.ts +0 -4
- package/dist/esm/types/src/packages/timeselect/index.d.ts +1 -0
- package/dist/esm/types/src/packages/timeselect/index.taro.d.ts +1 -0
- package/dist/esm/types/src/packages/timeselect/timeselect.d.ts +25 -20
- package/dist/esm/types/src/packages/timeselect/timeselect.taro.d.ts +25 -20
- package/dist/esm/types/src/utils/index.d.ts +1 -0
- package/dist/esm/types/src/utils/use-click-away.d.ts +3 -0
- package/dist/esm/{uploader.taro-7e38fc37.js → uploader.taro-5ad88f83.js} +2 -2
- package/dist/esm/use-client-rect-2bb6c562.js +40 -0
- package/dist/esm/{watermark.taro-e2245bb1.js → watermark.taro-b6b1ae18.js} +1 -1
- package/dist/locales/base.d.ts +1 -1
- package/dist/locales/base.js +1 -1
- package/dist/locales/en-US.js +2 -2
- package/dist/locales/id-ID.js +2 -2
- package/dist/locales/tr-TR.js +2 -2
- package/dist/locales/zh-CN.js +2 -2
- package/dist/locales/zh-TW.js +2 -2
- package/dist/locales/zh-UG.js +2 -2
- package/dist/nutui.react.es.js +970 -874
- package/dist/nutui.react.umd.js +969 -873
- package/dist/packages/barrage/barrage.scss +0 -13
- package/dist/packages/card/card.scss +8 -14
- package/dist/packages/infiniteloading/infiniteloading.scss +2 -25
- package/dist/packages/popover/popover.scss +158 -230
- package/dist/packages/popup/popup.scss +36 -0
- package/dist/packages/sidenavbar/sidenavbar.scss +10 -16
- package/dist/packages/sidenavbaritem/sidenavbaritem.scss +7 -19
- package/dist/packages/signature/signature.scss +1 -18
- package/dist/packages/subsidenavbar/subsidenavbar.scss +10 -19
- package/dist/packages/tag/tag.scss +10 -17
- package/dist/packages/timedetail/timedetail.scss +12 -37
- package/dist/packages/timeselect/timeselect.scss +15 -44
- package/dist/style.css +1 -1
- package/dist/style.mjs +1 -1
- package/dist/styles/themes/default.scss +0 -1
- package/dist/styles/variables-jmapp.scss +85 -144
- package/dist/styles/variables.scss +96 -155
- package/dist/types/index.d.ts +2 -3
- package/dist/types/locales/base.d.ts +1 -1
- package/dist/types/packages/barrage/barrage.taro.d.ts +32 -9
- package/dist/types/packages/barrage/index.taro.d.ts +1 -0
- package/dist/types/packages/card/card.taro.d.ts +57 -14
- package/dist/types/packages/card/index.taro.d.ts +1 -0
- package/dist/types/packages/configprovider/types.d.ts +1 -1
- package/dist/types/packages/imagepreview/imagepreview.taro.d.ts +5 -0
- package/dist/types/packages/infiniteloading/index.taro.d.ts +3 -2
- package/dist/types/packages/infiniteloading/infiniteloading.taro.d.ts +52 -16
- package/dist/types/packages/input/input.taro.d.ts +1 -1
- package/dist/types/packages/menu/menu.taro.d.ts +5 -1
- package/dist/types/packages/popover/index.taro.d.ts +1 -0
- package/dist/types/packages/popover/popover.taro.d.ts +99 -13
- package/dist/types/packages/sidenavbar/index.taro.d.ts +1 -0
- package/dist/types/packages/sidenavbar/sidenavbar.taro.d.ts +33 -13
- package/dist/types/packages/sidenavbaritem/index.taro.d.ts +1 -0
- package/dist/types/packages/sidenavbaritem/sidenavbaritem.taro.d.ts +3 -3
- package/dist/types/packages/signature/index.taro.d.ts +1 -0
- package/dist/types/packages/signature/signature.taro.d.ts +32 -17
- package/dist/types/packages/subsidenavbar/index.taro.d.ts +1 -0
- package/dist/types/packages/subsidenavbar/subsidenavbar.taro.d.ts +3 -3
- package/dist/types/packages/tag/index.taro.d.ts +1 -0
- package/dist/types/packages/tag/tag.taro.d.ts +52 -14
- package/dist/types/packages/timedetail/timedetail.taro.d.ts +9 -11
- package/dist/types/packages/timeselect/index.taro.d.ts +1 -0
- package/dist/types/packages/timeselect/timeselect.taro.d.ts +62 -21
- package/dist/types/packages/toast/toast.taro.d.ts +60 -12
- package/dist/types/utils/index.d.ts +1 -0
- package/package.json +1 -1
- package/dist/esm/Infiniteloading/style/style.css +0 -1
- package/dist/esm/Infiniteloading.js +0 -12
- package/dist/esm/TimePannel/style/css.js +0 -1
- package/dist/esm/TimePannel/style/index.js +0 -2
- package/dist/esm/TimePannel/style/style.css +0 -1
- package/dist/esm/TimePannel.js +0 -8
- package/dist/esm/card.taro-2080f4d2.js +0 -51
- package/dist/esm/popover.taro-ad483372.js +0 -162
- package/dist/esm/sidenavbaritem.taro-32a45ce6.js +0 -12
- package/dist/esm/tag.taro-1b4134a5.js +0 -92
- package/dist/esm/timedetail.taro-8d2acbbf.js +0 -41
- package/dist/esm/timepannel.taro-ee4c5dfa.js +0 -22
- package/dist/esm/timeselect.taro-069deedd.js +0 -133
- package/dist/esm/types/src/packages/popover/Trigger.d.ts +0 -19
- package/dist/esm/types/src/packages/sidenavbar/type.d.ts +0 -34
- package/dist/esm/types/src/packages/timedetail/demo.d.ts +0 -3
- package/dist/esm/types/src/packages/timedetail/demo.taro.d.ts +0 -3
- package/dist/esm/types/src/packages/timepannel/demo.d.ts +0 -3
- package/dist/esm/types/src/packages/timepannel/demo.taro.d.ts +0 -3
- package/dist/esm/types/src/packages/timepannel/index.d.ts +0 -2
- package/dist/esm/types/src/packages/timepannel/index.taro.d.ts +0 -2
- package/dist/esm/types/src/packages/timepannel/timepannel.d.ts +0 -8
- package/dist/esm/types/src/packages/timepannel/timepannel.taro.d.ts +0 -8
- package/dist/esm/use-client-rect-f317804e.js +0 -10
- package/dist/packages/timepannel/timepannel.scss +0 -17
- package/dist/types/packages/popover/Trigger.d.ts +0 -19
- package/dist/types/packages/timepannel/index.taro.d.ts +0 -2
- package/dist/types/packages/timepannel/timepannel.taro.d.ts +0 -8
- /package/dist/esm/{Infiniteloading → InfiniteLoading}/style/css.js +0 -0
- /package/dist/esm/{Infiniteloading → InfiniteLoading}/style/index.js +0 -0
- /package/dist/esm/{offsetContext-f32a9246.js → context-f32a9246.js} +0 -0
- /package/dist/esm/types/src/packages/sidenavbar/{offsetContext.d.ts → context.d.ts} +0 -0
- /package/dist/types/packages/sidenavbar/{offsetContext.d.ts → context.d.ts} +0 -0
|
@@ -2,24 +2,19 @@ import React, { useState, useRef, useEffect } from "react";
|
|
|
2
2
|
import classNames from "classnames";
|
|
3
3
|
import { ScrollView } from "@tarojs/components";
|
|
4
4
|
import { createSelectorQuery } from "@tarojs/taro";
|
|
5
|
-
import {
|
|
6
|
-
import { u as useConfig } from "./configprovider.taro-25758d9f.js";
|
|
5
|
+
import { u as useConfig } from "./configprovider.taro-372b1525.js";
|
|
7
6
|
import { C as ComponentDefaults } from "./typings-11d83a22.js";
|
|
8
7
|
const defaultProps = {
|
|
9
8
|
...ComponentDefaults,
|
|
10
9
|
hasMore: true,
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
pullIcon: "https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png",
|
|
15
|
-
pullText: "松开刷新",
|
|
16
|
-
loadIcon: "https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png",
|
|
17
|
-
loadingText: "加载中···",
|
|
18
|
-
loadMoreText: "哎呀,这里是底部了啦"
|
|
10
|
+
threshold: 40,
|
|
11
|
+
target: "",
|
|
12
|
+
pullRefresh: false
|
|
19
13
|
};
|
|
20
|
-
const
|
|
14
|
+
const classPrefix = `nut-infiniteloading`;
|
|
15
|
+
const InfiniteLoading = (props) => {
|
|
21
16
|
const { locale } = useConfig();
|
|
22
|
-
const { children, hasMore,
|
|
17
|
+
const { children, hasMore, threshold, target, pullRefresh, pullingText, loadingText, loadMoreText, className, onRefresh, onLoadMore, onScroll } = {
|
|
23
18
|
...defaultProps,
|
|
24
19
|
...props
|
|
25
20
|
};
|
|
@@ -33,10 +28,9 @@ const Infiniteloading = (props) => {
|
|
|
33
28
|
const y = useRef(0);
|
|
34
29
|
const refreshMaxH = useRef(0);
|
|
35
30
|
const distance = useRef(0);
|
|
36
|
-
const
|
|
37
|
-
const classes = classNames(className, b());
|
|
31
|
+
const classes = classNames(className, classPrefix);
|
|
38
32
|
useEffect(() => {
|
|
39
|
-
refreshMaxH.current =
|
|
33
|
+
refreshMaxH.current = threshold;
|
|
40
34
|
setTimeout(() => {
|
|
41
35
|
getScrollHeight();
|
|
42
36
|
}, 200);
|
|
@@ -54,7 +48,7 @@ const Infiniteloading = (props) => {
|
|
|
54
48
|
};
|
|
55
49
|
};
|
|
56
50
|
const getParentElement = (el) => {
|
|
57
|
-
return createSelectorQuery().select(
|
|
51
|
+
return createSelectorQuery().select(target ? `#${target} #${el}` : `#${el}`);
|
|
58
52
|
};
|
|
59
53
|
const infiniteDone = () => {
|
|
60
54
|
setIsInfiniting(false);
|
|
@@ -76,7 +70,7 @@ const Infiniteloading = (props) => {
|
|
|
76
70
|
direction.current = "up";
|
|
77
71
|
}
|
|
78
72
|
scrollTop.current = e.detail.scrollTop;
|
|
79
|
-
|
|
73
|
+
onScroll && onScroll(e.detail.scrollTop);
|
|
80
74
|
};
|
|
81
75
|
const lower = () => {
|
|
82
76
|
if (direction.current == "up" || !hasMore || isInfiniting) {
|
|
@@ -86,7 +80,7 @@ const Infiniteloading = (props) => {
|
|
|
86
80
|
onLoadMore && onLoadMore(infiniteDone);
|
|
87
81
|
};
|
|
88
82
|
const touchStart = (event) => {
|
|
89
|
-
if (scrollTop.current == 0 && !isTouching.current &&
|
|
83
|
+
if (scrollTop.current == 0 && !isTouching.current && pullRefresh) {
|
|
90
84
|
y.current = event.touches[0].pageY;
|
|
91
85
|
isTouching.current = true;
|
|
92
86
|
}
|
|
@@ -120,24 +114,14 @@ const Infiniteloading = (props) => {
|
|
|
120
114
|
React.createElement(
|
|
121
115
|
"div",
|
|
122
116
|
{ className: "nut-infinite-top", ref: refreshTop, style: getStyle() },
|
|
123
|
-
React.createElement(
|
|
124
|
-
"div",
|
|
125
|
-
{ className: "top-box" },
|
|
126
|
-
pullIcon && React.createElement(React.Fragment, null, pullIcon),
|
|
127
|
-
React.createElement("span", { className: "top-text" }, pullText || locale.infiniteloading.pullRefreshText)
|
|
128
|
-
)
|
|
117
|
+
React.createElement("div", { className: "top-box" }, pullingText || locale.infiniteloading.pullRefreshText)
|
|
129
118
|
),
|
|
130
119
|
React.createElement("div", { className: "nut-infinite-container" }, children),
|
|
131
|
-
React.createElement("div", { className: "nut-infinite-bottom" }, isInfiniting ? React.createElement(
|
|
132
|
-
"div",
|
|
133
|
-
{ className: "bottom-box" },
|
|
134
|
-
loadIcon && React.createElement(React.Fragment, null, loadIcon),
|
|
135
|
-
React.createElement("div", { className: "bottom-text" }, loadingText || locale.infiniteloading.loadText)
|
|
136
|
-
) : !hasMore && React.createElement("div", { className: "tips" }, loadMoreText || locale.infiniteloading.loadMoreText))
|
|
120
|
+
React.createElement("div", { className: "nut-infinite-bottom" }, isInfiniting ? React.createElement("div", { className: "bottom-box" }, loadingText || locale.infiniteloading.loadText) : !hasMore && React.createElement("div", { className: "tips" }, loadMoreText || locale.infiniteloading.loadMoreText))
|
|
137
121
|
);
|
|
138
122
|
};
|
|
139
|
-
|
|
140
|
-
|
|
123
|
+
InfiniteLoading.defaultProps = defaultProps;
|
|
124
|
+
InfiniteLoading.displayName = "NutInfiniteLoading";
|
|
141
125
|
export {
|
|
142
|
-
|
|
126
|
+
InfiniteLoading as I
|
|
143
127
|
};
|
|
@@ -2,7 +2,7 @@ import React, { forwardRef, useRef, useState, useImperativeHandle, useCallback }
|
|
|
2
2
|
import { View, Input as Input$1 } from "@tarojs/components";
|
|
3
3
|
import { MaskClose } from "@nutui/icons-react-taro";
|
|
4
4
|
import { getEnv, ENV_TYPE } from "@tarojs/taro";
|
|
5
|
-
import { u as useConfig } from "./configprovider.taro-
|
|
5
|
+
import { u as useConfig } from "./configprovider.taro-372b1525.js";
|
|
6
6
|
import { C as ComponentDefaults } from "./typings-11d83a22.js";
|
|
7
7
|
import { u as usePropsValue } from "./use-props-value-7ac1b1b5.js";
|
|
8
8
|
function trimExtraChar(value, char, regExp) {
|
|
@@ -5,13 +5,13 @@ import { C as ComponentDefaults } from "./typings-11d83a22.js";
|
|
|
5
5
|
const defaultProps = {
|
|
6
6
|
...ComponentDefaults,
|
|
7
7
|
activeColor: "",
|
|
8
|
-
|
|
8
|
+
closeOnOverlayClick: true,
|
|
9
9
|
scrollFixed: false,
|
|
10
10
|
lockScroll: true,
|
|
11
11
|
icon: null
|
|
12
12
|
};
|
|
13
13
|
const Menu = (props) => {
|
|
14
|
-
const { className, icon, scrollFixed, lockScroll,
|
|
14
|
+
const { className, icon, scrollFixed, lockScroll, closeOnOverlayClick, children, activeColor, ...rest } = {
|
|
15
15
|
...defaultProps,
|
|
16
16
|
...props
|
|
17
17
|
};
|
|
@@ -54,7 +54,7 @@ const Menu = (props) => {
|
|
|
54
54
|
index,
|
|
55
55
|
activeColor,
|
|
56
56
|
parent: {
|
|
57
|
-
|
|
57
|
+
closeOnOverlayClick,
|
|
58
58
|
lockScroll,
|
|
59
59
|
toggleMenuItem,
|
|
60
60
|
updateTitle,
|
|
@@ -4,7 +4,7 @@ import { getSystemInfoSync } from "@tarojs/taro";
|
|
|
4
4
|
import { CSSTransition } from "react-transition-group";
|
|
5
5
|
import { Check } from "@nutui/icons-react-taro";
|
|
6
6
|
import { O as Overlay } from "./overlay.taro-75012bd3.js";
|
|
7
|
-
import { g as getRectByTaro } from "./use-client-rect-
|
|
7
|
+
import { g as getRectByTaro } from "./use-client-rect-2bb6c562.js";
|
|
8
8
|
import { C as ComponentDefaults } from "./typings-11d83a22.js";
|
|
9
9
|
const defaultProps = {
|
|
10
10
|
...ComponentDefaults,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useRef, useState, useMemo, useEffect } from "react";
|
|
2
2
|
import { Notice, Close } from "@nutui/icons-react-taro";
|
|
3
3
|
import classNames from "classnames";
|
|
4
|
-
import { g as getRectByTaro } from "./use-client-rect-
|
|
4
|
+
import { g as getRectByTaro } from "./use-client-rect-2bb6c562.js";
|
|
5
5
|
import { C as ComponentDefaults } from "./typings-11d83a22.js";
|
|
6
6
|
const defaultProps = {
|
|
7
7
|
...ComponentDefaults,
|
|
@@ -3,7 +3,7 @@ import classNames from "classnames";
|
|
|
3
3
|
import { RectDown } from "@nutui/icons-react-taro";
|
|
4
4
|
import { View } from "@tarojs/components";
|
|
5
5
|
import { P as Popup } from "./popup.taro-e756f3fc.js";
|
|
6
|
-
import { u as useConfig } from "./configprovider.taro-
|
|
6
|
+
import { u as useConfig } from "./configprovider.taro-372b1525.js";
|
|
7
7
|
import { C as ComponentDefaults } from "./typings-11d83a22.js";
|
|
8
8
|
const defaultProps = {
|
|
9
9
|
...ComponentDefaults,
|
|
@@ -1,94 +1,93 @@
|
|
|
1
1
|
import { B } from "./button.taro-01eae688.js";
|
|
2
2
|
import { C } from "./cell.taro-4e31d1fa.js";
|
|
3
3
|
import { C as C2 } from "./cellgroup.taro-a790d91b.js";
|
|
4
|
-
import { C as C3 } from "./configprovider.taro-
|
|
5
|
-
import { I } from "./image.taro-
|
|
4
|
+
import { C as C3 } from "./configprovider.taro-372b1525.js";
|
|
5
|
+
import { I } from "./image.taro-fde6e649.js";
|
|
6
6
|
import { O } from "./overlay.taro-75012bd3.js";
|
|
7
7
|
import { C as C4 } from "./col.taro-d6a46a7d.js";
|
|
8
8
|
import { D } from "./divider.taro-0cb5f894.js";
|
|
9
|
-
import { G } from "./grid.taro-
|
|
10
|
-
import { G as G2 } from "./griditem.taro-
|
|
9
|
+
import { G } from "./grid.taro-9b63aca5.js";
|
|
10
|
+
import { G as G2 } from "./griditem.taro-48971911.js";
|
|
11
11
|
import { L } from "./layout.taro-9659a928.js";
|
|
12
12
|
import { R } from "./row.taro-8b7febd4.js";
|
|
13
|
-
import { S } from "./sticky.taro-
|
|
13
|
+
import { S } from "./sticky.taro-6bc62a96.js";
|
|
14
14
|
import { B as B2 } from "./backtop.taro-7de36464.js";
|
|
15
15
|
import { E } from "./elevator.taro-df8fde9d.js";
|
|
16
|
-
import { F } from "./fixednav.taro-
|
|
16
|
+
import { F } from "./fixednav.taro-6c69ad79.js";
|
|
17
17
|
import { N } from "./navbar.taro-5e1a0835.js";
|
|
18
|
-
import { S as S2 } from "./sidenavbar.taro-
|
|
19
|
-
import { S as S3 } from "./sidenavbaritem.taro-
|
|
20
|
-
import { S as S4 } from "./subsidenavbar.taro-
|
|
18
|
+
import { S as S2 } from "./sidenavbar.taro-1aefdd3c.js";
|
|
19
|
+
import { S as S3 } from "./sidenavbaritem.taro-7d805f92.js";
|
|
20
|
+
import { S as S4 } from "./subsidenavbar.taro-47bb6e74.js";
|
|
21
21
|
import { T } from "./tabbar.taro-18eee41f.js";
|
|
22
22
|
import { T as T2 } from "./tabbaritem.taro-89646ca1.js";
|
|
23
23
|
import { T as T3 } from "./tabpane.taro-f8d92ece.js";
|
|
24
24
|
import { T as T4 } from "./tabs.taro-66164782.js";
|
|
25
|
-
import { A } from "./address.taro-
|
|
26
|
-
import { C as C5 } from "./calendar.taro-
|
|
27
|
-
import { C as C6 } from "./calendaritem.taro-
|
|
25
|
+
import { A } from "./address.taro-cc879a1d.js";
|
|
26
|
+
import { C as C5 } from "./calendar.taro-02195ddb.js";
|
|
27
|
+
import { C as C6 } from "./calendaritem.taro-4230e5c4.js";
|
|
28
28
|
import { C as C7 } from "./cascader.taro-fb7a0230.js";
|
|
29
29
|
import { C as C8, a } from "./checkbox.taro-303276d7.js";
|
|
30
|
-
import { D as D2 } from "./datepicker.taro-
|
|
30
|
+
import { D as D2 } from "./datepicker.taro-8c9230b6.js";
|
|
31
31
|
import { F as F2 } from "./form.taro-b06754e8.js";
|
|
32
32
|
import { F as F3 } from "./formitem.taro-b326809d.js";
|
|
33
|
-
import { I as I2 } from "./input.taro-
|
|
33
|
+
import { I as I2 } from "./input.taro-69c08268.js";
|
|
34
34
|
import { I as I3 } from "./inputnumber.taro-6657d2c1.js";
|
|
35
|
-
import { M } from "./menu.taro-
|
|
36
|
-
import { M as M2 } from "./menuitem.taro-
|
|
37
|
-
import { N as N2 } from "./numberkeyboard.taro-
|
|
38
|
-
import { P } from "./picker.taro-
|
|
35
|
+
import { M } from "./menu.taro-40d36e0a.js";
|
|
36
|
+
import { M as M2 } from "./menuitem.taro-6aa35a00.js";
|
|
37
|
+
import { N as N2 } from "./numberkeyboard.taro-18879f04.js";
|
|
38
|
+
import { P } from "./picker.taro-6b672469.js";
|
|
39
39
|
import { R as R2, a as a2 } from "./radio.taro-5d6ca4ad.js";
|
|
40
|
-
import { R as R3 } from "./range.taro-
|
|
40
|
+
import { R as R3 } from "./range.taro-a1d1ad25.js";
|
|
41
41
|
import { R as R4 } from "./rate.taro-78c66969.js";
|
|
42
|
-
import { S as S5 } from "./searchbar.taro-
|
|
43
|
-
import { S as S6 } from "./shortpassword.taro-
|
|
44
|
-
import { S as S7 } from "./signature.taro-
|
|
42
|
+
import { S as S5 } from "./searchbar.taro-39351331.js";
|
|
43
|
+
import { S as S6 } from "./shortpassword.taro-cff61e4e.js";
|
|
44
|
+
import { S as S7 } from "./signature.taro-4f68516a.js";
|
|
45
45
|
import { S as S8 } from "./switch.taro-f0da73a3.js";
|
|
46
|
-
import { T as T5 } from "./textarea.taro-
|
|
47
|
-
import { U } from "./uploader.taro-
|
|
46
|
+
import { T as T5 } from "./textarea.taro-593cd471.js";
|
|
47
|
+
import { U } from "./uploader.taro-5ad88f83.js";
|
|
48
48
|
import { A as A2 } from "./actionsheet.taro-697a594b.js";
|
|
49
49
|
import { B as B3 } from "./badge.taro-872605bf.js";
|
|
50
|
-
import { B as B4 } from "./dialog.taro-
|
|
50
|
+
import { B as B4 } from "./dialog.taro-e5c2cb03.js";
|
|
51
51
|
import { D as D3 } from "./drag.taro-48e1ff38.js";
|
|
52
|
-
import { E as E2 } from "./empty.taro-
|
|
53
|
-
import { I as I4 } from "./infiniteloading.taro-
|
|
54
|
-
import { N as N3 } from "./noticebar.taro-
|
|
52
|
+
import { E as E2 } from "./empty.taro-8345ac72.js";
|
|
53
|
+
import { I as I4 } from "./infiniteloading.taro-53eeb1ec.js";
|
|
54
|
+
import { N as N3 } from "./noticebar.taro-8d496dd6.js";
|
|
55
55
|
import { N as N4 } from "./notify.taro-5768403d.js";
|
|
56
|
-
import { P as P2 } from "./popover.taro-
|
|
57
|
-
import { P as P3 } from "./pulltorefresh.taro-
|
|
58
|
-
import { S as S9 } from "./skeleton.taro-
|
|
59
|
-
import { S as S10 } from "./swipe.taro-
|
|
56
|
+
import { P as P2 } from "./popover.taro-ba6c323a.js";
|
|
57
|
+
import { P as P3 } from "./pulltorefresh.taro-3719fdfb.js";
|
|
58
|
+
import { S as S9 } from "./skeleton.taro-ce714b06.js";
|
|
59
|
+
import { S as S10 } from "./swipe.taro-966af6d3.js";
|
|
60
60
|
import { P as P4 } from "./popup.taro-e756f3fc.js";
|
|
61
61
|
import { T as T6 } from "./toast.taro-b2937e7c.js";
|
|
62
62
|
import { A as A3 } from "./animate.taro-c8b29242.js";
|
|
63
63
|
import { default as default2 } from "./AnimatingNumbers.js";
|
|
64
|
-
import { A as A4 } from "./audio.taro-
|
|
65
|
-
import { A as A5 } from "./avatar.taro-
|
|
64
|
+
import { A as A4 } from "./audio.taro-64b15071.js";
|
|
65
|
+
import { A as A5 } from "./avatar.taro-8a26cd6c.js";
|
|
66
66
|
import { A as A6 } from "./avatargroup.taro-ad5ffb46.js";
|
|
67
|
-
import { C as C9 } from "./circleprogress.taro-
|
|
67
|
+
import { C as C9 } from "./circleprogress.taro-9064d69c.js";
|
|
68
68
|
import { C as C10 } from "./collapse.taro-98577a29.js";
|
|
69
69
|
import { C as C11 } from "./collapseitem.taro-9451f40f.js";
|
|
70
|
-
import { C as C12 } from "./countdown.taro-
|
|
71
|
-
import { E as E3 } from "./ellipsis.taro-
|
|
72
|
-
import { I as I5 } from "./imagepreview.taro-
|
|
70
|
+
import { C as C12 } from "./countdown.taro-8f19d21b.js";
|
|
71
|
+
import { E as E3 } from "./ellipsis.taro-5653d0b2.js";
|
|
72
|
+
import { I as I5 } from "./imagepreview.taro-cfe0a4cc.js";
|
|
73
73
|
import { I as I6 } from "./indicator.taro-edbc71df.js";
|
|
74
74
|
import { V } from "./virtuallist.taro-97d3403a.js";
|
|
75
|
-
import { P as P5 } from "./pagination.taro-
|
|
75
|
+
import { P as P5 } from "./pagination.taro-592bca05.js";
|
|
76
76
|
import { P as P6 } from "./price.taro-479f1b82.js";
|
|
77
77
|
import { P as P7 } from "./progress.taro-437b9f6a.js";
|
|
78
78
|
import { S as S11 } from "./step.taro-2f55e4f2.js";
|
|
79
79
|
import { S as S12 } from "./steps.taro-196c1f59.js";
|
|
80
80
|
import { S as S13 } from "./swiper.taro-4aeb8526.js";
|
|
81
81
|
import { S as S14 } from "./swiperitem.taro-ef7342e8.js";
|
|
82
|
-
import { T as T7 } from "./table.taro-
|
|
83
|
-
import { T as T8 } from "./tag.taro-
|
|
82
|
+
import { T as T7 } from "./table.taro-a20f15f2.js";
|
|
83
|
+
import { T as T8 } from "./tag.taro-614758eb.js";
|
|
84
84
|
import { V as V2 } from "./video.taro-2a26d7da.js";
|
|
85
|
-
import { B as B5 } from "./barrage.taro-
|
|
86
|
-
import { C as C13 } from "./card.taro-
|
|
87
|
-
import { T as T9 } from "./timedetail.taro-
|
|
88
|
-
import { T as T10 } from "./
|
|
89
|
-
import { T as T11 } from "./
|
|
90
|
-
import {
|
|
91
|
-
import { W } from "./watermark.taro-e2245bb1.js";
|
|
85
|
+
import { B as B5 } from "./barrage.taro-e87bc58e.js";
|
|
86
|
+
import { C as C13 } from "./card.taro-92fe9733.js";
|
|
87
|
+
import { T as T9 } from "./timedetail.taro-d7aa4c1b.js";
|
|
88
|
+
import { T as T10 } from "./timeselect.taro-9e37e648.js";
|
|
89
|
+
import { T as T11 } from "./trendarrow.taro-253025d2.js";
|
|
90
|
+
import { W } from "./watermark.taro-b6b1ae18.js";
|
|
92
91
|
import "react";
|
|
93
92
|
import "classnames";
|
|
94
93
|
import "@nutui/icons-react-taro";
|
|
@@ -96,16 +95,16 @@ import "./typings-11d83a22.js";
|
|
|
96
95
|
import "@tarojs/components";
|
|
97
96
|
import "./UserContext-ab42ba7f.js";
|
|
98
97
|
import "@tarojs/taro";
|
|
99
|
-
import "./use-client-rect-
|
|
98
|
+
import "./use-client-rect-2bb6c562.js";
|
|
100
99
|
import "./can-use-dom-0e539bd3.js";
|
|
101
|
-
import "./
|
|
100
|
+
import "./context-f32a9246.js";
|
|
102
101
|
import "./use-props-value-7ac1b1b5.js";
|
|
103
102
|
import "./bem-cdccae08.js";
|
|
104
103
|
import "@bem-react/classname";
|
|
105
104
|
import "./ConfigProvider.js";
|
|
106
105
|
import "react-transition-group";
|
|
107
106
|
import "./use-touch-ff43512c.js";
|
|
108
|
-
import "./index-
|
|
107
|
+
import "./index-0a89a47b.js";
|
|
109
108
|
import "react-dom";
|
|
110
109
|
import "./context-d0fccf11.js";
|
|
111
110
|
import "./context-ab42ba7f.js";
|
|
@@ -150,7 +149,7 @@ export {
|
|
|
150
149
|
I as Image,
|
|
151
150
|
I5 as ImagePreview,
|
|
152
151
|
I6 as Indicator,
|
|
153
|
-
I4 as
|
|
152
|
+
I4 as InfiniteLoading,
|
|
154
153
|
I2 as Input,
|
|
155
154
|
I3 as InputNumber,
|
|
156
155
|
L as Layout,
|
|
@@ -195,10 +194,9 @@ export {
|
|
|
195
194
|
T8 as Tag,
|
|
196
195
|
T5 as TextArea,
|
|
197
196
|
T9 as TimeDetail,
|
|
198
|
-
T10 as
|
|
199
|
-
T11 as TimeSelect,
|
|
197
|
+
T10 as TimeSelect,
|
|
200
198
|
T6 as Toast,
|
|
201
|
-
|
|
199
|
+
T11 as TrendArrow,
|
|
202
200
|
U as Uploader,
|
|
203
201
|
V2 as Video,
|
|
204
202
|
V as VirtualList,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React, { useMemo } from "react";
|
|
2
2
|
import classNames from "classnames";
|
|
3
|
-
import { u as useConfig } from "./configprovider.taro-
|
|
3
|
+
import { u as useConfig } from "./configprovider.taro-372b1525.js";
|
|
4
4
|
import { u as usePropsValue } from "./use-props-value-7ac1b1b5.js";
|
|
5
5
|
import { C as ComponentDefaults } from "./typings-11d83a22.js";
|
|
6
6
|
const defaultProps = {
|
|
@@ -4,9 +4,9 @@ import Taro from "@tarojs/taro";
|
|
|
4
4
|
import { View, PickerView, PickerViewColumn } from "@tarojs/components";
|
|
5
5
|
import { P as Popup } from "./popup.taro-e756f3fc.js";
|
|
6
6
|
import { u as useTouch } from "./use-touch-ff43512c.js";
|
|
7
|
-
import { g as getRectByTaro } from "./use-client-rect-
|
|
7
|
+
import { g as getRectByTaro } from "./use-client-rect-2bb6c562.js";
|
|
8
8
|
import { c as canUseDom } from "./can-use-dom-0e539bd3.js";
|
|
9
|
-
import { u as useConfig } from "./configprovider.taro-
|
|
9
|
+
import { u as useConfig } from "./configprovider.taro-372b1525.js";
|
|
10
10
|
import { u as usePropsValue } from "./use-props-value-7ac1b1b5.js";
|
|
11
11
|
import { C as ComponentDefaults } from "./typings-11d83a22.js";
|
|
12
12
|
let passiveSupported = false;
|
|
@@ -250,7 +250,7 @@ const defaultProps = {
|
|
|
250
250
|
};
|
|
251
251
|
const InternalPicker = (props, ref) => {
|
|
252
252
|
const { locale } = useConfig();
|
|
253
|
-
const { visible, title, options = [], defaultValue = [], className, style, threeDimensional, duration, onConfirm, onClose, afterClose, onChange, ...rest } = { ...defaultProps, ...props };
|
|
253
|
+
const { children, visible, title, options = [], defaultValue = [], className, style, threeDimensional, duration, onConfirm, onClose, afterClose, onChange, ...rest } = { ...defaultProps, ...props };
|
|
254
254
|
const classPrefix = "nut-picker";
|
|
255
255
|
const classes = classNames(classPrefix, className);
|
|
256
256
|
const [selectedValue, setSelectedValue] = usePropsValue({
|
|
@@ -262,6 +262,7 @@ const InternalPicker = (props, ref) => {
|
|
|
262
262
|
(_a = props.onConfirm) == null ? void 0 : _a.call(props, setSelectedOptions(), val);
|
|
263
263
|
}
|
|
264
264
|
});
|
|
265
|
+
const [innerValue, setInnerValue] = useState(selectedValue);
|
|
265
266
|
const [currentValue, setCurrentValue] = useState([]);
|
|
266
267
|
const [columnIndex, setColumnIndex] = useState(0);
|
|
267
268
|
const pickerRef = useRef(null);
|
|
@@ -300,40 +301,49 @@ const InternalPicker = (props, ref) => {
|
|
|
300
301
|
}
|
|
301
302
|
return "single";
|
|
302
303
|
};
|
|
303
|
-
const normalListData = () => {
|
|
304
|
+
const normalListData = (innerValue2) => {
|
|
304
305
|
const type = columnsType();
|
|
305
306
|
switch (type) {
|
|
306
307
|
case "multiple":
|
|
307
308
|
return options;
|
|
308
309
|
case "cascade":
|
|
309
|
-
return formatCascade(options,
|
|
310
|
+
return formatCascade(options, innerValue2);
|
|
310
311
|
default:
|
|
311
312
|
return [options];
|
|
312
313
|
}
|
|
313
314
|
};
|
|
314
315
|
const init = () => {
|
|
315
|
-
const normalData = normalListData();
|
|
316
|
+
const normalData = normalListData(innerValue);
|
|
316
317
|
setColumnsList(normalData);
|
|
317
318
|
const data = [];
|
|
318
319
|
normalData.length > 0 && normalData.map((item) => {
|
|
319
320
|
item[0] && data.push(item[0].value);
|
|
320
321
|
return item;
|
|
321
322
|
});
|
|
322
|
-
if (!
|
|
323
|
-
|
|
323
|
+
if (!innerValue.length && innerValue.length === 0) {
|
|
324
|
+
setInnerValue([...data]);
|
|
324
325
|
}
|
|
325
326
|
};
|
|
327
|
+
useEffect(() => {
|
|
328
|
+
setInnerValue(innerValue !== selectedValue ? selectedValue : innerValue);
|
|
329
|
+
}, [visible]);
|
|
330
|
+
useEffect(() => {
|
|
331
|
+
if (visible) {
|
|
332
|
+
init();
|
|
333
|
+
}
|
|
334
|
+
}, [options, visible]);
|
|
326
335
|
useEffect(() => {
|
|
327
336
|
if (!visible) {
|
|
328
337
|
return;
|
|
329
338
|
}
|
|
330
|
-
|
|
331
|
-
|
|
339
|
+
Taro.getEnv() !== "WEB" && setCurrentValue(defaultValuesConvert());
|
|
340
|
+
onChange && onChange(setSelectedOptions(), innerValue, columnIndex);
|
|
341
|
+
}, [innerValue, columnsList, visible]);
|
|
332
342
|
const setSelectedOptions = () => {
|
|
333
343
|
const options2 = [];
|
|
334
344
|
let currOptions = [];
|
|
335
345
|
columnsList.forEach((columnOptions, index) => {
|
|
336
|
-
currOptions = columnOptions.filter((item) => item.value ===
|
|
346
|
+
currOptions = columnOptions.filter((item) => item.value === innerValue[index]);
|
|
337
347
|
if (currOptions[0]) {
|
|
338
348
|
options2.push(currOptions[0]);
|
|
339
349
|
} else {
|
|
@@ -344,8 +354,8 @@ const InternalPicker = (props, ref) => {
|
|
|
344
354
|
};
|
|
345
355
|
const defaultValuesConvert = () => {
|
|
346
356
|
const defaultIndexs = [];
|
|
347
|
-
if (
|
|
348
|
-
|
|
357
|
+
if (innerValue.length > 0) {
|
|
358
|
+
innerValue.forEach((value, index) => {
|
|
349
359
|
var _a;
|
|
350
360
|
for (let i = 0; i < ((_a = columnsList == null ? void 0 : columnsList[index]) == null ? void 0 : _a.length); i++) {
|
|
351
361
|
if (columnsList[index][i].value === value) {
|
|
@@ -362,37 +372,30 @@ const InternalPicker = (props, ref) => {
|
|
|
362
372
|
}
|
|
363
373
|
return defaultIndexs;
|
|
364
374
|
};
|
|
365
|
-
useEffect(() => {
|
|
366
|
-
if (!visible) {
|
|
367
|
-
return;
|
|
368
|
-
}
|
|
369
|
-
Taro.getEnv() !== "WEB" && setCurrentValue(defaultValuesConvert());
|
|
370
|
-
onChange && onChange(setSelectedOptions(), selectedValue, columnIndex);
|
|
371
|
-
if (isConfirmEvent.current) {
|
|
372
|
-
isConfirmEvent.current = false;
|
|
373
|
-
onConfirm && onConfirm(setSelectedOptions(), selectedValue);
|
|
374
|
-
}
|
|
375
|
-
}, [selectedValue, columnsList, visible]);
|
|
376
375
|
const chooseItem = (columnOptions, columnIndex2) => {
|
|
377
376
|
var _a, _b;
|
|
377
|
+
const values = [];
|
|
378
|
+
const start = columnIndex2;
|
|
378
379
|
if (columnOptions && Object.keys(columnOptions).length) {
|
|
379
|
-
if (
|
|
380
|
+
if (values[columnIndex2] !== columnOptions.value) {
|
|
380
381
|
if (columnsType() === "cascade") {
|
|
381
|
-
|
|
382
|
-
setSelectedValue([...selectedValue]);
|
|
382
|
+
values[columnIndex2] = columnOptions.value || "";
|
|
383
383
|
while ((_a = columnOptions == null ? void 0 : columnOptions.children) == null ? void 0 : _a[0]) {
|
|
384
|
-
|
|
385
|
-
setSelectedValue([...selectedValue]);
|
|
384
|
+
values[columnIndex2 + 1] = columnOptions.children[0].value;
|
|
386
385
|
columnIndex2++;
|
|
387
386
|
columnOptions = columnOptions.children[0];
|
|
388
387
|
}
|
|
389
388
|
if ((_b = columnOptions == null ? void 0 : columnOptions.children) == null ? void 0 : _b.length) {
|
|
390
|
-
|
|
391
|
-
setSelectedValue([...selectedValue]);
|
|
389
|
+
values[columnIndex2 + 1] = "";
|
|
392
390
|
}
|
|
393
|
-
|
|
391
|
+
const combineResult = [
|
|
392
|
+
...innerValue.slice(0, start),
|
|
393
|
+
...values.splice(start)
|
|
394
|
+
];
|
|
395
|
+
setInnerValue(combineResult);
|
|
396
|
+
setColumnsList(normalListData(combineResult));
|
|
394
397
|
} else {
|
|
395
|
-
|
|
398
|
+
setInnerValue((data) => {
|
|
396
399
|
const cdata = [...data];
|
|
397
400
|
cdata[columnIndex2] = Object.prototype.hasOwnProperty.call(columnOptions, "value") ? columnOptions.value : "";
|
|
398
401
|
return cdata;
|
|
@@ -403,16 +406,16 @@ const InternalPicker = (props, ref) => {
|
|
|
403
406
|
}
|
|
404
407
|
};
|
|
405
408
|
const confirm = () => {
|
|
406
|
-
let
|
|
409
|
+
let moving = false;
|
|
407
410
|
refs.forEach((ref2) => {
|
|
408
411
|
if (ref2.moving)
|
|
409
|
-
|
|
412
|
+
moving = true;
|
|
410
413
|
ref2.stopMomentum();
|
|
411
414
|
});
|
|
412
|
-
if (
|
|
415
|
+
if (moving) {
|
|
413
416
|
isConfirmEvent.current = true;
|
|
414
417
|
} else {
|
|
415
|
-
|
|
418
|
+
setSelectedValue(innerValue);
|
|
416
419
|
closePicker();
|
|
417
420
|
}
|
|
418
421
|
setTimeout(() => {
|
|
@@ -420,8 +423,8 @@ const InternalPicker = (props, ref) => {
|
|
|
420
423
|
}, 0);
|
|
421
424
|
};
|
|
422
425
|
const closePicker = () => {
|
|
423
|
-
onClose && onClose(setSelectedOptions(),
|
|
424
|
-
afterClose && afterClose(setSelectedOptions(),
|
|
426
|
+
onClose && onClose(setSelectedOptions(), innerValue);
|
|
427
|
+
afterClose && afterClose(setSelectedOptions(), innerValue, pickerRef);
|
|
425
428
|
};
|
|
426
429
|
const renderTitleBar = () => {
|
|
427
430
|
return React.createElement(
|
|
@@ -432,7 +435,7 @@ const InternalPicker = (props, ref) => {
|
|
|
432
435
|
React.createElement("span", { className: `${classPrefix}__confirm-btn`, onClick: confirm }, locale.confirm)
|
|
433
436
|
);
|
|
434
437
|
};
|
|
435
|
-
const [
|
|
438
|
+
const [, setPickingStatus] = useState(false);
|
|
436
439
|
const pickerStart = () => {
|
|
437
440
|
setPickingStatus(true);
|
|
438
441
|
};
|
|
@@ -460,8 +463,9 @@ const InternalPicker = (props, ref) => {
|
|
|
460
463
|
View,
|
|
461
464
|
{ className: classes, style, ...rest, catchMove: true },
|
|
462
465
|
renderTitleBar(),
|
|
466
|
+
children,
|
|
463
467
|
React.createElement("div", { className: `${classPrefix}__panel`, ref: pickerRef }, Taro.getEnv() === "WEB" ? columnsList == null ? void 0 : columnsList.map((item, index) => {
|
|
464
|
-
return React.createElement(PickerPanel$1, { ref: setRefs(index), defaultValue:
|
|
468
|
+
return React.createElement(PickerPanel$1, { ref: setRefs(index), defaultValue: innerValue == null ? void 0 : innerValue[index], options: item, threeDimensional, chooseItem: (value, index2) => chooseItem(value, index2), duration, key: index, keyIndex: index, itemShow: visible });
|
|
465
469
|
}) : React.createElement(PickerView, { ref: pickerRef, value: currentValue, immediateChange: true, onPickStart: pickerStart, onChange: pickerChange, onPickEnd: pickerEnd, className: "nut-picker-view-panel" }, columnsList == null ? void 0 : columnsList.map((columnOptions, index) => {
|
|
466
470
|
return React.createElement(PickerViewColumn, { key: `col${index}` }, columnOptions.map((item, index2) => {
|
|
467
471
|
return React.createElement(
|