Merge branch 'dev'

Author: rywaroy

README.md

@@ -1,6 +1,6 @@
 # crui
 
-[![Build Status](https://www.travis-ci.org/rywaroy/crui.svg?branch=master)](https://www.travis-ci.org/rywaroy/crui)　[![Version](https://img.shields.io/badge/npm-v2.2.1-blue.svg)](https://www.npmjs.com/package/crui)
+[![Build Status](https://www.travis-ci.org/rywaroy/crui.svg?branch=master)](https://www.travis-ci.org/rywaroy/crui)　[![Version](https://img.shields.io/badge/npm-v2.6.0-blue.svg)](https://www.npmjs.com/package/crui)
 
 > react 代码、模板快速生成工具
 
@@ -55,4 +55,6 @@ npm run start & npx crui
 
 * [文档生成](docs/document.md)
 
+* [mock数据](docs/mockData.md)
+
 * [配置](docs/configlist.md)

docs/images/mockData_01.jpg

@@ -0,0 +1,34 @@
+# mock数据
+
+基于mockjs，自动生成mock对象
+
+![](images/mockData_01.jpg)
+
+提供的功能：
+
+1. 自定义操作，添加mock对象属性，支持对象、数组
+2. 导入json，直接生成mock对象（自定义主键）
+3. 支持mock对象、mock数据的同步展示
+
+## 导入json
+
+![](images/mockData_02.jpg)
+
+添加json解析，可以配置主键，以主键为key生成mock对象，简便操作，可以配合table的columns对象使用
+
+## 生成js
+
+![](images/mockData_03.jpg)
+
+可设置
+
+1. api
+2. method
+3. mock文件夹/文件（选择文件夹还需设置文件，可生成对应文件）
+4. 如果需要services方法，还可以设置请求方法及请求方法及请求函数名
+
+## 扩展功能
+
+![](images/mockData_04.jpg)
+
+在可视化搭建中，table组件添加了mock可选配置，启用mock功能会根据table所配置的columns对象中dataIndex属性来自动生成mock对象。默认生成在mock/api.js中。

docs/images/mockData_02.jpg

@@ -1,6 +1,6 @@
 {
   "name": "crui",
-  "version": "2.5.2",
+  "version": "2.6.0",
   "description": "react代码快速生成工具",
   "scripts": {
     "start": "umi dev",
@@ -10,7 +10,7 @@
     "precommit": "lint-staged",
     "commit": "git-cz",
     "dev:watch": "NODE_ENV=development npx nodemon server/index.js",
-    "dev": "ts-node server/index.ts",
+    "dev": "NODE_ENV=development node lib/index.js",
     "build:server": "tsc -p tsconfig.server.json"
   },
   "bin": {
@@ -23,6 +23,7 @@
     "ahooks": "^2.5.0",
     "antd": "^3.19.5",
     "axios": "^0.19.0",
+    "behooks": "^0.7.1",
     "chalk": "^4.0.0",
     "clipboard": "^2.0.4",
     "commander": "^4.0.1",
@@ -38,6 +39,7 @@
     "koa-router": "^7.4.0",
     "koa-static": "^5.0.0",
     "loadsh": "^0.0.4",
+    "mockjs": "^1.1.0",
     "prettier": "^2.0.2",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
@@ -54,6 +56,7 @@
     "@types/koa-cors": "^0.0.0",
     "@types/koa-router": "^7.0.35",
     "@types/koa-static": "^4.0.1",
+    "@types/mockjs": "^1.0.3",
     "@types/node": "^14.0.13",
     "@types/socket.io": "^2.1.8",
     "@types/socket.io-client": "^1.4.33",

docs/images/mockData_03.jpg

@@ -7,11 +7,12 @@ export default async function isJsOrFolder(ctx: IContext) {
     if (fs.existsSync(base)) {
         const stat = fs.statSync(base);
         if (stat.isDirectory()) {
-            ctx.success(200, '验证成功', null);
+            ctx.success(200, '验证成功', { type: 'folder' });
         }
         if (stat.isFile()) {
-            if (path.extname(base) === '.js' || path.extname(base) === '.jsx') {
-                ctx.success(200, '验证成功', null);
+            const extname = ['.js', '.jsx', '.ts', '.tsx'];
+            if (extname.indexOf(path.extname(base)) > -1) {
+                ctx.success(200, '验证成功', { type: path.extname(base) });
             } else {
                 ctx.error(-1, '不是js文件', null);
             }

docs/images/mockData_04.jpg

@@ -7,7 +7,7 @@ export default async function isjs(ctx: IContext) {
     if (fs.existsSync(base)) {
         const stat = fs.statSync(base);
         if (stat.isFile()) {
-            if (path.extname(base) === '.js' || path.extname(base) === '.jsx') {
+            if (path.extname(base) === '.js' || path.extname(base) === '.jsx' || path.extname(base) === '.ts' || path.extname(base) === '.tsx') {
                 ctx.success(200, '验证成功', null);
             } else {
                 ctx.error(-1, '不是js文件', null);

docs/mockData.md

@@ -13,7 +13,7 @@ interface IBody {
     tabWith: number;
 }
 
-export default function preview(ctx: IContext) {
+export default function create(ctx: IContext) {
     // @ts-ignore for travis
     const { materials, url, name, namespace, tabWith }: IBody = ctx.request.body;
 
@@ -26,6 +26,7 @@ export default function preview(ctx: IContext) {
             name,
             namespace,
             tabWith,
+            isCreate: true,
         });
         const files = generator.create();
         Object.keys(files).forEach(item => {