Skip to content

Commit 429e428

Browse files
feat: 🎸 layout三种布局重构完成
1 parent bd24b92 commit 429e428

File tree

90 files changed

+3926
-4680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+3926
-4680
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "vue-element-admin-webpack",
2+
"name": "vue-element-plus-admin-webpack",
33
"version": "0.1.0",
44
"private": true,
55
"scripts": {
@@ -19,7 +19,7 @@
1919
"clipboard": "^2.0.6",
2020
"core-js": "^3.6.5",
2121
"echarts": "^4.9.0",
22-
"element-plus": "^1.0.1-beta.8",
22+
"element-plus": "1.0.1-beta.10",
2323
"highlight.js": "^10.4.0",
2424
"lodash-es": "^4.17.15",
2525
"mockjs": "^1.1.0",

src/components/Editor/props.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { PropType } from 'vue'
2-
import { message } from 'ant-design-vue'
2+
import { ElMessage } from 'element-plus'
33
import { oneOf } from '@/utils'
44

55
import { Config } from './types'
@@ -18,19 +18,19 @@ export const editorProps = {
1818
customAlert: (s: string, t: string) => {
1919
switch (t) {
2020
case 'success':
21-
message.success(s)
21+
ElMessage.success(s)
2222
break
2323
case 'info':
24-
message.info(s)
24+
ElMessage.info(s)
2525
break
2626
case 'warning':
27-
message.warning(s)
27+
ElMessage.warning(s)
2828
break
2929
case 'error':
30-
message.error(s)
30+
ElMessage.error(s)
3131
break
3232
default:
33-
message.info(s)
33+
ElMessage.info(s)
3434
break
3535
}
3636
},

src/components/Image/index.vue

Lines changed: 0 additions & 243 deletions
This file was deleted.

src/components/Logo/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default defineComponent({
1919
},
2020
setup(props) {
2121
const show = ref<boolean>(true)
22-
const title = computed(() => appStore.title)
22+
const title = computed(() => appStore.logoTitle)
2323
const layout = computed(() => appStore.layout)
2424
watch(
2525
() => props.collapsed,

src/components/Preview/index.vue

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="image-viewer__mask" />
1111
<!-- CLOSE -->
1212
<span class="image-viewer__btn image-viewer__close" @click="hide">
13-
<CloseCircleOutlined class="iconfont" />
13+
<i class="el-icon-circle-close iconfont" />
1414
</span>
1515
<!-- ARROW -->
1616
<template v-if="!isSingle">
@@ -19,14 +19,14 @@
1919
:class="{ 'is-disabled': !infinite && isFirst }"
2020
@click="prev"
2121
>
22-
<LeftOutlined class="iconfont" />
22+
<i class="el-icon-arrow-left iconfont" />
2323
</span>
2424
<span
2525
class="image-viewer__btn image-viewer__next"
2626
:class="{ 'is-disabled': !infinite && isLast }"
2727
@click="next"
2828
>
29-
<RightOutlined class="iconfont" />
29+
<i class="el-icon-arrow-right iconfont" />
3030
</span>
3131
</template>
3232
<!-- ACTIONS -->
@@ -63,15 +63,11 @@ import { isFirefox } from '@/utils/is'
6363
import { on, off } from '@/utils/dom-utils'
6464
import throttle from 'lodash-es/throttle'
6565
import SvgIcon from '_c/SvgIcon/index.vue'
66-
import { CloseCircleOutlined, LeftOutlined, RightOutlined } from '@ant-design/icons-vue'
6766
const mousewheelEventName = isFirefox() ? 'DOMMouseScroll' : 'mousewheel'
6867
export default defineComponent({
6968
name: 'Preview',
7069
components: {
71-
SvgIcon,
72-
CloseCircleOutlined,
73-
LeftOutlined,
74-
RightOutlined
70+
SvgIcon
7571
},
7672
props: previewProps,
7773
setup(props) {

0 commit comments

Comments
 (0)