small change

luo0412 · luo0412 · commit 8a73fed44c3c · 2019-04-26T14:31:05.000+08:00
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/business-components/antd-demos/DemoPage.css b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/business-components/antd-demos/DemoPage.css
@@ -1,14 +1,17 @@
-.left-menu{
+.left-menu {
     float: left;
     width: 240px;
     margin-right: -240px;
 }
-.main-contain{
+
+.main-contain {
     float: left;
     width: 100%;
     margin-left: 240px;
     min-height: 700px;
     border-left: solid 1px #009688;
 }
-.main-frame{
+
+.main-frame {
+
 }
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/business-components/antd-demos/components/DemoSelect.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/business-components/antd-demos/components/DemoSelect.js
@@ -206,11 +206,11 @@ class MyComponent extends Component {
 
     render() {
         return (
-            <div>
+            <div className="p-10">
                 <div id="echarts-test" style={{height: "500px", width: "700px"}}/>
             </div>
         )
     }
 }
 
-export default MyComponent;
+export default MyComponent;
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/common-views/Footer.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/common-views/Footer.js
@@ -3,7 +3,7 @@ import "./Footer.css"
 
 const Footer = () =>
     <div className="ant-col-24 app-footer">
-        <span>上海辰华网络技术服务有限公司 All Rights Reserved</span>
+        <span>xxx技术支持公司 All Rights Reserved</span>
     </div>;
 
 export default Footer;
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/common-views/Header.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/common-views/Header.js
@@ -3,7 +3,7 @@ import {Menu, Dropdown, Icon} from 'antd';
 import {Link, withRouter} from "react-router-dom";
 import Cookies from 'js-cookie';
 import myAxios from '../../utils/myAxios'
-import "./Header.css"
+import "./Header.less"
 
 class HeaderMenuWrap extends Component {
     constructor(props) {
@@ -95,13 +95,15 @@ class Header extends Component {
         const userName = userCode ? userCode : '';
         return (
             <div className="header-wrap">
-                <span className="header-title"></span>
-                <div className="tab-wrap"><RightDrop userName={userName} history={this.props.history}/>
-                    <HeaderMenu/>
+                <div className="header-wrap__container">
+                    <span className="header-title"></span>
+                    <div className="tab-wrap"><RightDrop userName={userName} history={this.props.history}/>
+                        <HeaderMenu/>
+                    </div>
                 </div>
             </div>
         );
     }
 }
 
-export default Header;
+export default Header;
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/common-views/Header.less b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/common-views/Header.less
@@ -22,7 +22,15 @@
     height: 80px;
     position: relative;
     background: url("../../assets/url-img/login/header_bg.jpg") no-repeat;
+    width: 100%;
+
+  &__container {
+    width: 1100px;
+    margin: 0 auto;
+  }
+
 }
+
 .header-title{
     color:#bbc9cd;
     font-size: 24px;
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/common-views/LayoutLR.css b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/common-views/LayoutLR.css
@@ -1,17 +1,21 @@
-.main-wrapper{
+.main-wrapper {
     overflow: hidden;
 }
-.left-menu{
-    padding-top: 6px;
+
+.left-menu {
+    /*padding-top: 6px;*/
     float: left;
     width: 240px;
     /*margin-right: -240px;*/
 }
-.main-contain{
+
+.main-contain {
     /*float: left;*/
     margin-left: 244px;
     min-height: 700px;
     border-left: solid 6px #ececec;
 }
-.main-frame{
+
+.main-frame {
+
 }
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/login/Login.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/login/Login.js
@@ -40,11 +40,11 @@ class Login extends Component {
                 <ul className='login-footer'>
                     <li>Powered by ChenHua Technology</li>
                     <li>电话：021-00000000</li>
-                    <li>@2018 上海辰华网络技术服务有限公司</li>
+                    <li>@2018 xxx技术支持公司</li>
                 </ul>
             </div>
         );
     }
 }
 
-export default Login;
+export default Login;
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/password-change/PasswordChange.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/components/password-change/PasswordChange.js
@@ -28,11 +28,11 @@ class PasswordChange extends Component {
                 <ul className='login-footer'>
                     <li>Powered by ChenHua Technology</li>
                     <li>电话：021-00000000</li>
-                    <li>@2018 上海辰华网络技术服务有限公司</li>
+                    <li>@2018 xxx技术支持公司</li>
                 </ul>
             </div>
         );
     }
 }
 
-export default PasswordChange;
+export default PasswordChange;
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/antd.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/antd.js
@@ -1,3 +1,7 @@
+/**
+ * Antd功能
+ */
+
 import { verIE } from "./fns";
 
 const horizontalScroll = e => {
@@ -25,4 +29,4 @@ export const shimAntdTable = () => {
 		$(".ant-table-scroll .ant-table-header,.ant-table-scroll .ant-table-body").each(checkBind("scroll", horizontalScroll));
 		$(".ant-table-fixed-left .ant-table-body-inner,.ant-table-scroll .ant-table-body,.ant-table-fixed-right .ant-table-body-inner").each(checkBind("scroll", verticalScroll));
 	}
-};
+};
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/data-tools.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/data-tools.js
@@ -1,5 +1,21 @@
-export const arrayToTree = function (_data, id, pid, childrenName, itemMap)      //将ID、ParentID这种数据格式转换为树格式
+/**
+ * 将ID、ParentID这种数据格式转换为树格式
+ *
+ * @param _data
+ * @param id
+ * @param pid
+ * @param childrenName
+ * @param itemMap
+ * @returns {Array}
+ */
+export const arrayToTree = function (_data, id, pid, childrenName, itemMap)
 {
+
+    function getKey(key) {
+        if (typeof (key) == "string") key = key.replace(/[.]/g, '').toLowerCase();
+        return key;
+    }
+
     var id = id || "id";
     var pid = pid || "parent_id";
     var childrenName = childrenName || "children";
@@ -27,9 +43,4 @@ export const arrayToTree = function (_data, id, pid, childrenName, itemMap)
         // data[i] = null;
     }
     return targetData;
-
-    function getKey(key) {
-        if (typeof (key) == "string") key = key.replace(/[.]/g, '').toLowerCase();
-        return key;
-    }
-};
+};
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/fns.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/fns.js
@@ -1,5 +1,12 @@
+/**
+ * 1.CASE 大小写
+ */
 export const lower = v => String(v).toLowerCase();
 export const upper = v => String(v).toUpperCase();
+
+/**
+ * 2.TYPE 获取/判断类型
+ */
 export const getType = v => ({}).toString.call(v).slice(8, -1);
 export const isMap = v => getType(v) === "Map";
 export const isSet = v => getType(v) === "Set";
@@ -22,6 +29,10 @@ export const isNum = v =>
 export const isInt = v =>
 	["number", "string"].includes(typeof v) &&
 	/^\s*(?:\+|-)?\s*\d+\s*$/.test(v);
+
+/**
+ * 3. VALIDATE 校验
+ */
 // 若存在类型转换一定要小心,比如:{valueOf:v=>2}=="2"=={toString:v=>2};isFinite会转换类型,Number.isFinite不会转换类型
 export const regCheck = (v, ok, no) => {
 	let check = false;
@@ -47,6 +58,7 @@ export const regCheck = (v, ok, no) => {
 	}
 	return check;
 };
+
 // 邮箱 name@domain name规则:最多64个字符 domain规则:必须为顶级域名,域名后缀2-6个字符
 // http://faqs.org/rfcs/rfc1035.html 域名限制
 // labels:63 octets or less;names:255 octets or less
@@ -104,6 +116,13 @@ export const validator = (rule, value, callback) => {
 	}
 	callback(err);
 };
