From 4bcd0cfc3b5c696a38aa7f8343607afc2effd002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com>
Date: Sun, 20 Mar 2022 00:31:05 +0800
Subject: [PATCH] =?UTF-8?q?build=20=E6=AD=A3=E5=B8=B8=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 magic-boot-ui/.env.production                 |  2 +-
 .../magic/basic/mb-editor-table.vue           |  7 ++-
 magic-boot-ui/src/scripts/common.js           | 46 +++++++++----------
 magic-boot-ui/src/scripts/routerPermission.js | 10 ++--
 magic-boot-ui/src/views/dashboard/index.vue   | 31 -------------
 magic-boot-ui/vite.config.js                  | 39 +++++++++++-----
 6 files changed, 64 insertions(+), 71 deletions(-)
 delete mode 100644 magic-boot-ui/src/views/dashboard/index.vue

diff --git a/magic-boot-ui/.env.production b/magic-boot-ui/.env.production
index 3c88bb5..f36aac8 100644
--- a/magic-boot-ui/.env.production
+++ b/magic-boot-ui/.env.production
@@ -1,3 +1,3 @@
 ENV = 'production'
-VITE_APP_BASE_API = 'http://xxx:8081/'
+VITE_APP_BASE_API = 'http://localhost:8081/'
 
diff --git a/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue b/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue
index c016c21..7ed256f 100644
--- a/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue
+++ b/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue
@@ -5,8 +5,12 @@
     </el-row>
     <mb-table ref="magicTable" v-bind="tableOptions">
       <template v-for="col in cols" #[col.field]="{ index }">
+        <div v-if="!col.component">
+          {{ tableOptions.data[index][col.field] }}
+        </div>
         <component
-          :is="!col.component ? 'mb-input' : col.component.startsWith('el-') ? col.component : 'mb-' + col.component"
+          v-else
+          :is="col.component.startsWith('el-') ? col.component : 'mb-' + col.component"
           v-model="tableOptions.data[index][col.field]"
           v-bind="col.props"
           @change="dataChange"
@@ -65,6 +69,7 @@ tableOptions.cols.push({
 })
 
 watch(() => props.modelValue, (value) => {
+  console.log(value)
   tableOptions.data = value
 }, {
   deep: true
diff --git a/magic-boot-ui/src/scripts/common.js b/magic-boot-ui/src/scripts/common.js
index df29c22..8baf1f5 100644
--- a/magic-boot-ui/src/scripts/common.js
+++ b/magic-boot-ui/src/scripts/common.js
@@ -72,29 +72,29 @@ common.renderWhere = (where) => {
   return newWhere
 }
 
-common.exportExcel = (options) => {
-  var where = options.where || {}
-  where = common.renderWhere(where)
-  where.current = 1
-  where.size = 99999999
-  const url = options.url
-  const headers = options.headers
-  const columns = options.columns
-  request({
-    url: url,
-    method: 'post',
-    params: where
-  }).then(res => {
-    import('@/vendor/Export2Excel').then(excel => {
-      const data = formatJson(res.data, columns)
-      excel.export_json_to_excel({
-        header: headers,
-        data,
-        filename: 'table-list'
-      })
-    })
-  })
-}
+// common.exportExcel = (options) => {
+//   var where = options.where || {}
+//   where = common.renderWhere(where)
+//   where.current = 1
+//   where.size = 99999999
+//   const url = options.url
+//   const headers = options.headers
+//   const columns = options.columns
+//   request({
+//     url: url,
+//     method: 'post',
+//     params: where
+//   }).then(res => {
+//     import('@/vendor/Export2Excel').then(excel => {
+//       const data = formatJson(res.data, columns)
+//       excel.export_json_to_excel({
+//         header: headers,
+//         data,
+//         filename: 'table-list'
+//       })
+//     })
+//   })
+// }
 
 common.handlerTreeData = (data, id, pid, sort, pidVal) => {
   var treeData = []
diff --git a/magic-boot-ui/src/scripts/routerPermission.js b/magic-boot-ui/src/scripts/routerPermission.js
index 725da5e..84975cf 100644
--- a/magic-boot-ui/src/scripts/routerPermission.js
+++ b/magic-boot-ui/src/scripts/routerPermission.js
@@ -1,6 +1,8 @@
 import request from '@/scripts/request'
 import common from '@/scripts/common'
-import { defineAsyncComponent } from 'vue'
+
+const viewModules = import.meta.glob("../views/**/**.vue")
+const layoutModules = import.meta.glob("../layout/**.vue")
 
 export const filterAsyncRouter = (routers, level) => {
   level = level || 0
@@ -13,7 +15,7 @@ export const filterAsyncRouter = (routers, level) => {
         const component = router.component
         if (component === 'Layout') {
           router.path = "/" + common.uuid()
-          router.component = level > 0 ? import(`../layout/none.vue`) : loadLayoutView(component)
+          router.component = level > 0 ? layoutModules[`../layout/none.vue`] : loadLayoutView(component)
         } else {
           router.path = router.path = router.path.startsWith('/') ? router.path : '/' + router.path
           router.component = loadView(component)
@@ -30,12 +32,12 @@ export const filterAsyncRouter = (routers, level) => {
 }
 
 export const loadLayoutView = (view) => {
-  return import(`../layout/layout.vue`)
+  return layoutModules[`../layout/layout.vue`]
 }
 
 export const loadView = (view) => {
   view = view.substring(0, 1) === '/' ? view : '/' + view
-  return defineAsyncComponent(() => import(`../views${view}.vue`))
+  return viewModules[`../views${view}.vue`]
 }
 
 export function generateRoutes(){
diff --git a/magic-boot-ui/src/views/dashboard/index.vue b/magic-boot-ui/src/views/dashboard/index.vue
deleted file mode 100644
index bf3b93b..0000000
--- a/magic-boot-ui/src/views/dashboard/index.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-  <div class="dashboard-container">
-    <div class="dashboard-text">欢迎</div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'Dashboard',
-  computed: {
-    ...mapGetters([
-      'name'
-    ])
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.dashboard {
-  &-container {
-    margin: 30px;
-    background: white;
-  }
-  &-text {
-    font-size: 30px;
-    line-height: 46px;
-  }
-}
-</style>
diff --git a/magic-boot-ui/vite.config.js b/magic-boot-ui/vite.config.js
index 0e54fd9..a4ea1e2 100644
--- a/magic-boot-ui/vite.config.js
+++ b/magic-boot-ui/vite.config.js
@@ -5,17 +5,34 @@ import viteSvgIcons from 'vite-plugin-svg-icons'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [
-    vue(),
-    viteSvgIcons({
-			iconDirs: [path.resolve(process.cwd(), 'src/icons')],
-			symbolId: 'mb-icon-[name]'
-		})
-  ],
-  resolve: {
+    base: './',
+    plugins: [
+        vue(),
+        viteSvgIcons({
+            iconDirs: [path.resolve(process.cwd(), 'src/icons')],
+            symbolId: 'mb-icon-[name]'
+        })
+    ],
+    resolve: {
     extensions: ['.vue', '.json', '.js'],
-    alias: {
-      '@': path.resolve(__dirname,'src')
+        alias: {
+            '@': path.resolve(__dirname,'src')
+        }
+    },
+    css: {//去除@charset UTF-8规则影响
+        postcss: {
+            plugins: [
+                {
+                    postcssPlugin: 'internal:charset-removal',
+                    AtRule: {
+                        charset: (atRule) => {
+                            if (atRule.name === 'charset') {
+                                atRule.remove();
+                            }
+                        }
+                    }
+                }
+            ]
+        }
     }
-  }
 })