Browse Source

重构mock,修复苹果电脑运行报错

chuzhixin 4 years ago
parent
commit
ce1021fc44

+ 0 - 2
.env.development

@@ -1,2 +0,0 @@
-NODE_ENV = development
-VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 1 - 1
mock/controller/ad.js

@@ -14,7 +14,7 @@ const data = [
       "//shang.qq.com/wpa/qunwpa?idkey=14f123ac6d4ef3122bbb60d4693f1d8c951a50be2296951efb12d5ab1642f36b",
   },
 ];
-export default [
+module.exports = [
   {
     url: "/ad/getList",
     type: "get",

+ 1 - 1
mock/controller/blacklist.js

@@ -32,7 +32,7 @@ const data = [
   },
   ,
 ];
-export default [
+module.exports = [
   {
     url: "/blacklist/getList",
     type: "post",

+ 1 - 1
mock/controller/changeLog.js

@@ -168,7 +168,7 @@ const data = [
   },
 ];
 
-export default [
+module.exports = [
   {
     url: "/changeLog/getList",
     type: "post",

+ 1 - 1
mock/controller/colorfulIcon.js

@@ -303,7 +303,7 @@ const data = [
   "add_database",
   "add_row",
 ];
-export default [
+module.exports = [
   {
     url: "/colorfulIcon/getList",
     type: "post",

+ 2 - 2
mock/controller/goodsDetail.js

@@ -1,6 +1,6 @@
-import { mock } from "mockjs";
+const { mock } = require("mockjs");
 
-export default [
+module.exports = [
   {
     url: "/goodsDetail/getList",
     type: "post",

+ 2 - 2
mock/controller/goodsList.js

@@ -1,4 +1,4 @@
-import { mock } from "mockjs";
+const { mock } = require("mockjs");
 
 const List = [];
 const count = 999;
@@ -18,7 +18,7 @@ for (let i = 0; i < count; i++) {
   );
 }
 
-export default [
+module.exports = [
   {
     url: "/goodsList/getList",
     type: "post",

+ 1 - 1
mock/controller/icon.js

@@ -964,7 +964,7 @@ const data = [
   "yen-sign",
   "yin-yang",
 ];
-export default [
+module.exports = [
   {
     url: "/icon/getList",
     type: "post",

+ 1 - 1
mock/controller/menuManagement.js

@@ -1,4 +1,4 @@
-export default [
+module.exports = [
   {
     url: "/menuManagement/getTree",
     type: "post",

+ 1 - 2
mock/controller/notice.js

@@ -24,8 +24,7 @@ const data = [
     type: "success",
   },
 ];
-
-export default [
+module.exports = [
   {
     url: "/notice/getList",
     type: "post",

+ 2 - 2
mock/controller/personalCenter.js

@@ -1,6 +1,6 @@
-import { mock } from "mockjs";
+const { mock } = require("mockjs");
 
-export default [
+module.exports = [
   {
     url: "/personalCenter/getList",
     type: "post",

+ 1 - 1
mock/controller/remixIcon.js

@@ -2271,7 +2271,7 @@ const data = [
   "zzz-fill",
   "zzz-line",
 ];
-export default [
+module.exports = [
   {
     url: "/remixIcon/getList",
     type: "post",

+ 1 - 1
mock/controller/roleManagement.js

@@ -9,7 +9,7 @@ const List = [
     permission: "editor",
   },
 ];
-export default [
+module.exports = [
   {
     url: "/roleManagement/getList",
     type: "post",

+ 1 - 1
mock/controller/router.js

@@ -379,7 +379,7 @@ const data = [
     ],
   },
 ];
-export default [
+module.exports = [
   {
     url: "/menu/navigate",
     type: "post",

+ 3 - 3
mock/controller/table.js

@@ -1,5 +1,5 @@
-import { mock } from "mockjs";
-import { handleRandomImage } from "../utils";
+const { mock } = require("mockjs");
+const { handleRandomImage } = require("../utils");
 
 const List = [];
 const count = 999;
@@ -21,7 +21,7 @@ for (let i = 0; i < count; i++) {
   );
 }
 
-export default [
+module.exports = [
   {
     url: "/table/getList",
     type: "post",

+ 1 - 1
mock/controller/tree.js

@@ -43,7 +43,7 @@ const data = [
     ],
   },
 ];
-export default [
+module.exports = [
   {
     url: "/tree/list",
     type: "post",

+ 1 - 1
mock/controller/upload.js

@@ -1,5 +1,5 @@
 const data = [];
-export default [
+module.exports = [
   {
     url: "/upload",
     type: "post",

+ 1 - 1
mock/controller/user.js

@@ -4,7 +4,7 @@ const accessTokens = {
   test: "test-accessToken",
 };
 
-export default [
+module.exports = [
   {
     url: "/publicKey",
     type: "post",

+ 1 - 1
mock/controller/userManagement.js

@@ -25,7 +25,7 @@ const List = [
     datatime: "@datetime",
   },
 ];
-export default [
+module.exports = [
   {
     url: "/userManagement/getList",
     type: "post",

+ 7 - 26
mock/index.js

@@ -3,33 +3,14 @@
  * @description 导入所有 controller 模块,npm run serve时在node环境中自动输出controller文件夹下Mock接口,请勿修改。
  */
 
-import { handleMockArray } from "./utils";
-import chalk from "chalk";
-import fs from "fs";
-import { baseURL, devPort, httpRequestFile } from "../src/config/settings";
+const { handleMockArray } = require("./utils");
 
 const mocks = [];
 const mockArray = handleMockArray();
-
-if (httpRequestFile) {
-  fs.writeFile("./http/mock.http", "", {}, function (err) {
-    if (err) throw err;
-  });
-}
-mockArray.forEach(async (item) => {
-  const obj = require(item).default;
-  await mocks.push(...obj);
-  if (httpRequestFile) {
-    obj.forEach((item) => {
-      fs.appendFile(
-        "./http/mock.http",
-        `\r\n###${item.url}###\r\POST http://localhost:${devPort}/${baseURL}${item.url}\r\nContent-Type: application/x-www-form-urlencoded\r\n###\r\n`,
-        (error) => {
-          if (error)
-            return chalk.red(`\n > 追加HTTP Request失败${error.message}`);
-        }
-      );
-    });
-  }
+mockArray.forEach((item) => {
+  const obj = require(item);
+  mocks.push(...obj);
 });
-export default mocks;
+module.exports = {
+  mocks,
+};

+ 1 - 2
mock/mockServer.js

@@ -13,7 +13,7 @@ const mockDir = path.join(process.cwd(), "mock");
  */
 const registerRoutes = (app) => {
   let mockLastIndex;
-  const { default: mocks } = require("./index.js");
+  const { mocks } = require("./index.js");
   const mocksForServer = mocks.map((route) => {
     return responseFake(route.url, route.type, route.response);
   });
@@ -58,7 +58,6 @@ const responseFake = (url, type, respond) => {
  * @param app
  */
 module.exports = (app) => {
-  require("@babel/register");
   app.use(bodyParser.json());
   app.use(
     bodyParser.urlencoded({

+ 9 - 5
mock/utils/index.js

@@ -1,6 +1,6 @@
-import { Random } from "mockjs";
-import { join } from "path";
-import fs from "fs";
+const { Random } = require("mockjs");
+const { join } = require("path");
+const fs = require("fs");
 
 /**
  * @copyright chuzhixin 1204505056@qq.com
@@ -9,7 +9,7 @@ import fs from "fs";
  * @param height
  * @returns {string}
  */
-export function handleRandomImage(width = 50, height = 50) {
+function handleRandomImage(width = 50, height = 50) {
   return `https://picsum.photos/${width}/${height}?random=${Random.guid()}`;
 }
 
@@ -18,7 +18,7 @@ export function handleRandomImage(width = 50, height = 50) {
  * @description 处理所有 controller 模块,npm run serve时在node环境中自动输出controller文件夹下Mock接口,请勿修改。
  * @returns {[]}
  */
-export function handleMockArray() {
+function handleMockArray() {
   const mockArray = [];
   const getFiles = (jsonPath) => {
     const jsonFiles = [];
@@ -37,3 +37,7 @@ export function handleMockArray() {
   getFiles("mock/controller");
   return mockArray;
 }
+module.exports = {
+  handleRandomImage,
+  handleMockArray,
+};

+ 3 - 2
package.json

@@ -77,7 +77,7 @@
     "zx-markdown-editor": "^0.0.2",
     "zx-player": "^0.9.6",
     "zx-quill": "^0.0.2",
-    "zx-templates": "^0.0.13",
+    "zx-templates": "^0.0.14",
     "zx-verify": "^0.0.2"
   },
   "devDependencies": {
@@ -90,8 +90,9 @@
     "@vue/eslint-config-prettier": "^6.0.0",
     "autoprefixer": "^9.8.6",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-dynamic-import-node": "^2.3.3",
     "compression-webpack-plugin": "^4.0.1",
-    "eslint": "^7.6.0",
+    "eslint": "^7.7.0",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-vue": "^6.2.2",
     "filemanager-webpack-plugin": "^2.0.5",

+ 1 - 1
src/config/static.js

@@ -9,7 +9,7 @@ const mocks = [];
 const files = require.context("../../mock/controller", false, /\.js$/);
 
 files.keys().forEach((key) => {
-  const obj = files(key).default;
+  const obj = files(key);
   mocks.push(...obj);
 });