feat: 🎸 layout三种布局重构完成

kailong321200875 · Dec 21, 2020 · 429e428 · 429e428
1 parent bd24b92
commit 429e428
Show file tree

Hide file tree

Showing 90 changed files with 3,926 additions and 4,680 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "vue-element-admin-webpack",
+  "name": "vue-element-plus-admin-webpack",
   "version": "0.1.0",
   "private": true,
   "scripts": {
@@ -19,7 +19,7 @@
     "clipboard": "^2.0.6",
     "core-js": "^3.6.5",
     "echarts": "^4.9.0",
-    "element-plus": "^1.0.1-beta.8",
+    "element-plus": "1.0.1-beta.10",
     "highlight.js": "^10.4.0",
     "lodash-es": "^4.17.15",
     "mockjs": "^1.1.0",

diff --git a/src/components/Editor/props.ts b/src/components/Editor/props.ts
@@ -1,5 +1,5 @@
 import { PropType } from 'vue'
-import { message } from 'ant-design-vue'
+import { ElMessage } from 'element-plus'
 import { oneOf } from '@/utils'
 
 import { Config } from './types'
@@ -18,19 +18,19 @@ export const editorProps = {
         customAlert: (s: string, t: string) => {
           switch (t) {
           case 'success':
-            message.success(s)
+            ElMessage.success(s)
             break
           case 'info':
-            message.info(s)
+            ElMessage.info(s)
             break
           case 'warning':
-            message.warning(s)
+            ElMessage.warning(s)
             break
           case 'error':
-            message.error(s)
+            ElMessage.error(s)
             break
           default:
-            message.info(s)
+            ElMessage.info(s)
             break
           }
         },

diff --git a/src/components/Image/index.vue b/src/components/Image/index.vue
diff --git a/src/components/Logo/index.vue b/src/components/Logo/index.vue
@@ -19,7 +19,7 @@ export default defineComponent({
   },
   setup(props) {
     const show = ref<boolean>(true)
-    const title = computed(() => appStore.title)
+    const title = computed(() => appStore.logoTitle)
     const layout = computed(() => appStore.layout)
     watch(
       () => props.collapsed,

diff --git a/src/components/Preview/index.vue b/src/components/Preview/index.vue
@@ -10,7 +10,7 @@
       <div class="image-viewer__mask" />
       <!-- CLOSE -->
       <span class="image-viewer__btn image-viewer__close" @click="hide">
-        <CloseCircleOutlined class="iconfont" />
+        <i class="el-icon-circle-close iconfont" />
       </span>
       <!-- ARROW -->
       <template v-if="!isSingle">
@@ -19,14 +19,14 @@
           :class="{ 'is-disabled': !infinite && isFirst }"
           @click="prev"
         >
-          <LeftOutlined class="iconfont" />
+          <i class="el-icon-arrow-left iconfont" />
         </span>
         <span
           class="image-viewer__btn image-viewer__next"
           :class="{ 'is-disabled': !infinite && isLast }"
           @click="next"
         >
-          <RightOutlined class="iconfont" />
+          <i class="el-icon-arrow-right iconfont" />
         </span>
       </template>
       <!-- ACTIONS -->
@@ -63,15 +63,11 @@ import { isFirefox } from '@/utils/is'
 import { on, off } from '@/utils/dom-utils'
 import throttle from 'lodash-es/throttle'
 import SvgIcon from '_c/SvgIcon/index.vue'
-import { CloseCircleOutlined, LeftOutlined, RightOutlined } from '@ant-design/icons-vue'
 const mousewheelEventName = isFirefox() ? 'DOMMouseScroll' : 'mousewheel'
 export default defineComponent({
   name: 'Preview',
   components: {
-    SvgIcon,
-    CloseCircleOutlined,
-    LeftOutlined,
-    RightOutlined
+    SvgIcon
   },
   props: previewProps,
   setup(props) {