+
+
+/**
+ *
+ * @param fn
+ * @returns {Promise<any>}
+ */
 export const lazyFn = fn =>
 	// eslint-disable-next-line promise/avoid-new
 	new Promise(
@@ -113,6 +132,7 @@ export const lazyFn = fn =>
 			)
 		)
 	);
+
 export const tryJSON = str => {
 	let res;
 	try {
@@ -134,6 +154,9 @@ export const tryEVAL = str => {
 	}
 	return res;
 };
+
+
+
 export const verIE = () => {
 	// 返回值{ver:IE版本,mod:文档模式版本}, 只能获取11以下的版本信息
 	const isIE = tryEVAL("/*@cc_on !@*/false");
@@ -199,6 +222,8 @@ export const verClient = () => {
 	}
 	return res;
 };
+
+
 export const urlArgs = (v, b) => {
 	// b==false,返回值{args:URL中的参数,hash:URL中的哈希,main:URL中的主体}
 	// b==true,逆向操作
@@ -247,6 +272,8 @@ export const urlArgs = (v, b) => {
 		return obj;
 	}
 };
+
+
 const HTTP = "http://";
 const HTTPS = "https://";
 export const URL_SELECT = {
@@ -338,4 +365,4 @@ export const getArea = division => {
 		}
 	});
 	return LIST.filter(v => v.pid == null);
-};
+};
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/myAxios.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/myAxios.js
@@ -1,10 +1,10 @@
 import axios from 'axios';
 import Qs from 'qs';
 import Cookies from 'js-cookie';
