Skip to content

Commit eec77d2

Browse files
refactor(slider): silder&&time-picker (#1672)
* refactor(slider): silder&&time-picker重构 * refactor(slider): 引入修改 --------- Co-authored-by: huaweidevcloud <[email protected]>
1 parent fe5757d commit eec77d2

File tree

12 files changed

+18
-18
lines changed

12 files changed

+18
-18
lines changed

packages/devui-vue/devui/slider/__tests__/slider.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { mount } from '@vue/test-utils';
22
import { nextTick, ref } from 'vue';
33
import DSlider from '../src/slider';
4-
import { useNamespace } from '../../shared/hooks/use-namespace';
4+
import { useNamespace } from '@devui/shared/utils';
55

66
const ns = useNamespace('slider', true);
77

packages/devui-vue/devui/slider/src/slider.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { defineComponent, computed, SetupContext } from 'vue';
22
import { sliderProps, SliderProps } from './slider-types';
3-
import { useNamespace } from '../../shared/hooks/use-namespace';
4-
import { isFunction } from '../../shared/utils';
3+
import { useNamespace, isFunction } from '@devui/shared/utils';
54
import { useSliderEvent } from './use-slider';
65
import './slider.scss';
76

packages/devui-vue/devui/slider/src/use-slider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export function useSliderEvent(props: SliderProps, ctx: SetupContext): UseSlider
8989
}
9090

9191
watch(
92-
() => props.modelValue,
92+
[() => props.modelValue, () => props.max, () => props.min],
9393
() => {
9494
currentValue.value = Number(props.modelValue);
9595

packages/devui-vue/devui/time-picker/__tests__/time-picker.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { mount } from '@vue/test-utils';
22
import DTimePicker from '../src/time-picker';
33
import { nextTick, ref } from 'vue';
4-
import { useNamespace } from '../../shared/hooks/use-namespace';
4+
import { useNamespace } from '@devui/shared/utils';
55
import { Form as DForm, FormItem as DFormItem } from '../../form';
66

77
jest.mock('../../locale/create', () => ({

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import '../../../../styles-var/devui-var.scss';
1+
@import '@devui/theme/styles-var/devui-var.scss';
22

3-
.#{$devui-prefix}-time-list {
3+
.#{$devui-prefix}-popup-line {
44
width: 100%;
55
height: 256px;
66
border-bottom: 1px solid $devui-dividing-line;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import { usePopupLine } from './composables/use-popup-line';
44
import { ArrType, TimeListItem } from '../../types';
55
import { popupLineProps, PopupLineProps } from './popup-line-types';
66
import TimeScroll from '../time-scroll';
7-
import { useNamespace } from '../../../../shared/hooks/use-namespace';
7+
import { useNamespace } from '@devui/shared/utils';
88
import './index.scss';
99

1010
export default defineComponent({
11-
name: 'DTimeList',
11+
name: 'DPopupLine',
1212
props: popupLineProps,
1313
emits: ['change'],
1414
setup(props: PopupLineProps, ctx: SetupContext) {
15-
const ns = useNamespace('time-list');
15+
const ns = useNamespace('popup-line');
1616
const timeListDom = ref<Element>();
1717
const { getNewTime, activeTimeFun, resetTimeValue, resetScrollTop } = usePopupLine(
1818
props.hourList as Array<ArrType>,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../../../styles-var/devui-var.scss';
1+
@import '@devui/theme/styles-var/devui-var.scss';
22
.#{$devui-prefix}-time-popup--btn {
33
padding: 8px 10px;
44
display: flex;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PopupLine from '../popup-line/index';
55
import { Button } from '../../../../button/index';
66
import { popupTimeObj } from '../../types';
77
import { timePopupProps, TimePopupProps } from './time-popup-types';
8-
import { useNamespace } from '../../../../shared/hooks/use-namespace';
8+
import { useNamespace } from '@devui/shared/utils';
99
import { createI18nTranslate } from '../../../../locale/create';
1010
import './index.scss';
1111

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../../../styles-var/devui-var.scss';
1+
@import '@devui/theme/styles-var/devui-var.scss';
22

33
.#{$devui-prefix}-scroll-box {
44
width: 100%;
@@ -11,6 +11,7 @@
1111
}
1212

1313
.box-content {
14+
position: static;
1415
height: 100%;
1516
overflow-y: auto;
1617
overflow-x: hidden;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { defineComponent, onBeforeUnmount, onMounted, onUnmounted } from 'vue';
22
import type { SetupContext } from 'vue';
33
import { TimePickerProps, timePickerProps } from '../../time-picker-types';
44
import useTimeScroll from './composables/use-time-scroll';
5-
import { useNamespace } from '../../../../shared/hooks/use-namespace';
5+
import { useNamespace } from '@devui/shared/utils';
66

77
import './index.scss';
88

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export default function useTimePicker(hh: Ref, mm: Ref, ss: Ref, format: string,
8181
};
8282

8383
const clickVerifyFun = () => {
84-
if (props.disabled || props.readonly) {
84+
if (props.disabled) {
8585
return;
8686
}
8787
mouseInputFun();

packages/devui-vue/devui/time-picker/src/time-picker.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import useTimePicker from './composables/use-time-picker';
55
import TimePopup from './components/time-popup/index';
66
import DInput from '../../input/src/input';
77
import { FlexibleOverlay, Placement } from '../../overlay';
8-
import { useNamespace } from '../../shared/hooks/use-namespace';
8+
import { useNamespace } from '@devui/shared/utils';
99

1010
import './time-picker.scss';
1111

@@ -68,10 +68,10 @@ export default defineComponent({
6868
disabled={props.disabled}
6969
readonly={props.readonly}
7070
size={props.size}
71-
onFocus={withModifiers(clickVerifyFun, ['stop'])}
71+
onFocus={clickVerifyFun}
7272
v-slots={{
7373
suffix: () => (
74-
<span class="time-input-icon">
74+
<span class="time-input-icon" onClick={clickVerifyFun}>
7575
<span onClick={clearAll} class="clear-button">
7676
{showClearIcon.value ? <Icon size="small" name="close" /> : ''}
7777
</span>

0 commit comments

Comments
 (0)