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

src/basic/utils/request.js

@@ -33,6 +33,7 @@ const codeMessage = {
  */
 
 const errorHandler = error => {
+  console.log(error)
   const { response } = error
 
   if (response && response.status) {
@@ -91,9 +92,11 @@ const refreshTokenIfNeed = async (response, config) => {
   if (
     res &&
     res.code !== consts.RET_CODE.SUCCESS &&
-    !consts.TOKEN_INVALID_CODE.includes(res.code)
+    !consts.TOKEN_INVALID_CODE.includes(res.code) &&
+    config.url !== '/login'
   ) {
     message.error((res && res.msg) || '请求错误')
+    // return Promise.reject(response)
     return response
   }
   if (res && res.code && consts.TOKEN_INVALID_CODE.includes(res.code)) {

src/components/EditableForm/src/editableFormItem.jsx

@@ -1,13 +1,13 @@
 import consts from '@/basic/consts'
 import { editFormApi } from '@/services/common'
-import { Input, Row, Col } from 'antd'
+import { Input, Row, Col, DatePicker } from 'antd'
 import React, { useState, useEffect, useRef } from 'react'
 import LazyCascader from '../../LazyCascader'
 import { connect } from 'dva'
 import './index.less'
 import useOptions from './useOptions'
-import ChangeSelect from '@/pages/customer/Company/components/ChangeSelect'
-import ChangeTreeSelect from '@/pages/staff/Employee/components/ChangeTreeSelect'
+import ChangeSelect from './components/ChangeSelect'
+import ChangeTreeSelect from './components/ChangeTreeSelect'
 
 const extraValArr = ['cascader', 'select', 'treeSelect'] // 需要设置ExtraVal的类型
 
@@ -191,6 +191,9 @@ const EditableFormItem = ({
           />
         )
         break
+      case 'datePicker':
+        cell = <DatePicker onBlur={save} defaultValue={state.val} />
+        break
       default:
         cell = (
           <Input

src/pages/Customer/Contact/components/AddContact/index.jsx

@@ -17,8 +17,8 @@ const Addcontact = props => {
       {...layout}
       title={<ModalDrag title={'添加联系人'} />}
       trigger={
-        <Button key="button" type="primary" size="small" className="flex items-center">
-          <Plus className="zh-mg-right-5" />
+        <Button type="primary" className="flex items-center">
+          <Plus className="mr-1" />
           联系人
         </Button>
       }

src/pages/Customer/Contact/index.jsx

@@ -549,57 +549,59 @@ const Contact = props => {
     )
   }
   return (
-    <ProTable
-      bordered
-      params={state.params}
-      actionRef={tRef}
-      rowKey={record => record.id}
-      columns={columns}
-      request={async (params, sort, filter) => {
-        const {
-          code = -1,
-          data: { client = [], total = 0 }
-        } = await queryContact({ ...params, ...sort, ...filter })
-        setState({ ...state, orderIds: client.map(item => item.id) })
-        return {
-          data: client,
-          success: code === consts.RET_CODE.SUCCESS,
-          total
-        }
-      }}
-      tableAlertRender={renderTableAlert}
-      rowSelection={{
-        onChange: hanleRowSelectChange,
-        type: 'checkbox',
-        columnWidth: 25
-      }}
-      // search={false}
-      search={{ filterType: 'light' }}
-      toolbar={{
-        search: {
-          allowClear: true,
-          onSearch: handleSearch,
-          placeholder: '输入联系人、客户名称、电话邮箱等'
-        },
-        actions: [
-          <LazyCascader
-            key="lazyCascader"
-            onChange={onDistrictChange}
-            changeOnSelect={true}
-            bordered={false}
-            className="hover:bg-[rgba(0,0,0,0.1)]"
-          />,
-          <Addcontact onConfirm={handleAddClient} key="addContactBtn" />
-        ]
-      }}
-      onLoadingChange={loadingStatus => {
-        loadingStatus && redoHeight()
-      }}
-      scroll={getScrollRef}
-      columnsStateMap={columnsStateMap}
-      onColumnsStateChange={map => setColumnsStateMap(map)}
-      headerTitle="联系人"
-    />
+    <div className={styles.contactContent}>
+      <ProTable
+        bordered
+        params={state.params}
+        actionRef={tRef}
+        rowKey={record => record.id}
+        columns={columns}
+        request={async (params, sort, filter) => {
+          const {
+            code = -1,
+            data: { client = [], total = 0 }
+          } = await queryContact({ ...params, ...sort, ...filter })
+          setState({ ...state, orderIds: client.map(item => item.id) })
+          return {
+            data: client,
+            success: code === consts.RET_CODE.SUCCESS,
+            total
+          }
+        }}
+        tableAlertRender={renderTableAlert}
+        rowSelection={{
+          onChange: hanleRowSelectChange,
+          type: 'checkbox',
+          columnWidth: 25
+        }}
+        // search={false}
+        search={{ filterType: 'light' }}
+        toolbar={{
+          search: {
+            allowClear: true,
+            onSearch: handleSearch,
+            placeholder: '输入联系人、客户名称、电话邮箱等'
+          },
+          actions: [
+            <LazyCascader
+              key="lazyCascader"
+              onChange={onDistrictChange}
+              changeOnSelect={true}
+              bordered={false}
+              className="hover:bg-[rgba(0,0,0,0.1)]"
+            />,
+            <Addcontact onConfirm={handleAddClient} key="addContactBtn" />
+          ]
+        }}
+        onLoadingChange={loadingStatus => {
+          loadingStatus && redoHeight()
+        }}
+        scroll={getScrollRef}
+        columnsStateMap={columnsStateMap}
+        onColumnsStateChange={map => setColumnsStateMap(map)}
+        headerTitle="联系人"
+      />
+    </div>
   )
 }
 

src/pages/Customer/Contact/index.less

@@ -4,3 +4,11 @@
     cursor: pointer;
   }
 }
+
+.contactContent {
+  :global(.ant-cascader-input.ant-input) {
+    &::-webkit-input-placeholder {
+      color: rgba(0, 0, 0, 0.85);
+    }
+  }
+}