diff --git a/packages/devui-vue/devui/time-picker/src/components/popup-line/index.scss b/packages/devui-vue/devui/time-picker/src/components/popup-line/index.scss index 52ba7c3eb5b43ab0561938029936b725f421f273..854f28384fbeb1bf6becac98891f8bb609d6a3ef 100644 --- a/packages/devui-vue/devui/time-picker/src/components/popup-line/index.scss +++ b/packages/devui-vue/devui/time-picker/src/components/popup-line/index.scss @@ -7,7 +7,7 @@ width: 100%; height: 256px; border-bottom: 1px solid $devui-dividing-line; - + display: flex; .time-item { height: 100%; display: inline-block; diff --git a/packages/devui-vue/devui/time-picker/src/components/popup-line/index.tsx b/packages/devui-vue/devui/time-picker/src/components/popup-line/index.tsx index 3cd2538158b7759516032fb3ad1dd5babf657333..d13669b25414c725880fa8057a549cff817e27b7 100644 --- a/packages/devui-vue/devui/time-picker/src/components/popup-line/index.tsx +++ b/packages/devui-vue/devui/time-picker/src/components/popup-line/index.tsx @@ -53,7 +53,6 @@ export default defineComponent({ timeListDom, ) - const setOutoTime = (time:string)=>{ resetTimeValue(time) } @@ -75,7 +74,7 @@ export default defineComponent({ const TimeUl = (timeList:Array)=>{ return ( -
6?'33.333%':'50%'}}> +
    {TimeLi(timeList)} diff --git a/packages/devui-vue/devui/time-picker/src/components/time-popup/index.scss b/packages/devui-vue/devui/time-picker/src/components/time-popup/index.scss index 161c6f300c997374f3bbb45c28cafc08438de294..bc97ca46732aecd233fda2b49be268288362f195 100644 --- a/packages/devui-vue/devui/time-picker/src/components/time-popup/index.scss +++ b/packages/devui-vue/devui/time-picker/src/components/time-popup/index.scss @@ -8,7 +8,6 @@ background-color: $devui-connected-overlay-bg; box-shadow: 0 0 2px 2px $devui-shadow; border-radius: $devui-border-radius; - border: 1px solid $devui-line; overflow: hidden; position: fixed; z-index: -1; @@ -31,4 +30,4 @@ display: flex; justify-content: space-between; align-items: center; -} +} \ No newline at end of file diff --git a/packages/devui-vue/devui/time-picker/src/components/time-scroll/index.tsx b/packages/devui-vue/devui/time-picker/src/components/time-scroll/index.tsx index 36cf4c2e9b6f041b235c8df502f5bd395d58c3af..14aff8028659d6489ce4045237742de3dd5e7607 100644 --- a/packages/devui-vue/devui/time-picker/src/components/time-scroll/index.tsx +++ b/packages/devui-vue/devui/time-picker/src/components/time-scroll/index.tsx @@ -1,10 +1,12 @@ import { defineComponent, onBeforeUnmount, onMounted, onUnmounted } from 'vue' +import { TimePickerProps, timePickerProps } from '../../time-picker-types' import useTimeScroll from './composables/use-time-scroll' import './index.scss' export default defineComponent({ name:'DTimeScroll', + props:timePickerProps, setup(props,ctx){ const { scrollBoxDom, @@ -44,7 +46,7 @@ export default defineComponent({ return ( <>
    -
    { ctx.slots.default?.() @@ -58,6 +60,5 @@ export default defineComponent({ ) } - } }) \ No newline at end of file diff --git a/packages/devui-vue/devui/time-picker/src/composables/use-time-picker.ts b/packages/devui-vue/devui/time-picker/src/composables/use-time-picker.ts index 9b2f58b9dfcb0998870e73930f57ee2ec1a6e027..03e2fd791561a10599fb26f5e3556f4183e276d2 100644 --- a/packages/devui-vue/devui/time-picker/src/composables/use-time-picker.ts +++ b/packages/devui-vue/devui/time-picker/src/composables/use-time-picker.ts @@ -37,7 +37,7 @@ export default function useTimePicker( const mouseInIputFun = ()=>{ if(firsthandActiveTime.value == '00:00:00'){ - const vModelValueArr = vModeValue.value.split(':') + const vModelValueArr = value.split(':') const minTimeValueArr = minTime.split(':') vModeValue.value == '' @@ -45,14 +45,13 @@ export default function useTimePicker( : '' if( vModeValue.value > minTime ){ - firsthandActiveTime.value = vModeValue.value + firsthandActiveTime.value = value setInputValue(vModelValueArr[0],vModelValueArr[1],vModelValueArr[2]) }else{ firsthandActiveTime.value = minTime setInputValue(minTimeValueArr[0],minTimeValueArr[1],minTimeValueArr[2]) } } - isActive.value = true showPopup.value = true } @@ -70,6 +69,7 @@ export default function useTimePicker( const vModelValueArr = vModeValue.value.split(':') vModeValue.value && setInputValue(vModelValueArr[0],vModelValueArr[1],vModelValueArr[2]) + } diff --git a/packages/devui-vue/devui/time-picker/src/time-picker-types.ts b/packages/devui-vue/devui/time-picker/src/time-picker-types.ts index 498f69297a676a65871c8711c9c87bc22350cbf6..121d3fecc96f8e3652d85d2fa557c9ede268a73d 100644 --- a/packages/devui-vue/devui/time-picker/src/time-picker-types.ts +++ b/packages/devui-vue/devui/time-picker/src/time-picker-types.ts @@ -33,8 +33,11 @@ export const timePickerProps = { autoOpen:{ type:Boolean, default:false + }, + showAnimation:{ + type:Boolean, + default:true } } as const; - export type TimePickerProps = ExtractPropTypes; diff --git a/packages/devui-vue/docs/components/time-picker/index.md b/packages/devui-vue/docs/components/time-picker/index.md index 858f7c11c6e1702936dd27c100bf5a8c6a2d39e5..a79d3da59769e51379074a475a84ae084a66763b 100644 --- a/packages/devui-vue/docs/components/time-picker/index.md +++ b/packages/devui-vue/docs/components/time-picker/index.md @@ -86,29 +86,30 @@

    mm:HH:ss

    - +

    hh:mm

    - +

    MM:ss

    - +