Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
1c1ef86
feat: 初始化pickerview
irisSong Jan 16, 2025
3acf368
feat: add pickerView
irisSong Jan 22, 2025
2e3a00a
feat: add tiled demo
irisSong Jan 22, 2025
c651e62
refactor: 重构h5
irisSong Jan 24, 2025
e60df8e
fix: 适配demo
irisSong Jan 24, 2025
43fc55a
feat: 增加级联功能
irisSong Jan 26, 2025
4ce2688
fix: 级联优化
irisSong Feb 10, 2025
28c4e2c
feat: pickerview增加级联效果
irisSong Feb 11, 2025
bc3fb35
fix: 更新taro版本
irisSong Feb 11, 2025
b0b635c
fix: 移除冗余代码+解决form中滚动未结束死循环问题
irisSong Feb 11, 2025
85d5d40
fix: 移除console
irisSong Feb 12, 2025
7a27934
fix: 更新pickerview
irisSong Feb 12, 2025
a030ff4
fix: update test
irisSong Feb 12, 2025
f436c51
fix: update error
irisSong Feb 12, 2025
6a6bc39
fix: update error
irisSong Feb 12, 2025
10be5cd
fix: update demo
irisSong Feb 12, 2025
80f20a1
Merge remote-tracking branch 'upstream/feat_v3.x' into feat_v3.x_pick…
irisSong Feb 12, 2025
8ad7392
fix: update test
irisSong Feb 12, 2025
95b5423
feat: 添加异步demo
irisSong Feb 12, 2025
fe66362
fix: update doc
irisSong Feb 12, 2025
aa5f2ea
fix: 同步pickerview变更
irisSong Feb 12, 2025
b5987b9
fix: 解决小程序控制条样式问题+demo7取消不还原问题
irisSong Feb 12, 2025
0ae1a26
fix: datepicker类型同步更新
irisSong Feb 12, 2025
ce3b37b
fix: 合并主分支
irisSong Feb 12, 2025
26f9319
fix: update test
irisSong Feb 12, 2025
d5118f6
fix: 修改标签
irisSong Feb 13, 2025
a787f7d
feat: add test
irisSong Feb 13, 2025
c10fcc7
fix: update doc and test
irisSong Feb 13, 2025
9e32bcd
fix: adjust the dependency package location
irisSong Feb 13, 2025
ae272de
Merge remote-tracking branch 'upstream/feat_v3.x' into feat_v3.x_pick…
irisSong Feb 13, 2025
f539b83
fix: adjust the dependency package path
irisSong Feb 13, 2025
f06ec00
fix: adjust the dependency package path
irisSong Feb 13, 2025
b67dfca
fix: adjust the dependency package path
irisSong Feb 13, 2025
9905564
fix: update doc props type
irisSong Feb 13, 2025
0c448c8
fix: adjust note
irisSong Feb 13, 2025
cc30cb0
chore: merge v3.x
irisSong Feb 13, 2025
b699d60
Merge branch 'feat_v3.x_picker' of https://github.com/irisSong/nutui-…
irisSong Feb 13, 2025
7760169
fix: adjust the dependency package path
irisSong Feb 13, 2025
86855f0
fix: 合并最新的pickerview
irisSong Feb 13, 2025
88d4f80
fix: optimize details
irisSong Feb 13, 2025
654d1e0
fix: update test
irisSong Feb 13, 2025
507f18c
fix: merge pickerview
irisSong Feb 13, 2025
d9628e7
fix: path not compilable
irisSong Feb 13, 2025
38296d3
fix: key error
irisSong Feb 13, 2025
dc14741
Merge branch 'feat_v3.x_pickerview' into feat_v3.x_picker
irisSong Feb 14, 2025
65238d3
fix: update datepicker test
irisSong Feb 14, 2025
15630d6
Merge remote-tracking branch 'upstream/feat_v3.x' into feat_v3.x_picker
irisSong Feb 14, 2025
369fec3
fix: hidden entry
irisSong Feb 14, 2025
eb899ee
Merge remote-tracking branch 'upstream/feat_v3.x' into feat_v3.x_picker
irisSong Feb 17, 2025
b458e92
fix: modify config
irisSong Feb 17, 2025
ffba77f
fix: remove repeat config
irisSong Feb 17, 2025
f6edf91
fix: 修改组件引入路径
irisSong Feb 25, 2025
9688104
fix: ts类型和单测修正
irisSong Feb 25, 2025
f81ef99
fix: 弹窗动效还原
irisSong Feb 25, 2025
f278479
fix: remove console
irisSong Feb 25, 2025
3fbf988
Merge remote-tracking branch 'upstream/feat_v3.x' into feat_v3.x_picker
irisSong Feb 26, 2025
01306fc
fix: picker的onchange修改popover demo同步更新
irisSong Feb 27, 2025
f9297c5
Merge remote-tracking branch 'upstream/feat_v3.x' into feat_v3.x_picker
irisSong Feb 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions src/packages/popover/demos/h5/demo4-1.tsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import React, { useState } from 'react'
import { Popover, Cell, Picker, Toast } from '@nutui/nutui-react'
import {
Popover,
Cell,
Picker,
Toast,
PickerOnChangeCallbackParameter,
} from '@nutui/nutui-react'
import { Tips, Close } from '@nutui/icons-react'

