From fbe5990f1cedc187ccafdcfe4f582db0e2a21814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A5=98=ED=95=9C=EA=B2=BD?= Date: Tue, 19 Jul 2022 20:21:30 +0900 Subject: [PATCH] refactor(components): [descriptions] switch to script-setup syntax (#8349) --- .../__tests__/descriptions.test.tsx | 2 +- packages/components/descriptions/index.ts | 7 +- .../descriptions/src/description.ts | 31 ++++ .../descriptions/src/description.vue | 115 +++++++++++++ .../descriptions/src/descriptions-cell.ts | 4 +- .../descriptions/src/descriptions-row.ts | 8 + .../descriptions/src/descriptions-row.vue | 31 ++-- .../components/descriptions/src/index.vue | 152 ------------------ packages/components/descriptions/src/token.ts | 2 +- 9 files changed, 174 insertions(+), 178 deletions(-) create mode 100644 packages/components/descriptions/src/description.ts create mode 100644 packages/components/descriptions/src/description.vue create mode 100644 packages/components/descriptions/src/descriptions-row.ts delete mode 100644 packages/components/descriptions/src/index.vue diff --git a/packages/components/descriptions/__tests__/descriptions.test.tsx b/packages/components/descriptions/__tests__/descriptions.test.tsx index 2da21b6fd7..69535d7edb 100644 --- a/packages/components/descriptions/__tests__/descriptions.test.tsx +++ b/packages/components/descriptions/__tests__/descriptions.test.tsx @@ -3,7 +3,7 @@ import { nextTick, ref } from 'vue' import { mount } from '@vue/test-utils' import { describe, expect, test } from 'vitest' import ElTag from '@element-plus/components/tag' -import ElDescriptions from '../src/index.vue' +import ElDescriptions from '../src/description.vue' import ElDescriptionsItem from '../src/description-item' describe('Descriptions.vue', () => { diff --git a/packages/components/descriptions/index.ts b/packages/components/descriptions/index.ts index 25ff7af3ce..f12e51409b 100644 --- a/packages/components/descriptions/index.ts +++ b/packages/components/descriptions/index.ts @@ -1,11 +1,14 @@ import { withInstall, withNoopInstall } from '@element-plus/utils' -import Descriptions from './src/index.vue' +import Descriptions from './src/description.vue' import DescriptionsItem from './src/description-item' export const ElDescriptions = withInstall(Descriptions, { DescriptionsItem, }) -export default ElDescriptions export const ElDescriptionsItem = withNoopInstall(DescriptionsItem) + +export default ElDescriptions + +export * from './src/description' diff --git a/packages/components/descriptions/src/description.ts b/packages/components/descriptions/src/description.ts new file mode 100644 index 0000000000..b175b26322 --- /dev/null +++ b/packages/components/descriptions/src/description.ts @@ -0,0 +1,31 @@ +import { buildProps } from '@element-plus/utils' +import { useSizeProp } from '@element-plus/hooks' + +import type Description from './description.vue' + +export const descriptionProps = buildProps({ + border: { + type: Boolean, + default: false, + }, + column: { + type: Number, + default: 3, + }, + direction: { + type: String, + values: ['horizontal', 'vertical'], + default: 'horizontal', + }, + size: useSizeProp, + title: { + type: String, + default: '', + }, + extra: { + type: String, + default: '', + }, +} as const) + +export type DescriptionInstance = InstanceType diff --git a/packages/components/descriptions/src/description.vue b/packages/components/descriptions/src/description.vue new file mode 100644 index 0000000000..130fd77c0a --- /dev/null +++ b/packages/components/descriptions/src/description.vue @@ -0,0 +1,115 @@ + + + diff --git a/packages/components/descriptions/src/descriptions-cell.ts b/packages/components/descriptions/src/descriptions-cell.ts index ed3a88cb77..877bc3b722 100644 --- a/packages/components/descriptions/src/descriptions-cell.ts +++ b/packages/components/descriptions/src/descriptions-cell.ts @@ -2,7 +2,7 @@ import { defineComponent, h, inject } from 'vue' import { addUnit, getNormalizedProps } from '@element-plus/utils' import { useNamespace } from '@element-plus/hooks' -import { elDescriptionsKey } from './token' +import { descriptionsKey } from './token' import type { VNode } from 'vue' import type { @@ -24,7 +24,7 @@ export default defineComponent({ }, }, setup() { - const descriptions = inject(elDescriptionsKey, {} as IDescriptionsInject) + const descriptions = inject(descriptionsKey, {} as IDescriptionsInject) return { descriptions, diff --git a/packages/components/descriptions/src/descriptions-row.ts b/packages/components/descriptions/src/descriptions-row.ts new file mode 100644 index 0000000000..703e57dc11 --- /dev/null +++ b/packages/components/descriptions/src/descriptions-row.ts @@ -0,0 +1,8 @@ +import { buildProps } from '@element-plus/utils' + +export const descriptionsRowProps = buildProps({ + row: { + type: Array, + default: () => [], + }, +} as const) diff --git a/packages/components/descriptions/src/descriptions-row.vue b/packages/components/descriptions/src/descriptions-row.vue index 2ed8329d79..8f869e6071 100644 --- a/packages/components/descriptions/src/descriptions-row.vue +++ b/packages/components/descriptions/src/descriptions-row.vue @@ -22,30 +22,21 @@ - diff --git a/packages/components/descriptions/src/index.vue b/packages/components/descriptions/src/index.vue deleted file mode 100644 index 99a5f34198..0000000000 --- a/packages/components/descriptions/src/index.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - diff --git a/packages/components/descriptions/src/token.ts b/packages/components/descriptions/src/token.ts index 0789daf484..27be7e16b9 100644 --- a/packages/components/descriptions/src/token.ts +++ b/packages/components/descriptions/src/token.ts @@ -1,5 +1,5 @@ import type { InjectionKey } from 'vue' import type { IDescriptionsInject } from './descriptions.type' -export const elDescriptionsKey = +export const descriptionsKey = 'elDescriptions' as any as InjectionKey