Skip to content

Commit 2f991ed

Browse files
committed
fix: 解决格式化后出现undefinde的问题,增加了howAnimation属性
1 parent 8c9a6ac commit 2f991ed

File tree

6 files changed

+14
-5
lines changed

6 files changed

+14
-5
lines changed

packages/devui-vue/devui/time-picker/src/components/popup-line/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
width: 100%;
88
height: 256px;
99
border-bottom: 1px solid $devui-dividing-line;
10+
display: flex;
1011

1112
.time-item {
1213
height: 100%;

packages/devui-vue/devui/time-picker/src/components/popup-line/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export default defineComponent({
7575

7676
const TimeUl = (timeList:Array<ArrType>)=>{
7777
return (
78-
<div class='time-item' style={{'width':props.format.length>6?'33.333%':'50%'}}>
78+
<div class='time-item' style={{'flex':1}}>
7979
<TimeScroll>
8080
<ul class='time-ul'>
8181
{TimeLi(timeList)}

packages/devui-vue/devui/time-picker/src/components/time-popup/index.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
background-color: $devui-connected-overlay-bg;
99
box-shadow: 0 0 2px 2px $devui-shadow;
1010
border-radius: $devui-border-radius;
11-
border: 1px solid $devui-line;
1211
overflow: hidden;
1312
position: fixed;
1413
z-index: -1;

packages/devui-vue/devui/time-picker/src/components/time-scroll/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { defineComponent, onBeforeUnmount, onMounted, onUnmounted } from 'vue'
2+
import { TimePickerProps, timePickerProps } from '../../time-picker-types'
23
import useTimeScroll from './composables/use-time-scroll'
34

45
import './index.scss'
56

67
export default defineComponent({
78
name:'DTimeScroll',
9+
props:timePickerProps,
810
setup(props,ctx){
911
const {
1012
scrollBoxDom,
@@ -44,7 +46,7 @@ export default defineComponent({
4446
return (
4547
<>
4648
<div ref={scrollBoxDom} class="devui-scroll-box">
47-
<div ref={scrollContentDom} class={`box-content ${ isDown.value ? 'box-content-behavior-auto':''}`}
49+
<div ref={scrollContentDom} class={`box-content ${ isDown.value || !props.showAnimation ? 'box-content-behavior-auto':''}`}
4850
style={{'margin-right': marginRight + 'px'}}>
4951
{
5052
ctx.slots.default?.()

packages/devui-vue/devui/time-picker/src/composables/use-time-picker.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,18 @@ export default function useTimePicker(
3737
const mouseInIputFun = ()=>{
3838
if(firsthandActiveTime.value == '00:00:00'){
3939

40-
const vModelValueArr = vModeValue.value.split(':')
40+
41+
const vModelValueArr = value.split(':')
4142
const minTimeValueArr = minTime.split(':')
4243

4344
vModeValue.value == ''
4445
? vModeValue.value = '00:00:00'
4546
: ''
4647

4748
if( vModeValue.value > minTime ){
48-
firsthandActiveTime.value = vModeValue.value
49+
firsthandActiveTime.value = value
4950
setInputValue(vModelValueArr[0],vModelValueArr[1],vModelValueArr[2])
51+
5052
}else{
5153
firsthandActiveTime.value = minTime
5254
setInputValue(minTimeValueArr[0],minTimeValueArr[1],minTimeValueArr[2])
@@ -70,6 +72,7 @@ export default function useTimePicker(
7072

7173
const vModelValueArr = vModeValue.value.split(':')
7274
vModeValue.value && setInputValue(vModelValueArr[0],vModelValueArr[1],vModelValueArr[2])
75+
7376
}
7477

7578

packages/devui-vue/devui/time-picker/src/time-picker-types.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ export const timePickerProps = {
3333
autoOpen:{
3434
type:Boolean,
3535
default:false
36+
},
37+
showAnimation:{
38+
type:Boolean,
39+
default:true
3640
}
3741
} as const;
3842

0 commit comments

Comments
 (0)