diff --git a/packages/element-plus/index.ts b/packages/element-plus/index.ts index b0f2e7432d..2d3edc016c 100644 --- a/packages/element-plus/index.ts +++ b/packages/element-plus/index.ts @@ -6,7 +6,7 @@ import ElCard from '@element-plus/card' import ElTag from '@element-plus/tag' import ElLayout from '@element-plus/layout' import ElDivider from '@element-plus/divider' -import ElTimeLine from '@element-plus/time-line' +import ElTimeline from '@element-plus/timeline' import ElProgress from '@element-plus/progress' import ElBreadcrumb from '@element-plus/breadcrumb' import ElIcon from '@element-plus/icon' @@ -22,7 +22,7 @@ export { ElCard, ElDivider, ElTag, - ElTimeLine, + ElTimeline, ElProgress, ElBreadcrumb, ElIcon, @@ -39,7 +39,7 @@ export default function install(app: App): void { ElTag(app) ElLayout(app) ElDivider(app) - ElTimeLine(app) + ElTimeline(app) ElProgress(app) ElBreadcrumb(app) ElIcon(app) diff --git a/packages/element-plus/package.json b/packages/element-plus/package.json index 6991972887..7b024707dc 100644 --- a/packages/element-plus/package.json +++ b/packages/element-plus/package.json @@ -19,6 +19,8 @@ "@element-plus/button": "^0.0.0", "@element-plus/breadcrumb": "^0.0.0", "@element-plus/card": "^0.0.0", + "@element-plus/tag": "^0.0.0", + "@element-plus/timeline": "^0.0.0", "@element-plus/divider": "^0.0.0", "@element-plus/icon": "^0.0.0", "@element-plus/layout": "^0.0.0", diff --git a/packages/switch/doc/basic.vue b/packages/switch/doc/basic.vue index 8628f878a7..72ad163dc9 100644 --- a/packages/switch/doc/basic.vue +++ b/packages/switch/doc/basic.vue @@ -6,11 +6,11 @@
use :value - +
use :model-value - +
@@ -21,6 +21,8 @@ export default defineComponent({ data() { return { v: true, + value: true, + modelValue: true, } }, }) diff --git a/packages/time-line/index.ts b/packages/time-line/index.ts deleted file mode 100644 index 5eeea18046..0000000000 --- a/packages/time-line/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { App } from 'vue' -import TimeLine from './src/index.vue' -import TimeLineItem from './src/item.vue' -export default (app: App): void => { - app.component(TimeLine.name, TimeLine) - app.component(TimeLineItem.name, TimeLineItem) -} diff --git a/packages/time-line/__tests__/time-line.spec.ts b/packages/timeline/__tests__/timeline.spec.ts similarity index 100% rename from packages/time-line/__tests__/time-line.spec.ts rename to packages/timeline/__tests__/timeline.spec.ts diff --git a/packages/time-line/doc/basic.vue b/packages/timeline/doc/basic.vue similarity index 91% rename from packages/time-line/doc/basic.vue rename to packages/timeline/doc/basic.vue index 353f948541..1e57776647 100644 --- a/packages/time-line/doc/basic.vue +++ b/packages/timeline/doc/basic.vue @@ -1,7 +1,7 @@ diff --git a/packages/time-line/doc/index.stories.ts b/packages/timeline/doc/index.stories.ts similarity index 77% rename from packages/time-line/doc/index.stories.ts rename to packages/timeline/doc/index.stories.ts index c62b4a98eb..3ef719d65d 100644 --- a/packages/time-line/doc/index.stories.ts +++ b/packages/timeline/doc/index.stories.ts @@ -1,6 +1,6 @@ export { default as BasicUsage } from './basic.vue' export default { - title: 'TimeLine', + title: 'Timeline', } diff --git a/packages/timeline/index.ts b/packages/timeline/index.ts new file mode 100644 index 0000000000..450b19f2e8 --- /dev/null +++ b/packages/timeline/index.ts @@ -0,0 +1,7 @@ +import { App } from 'vue' +import Timeline from './src/index.vue' +import TimelineItem from './src/item.vue' +export default (app: App): void => { + app.component(Timeline.name, Timeline) + app.component(TimelineItem.name, TimelineItem) +} diff --git a/packages/time-line/package.json b/packages/timeline/package.json similarity index 83% rename from packages/time-line/package.json rename to packages/timeline/package.json index a6ba1a90ba..2332fd4006 100644 --- a/packages/time-line/package.json +++ b/packages/timeline/package.json @@ -1,5 +1,5 @@ { - "name": "@element-plus/time-line", + "name": "@element-plus/timeline", "version": "0.0.0", "main": "dist/index.js", "license": "MIT", diff --git a/packages/time-line/src/index.vue b/packages/timeline/src/index.vue similarity index 97% rename from packages/time-line/src/index.vue rename to packages/timeline/src/index.vue index 2581f2e976..40b6f8581f 100644 --- a/packages/time-line/src/index.vue +++ b/packages/timeline/src/index.vue @@ -2,7 +2,7 @@ import { h, provide, defineComponent } from 'vue' export default defineComponent({ - name: 'ElTimeLine', + name: 'ElTimeline', setup(props, ctx) { provide('timeline', ctx) diff --git a/packages/time-line/src/item.vue b/packages/timeline/src/item.vue similarity index 98% rename from packages/time-line/src/item.vue rename to packages/timeline/src/item.vue index b1de47b6f6..b076ece186 100644 --- a/packages/time-line/src/item.vue +++ b/packages/timeline/src/item.vue @@ -59,7 +59,7 @@ interface ITimeLineItemProps { } export default defineComponent({ - name: 'ElTimeLineItem', + name: 'ElTimelineItem', props: { timestamp: { type: String,