diff --git a/src/_common b/src/_common index c261efa95..becfba8b1 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit c261efa959465cb49f85843761e659281b6a2b88 +Subproject commit becfba8b1e450af231fe6ed80b16fcae2d56f27a diff --git a/src/date-time-picker/__test__/index.test.jsx b/src/date-time-picker/__test__/index.test.jsx index b5b883a8a..dc5d3ccd6 100644 --- a/src/date-time-picker/__test__/index.test.jsx +++ b/src/date-time-picker/__test__/index.test.jsx @@ -3,8 +3,8 @@ import { mount } from '@vue/test-utils'; import { describe, it, expect, vi } from 'vitest'; import dayjs from 'dayjs'; -import DateTimePicker from '../date-time-picker.vue'; -import PickerItem from '../../picker/picker-item.vue'; +import DateTimePicker from '../date-time-picker'; +import PickerItem from '../../picker/picker-item'; import { DEFAULT_ITEM_HEIGHT, ANIMATION_TIME_LIMIT } from '../../picker/picker.class'; const makeTouch = (el, eventName, touchPosition) => { @@ -139,7 +139,7 @@ describe('DateTimePicker', () => { start: '2023-06-13' }, }); - expect(wrapper.vm.valueOfPicker).toStrictEqual(['10', '0', '0']) + expect(wrapper.vm.value).toStrictEqual('10:00:00') }) it(': start && end ', async () => { diff --git a/src/date-time-picker/date-time-picker.vue b/src/date-time-picker/date-time-picker.tsx similarity index 88% rename from src/date-time-picker/date-time-picker.vue rename to src/date-time-picker/date-time-picker.tsx index 4be7d610c..1f164c55e 100644 --- a/src/date-time-picker/date-time-picker.vue +++ b/src/date-time-picker/date-time-picker.tsx @@ -1,22 +1,8 @@ - - - diff --git a/src/date-time-picker/index.ts b/src/date-time-picker/index.ts index a094af096..2efe27cea 100644 --- a/src/date-time-picker/index.ts +++ b/src/date-time-picker/index.ts @@ -1,4 +1,4 @@ -import DateTimePicker from './date-time-picker.vue'; +import DateTimePicker from './date-time-picker'; import { withInstall, WithInstallType } from '../shared'; import './style'; diff --git a/src/picker/__test__/__snapshots__/demo.test.jsx.snap b/src/picker/__test__/__snapshots__/demo.test.jsx.snap index 627ca3b1d..fb2735d8c 100644 --- a/src/picker/__test__/__snapshots__/demo.test.jsx.snap +++ b/src/picker/__test__/__snapshots__/demo.test.jsx.snap @@ -73,7 +73,9 @@ exports[`Picker > Picker areaVue demo works fine 1`] = `
+ > + +
@@ -262,7 +264,9 @@ exports[`Picker > Picker baseVue demo works fine 1`] = `
+ > + +
@@ -367,7 +371,9 @@ exports[`Picker > Picker baseVue demo works fine 1`] = `
+ > + +
@@ -808,7 +814,9 @@ exports[`Picker > Picker mobileVue demo works fine 1`] = `
+ > + +
@@ -913,7 +921,9 @@ exports[`Picker > Picker mobileVue demo works fine 1`] = `
+ > + +
@@ -1102,7 +1112,9 @@ exports[`Picker > Picker mobileVue demo works fine 1`] = `
+ > + +
@@ -1305,7 +1317,9 @@ exports[`Picker > Picker mobileVue demo works fine 1`] = `
+ > + +
@@ -1485,7 +1499,9 @@ exports[`Picker > Picker titleVue demo works fine 1`] = `
+ > + +
diff --git a/src/picker/__test__/index.test.jsx b/src/picker/__test__/index.test.jsx index 05d288f78..589359c73 100644 --- a/src/picker/__test__/index.test.jsx +++ b/src/picker/__test__/index.test.jsx @@ -1,8 +1,8 @@ import { nextTick, ref } from 'vue'; import { mount } from '@vue/test-utils'; import { describe, it, expect, vi } from 'vitest'; -import Picker from '../picker.vue'; -import PickerItem from '../picker-item.vue'; +import Picker from '../picker'; +import PickerItem from '../picker-item'; import { DEFAULT_ITEM_HEIGHT, ANIMATION_TIME_LIMIT } from '../picker.class'; diff --git a/src/picker/cascade.vue b/src/picker/cascade.vue index 7ed4d5f2b..c5a49616d 100644 --- a/src/picker/cascade.vue +++ b/src/picker/cascade.vue @@ -10,7 +10,7 @@ import { computed, defineComponent, ref } from 'vue'; import config from '../config'; import PickerProps from './props'; import { PickerColumn, PickerValue } from './type'; -import Picker from './picker.vue'; +import Picker from './picker'; const { prefix } = config; const name = `${prefix}-cascade`; diff --git a/src/picker/index.ts b/src/picker/index.ts index 8d58416fd..95e1794d0 100644 --- a/src/picker/index.ts +++ b/src/picker/index.ts @@ -1,4 +1,4 @@ -import _Picker from './picker.vue'; +import _Picker from './picker'; import _Cascade from './cascade.vue'; import { withInstall, WithInstallType } from '../shared'; diff --git a/src/picker/picker-item.vue b/src/picker/picker-item.tsx similarity index 72% rename from src/picker/picker-item.vue rename to src/picker/picker-item.tsx index f83b898e0..4950acbbf 100644 --- a/src/picker/picker-item.vue +++ b/src/picker/picker-item.tsx @@ -1,12 +1,3 @@ - - - diff --git a/src/picker/picker.vue b/src/picker/picker.tsx similarity index 64% rename from src/picker/picker.vue rename to src/picker/picker.tsx index 3862d89e7..83ce38fea 100644 --- a/src/picker/picker.vue +++ b/src/picker/picker.tsx @@ -1,55 +1,31 @@ - - -