Merge branch 'master' of https://github.com/hug-sun/element3

.eslintignore

@@ -1,13 +1,7 @@
-src/utils/popper.js
-src/utils/date.js
-examples/play
-*.sh
 node_modules
 lib
 coverage
-*.md
 *.scss
 *.woff
 *.ttf
-src/index.js
 dist

packages/element3/packages/cascader/Cascader.vue

@@ -139,7 +139,7 @@ import { useEmitter } from '../../src/use/emitter'
 import { migrating } from '../../src/use/migrating'
 import Clickoutside from '../../src/directives/clickoutside'
 import ElInput from '../input'
-import ElTag from '../tag'
+import { ElTag } from '../../src/components/Tag'
 import ElScrollbar from '../scrollbar'
 import ElCascaderPanel from '../cascader-panel'
 import AriaUtils from '../../src/utils/aria-utils'

packages/element3/packages/select/Select.vue

@@ -171,7 +171,7 @@ import Locale from '../../src/mixins/locale'
 import ElInput from '../input'
 import ElSelectMenu from './SelectDropdown'
 import ElOption from '../option/Option'
-import ElTag from '../tag'
+import { ElTag } from '../../src/components/Tag'
 import ElScrollbar from '../scrollbar'
 import { debounce } from 'throttle-debounce'
 import Clickoutside from '../../src/directives/clickoutside'

packages/element3/packages/theme-chalk/src/index.scss

@@ -2,9 +2,7 @@
 @import "./alert.scss";
 @import "./aside.scss";
 @import "./autocomplete.scss";
-@import "./avatar.scss";
 @import "./backtop.scss";
-@import "./badge.scss";
 @import "./breadcrumb.scss";
 @import "./breadcrumb-item.scss";
 @import "./button-group.scss";
@@ -24,7 +22,6 @@
 @import "./container.scss";
 @import "./date-picker.scss";
 @import "./dialog.scss";
-@import "./divider.scss";
 @import "./drawer.scss";
 @import "./dropdown.scss";
 @import "./dropdown-item.scss";
@@ -42,7 +39,6 @@
 @import "./menu.scss";
 @import "./menu-item.scss";
 @import "./menu-item-group.scss";
-@import "./message.scss";
 @import "./message-box.scss";
 @import "./notification.scss";
 @import "./page-header.scss";
@@ -66,7 +62,6 @@
 @import "./table.scss";
 @import "./table-column.scss";
 @import "./tabs.scss";
-@import "./tag.scss";
 @import "./time-picker.scss";
 @import "./time-select.scss";
 @import "./timeline.scss";
@@ -75,7 +70,12 @@
 @import "./transfer.scss";
 @import "./tree.scss";
 @import "./upload.scss";
+@import "./avatar.scss";
+@import "./badge.scss";
 @import "./button.scss";
 @import "./container.scss";
+@import "./divider.scss";
 @import "./link.scss";
+@import "./message.scss";
 @import "./switch.scss";
+@import "./tag.scss";

packages/element3/packages/avatar/index.js → packages/element3/src/components/Avatar/index.js

@@ -1,8 +1,8 @@
-import ElAvatar from './Avatar.vue'
+import ElAvatar from './src/Avatar.vue'
 
 /* istanbul ignore next */
 ElAvatar.install = function (app) {
   app.component(ElAvatar.name, ElAvatar)
 }
 
-export default ElAvatar
+export { ElAvatar }

packages/element3/packages/avatar/Avatar.vue → packages/element3/src/components/Avatar/src/Avatar.vue

@@ -14,13 +14,13 @@
 </template>
 
 <script>