interface PickerOption {
text: string | number
value: string | number
disabled?: boolean
children?: PickerOption[]
className?: string | number
}

const Demo41 = () => {
const [baseDesc, setBaseDesc] = useState('')
const [showPicker, setShowPicker] = useState(false)
const [customPositon, setCustomPosition] = useState(false)
const [curPostion, setCurPostion] = useState('')

const columns = [
{ text: 'top', value: 'top' },
{ text: 'top-start', value: 'top-start' },
{ text: 'top-end', value: 'top-end' },
{ text: 'bottom', value: 'bottom' },
{ text: 'bottom-start', value: 'bottom-start' },
{ text: 'bottom-end', value: 'bottom-end' },
[
{ label: 'top', value: 'top' },
{ label: 'top-start', value: 'top-start' },
{ label: 'top-end', value: 'top-end' },
{ label: 'bottom', value: 'bottom' },
{ label: 'bottom-start', value: 'bottom-start' },
{ label: 'bottom-end', value: 'bottom-end' },
],
]
const positionList = [
{
Expand Down Expand Up @@ -60,13 +60,13 @@ const Demo41 = () => {
onConfirm={(list) => {
let description = ''
list.forEach((option: any) => {
description += ` ${option.text}`
description += ` ${option.label}`
})
setBaseDesc(description)
}}
onChange={(options: PickerOption[]) => {
if (options[0]?.value) {
setCurPostion(options[0].value as string)
onChange={({ selectedOptions }: PickerOnChangeCallbackParameter) => {
if (selectedOptions[0]?.value) {
setCurPostion(selectedOptions[0].value as string)
}
}}
onClose={() => {
Expand Down
49 changes: 24 additions & 25 deletions src/packages/popover/demos/h5/demo4.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import React, { useState } from 'react'
import { Popover, Cell, Picker } from '@nutui/nutui-react'

interface PickerOption {
text: string | number
value: string | number
disabled?: boolean
children?: PickerOption[]
className?: string | number
}
import {
Popover,
Cell,
Picker,
PickerOnChangeCallbackParameter,
} from '@nutui/nutui-react'

const Demo4 = () => {
const [baseDesc, setBaseDesc] = useState('')
Expand All @@ -16,18 +13,20 @@ const Demo4 = () => {
const [curPostion, setCurPostion] = useState('')

const columns = [
{ text: 'top', value: 'top' },
{ text: 'top-start', value: 'top-start' },
{ text: 'top-end', value: 'top-end' },
{ text: 'right', value: 'right' },
{ text: 'right-start', value: 'right-start' },
{ text: 'right-end', value: 'right-end' },
{ text: 'bottom', value: 'bottom' },
{ text: 'bottom-start', value: 'bottom-start' },
{ text: 'bottom-end', value: 'bottom-end' },
{ text: 'left', value: 'left' },
{ text: 'left-start', value: 'left-start' },
{ text: 'left-end', value: 'left-end' },
[
{ label: 'top', value: 'top' },
{ label: 'top-start', value: 'top-start' },
{ label: 'top-end', value: 'top-end' },
{ label: 'right', value: 'right' },
{ label: 'right-start', value: 'right-start' },
{ label: 'right-end', value: 'right-end' },
{ label: 'bottom', value: 'bottom' },
{ label: 'bottom-start', value: 'bottom-start' },
{ label: 'bottom-end', value: 'bottom-end' },
{ label: 'left', value: 'left' },
{ label: 'left-start', value: 'left-start' },
{ label: 'left-end', value: 'left-end' },
],
]
const positionList = [
{
Expand Down Expand Up @@ -57,13 +56,13 @@ const Demo4 = () => {
onConfirm={(list) => {
let description = ''
list.forEach((option: any) => {
description += ` ${option.text}`
description += ` ${option.label}`
})
setBaseDesc(description)
}}
onChange={(options: PickerOption[]) => {
if (options[0]?.value) {
setCurPostion(options[0].value as string)
onChange={({ selectedOptions }: PickerOnChangeCallbackParameter) => {
if (selectedOptions[0]?.value) {
setCurPostion(selectedOptions[0].value as string)
}
}}
onClose={() => {
Expand Down
41 changes: 21 additions & 20 deletions src/packages/popover/demos/taro/demo4-1.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import React, { useState } from 'react'
import { View } from '@tarojs/components'
import { Popover, Cell, Picker, Toast } from '@nutui/nutui-react-taro'
import {
Popover,
Cell,
Picker,
Toast,
PickerOnChangeCallbackParameter,
} from '@nutui/nutui-react-taro'
import { Tips, Close } from '@nutui/icons-react-taro'

interface PickerOption {
text: string | number
value: string | number
disabled?: boolean
children?: PickerOption[]
className?: string | number
}
const Demo4 = () => {
const [baseDesc, setBaseDesc] = useState('')
const [showPicker, setShowPicker] = useState(false)
Expand All @@ -18,14 +17,16 @@ const Demo4 = () => {
const [showToast, SetShowToast] = useState(false)

const columns = [
{ text: 'top', value: 'top' },
{ text: 'top-start', value: 'top-start' },
{ text: 'top-end', value: 'top-end' },
{ text: 'right', value: 'right' },
{ text: 'bottom', value: 'bottom' },
{ text: 'bottom-start', value: 'bottom-start' },
{ text: 'bottom-end', value: 'bottom-end' },
{ text: 'left', value: 'left' },
[
{ label: 'top', value: 'top' },
{ label: 'top-start', value: 'top-start' },
{ label: 'top-end', value: 'top-end' },
{ label: 'right', value: 'right' },
{ label: 'bottom', value: 'bottom' },
{ label: 'bottom-start', value: 'bottom-start' },
{ label: 'bottom-end', value: 'bottom-end' },
{ label: 'left', value: 'left' },
],
]
const positionList = [
{
Expand Down Expand Up @@ -63,13 +64,13 @@ const Demo4 = () => {
onConfirm={(list) => {
let description = ''
list.forEach((option: any) => {
description += ` ${option.text}`
description += ` ${option.label}`
})
setBaseDesc(description)
}}
onChange={(options: PickerOption[]) => {
if (options[0]?.value) {
setCurPostion(options[0].value as string)
onChange={({ selectedOptions }: PickerOnChangeCallbackParameter) => {
if (selectedOptions[0]?.value) {
setCurPostion(selectedOptions[0].value as string)
}
}}
onClose={() => {
Expand Down
48 changes: 24 additions & 24 deletions src/packages/popover/demos/taro/demo4.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
import React, { useState } from 'react'
import { View } from '@tarojs/components'
import { Popover, Cell, Picker } from '@nutui/nutui-react-taro'
import {
Popover,
Cell,
Picker,
PickerOnChangeCallbackParameter,
} from '@nutui/nutui-react-taro'

interface PickerOption {
text: string | number
value: string | number
disabled?: boolean
children?: PickerOption[]
className?: string | number
}
const Demo4 = () => {
const [baseDesc, setBaseDesc] = useState('')
const [showPicker, setShowPicker] = useState(false)
const [customPositon, setCustomPosition] = useState(false)
const [curPostion, setCurPostion] = useState('')

const columns = [
{ text: 'top', value: 'top' },
{ text: 'top-start', value: 'top-start' },
{ text: 'top-end', value: 'top-end' },
{ text: 'right', value: 'right' },
{ text: 'right-start', value: 'right-start' },
{ text: 'right-end', value: 'right-end' },
{ text: 'bottom', value: 'bottom' },
{ text: 'bottom-start', value: 'bottom-start' },
{ text: 'bottom-end', value: 'bottom-end' },
{ text: 'left', value: 'left' },
{ text: 'left-start', value: 'left-start' },
{ text: 'left-end', value: 'left-end' },
[
{ label: 'top', value: 'top' },
{ label: 'top-start', value: 'top-start' },
{ label: 'top-end', value: 'top-end' },
{ label: 'right', value: 'right' },
{ label: 'right-start', value: 'right-start' },
{ label: 'right-end', value: 'right-end' },
{ label: 'bottom', value: 'bottom' },
{ label: 'bottom-start', value: 'bottom-start' },
{ label: 'bottom-end', value: 'bottom-end' },
{ label: 'left', value: 'left' },
{ label: 'left-start', value: 'left-start' },
{ label: 'left-end', value: 'left-end' },
],
]
const positionList = [
{
Expand Down Expand Up @@ -57,13 +57,13 @@ const Demo4 = () => {
onConfirm={(list) => {
let description = ''
list.forEach((option: any) => {
description += ` ${option.text}`
description += ` ${option.label}`
})
setBaseDesc(description)
}}
onChange={(options: PickerOption[]) => {
if (options[0]?.value) {
setCurPostion(options[0].value as string)
onChange={({ selectedOptions }: PickerOnChangeCallbackParameter) => {
if (selectedOptions[0]?.value) {
setCurPostion(selectedOptions[0].value as string)
}
}}
onClose={() => {
Expand Down
Loading