2.8.4

cutting-mat · Mar 29, 2022 · a40c730 · a40c730
1 parent db5f6c1
commit a40c730
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 16 deletions.
diff --git a/mock/index.js b/mock/index.js
@@ -1,3 +1,9 @@
+/**
+ * Mock数据
+ * 同目录*.js文件将视为定义接口文件，将尝试注册为Mock接口
+ * 同目录*.json文件将视为YAPI导出的json数据，将自动解析并注册为Mock接口
+ * */
+
 import Vue from 'vue'
 Vue.DebugRequest = true;
 console.log(`[Mock] Start. Please make sure that main.js => AccessControl is closed, otherwise it will not work properly`)
@@ -121,7 +127,7 @@ export const runJsMock = function () {
         let jsmocks = []
 
         jsctx.keys().forEach((key) => {
-            if (key !== './index.js') {
+            if (key !== './index.js' && Array.isArray(jsctx(key).default)) {
                 jsmocks.push(jsctx(key).default)
             }
         });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "template-element-ui",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

diff --git a/src/core/assets/global.css b/src/core/assets/global.css
@@ -1,6 +1,6 @@
 @import url('./global.reset.css');
 @import url('./global.component.css');
-@import url('./global.element.custom.css');
+@import url('./global.ui.custom.css');
 
 
 /* page layout */
@@ -28,7 +28,7 @@ body {
 }
 
 .wrap {
-    width   : 900px;
+    width       : 900px;
     margin-left : auto;
     margin-right: auto;
-}
+}
diff --git a/src/core/assets/global.element.custom.css → src/core/assets/global.ui.custom.css b/src/core/assets/global.element.custom.css → src/core/assets/global.ui.custom.css
diff --git a/src/main.js b/src/main.js
@@ -8,17 +8,18 @@ import Vue from 'vue';
 // import mocker from '../mock';
 // mocker()
 
-// UI库
-import ElementUI from '@/element-ui.install';
-Vue.use(ElementUI);
-// 全局样式
-import '@/core/assets/global.css';
+// 加载根组件
+import App from './App.vue';
+
+// 预安装
+import preInstall from '@/pre-install';
+Vue.use(preInstall);
 
-// 核心插件
+// 安装核心插件
 import plugins from '@/core/plugins';
 Vue.use(plugins);
 
-// 路由
+// 创建路由实例
 import { routeGenerator } from '@/core';
 const routeInstance = routeGenerator({
     beforeEach: ((to, from, next) => {
@@ -30,8 +31,6 @@ const routeInstance = routeGenerator({
 })
 
 // 应用启动
-import App from './App.vue';
-
 new Vue({
     router: routeInstance,
     render: h => h(App)

diff --git a/src/element-ui.install.js → src/pre-install.js b/src/element-ui.install.js → src/pre-install.js
@@ -1,3 +1,4 @@
+// 组件库按需引入
 import {
     Loading,
     Pagination,
@@ -177,8 +178,13 @@ const components = [
 
 import 'element-ui/lib/theme-chalk/index.css';
 
+// 加载全局样式
+import '@/core/assets/global.css';
+
+// 预安装插件
 export default {
     install: function (Vue, opts = {}) {
+        // 安装ElementUI
         components.forEach(component => {
             Vue.use(component);
         });

diff --git a/src/request.config.js b/src/request.config.js
@@ -1,5 +1,5 @@
 
-// 各环境baseURL配置
+// 各环境BaseURL配置
 const ENVIRONMENT = {
     mock: 'http://yapi.sogdata.com/mock/125',   // 内网YAPI项目
     dev: 'http://retire.kaifa/japi',
@@ -14,7 +14,7 @@ const HASH = {
     "master.com": ENVIRONMENT.master
 }
 
-// axios 请求实例配置
+// Axios 请求实例配置
 export default {
     baseURL: HASH[window.location.host] || ENVIRONMENT.mock,
     timeout: 10000,