修改部分项目目录

devoutDisciple · devoutDisciple · commit 138a199ded3d · 2018-10-09T21:48:08.000+08:00
diff --git a/appcache.manifest b/appcache.manifest
@@ -0,0 +1,15 @@
+CACHE MANIFEST
+#version 1.0.0
+
+CACHE:
+#css
+#js
+./dist/lib.dll.js
+
+#img
+https://reactjs.org/favicon.ico
+
+NETWORK:
+*
+FALLBACK:
+  /404.html
diff --git a/dist/app.0.css b/dist/app.0.css
diff --git a/dist/appcache.manifest b/dist/appcache.manifest
@@ -0,0 +1,15 @@
+CACHE MANIFEST
+#version 1.0.0
+
+CACHE:
+#css
+#js
+./dist/lib.dll.js
+
+#img
+https://reactjs.org/favicon.ico
+
+NETWORK:
+*
+FALLBACK:
+  /404.html
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/dist/index.html b/dist/index.html
@@ -1,15 +1,16 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" manifest="appcache.manifest">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>react-demo</title>
-    <link rel='icon' href='https://reactjs.org/favicon.ico'>
+    <link rel="icon" href="https://reactjs.org/favicon.ico">
     <script src="./lib.dll.js"></script>
     <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.8&key=61c862deb5927dba993ae57bc14250d6"></script>
-</head>
+    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.1.0/socket.io.js"></script> -->
+<link href="/app.0.css?23ed2a3bf57f7d7f8f56" rel="stylesheet"></head>
 <body>
     <div id="root"></div>
-</body>
+<script type="text/javascript" src="/bundle.js?23ed2a3bf57f7d7f8f56"></script></body>
 </html>
diff --git a/dist/lib.dll.js b/dist/lib.dll.js
diff --git a/dist/manifest.json b/dist/manifest.json
diff --git a/index.html b/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" manifest="appcache.manifest">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/package.json b/package.json
@@ -6,9 +6,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start:dev": "npm run start",
-    "start:prod": "npm run product",
     "start": "webpack-dev-server --progress --profile --colors --config ./webpack.config.dev.js --mode development",
-    "product": "webpack-dev-server --progress --profile --colors --config ./webpack.config.prod.js --mode production",
     "build:prod": "webpack -p --config ./webpack.config.dev.js --mode production --progress --profile --colors",
     "build:dev": "webpack --progress --profile --colors --config ./webpack.config.dev.js --mode development",
     "build:test": "npm run build:dev",
diff --git a/src/component/canvas/index.js b/src/component/canvas/index.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import {inject, observer} from 'mobx-react';
+import './index.less';
+import CanvasStore from '../../stores/canvas/CanvasStore';
+
+@inject('CanvasStore')
+@observer
+export default class Map extends React.Component{
+
+    canvasStore: CanvasStore = null;
+    jsplumbInstance : any = null;
+
+    constructor(props) {
+        super(props);
+        this.canvasStore = props.CanvasStore;
+    }
+
+
+    render() {
+
+        return (
+            <div className='canvas'>
+                canvas
+            </div>
+        );
+    }
+}
diff --git a/src/component/canvas/index.less b/src/component/canvas/index.less
diff --git a/src/component/flow/index.less b/src/component/flow/index.less
@@ -17,6 +17,10 @@
         position: absolute;
         background: red;
     }
+    #test1{
+        left: 836px;
+        top: 367px;
+    }
     #test2{
         background: blue;
         left: 300px;
diff --git a/src/config/menuList.js b/src/config/menuList.js
@@ -19,6 +19,12 @@ const list = [
 
         ]
     },
+    {
+        key: 'canvas',
+        label: 'canvas',
+        icon: 'alipay-circle',
+        path: '/canvas'
+    },
     {
         key: 'map',
         label: '地图',
diff --git a/src/config/stateConfig.js b/src/config/stateConfig.js
@@ -1,6 +1,6 @@
 // 菜单状态
 export const menuState = {
-    defaultSelectedKeys: ['chat'],
+    defaultSelectedKeys: ['form'],
     defaultOpenKeys: ['ant-design'],
     mode: 'inline',
     theme: 'dark',
@@ -22,6 +22,6 @@ export const formItemLineLayout = {
 
 export const socketUrl = 'ws://localhost:3002';
 
-export const INIT_ROUTER = '/chat';
+export const INIT_ROUTER = '/antd/form';
 
 
diff --git a/src/router/ChunkRouter.js b/src/router/ChunkRouter.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { Route, Redirect} from 'react-router-dom';
 import Form from '$component/antd/Form/index';
 import Other from '$component/antd/Other/index';
+import Canvas from '../component/canvas/index';
 import Map from '$component/Map/Map';
 import Dnd from '$component/dnd/index';
 import Flow from '$component/flow/index';
@@ -16,6 +17,7 @@ const ChunkRoute = () => {
             <Redirect from="/" to={INIT_ROUTER}/>
             <Route path="/antd/form" component={Form}></Route>
             <Route path="/antd/other" component={Other}></Route>
+            <Route path="/canvas" component={Canvas}></Route>
             <Route path="/map" component={Map}></Route>
             <Route path="/flow" component={Flow}></Route>
             <Route path="/dnd" component={Dnd}></Route>
diff --git a/src/stores/canvas/CanvasStore.js b/src/stores/canvas/CanvasStore.js
@@ -0,0 +1,22 @@
+/*
+ * @Author: zhangzhen
+ * @Date: 2018-10-09 21:45:14
+ * @Last Modified by: zhangzhen
+ * @Last Modified time: 2018-10-09 21:45:45
+ */
+import {
+    observable,
+    action
+} from 'mobx';
+
+class CanvasStore {
+    @observable.ref
+    hello = 1;
+
+
+    @action
+    setCanvas() {
+    }
+
+}
+export default new CanvasStore();
diff --git a/src/stores/createStore.js b/src/stores/createStore.js
@@ -6,6 +6,7 @@ import DndStore from './dnd/DndStore';
 import FlowStore from './flow/FlowStore';
 import D3Store from './d3/D3Store';
 import ChatStore from './chat/ChatStore';
+import CanvasStore from './canvas/CanvasStore';
 
 export const createStore = () => {
     return {
@@ -16,6 +17,7 @@ export const createStore = () => {
         DndStore,
         FlowStore,
         D3Store,
-        ChatStore
+        ChatStore,
+        CanvasStore
     };
 };
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
@@ -205,7 +205,8 @@ module.exports = (env, argv) => {
 		},
 		plugins: [
 			COMMON_0_CSS,
-			COMMON_1_CSS,
+            COMMON_1_CSS,
+            COMMON_0_LESS,
 			COMMON_1_LESS,
 			new HappyPack({
 				//如何处理 用法和loader 的配置一样
