Merge branch 'master' of http://192.168.1.41:3000/outaozhen/cldV2react

.eslintrc.js

@@ -1,17 +1,17 @@
 module.exports = {
-  extends: [require.resolve('@umijs/fabric/dist/eslint')],
+  extends: [ require.resolve('@umijs/fabric/dist/eslint') ],
   globals: {
     ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
     page: true,
     REACT_APP_ENV: true
   },
   rules: {
-    'semi': ['error', 'never'],
-    'no-multiple-empty-lines': [1, { max: 2 }], // 空行最多不能超过2行
-    'comma-dangle': [2, 'never'],
+    'semi': [ 'error', 'never' ],
+    'no-multiple-empty-lines': [ 1, { max: 2 } ],
+    'comma-dangle': [ 2, 'never' ],
     'react/prop-types': 0,
-    'spaced-comment': 'error', // 注释前面必须有空格
-    'array-bracket-spacing': ['error', 'always'],
-    'object-curly-spacing': ['error', 'always']
+    'spaced-comment': 'error',
+    'array-bracket-spacing': [ 'error', 'always' ],
+    'object-curly-spacing': [ 'error', 'always' ]
   }
 }

.prettierrc.js

@@ -1,14 +1,14 @@
-const fabric = require("@umijs/fabric")
+const fabric = require('@umijs/fabric')
 
 module.exports = {
   ...fabric.prettier,
-  eslintIntegration: true,
-  stylelintIntegration: true,
+  eslintIntegration: false,
+  stylelintIntegration: false,
   semi: false,
-  quoteProps: "consistent",
-  htmlWhitespaceSensitivity: "ignore",
+  quoteProps: 'consistent',
+  htmlWhitespaceSensitivity: 'ignore',
   jsxBracketSameLine: true,
-  trailingComma: "none",
+  trailingComma: 'none',
   bracketSpacing: true,
-  arrowParens: "avoid"
+  arrowParens: 'avoid'
 }

src/basic

@@ -1 +1 @@
-Subproject commit 27297630dbbfe995193822d8a3b3c3e898050dec
+Subproject commit 087ab009798af13c1467c3cc82053d62de1e097f

src/pages/ListTableList/service.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request from '@/basic/utils/request'
 
 export async function queryRule(params) {
   return request('/api/rule', {

src/services/contact.js

@@ -1,5 +1,5 @@
-import request from '@/utils/request'
+import request from '@/basic/utils/request'
 
 export async function queryContact(){
     return request('/api/contact')// 请求/api/contact 端口数据的函数 queryContact
-}
+}

src/services/journallist.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request from '@/basic/utils/request'
 
 export async function queryJournal(){
     return request('/api/journallist')// 请求/api/journallist 端口数据的函数 queryJournal

src/services/login.js

@@ -1,7 +1,7 @@
-import request from '@/utils/request'
+import request from '@/basic/utils/request'
 
 export async function fakeAccountLogin(params) {
- 
+
 
  // 发送接口请求数据
 //  loginSafety

src/services/user.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request from '@/basic/utils/request'
 
 export async function query() {
   return request('/api/users')

src/utils/request.js

@@ -1,57 +0,0 @@
-/**
- * request 网络请求工具
- * 更详细的 api 文档: https://github.com/umijs/umi-request
- */
-import { extend } from 'umi-request'
-import { notification } from 'antd'
-
-const codeMessage = {
-  200: '服务器成功返回请求的数据。',
-  201: '新建或修改数据成功。',
-  202: '一个请求已经进入后台排队（异步任务）。',
-  204: '删除数据成功。',
-  400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
-  401: '用户没有权限（令牌、用户名、密码错误）。',
-  403: '用户得到授权，但是访问是被禁止的。',
-  404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
-  406: '请求的格式不可得。',
-  410: '请求的资源被永久删除，且不会再得到的。',
-  422: '当创建一个对象时，发生一个验证错误。',
-  500: '服务器发生错误，请检查服务器。',
-  502: '网关错误。',
-  503: '服务不可用，服务器暂时过载或维护。',
-  504: '网关超时。'
-}
-/**
- * 异常处理程序
- */
-
-const errorHandler = (error) => {
-  const { response } = error
-
-  if (response && response.status) {
-    const errorText = codeMessage[response.status] || response.statusText
-    const { status, url } = response
-    notification.error({
-      message: `请求错误 ${status}: ${url}`,
-      description: errorText
-    })
-  } else if (!response) {
-    notification.error({
-      description: '您的网络发生异常，无法连接服务器',
-      message: '网络异常'
-    })
-  }
-
-  return response
-}
-/**
- * 配置request请求时的默认参数
- */
-
-const request = extend({
-  errorHandler,
-  // 默认错误处理
-  credentials: 'include' // 默认请求是否带上cookie
-})
-export default request

src/utils/utils.js

@@ -2,7 +2,7 @@ import { parse } from 'querystring'
 /* eslint no-useless-escape:0 import/prefer-default-export:0 */
 
 const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/
-export const isUrl = (path) => reg.test(path)
+export const isUrl = path => reg.test(path)
 export const isAntDesignPro = () => {
   if (ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION === 'site') {
     return true