From 5ecd5f7afd95f6e848ec6516d09290c610794d15 Mon Sep 17 00:00:00 2001
From: liangshichao <290352095@qq.com>
Date: Tue, 8 Jan 2019 19:42:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A6=96=E9=A1=B5header?=
=?UTF-8?q?=E5=92=8Cfooter=E7=9A=84Layout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.eslintrc.js | 13 ++++++-----
.umirc.js | 2 +-
src/assets/common/index.less | 1 +
src/component/common/BasicFooter/index.less | 15 ++++++++++++
src/component/common/BasicFooter/index.tsx | 14 +++++++++++
src/component/common/BasicHeader/index.less | 6 +++++
src/component/common/BasicHeader/index.tsx | 14 +++++++++++
src/layouts/BasicLayout.tsx | 13 -----------
.../index.less} | 14 +++++++++++
src/layouts/BasicLayout/index.tsx | 16 +++++++++++++
.../index.tsx} | 4 ++--
src/layouts/GlobalLayout.tsx | 9 --------
src/layouts/GlobalLayout/index.tsx | 9 ++++++++
src/layouts/TestLayout.tsx | 2 +-
src/layouts/index.tsx | 23 +++++++++++++------
src/models/globalModel.tsx | 4 ++--
src/pages/coderiver/index.tsx | 11 +++++++++
src/pages/display/models/displayModel.tsx | 4 ++--
src/pages/document.ejs | 6 ++---
src/pages/exception/403.tsx | 2 +-
src/pages/exception/404.tsx | 2 +-
src/pages/exception/500.tsx | 2 +-
src/pages/index.tsx | 15 ++++++++++--
src/type/{displayType.d.ts => common.d.ts} | 0
src/{typing.d.ts => type/model.d.ts} | 1 -
tsconfig.json | 7 +++---
26 files changed, 153 insertions(+), 56 deletions(-)
create mode 100644 src/assets/common/index.less
create mode 100644 src/component/common/BasicFooter/index.less
create mode 100644 src/component/common/BasicFooter/index.tsx
create mode 100644 src/component/common/BasicHeader/index.less
create mode 100644 src/component/common/BasicHeader/index.tsx
delete mode 100644 src/layouts/BasicLayout.tsx
rename src/layouts/{BasicLayout.less => BasicLayout/index.less} (53%)
create mode 100644 src/layouts/BasicLayout/index.tsx
rename src/layouts/{DisplayLayout.tsx => DisplayLayout/index.tsx} (58%)
delete mode 100644 src/layouts/GlobalLayout.tsx
create mode 100644 src/layouts/GlobalLayout/index.tsx
create mode 100644 src/pages/coderiver/index.tsx
rename src/type/{displayType.d.ts => common.d.ts} (100%)
rename src/{typing.d.ts => type/model.d.ts} (99%)
diff --git a/.eslintrc.js b/.eslintrc.js
index 6cc0dcf..2b5c539 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -231,7 +231,7 @@ module.exports = {
*/
// 'typescript/no-constant-condition': 2,
- 'typescript/quotemark': [true,"single","avoid-escape","jsx-double"],
+ 'typescript/quotemark': [true, 'single', 'avoid-escape', 'jsx-double'],
'typescript/no-console': 0,
'typescript/ordered-imports': 0,
'typescript/no-namespace': 0,
@@ -259,8 +259,8 @@ module.exports = {
// "public-instence-method"
// ]
// }],
- 'typescript/object-literal-key-quotes': [true,"as-needed"],
- 'typescript/no-trailing-whitespace': [false,"ignore-comments"],
+ 'typescript/object-literal-key-quotes': [true, 'as-needed'],
+ 'typescript/no-trailing-whitespace': [false, 'ignore-comments'],
'typescript/class-name-casing': 2,
/**
@@ -274,6 +274,8 @@ module.exports = {
'react/jsx-sort-prop-types': 0, // 是否排序 prop types
'react/jsx-uses-react': 2, // 组件中中是否用了 react
'react/jsx-uses-vars': 2, // 定义了 jsx component 没有使用
+ 'react/jsx-pascal-case': 1, // 使用jsx作为组件扩展名,采用pascal命名法 引用名采用驼峰命名
+ 'react/jsx-closing-bracket-location': 1, // 组件prop的的对齐风格
'react/no-did-mount-set-state': 0, // 不要在 componentDidMount 里面设置 state
'react/no-did-update-set-state': 0, // 同上
'react/no-multi-comp': 0, // 一个文件里面禁止声明多个 component
@@ -282,6 +284,7 @@ module.exports = {
'react/react-in-jsx-scope': 1, // 查看 jsx 是否引入 react
'react/self-closing-comp': 2, // 检查是否有没有 children 的非子闭合标签
'react/jsx-wrap-multilines': 1, // 不强制 return 的时候,结构的格式
+ 'react/prefer-es6-class': 1, // 使用组件类继承React.Component
'react/sort-comp': [
0,
{
@@ -298,8 +301,6 @@ module.exports = {
],
'react/jsx-indent-props': 0,
-
- 'no-var':0
+ 'no-var': 0,
},
-
};
diff --git a/.umirc.js b/.umirc.js
index fc17709..9498216 100644
--- a/.umirc.js
+++ b/.umirc.js
@@ -2,7 +2,6 @@
import path from 'path';
-
export default {
plugins: [
// ref: https://umijs.org/plugin/umi-plugin-react.html
@@ -57,6 +56,7 @@ export default {
// })
// );
config.resolve.alias.set('src', path.resolve(__dirname, './src'));
+ config.resolve.alias.set('component', path.resolve(__dirname, './src/component'));
// config.module
// .rule('save')
// .test(/\.less$/)
diff --git a/src/assets/common/index.less b/src/assets/common/index.less
new file mode 100644
index 0000000..85f21ea
--- /dev/null
+++ b/src/assets/common/index.less
@@ -0,0 +1 @@
+@footer-border-color:#40aea8;
diff --git a/src/component/common/BasicFooter/index.less b/src/component/common/BasicFooter/index.less
new file mode 100644
index 0000000..7ec1e77
--- /dev/null
+++ b/src/component/common/BasicFooter/index.less
@@ -0,0 +1,15 @@
+@import url('../../../assets/common/index');
+
+.cr-footer {
+ width: 100%;
+ height: 390px;
+ border-top: 4px solid @footer-border-color;
+ background: #fff;
+ :global {
+ .main {
+ width: 1280px;
+ margin: 0 auto;
+ background: #ccc;
+ }
+ }
+}
diff --git a/src/component/common/BasicFooter/index.tsx b/src/component/common/BasicFooter/index.tsx
new file mode 100644
index 0000000..b21c0ca
--- /dev/null
+++ b/src/component/common/BasicFooter/index.tsx
@@ -0,0 +1,14 @@
+import React, { Component } from 'react';
+import styles from './index.less';
+
+export default class BasicHeader extends Component {
+ render() {
+ return (
+
+ );
+ }
+}
diff --git a/src/component/common/BasicHeader/index.less b/src/component/common/BasicHeader/index.less
new file mode 100644
index 0000000..7d9b58b
--- /dev/null
+++ b/src/component/common/BasicHeader/index.less
@@ -0,0 +1,6 @@
+.cr-header {
+ width: 100%;
+ height: 70px;
+ :global {
+ }
+}
diff --git a/src/component/common/BasicHeader/index.tsx b/src/component/common/BasicHeader/index.tsx
new file mode 100644
index 0000000..21abfd7
--- /dev/null
+++ b/src/component/common/BasicHeader/index.tsx
@@ -0,0 +1,14 @@
+import React, { Component } from 'react';
+import styles from './index.less';
+
+export default class BasicHeader extends Component {
+ render() {
+ return (
+
src/pages/index.js and save to reload.
b_ZJrk&SuvnD9gvf@9BCP;yUtNstFw;Cmv
zkq9y`U~eo{Z?~tnOu=(Usp#M##XYJd*}5;-Rh470-#yr!iAYsy3Q^%K>UEu8QA
zX2SAlc;O_{Htc-|AsfFi)mxOw{Aw&`ItT3D9aphEk8>MbGfH@cAFZ_h>TSat5lUOF
z=a>`qt@aLq0bl;$D6wa9e>hexGmGe0b{K8CGf7BdN9)PBvyfdE!A^qRuFT$=|4ql+
zOeexZj^#GbpYL{QKLohL)!RS=l}F3n`~X2Qg9J_#Fob5z0;0GbUwV0ErMO~a^iZ)g
z-m_x5!NGlV!e2~Gj2!1grkqlVICB~a$J