-import { isString, isNumber } from '../../src/utils/types'
+import { isString, isNumber } from '../../../utils/types'
 import { defineComponent, computed, toRefs, ref } from 'vue'
 import { props } from './props'
 export default defineComponent({
   name: 'ElAvatar',
 
-  props: props,
+  props,
 
   setup(props) {
     const { size, shape, icon, error } = toRefs(props)

packages/element3/packages/avatar/props.js → packages/element3/src/components/Avatar/src/props.js

@@ -1,4 +1,4 @@
-import { isString, isNumber } from '../../src/utils/types'
+import { isString, isNumber } from '../../../utils/types'
 
 export const props = {
   icon: {

packages/element3/packages/avatar/__tests__/Avatar.spec.js → packages/element3/src/components/Avatar/tests/Avatar.spec.js

@@ -1,4 +1,4 @@
-import Avatar from '../Avatar.vue'
+import Avatar from '../src/Avatar.vue'
 import { mount } from '@vue/test-utils'
 import { nextTick } from 'vue'
 

packages/element3/packages/badge/index.js → packages/element3/src/components/Badge/index.js

@@ -1,8 +1,8 @@
-import ElBadge from './Badge.vue'
+import ElBadge from './src/Badge.vue'
 
 /* istanbul ignore next */
 ElBadge.install = function (app) {
   app.component(ElBadge.name, ElBadge)
 }
 
-export default ElBadge
+export { ElBadge }

packages/element3/packages/badge/Badge.vue → packages/element3/src/components/Badge/src/Badge.vue

@@ -20,7 +20,7 @@
 
 <script>
 import { defineComponent, computed } from 'vue'
-import { isString } from '../../src/utils/types'
+import { isString } from '../../../utils/types'
 
 export default defineComponent({
   name: 'ElBadge',

packages/element3/packages/badge/__tests__/Badge.spec.js → packages/element3/src/components/Badge/tests/Badge.spec.js

@@ -1,4 +1,4 @@
-import Badge from '../Badge.vue'
+import Badge from '../src/Badge.vue'
 import { mount } from '@vue/test-utils'
 
 describe('Badge', () => {

packages/element3/packages/divider/index.js → packages/element3/src/components/Divider/index.js

@@ -1,8 +1,8 @@
-import ElDivider from './Divider'
+import ElDivider from './src/Divider'
 
 /* istanbul ignore next */
 ElDivider.install = function (app) {
   app.component(ElDivider.name, ElDivider)
 }
 
-export default ElDivider
+export { ElDivider }

packages/element3/packages/divider/__tests__/Divider.spec.js → packages/element3/src/components/Divider/tests/Divider.spec.js

@@ -1,4 +1,4 @@
-import Divider from '../Divider.vue'
+import Divider from '../src/Divider.vue'
 import { mount } from '@vue/test-utils'
 
 describe('Divider.vue', () => {

packages/element3/src/components/Message/index.js

@@ -0,0 +1 @@
+export { Message } from './src/Message.js'

packages/element3/packages/message/Message.js → packages/element3/src/components/Message/src/Message.js

@@ -1,6 +1,6 @@
 import messageComponent from './Message.vue'
-import { createComponent } from '../../src/use/component.js'
-import { PopupManager } from '../../src/utils/popup'
+import { createComponent } from '../../../use/component'
+import { PopupManager } from '../../../utils/popup'
 import { isVNode } from 'vue'
 
 const instanceList = []

packages/element3/packages/message/tests/Message.spec.js → packages/element3/src/components/Message/tests/Message.spec.js

@@ -1,4 +1,4 @@
-import { Message } from '../Message.js'
+import { Message } from '../src/Message.js'
 import { h } from 'vue'
 describe('Message', () => {
   afterEach(async () => {

packages/element3/packages/message/tests/Message.vue.spec.js → packages/element3/src/components/Message/tests/Message.vue.spec.js

@@ -1,5 +1,5 @@
 import { mount, flushPromises } from '@vue/test-utils'
-import Message from '../Message.vue'
+import Message from '../src/Message.vue'
 import { h } from 'vue'
 
 describe('Message.vue', () => {

packages/element3/packages/tag/index.js → packages/element3/src/components/Tag/index.js

@@ -1,8 +1,8 @@
-import ElTag from './Tag.vue'
+import ElTag from './src/Tag.vue'
 
 /* istanbul ignore next */
 ElTag.install = function (app) {
   app.component(ElTag.name, ElTag)
 }
 
-export default ElTag
+export { ElTag }

packages/element3/packages/tag/Tag.vue → packages/element3/src/components/Tag/src/Tag.vue

@@ -1,5 +1,5 @@
 <script lang="jsx">
-import { useGlobalOptions } from '../../src/use/globalConfig'
+import { useGlobalOptions } from '../../../use/globalConfig.js'
 import { ref, computed, toRefs, Transition } from 'vue'
 
 const useShow = (emit) => {

packages/element3/packages/tag/__tests__/Tag.spec.js → packages/element3/src/components/Tag/tests/Tag.spec.js

@@ -1,7 +1,7 @@
-import Tag from '../Tag.vue'
+import Tag from '../src/Tag.vue'
 import { mount } from '@vue/test-utils'
 import { ref, nextTick } from 'vue'
-import { setupGlobalOptions } from '../../../src/use/globalConfig'
+import { setupGlobalOptions } from '../../../use/globalConfig'
 
 describe('Tag.vue', () => {
   it('normal render', () => {

packages/element3/src/index.js

@@ -40,19 +40,19 @@ import ElFormItem from '../packages/form-item'
 // Data
 import ElTable from '../packages/table'
 import ElTableColumn from '../packages/table-column'
-import ElTag from '../packages/tag'
+import { ElTag } from './components/Tag'
 import ElProgress from '../packages/progress'
 // import { ElProgress } from './components/Progress'
 import ElTree from '../packages/tree'
 import ElPagination from '../packages/pagination'
-import ElBadge from '../packages/badge'
-import ElAvatar from '../packages/avatar'
+import { ElBadge } from './components/Badge'
+import { ElAvatar } from './components/Avatar'
 // Notice
 import ElAlert from '../packages/alert'
 
 import ElLoading, { useLoading } from '../packages/loading'
 
-import { Message } from '../packages/message'
+import { Message } from './components/Message'
 
 import ElMessageBox, { useMsgbox } from '../packages/message-box'
 
@@ -84,7 +84,7 @@ import ElCollapse from '../packages/collapse'
 import ElCollapseItem from '../packages/collapse-item'
 import ElTimeline from '../packages/timeline'
 import ElTimelineItem from '../packages/timeline-item'
-import ElDivider from '../packages/divider'
+import { ElDivider } from './components/Divider'
 import ElCalendar from '../packages/calendar'
 import ElImage from '../packages/image'
 import ElBacktop from '../packages/backtop'