- onEnter(Home, props)}
- />
- onEnter(Features, props)}
- />
- onEnter(Test, props)}
- />
- onEnter(TestClass, props)}
- />
+ onEnter(Home, props)} />
+ onEnter(Features, props)} />
+ onEnter(Test, props)} />
+ onEnter(TestClass, props)} />
@@ -110,6 +99,6 @@ function RootRouterContainer(props) {
export default connect(
state => ({}),
dispatch => ({
- actions: {}
- })
+ actions: {},
+ }),
)(RootRouterContainer);
diff --git a/src/global.d.ts b/src/global.d.ts
index c20e0a53..e69de29b 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -1 +0,0 @@
-declare const axios: any;
diff --git a/src/index.tsx b/src/index.tsx
index cfd58156..aeb0a5c3 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,8 +1,8 @@
/** APP入口 **/
import "core-js/stable";
import "regenerator-runtime/runtime";
-import React from "react";
-import ReactDOM from "react-dom";
+import * as React from "react";
+import * as ReactDOM from "react-dom";
import * as serviceWorker from "./serviceWorker";
import Root from "./root";
diff --git a/src/models/app.ts b/src/models/app.ts
index 147b1eb3..b918f1c4 100644
--- a/src/models/app.ts
+++ b/src/models/app.ts
@@ -1,27 +1,34 @@
+import { prototype } from "stream";
+
/**
* 基本Model app.js, 在src/store/index.js中被挂载到store上,命名为app
* 可用于存放通用信息,比如用户数据、角色、权限、省市区等通用数据
* **/
+interface IParams {
+ id?: string | number;
+ [propName: string]: any;
+}
+
export default {
/** store数据 **/
state: {
- userinfo: null // 用户信息
+ userinfo: null, // 用户信息
},
/** reducers **/
reducers: {
- setUserInfo(state, payload) {
+ setUserInfo(state: object, payload: object) {
return Object.assign({}, state, {
- userinfo: payload
+ userinfo: payload,
});
- }
+ },
},
/** actions 可以是一个对象,也可以是一个函数,函数的第1个参数自动被注入dispatch **/
effects: {
// 模拟获取用户信息
- async getUserinfo(params = {}) {
+ async getUserinfo(params: IParams = {}) {
const user = { id: params.id, username: "admin" };
this.setUserInfo(user);
return user;
- }
- }
+ },
+ },
};
diff --git a/src/models/test.js b/src/models/test.ts
similarity index 72%
rename from src/models/test.js
rename to src/models/test.ts
index 424c3a16..b6a14e4a 100644
--- a/src/models/test.js
+++ b/src/models/test.ts
@@ -6,34 +6,39 @@
import { message } from "antd";
import Server from "../util/server"; // 自己封装的异步请求方法
+interface IParams {
+ id?: string | number;
+ [propName: string]: any;
+}
+
export default {
/** store数据 **/
state: {
count: 0, // 测试数字
- fetchvalue: [] // 异步请求的测试数据
+ fetchvalue: [], // 异步请求的测试数据
},
/** reducers **/
reducers: {
- setCount(state, payload) {
+ setCount(state: object, payload: number) {
return Object.assign({}, state, {
- count: payload
+ count: payload,
});
},
- setFetchValue(state, payload) {
+ setFetchValue(state: object, payload: Array
) {
return Object.assign({}, state, {
- fetchvalue: payload
+ fetchvalue: payload,
});
- }
+ },
},
/** actions **/
- effects: dispatch => ({
+ effects: (dispatch: Function) => ({
// 测试 - 数字加1
- onTestAdd(params) {
+ onTestAdd(params: number) {
this.setCount(params + 1); // 这里会指向上面reducers中的setCount
},
// 测试 - 异步请求
- async serverFetch(params = {}) {
+ async serverFetch(params: IParams = {}) {
try {
const res = await Server.newServer("url.ajax", params, "post");
if (res && res.data.status === 200) {
@@ -43,6 +48,6 @@ export default {
} catch (e) {
message.error("网络错误", 1);
}
- }
- })
+ },
+ }),
};
diff --git a/src/root/index.tsx b/src/root/index.tsx
index 05b31c51..7c9ce7d0 100644
--- a/src/root/index.tsx
+++ b/src/root/index.tsx
@@ -5,7 +5,7 @@
* */
/** 所需的各种插件 **/
-import React from "react";
+import * as React from "react";
import { Provider } from "react-redux";
import store from "../store";
import Routers from "../container/routers";
diff --git a/src/store/index.ts b/src/store/index.ts
index 49e2c30b..16efc3f3 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -7,6 +7,6 @@ import test from "../models/test";
export default init({
models: {
app, // 这里的命名很重要,即这个模块的名字
- test
- }
+ test,
+ },
});
diff --git a/src/util/server.ts b/src/util/server.ts
index 7fe55ccc..f6beeb7a 100644
--- a/src/util/server.ts
+++ b/src/util/server.ts
@@ -6,7 +6,7 @@
import axios, { Method } from "axios";
export default class ApiService {
- static newServer(url: string, bodyObj: object = {}, method: Method = "post") {
+ static newServer(url: string, bodyObj: object = {}, method: Method = "post"): Promise {
return axios({
url,
method,
diff --git a/src/util/tools.ts b/src/util/tools.ts
index c964e7e8..438aae41 100644
--- a/src/util/tools.ts
+++ b/src/util/tools.ts
@@ -5,25 +5,21 @@ const tools = {
保留N位小数
最终返回的是字符串
若转换失败,返回参数原值
- @params
- str - 数字或字符串
- x - 保留几位小数点
+ @param str 字符串或数字
+ @param x 保留几位小数
*/
- pointX(str: string | number, x: number = 0) {
- if (!str && str !== 0) {
- return str;
- }
+ pointX(str: string | number, x: number = 0): string {
const temp = Number(str);
if (temp === 0) {
return temp.toFixed(x);
}
- return temp ? temp.toFixed(x) : str;
+ return temp ? temp.toFixed(x) : String(str);
},
/**
去掉字符串两端空格
*/
- trim(str: string) {
+ trim(str: string): string {
const reg = /^\s*|\s*$/g;
return str.replace(reg, "");
},
@@ -33,7 +29,7 @@ const tools = {
如:将123456转换为1****6,最多将字符串中间6个字符变成*
如果字符串长度小于等于2,将不会有效果
*/
- addMosaic(str: string | number) {
+ addMosaic(str: string | number): string {
const s = String(str);
const lenth = s.length;
const howmuch = (() => {
@@ -59,7 +55,7 @@ const tools = {
字符串加密
简单的加密方法
*/
- compile(code: string) {
+ compile(code: string): string {
let c = String.fromCharCode(code.charCodeAt(0) + code.length);
for (let i = 1; i < code.length; i++) {
c += String.fromCharCode(code.charCodeAt(i) + code.charCodeAt(i - 1));
@@ -71,7 +67,7 @@ const tools = {
字符串解谜
对应上面的字符串加密方法
*/
- uncompile(code: string) {
+ uncompile(code: string): string {
let c = String.fromCharCode(code.charCodeAt(0) - code.length);
for (let i = 1; i < code.length; i++) {
c += String.fromCharCode(code.charCodeAt(i) - c.charCodeAt(i - 1));
diff --git a/tsconfig.json b/tsconfig.json
index 4b18fd5f..e6a1a4c1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,8 +4,10 @@
"sourceMap": true,
"noImplicitAny": true,
"module": "commonjs",
+ "allowJs": true,
"target": "es5",
- "jsx": "react"
+ "jsx": "react",
+ "allowSyntheticDefaultImports": true
},
"include": ["./src/**/*"]
}
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
index b77f991f..28b6579f 100644
--- a/webpack.dev.config.js
+++ b/webpack.dev.config.js
@@ -12,7 +12,6 @@ module.exports = {
entry: [
"webpack-hot-middleware/client?reload=true&path=/__webpack_hmr", // webpack热更新插件,就这么写
"./src/index.tsx", // 项目入口
- "./dll/vendor.dll.js",
],
output: {
path: __dirname + "/", // 将打包好的文件放在此路径下,dev模式中,只会在内存中存在,不会真正的打包到此路径
@@ -105,14 +104,6 @@ module.exports = {
PUBLIC_URL: PUBLIC_PATH,
}),
}),
- new webpack.DllReferencePlugin({
- context: __dirname,
- /**
- 下面这个地址对应webpack.dll.config.js中生成的那个json文件的路径
- 这样webpack打包时,就先直接去这个json文件中把那些预编译的资源弄进来
- **/
- manifest: require("./dll/vendor-manifest.json"),
- }),
new HappyPack({
loaders: ["babel-loader"],
}),
@@ -123,7 +114,6 @@ module.exports = {
template: "./public/index.ejs", //html模板路径
inject: true, // 是否将js放在body的末尾
templateParameters: {
- dll: "",
manifest: "",
},
}),
diff --git a/webpack.dll.config.js b/webpack.dll.config.js
deleted file mode 100644
index f792a219..00000000
--- a/webpack.dll.config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const { dependencies } = require('./package.json');
-module.exports = {
- mode: 'development',
- entry: {
- vendor: Object.keys(dependencies),
- },
- output: {
- path: path.join(__dirname, 'dll'), // 生成的dll.js路径,我是存在/build/dev中
- filename: '[name].dll.js', // 生成的文件名字
- library: '[name]_library', // 生成文件的一些映射关系,与下面DllPlugin中配置对应
- },
- plugins: [
- // 使用DllPlugin插件编译上面配置的NPM包
- new webpack.DllPlugin({
- // 会生成一个json文件,里面是关于dll.js的一些配置信息
- path: path.join(__dirname, 'dll', '[name]-manifest.json'),
- name: '[name]_library', // 与上面output中配置对应
- context: __dirname,
- }),
- ],
-};