mod: conflict resolution

2022-04-08 19:39:36 +08:00
parent 87d3078941 f8c9d54687
commit 47edf7b270
25 changed files with 1252 additions and 817 deletions
--- a/src/components/SizeDropdown/src/SizeDropdown.vue
+++ b/src/components/SizeDropdown/src/SizeDropdown.vue
@@ -31,7 +31,7 @@ const setCurrentSize = (size: ElememtPlusSzie) => {
    <template #dropdown>
      <ElDropdownMenu>
        <ElDropdownItem v-for="item in sizeMap" :key="item" :command="item">
-          {{ t(`size.${[item]}`) }}
+          {{ t(`size.${item}`) }}
        </ElDropdownItem>
      </ElDropdownMenu>
    </template>