正在显示
10 个修改的文件
包含
24 行增加
和
208 行删除
1 | -import moment from 'moment'; | ||
2 | -import React from 'react'; | ||
3 | -import nzh from 'nzh/cn'; | ||
4 | -import { parse, stringify } from 'qs'; | ||
5 | - | ||
6 | -export function fixedZero(val) { | ||
7 | - return val * 1 < 10 ? `0${val}` : val; | ||
8 | -} | ||
9 | - | ||
10 | -export function getTimeDistance(type) { | ||
11 | - const now = new Date(); | ||
12 | - const oneDay = 1000 * 60 * 60 * 24; | ||
13 | - | ||
14 | - if (type === 'today') { | ||
15 | - now.setHours(0); | ||
16 | - now.setMinutes(0); | ||
17 | - now.setSeconds(0); | ||
18 | - return [moment(now), moment(now.getTime() + (oneDay - 1000))]; | ||
19 | - } | ||
20 | - | ||
21 | - if (type === 'week') { | ||
22 | - let day = now.getDay(); | ||
23 | - now.setHours(0); | ||
24 | - now.setMinutes(0); | ||
25 | - now.setSeconds(0); | ||
26 | - | ||
27 | - if (day === 0) { | ||
28 | - day = 6; | ||
29 | - } else { | ||
30 | - day -= 1; | ||
31 | - } | ||
32 | - | ||
33 | - const beginTime = now.getTime() - day * oneDay; | ||
34 | - | ||
35 | - return [moment(beginTime), moment(beginTime + (7 * oneDay - 1000))]; | ||
36 | - } | ||
37 | - | ||
38 | - if (type === 'month') { | ||
39 | - const year = now.getFullYear(); | ||
40 | - const month = now.getMonth(); | ||
41 | - const nextDate = moment(now).add(1, 'months'); | ||
42 | - const nextYear = nextDate.year(); | ||
43 | - const nextMonth = nextDate.month(); | ||
44 | - | ||
45 | - return [ | ||
46 | - moment(`${year}-${fixedZero(month + 1)}-01 00:00:00`), | ||
47 | - moment(moment(`${nextYear}-${fixedZero(nextMonth + 1)}-01 00:00:00`).valueOf() - 1000), | ||
48 | - ]; | ||
49 | - } | ||
50 | - | ||
51 | - const year = now.getFullYear(); | ||
52 | - return [moment(`${year}-01-01 00:00:00`), moment(`${year}-12-31 23:59:59`)]; | ||
53 | -} | ||
54 | - | ||
55 | -export function getPlainNode(nodeList, parentPath = '') { | ||
56 | - const arr = []; | ||
57 | - nodeList.forEach(node => { | ||
58 | - const item = node; | ||
59 | - item.path = `${parentPath}/${item.path || ''}`.replace(/\/+/g, '/'); | ||
60 | - item.exact = true; | ||
61 | - if (item.children && !item.component) { | ||
62 | - arr.push(...getPlainNode(item.children, item.path)); | ||
63 | - } else { | ||
64 | - if (item.children && item.component) { | ||
65 | - item.exact = false; | ||
66 | - } | ||
67 | - arr.push(item); | ||
68 | - } | ||
69 | - }); | ||
70 | - return arr; | ||
71 | -} | ||
72 | - | ||
73 | -export function digitUppercase(n) { | ||
74 | - return nzh.toMoney(n); | ||
75 | -} | ||
76 | - | ||
77 | -function getRelation(str1, str2) { | ||
78 | - if (str1 === str2) { | ||
79 | - console.warn('Two path are equal!'); // eslint-disable-line | ||
80 | - } | ||
81 | - const arr1 = str1.split('/'); | ||
82 | - const arr2 = str2.split('/'); | ||
83 | - if (arr2.every((item, index) => item === arr1[index])) { | ||
84 | - return 1; | ||
85 | - } | ||
86 | - if (arr1.every((item, index) => item === arr2[index])) { | ||
87 | - return 2; | ||
88 | - } | ||
89 | - return 3; | ||
90 | -} | ||
91 | - | ||
92 | -function getRenderArr(routes) { | ||
93 | - let renderArr = []; | ||
94 | - renderArr.push(routes[0]); | ||
95 | - for (let i = 1; i < routes.length; i += 1) { | ||
96 | - // 去重 | ||
97 | - renderArr = renderArr.filter(item => getRelation(item, routes[i]) !== 1); | ||
98 | - // 是否包含 | ||
99 | - const isAdd = renderArr.every(item => getRelation(item, routes[i]) === 3); | ||
100 | - if (isAdd) { | ||
101 | - renderArr.push(routes[i]); | ||
102 | - } | ||
103 | - } | ||
104 | - return renderArr; | ||
105 | -} | ||
106 | - | ||
107 | -/** | ||
108 | - * Get router routing configuration | ||
109 | - * { path:{name,...param}}=>Array<{name,path ...param}> | ||
110 | - * @param {string} path | ||
111 | - * @param {routerData} routerData | ||
112 | - */ | ||
113 | -export function getRoutes(path, routerData) { | ||
114 | - let routes = Object.keys(routerData).filter( | ||
115 | - routePath => routePath.indexOf(path) === 0 && routePath !== path | ||
116 | - ); | ||
117 | - // Replace path to '' eg. path='user' /user/name => name | ||
118 | - routes = routes.map(item => item.replace(path, '')); | ||
119 | - // Get the route to be rendered to remove the deep rendering | ||
120 | - const renderArr = getRenderArr(routes); | ||
121 | - // Conversion and stitching parameters | ||
122 | - const renderRoutes = renderArr.map(item => { | ||
123 | - const exact = !routes.some(route => route !== item && getRelation(route, item) === 1); | ||
124 | - return { | ||
125 | - exact, | ||
126 | - ...routerData[`${path}${item}`], | ||
127 | - key: `${path}${item}`, | ||
128 | - path: `${path}${item}`, | ||
129 | - }; | ||
130 | - }); | ||
131 | - return renderRoutes; | ||
132 | -} | ||
133 | - | ||
134 | -export function getPageQuery() { | ||
135 | - return parse(window.location.href.split('?')[1]); | ||
136 | -} | ||
137 | - | ||
138 | -export function getQueryPath(path = '', query = {}) { | ||
139 | - const search = stringify(query); | ||
140 | - if (search.length) { | ||
141 | - return `${path}?${search}`; | ||
142 | - } | ||
143 | - return path; | ||
144 | -} | ||
145 | - | ||
146 | -/* eslint no-useless-escape:0 */ | ||
147 | -const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/; | ||
148 | - | ||
149 | -export function isUrl(path) { | ||
150 | - return reg.test(path); | ||
151 | -} | ||
152 | - | ||
153 | -export function formatWan(val) { | ||
154 | - const v = val * 1; | ||
155 | - if (!v || Number.isNaN(v)) return ''; | ||
156 | - | ||
157 | - let result = val; | ||
158 | - if (val > 10000) { | ||
159 | - result = Math.floor(val / 10000); | ||
160 | - result = ( | ||
161 | - <span> | ||
162 | - {result} | ||
163 | - <span | ||
164 | - style={{ | ||
165 | - position: 'relative', | ||
166 | - top: -2, | ||
167 | - fontSize: 14, | ||
168 | - fontStyle: 'normal', | ||
169 | - marginLeft: 2, | ||
170 | - }} | ||
171 | - > | ||
172 | - 万 | ||
173 | - </span> | ||
174 | - </span> | ||
175 | - ); | ||
176 | - } | ||
177 | - return result; | ||
178 | -} | ||
179 | - | ||
180 | -// 给官方演示站点用,用于关闭真实开发环境不需要使用的特性 | ||
181 | -export function isAntdPro() { | ||
182 | - return window.location.hostname === 'preview.pro.ant.design'; | ||
183 | -} |
@@ -15,8 +15,6 @@ | @@ -15,8 +15,6 @@ | ||
15 | "antd": "^3.10.9", | 15 | "antd": "^3.10.9", |
16 | "dva": "^2.4.0", | 16 | "dva": "^2.4.0", |
17 | "moment": "^2.22.2", | 17 | "moment": "^2.22.2", |
18 | - "nzh": "^1.0.3", | ||
19 | - "qs": "^6.6.0", | ||
20 | "react": "^16.6.3", | 18 | "react": "^16.6.3", |
21 | "umi-request": "^1.0.0" | 19 | "umi-request": "^1.0.0" |
22 | }, | 20 | }, |
@@ -133,6 +133,6 @@ function postRule(req, res, u, b) { | @@ -133,6 +133,6 @@ function postRule(req, res, u, b) { | ||
133 | } | 133 | } |
134 | 134 | ||
135 | export default { | 135 | export default { |
136 | - 'GET /api/rule': getRule, | ||
137 | - 'POST /api/rule': postRule, | 136 | + 'GET /api/BLOCK_NAME': getRule, |
137 | + 'POST /api/BLOCK_NAME': postRule, | ||
138 | }; | 138 | }; |
@@ -21,7 +21,7 @@ import { | @@ -21,7 +21,7 @@ import { | ||
21 | Steps, | 21 | Steps, |
22 | Radio, | 22 | Radio, |
23 | } from 'antd'; | 23 | } from 'antd'; |
24 | -import StandardTable from '@/components/StandardTable'; | 24 | +import StandardTable from './components/StandardTable'; |
25 | 25 | ||
26 | import styles from './style.less'; | 26 | import styles from './style.less'; |
27 | 27 | ||
@@ -272,8 +272,8 @@ class UpdateForm extends PureComponent { | @@ -272,8 +272,8 @@ class UpdateForm extends PureComponent { | ||
272 | } | 272 | } |
273 | 273 | ||
274 | /* eslint react/no-multi-comp:0 */ | 274 | /* eslint react/no-multi-comp:0 */ |
275 | -@connect(({ rule, loading }) => ({ | ||
276 | - rule, | 275 | +@connect(({ BLOCK_NAME_CAMEL_CASE, loading }) => ({ |
276 | + BLOCK_NAME_CAMEL_CASE, | ||
277 | loading: loading.models.rule, | 277 | loading: loading.models.rule, |
278 | })) | 278 | })) |
279 | @Form.create() | 279 | @Form.create() |
@@ -351,7 +351,7 @@ class TableList extends PureComponent { | @@ -351,7 +351,7 @@ class TableList extends PureComponent { | ||
351 | componentDidMount() { | 351 | componentDidMount() { |
352 | const { dispatch } = this.props; | 352 | const { dispatch } = this.props; |
353 | dispatch({ | 353 | dispatch({ |
354 | - type: 'rule/fetch', | 354 | + type: 'BLOCK_NAME_CAMEL_CASE/fetch', |
355 | }); | 355 | }); |
356 | } | 356 | } |
357 | 357 | ||
@@ -376,7 +376,7 @@ class TableList extends PureComponent { | @@ -376,7 +376,7 @@ class TableList extends PureComponent { | ||
376 | } | 376 | } |
377 | 377 | ||
378 | dispatch({ | 378 | dispatch({ |
379 | - type: 'rule/fetch', | 379 | + type: 'BLOCK_NAME_CAMEL_CASE/fetch', |
380 | payload: params, | 380 | payload: params, |
381 | }); | 381 | }); |
382 | }; | 382 | }; |
@@ -388,7 +388,7 @@ class TableList extends PureComponent { | @@ -388,7 +388,7 @@ class TableList extends PureComponent { | ||
388 | formValues: {}, | 388 | formValues: {}, |
389 | }); | 389 | }); |
390 | dispatch({ | 390 | dispatch({ |
391 | - type: 'rule/fetch', | 391 | + type: 'BLOCK_NAME_CAMEL_CASE/fetch', |
392 | payload: {}, | 392 | payload: {}, |
393 | }); | 393 | }); |
394 | }; | 394 | }; |
@@ -408,7 +408,7 @@ class TableList extends PureComponent { | @@ -408,7 +408,7 @@ class TableList extends PureComponent { | ||
408 | switch (e.key) { | 408 | switch (e.key) { |
409 | case 'remove': | 409 | case 'remove': |
410 | dispatch({ | 410 | dispatch({ |
411 | - type: 'rule/remove', | 411 | + type: 'BLOCK_NAME_CAMEL_CASE/remove', |
412 | payload: { | 412 | payload: { |
413 | key: selectedRows.map(row => row.key), | 413 | key: selectedRows.map(row => row.key), |
414 | }, | 414 | }, |
@@ -448,7 +448,7 @@ class TableList extends PureComponent { | @@ -448,7 +448,7 @@ class TableList extends PureComponent { | ||
448 | }); | 448 | }); |
449 | 449 | ||
450 | dispatch({ | 450 | dispatch({ |
451 | - type: 'rule/fetch', | 451 | + type: 'BLOCK_NAME_CAMEL_CASE/fetch', |
452 | payload: values, | 452 | payload: values, |
453 | }); | 453 | }); |
454 | }); | 454 | }); |
@@ -470,7 +470,7 @@ class TableList extends PureComponent { | @@ -470,7 +470,7 @@ class TableList extends PureComponent { | ||
470 | handleAdd = fields => { | 470 | handleAdd = fields => { |
471 | const { dispatch } = this.props; | 471 | const { dispatch } = this.props; |
472 | dispatch({ | 472 | dispatch({ |
473 | - type: 'rule/add', | 473 | + type: 'BLOCK_NAME_CAMEL_CASE/add', |
474 | payload: { | 474 | payload: { |
475 | desc: fields.desc, | 475 | desc: fields.desc, |
476 | }, | 476 | }, |
@@ -483,7 +483,7 @@ class TableList extends PureComponent { | @@ -483,7 +483,7 @@ class TableList extends PureComponent { | ||
483 | handleUpdate = fields => { | 483 | handleUpdate = fields => { |
484 | const { dispatch } = this.props; | 484 | const { dispatch } = this.props; |
485 | dispatch({ | 485 | dispatch({ |
486 | - type: 'rule/update', | 486 | + type: 'BLOCK_NAME_CAMEL_CASE/update', |
487 | payload: { | 487 | payload: { |
488 | name: fields.name, | 488 | name: fields.name, |
489 | desc: fields.desc, | 489 | desc: fields.desc, |
@@ -616,7 +616,7 @@ class TableList extends PureComponent { | @@ -616,7 +616,7 @@ class TableList extends PureComponent { | ||
616 | 616 | ||
617 | render() { | 617 | render() { |
618 | const { | 618 | const { |
619 | - rule: { data }, | 619 | + BLOCK_NAME_CAMEL_CASE: { data }, |
620 | loading, | 620 | loading, |
621 | } = this.props; | 621 | } = this.props; |
622 | const { selectedRows, modalVisible, updateModalVisible, stepFormValues } = this.state; | 622 | const { selectedRows, modalVisible, updateModalVisible, stepFormValues } = this.state; |
1 | -import { stringify } from 'qs'; | ||
2 | import request from 'umi-request'; | 1 | import request from 'umi-request'; |
3 | 2 | ||
4 | export async function queryRule(params) { | 3 | export async function queryRule(params) { |
5 | - return request(`/api/rule?${stringify(params)}`); | 4 | + return request(`/api/BLOCK_NAME`, { |
5 | + params, | ||
6 | + }); | ||
6 | } | 7 | } |
7 | 8 | ||
8 | export async function removeRule(params) { | 9 | export async function removeRule(params) { |
9 | - return request('/api/rule', { | 10 | + return request('/api/BLOCK_NAME', { |
10 | method: 'POST', | 11 | method: 'POST', |
11 | - body: { | 12 | + data: { |
12 | ...params, | 13 | ...params, |
13 | method: 'delete', | 14 | method: 'delete', |
14 | }, | 15 | }, |
@@ -16,9 +17,9 @@ export async function removeRule(params) { | @@ -16,9 +17,9 @@ export async function removeRule(params) { | ||
16 | } | 17 | } |
17 | 18 | ||
18 | export async function addRule(params) { | 19 | export async function addRule(params) { |
19 | - return request('/api/rule', { | 20 | + return request('/api/BLOCK_NAME', { |
20 | method: 'POST', | 21 | method: 'POST', |
21 | - body: { | 22 | + data: { |
22 | ...params, | 23 | ...params, |
23 | method: 'post', | 24 | method: 'post', |
24 | }, | 25 | }, |
@@ -26,9 +27,9 @@ export async function addRule(params) { | @@ -26,9 +27,9 @@ export async function addRule(params) { | ||
26 | } | 27 | } |
27 | 28 | ||
28 | export async function updateRule(params) { | 29 | export async function updateRule(params) { |
29 | - return request('/api/rule', { | 30 | + return request('/api/BLOCK_NAME', { |
30 | method: 'POST', | 31 | method: 'POST', |
31 | - body: { | 32 | + data: { |
32 | ...params, | 33 | ...params, |
33 | method: 'update', | 34 | method: 'update', |
34 | }, | 35 | }, |
请
注册
或
登录
后发表评论