Prechádzať zdrojové kódy

去掉element按需加载配置

tongshangming 3 rokov pred
rodič
commit
ebdc7aab05

+ 1 - 1
src/auto-import.d.ts

@@ -2,7 +2,6 @@
 export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
-  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
   const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
   const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
   const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
@@ -128,6 +127,7 @@ declare global {
   const useBrowserLocation: typeof import('@vueuse/core')['useBrowserLocation']
   const useCached: typeof import('@vueuse/core')['useCached']
   const useClipboard: typeof import('@vueuse/core')['useClipboard']
+  const useCloned: typeof import('@vueuse/core')['useCloned']
   const useColorMode: typeof import('@vueuse/core')['useColorMode']
   const useConfirmDialog: typeof import('@vueuse/core')['useConfirmDialog']
   const useCounter: typeof import('@vueuse/core')['useCounter']

+ 10 - 14
src/components/GlobalTabs.vue

@@ -129,10 +129,9 @@ watch(contextMenuVisible, val => {
 </script>
 
 <template>
-  <div class="bg-white">
+  <div class="bg-white" style="border-top: 1px solid var(--el-border-color-light)">
     <el-tabs
       v-model="activeValue"
-      :closable="!(tabs.length === 1)"
       type="card"
       @tab-change="changeTab"
       @tab-remove="removeTab"
@@ -146,26 +145,23 @@ watch(contextMenuVisible, val => {
         :tab="item"
         :closable="item.name !== config.homeRouteName"
       >
-        <template #label>
-          <span>{{ item.title }}</span>
-        </template>
       </el-tab-pane>
     </el-tabs>
-  </div>
 
-  <!--自定义右键菜单html代码-->
-  <ul v-show="contextMenuVisible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
-    <li @click="closeAll">关闭所有</li>
-    <li @click="closeLeft">关闭左侧</li>
-    <li @click="closeRight">关闭右侧</li>
-    <li @click="closeOther">关闭其他</li>
-  </ul>
+    <!--自定义右键菜单html代码-->
+    <ul v-show="contextMenuVisible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
+      <li @click="closeAll">关闭所有</li>
+      <li @click="closeLeft">关闭左侧</li>
+      <li @click="closeRight">关闭右侧</li>
+      <li @click="closeOther">关闭其他</li>
+    </ul>
+  </div>
 </template>
 
 <style lang="scss" scoped>
 :deep(.el-tabs__header) {
   margin: 0;
-  border-top: 1px solid var(--el-border-color-light);
+  // border-top: 1px solid var(--el-border-color-light);
 }
 :deep(.el-tabs__nav) {
   border-top: none !important;

+ 1 - 1
src/components/ProTable.vue

@@ -166,7 +166,7 @@ defineExpose({
 </script>
 
 <template>
-  <div class="flex flex-col" style="height: calc(100vh - 100px - var(--main-padding) * 2)">
+  <div class="flex flex-col" style="height: calc(100vh - 101px - var(--main-padding) * 2)">
     <el-card class="mb-4" shadow="never">
       <el-form :inline="true">
         <el-form-item :label="item.label" v-for="item in searchList">

+ 1 - 1
src/layouts/BasicLayout.vue

@@ -9,7 +9,7 @@
       <global-menu />
       <el-main style="padding: 0">
         <global-tabs></global-tabs>
-        <div style="padding: var(--main-padding); height: calc(100% - 40px)">
+        <div style="padding: var(--main-padding); height: calc(100% - 41px)">
           <router-view></router-view>
         </div>
       </el-main>

+ 0 - 3
src/router/generator.ts

@@ -1,3 +0,0 @@
-// export const hasRole = (role, route) => {
-
-// }

+ 2 - 2
src/views/user/Login.vue

@@ -866,14 +866,14 @@ const handleSubmit = () => {
         <el-form-item prop="username">
           <el-input v-model="formData.username" placeholder="请输入用户名">
             <template #prefix>
-              <user />
+              <el-icon :size="16"><User /></el-icon>
             </template>
           </el-input>
         </el-form-item>
         <el-form-item prop="password">
           <el-input type="password" v-model="formData.password" placeholder="请输入密码">
             <template #prefix>
-              <lock />
+              <el-icon :size="16"><Lock /></el-icon>
             </template>
           </el-input>
         </el-form-item>

+ 0 - 2
vite.config.ts

@@ -20,11 +20,9 @@ export default defineConfig({
     DefineOptions(),
     AutoImport({
       imports: ['vue', 'vue-router', 'pinia', '@vueuse/core'],
-      resolvers: [ElementPlusResolver()],
       dts: 'src/auto-import.d.ts'
     }),
     Components({
-      resolvers: [ElementPlusResolver()],
       dirs: ['src/components'],
       extensions: ['vue'],
       dts: 'src/components.d.ts'