-import {Modal} from 'antd';
+import { Modal } from 'antd';
 
 const myAxios = axios.create({
-    //若地址带有子路径，需要配置此项，否则网址后面加/，以便寻找正确的相对目录'./'，如sdafs.cn/qqaa/
+    // 若地址带有子路径，需要配置此项，否则网址后面加/，以便寻找正确的相对目录'./'，如sdafs.cn/qqaa/
     // baseURL:'/peas',
     timeout: 10000,
     headers: {'X-Requested-With': 'XMLHttpRequest'},
@@ -13,30 +13,35 @@ const myAxios = axios.create({
 });
 
 myAxios.interceptors.request.use(config => {
-    console.log('******before config***', config);
+    // console.log('******before config***', config);
     const token = Cookies.get("CSRFToken");
     Cookies.set("CSRFDefense", token);
     if (config.method === 'post' || config.method === 'put') {
-        //后台接受的参数Content-Type
-        // 默认application/x-www-form-urlencode;charset=utf-8,对应spring注解：@RequestParam,又字段__isFormType标明
-        // application/json;对应spring注解：@RequestBody
+        // 后台接受的参数Content-Type
+        // 默认 application/x-www-form-urlencode;charset=utf-8,
+        //     --> 对应spring注解：@RequestParam, 用字段__isFormType标明
+        // application/json;
+        //     --> 对应spring注解：@RequestBody
         if (config.data['__isFormType']) {
             config.data = Qs.stringify({...config.data});
-        } else{
+        } else {
             config.data = JSON.stringify(config.data);
             config.headers['Content-Type'] = 'application/json;charset=utf-8';
         }
     }
-    console.log('******axios config***', config);
+
+    // console.log('******axios config***', config);
     return config;
 }, error => {
     console.log(error);
     return Promise.reject(error);
 });
 
+
 myAxios.interceptors.response.use(response => {
-    console.log('******axios response***', response);
+    // console.log('******axios response***', response);
     const status = response.status;
+    // 304 权限问题也正常返回，前端处理
     if ((status >= 200 && status < 300) || status === 304) {
         return response.data;
     }
@@ -65,4 +70,4 @@ myAxios.interceptors.response.use(response => {
     }
 });
 
-export default myAxios;
+export default myAxios;
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/regfns.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/regfns.js
@@ -1,13 +1,24 @@
+/**
+ * 查询字符串解析
+ *
+ * eg.
+ * let queryParams1 = queryParams("name=luo0412&ui=2");
+ *      --> { name: "luo0412", ui: "2"}
+ *
+ * @param searchString
+ */
 export const queryParams =  (searchString) => {
     let query = {};
     const reg = new RegExp(/([^=&]+)=([^&]+)/g);
-    searchString.replace(reg,function (full,key,value) {
+    searchString.replace(reg, function (full, key, value) {
         if(query[key] === undefined){
             query[key] = value;
-        }else{
-            if(Object.prototype.toString.call(query[key]) === '[object Array]'){
+        } else {
+
+            // 1)数组追加 2)已存在的值 k-v都保存
+            if (Object.prototype.toString.call(query[key]) === '[object Array]'){
                 query[key].push(value);
-            }else{
+            } else {
                 query[key] = [query[key],value];
             }
         }
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/scriptLoader.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/utils/scriptLoader.js
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/views/index.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/views/index.js
diff --git a/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/views/main.js b/webpack1-react14-antd1-echarts-upload-youka2012-ie8-spa/src/views/main.js

Original file line number	Diff line number	Diff line change
`@@ -206,11 +206,11 @@ class MyComponent extends Component {`
`206`	`206`
`207`	`207`	`render() {`
`208`	`208`	`return (`
`209`		`- <div>`
	`209`	`+ <div className="p-10">`
`210`	`210`	`<div id="echarts-test" style={{height: "500px", width: "700px"}}/>`
`211`	`211`	`</div>`
`212`	`212`	`)`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
`216`		`-export default MyComponent;`
	`216`	`+export default MyComponent;`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@ class Login extends Component {`
`40`	`40`	`<ul className='login-footer'>`
`41`	`41`	`<li>Powered by ChenHua Technology</li>`
`42`	`42`	`<li>电话：021-00000000</li>`
`43`		`- <li>@2018 上海辰华网络技术服务有限公司</li>`
	`43`	`+ <li>@2018 xxx技术支持公司</li>`
`44`	`44`	`</ul>`
`45`	`45`	`</div>`
`46`	`46`	`);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`-export default Login;`
	`50`	`+export default Login;`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ class PasswordChange extends Component {`
`28`	`28`	`<ul className='login-footer'>`
`29`	`29`	`<li>Powered by ChenHua Technology</li>`
`30`	`30`	`<li>电话：021-00000000</li>`
`31`		`- <li>@2018 上海辰华网络技术服务有限公司</li>`
	`31`	`+ <li>@2018 xxx技术支持公司</li>`
`32`	`32`	`</ul>`
`33`	`33`	`</div>`
`34`	`34`	`);`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-export default PasswordChange;`
	`38`	`+export default PasswordChange;`