Merge branch 'dev' of http://192.168.1.41:3000/outaozhen/cldV2react into dev

.gitignore

@@ -9,7 +9,7 @@ _roadhog-api-doc
 # production
 /dist
 /.vscode
-
+dist*
 # misc
 .DS_Store
 npm-debug.log*

src/components/Table/src/BasicTable.tsx

@@ -74,8 +74,7 @@ const BasicTable: {
   const tableElRef = useRef<HTMLElement>(null)
 
   const authColumnsStateMap = getAuthCache(TABLE_COLUMNS_MAP)
-  columnsStateMap =
-    (authColumnsStateMap && authColumnsStateMap[ColumnStateEnum[columnStateType]]) || {}
+  columnsStateMap = (authColumnsStateMap && authColumnsStateMap[ColumnStateEnum[columnStateType]]) || {}
   const [state, setState] = useState({
     selectKeysRef: null,
     sizeRef: 'middle',
@@ -225,14 +224,10 @@ const BasicTable: {
         rowKey={rowKey || 'id'}
         columns={originalColumns}
         params={computedParams}
-        // columnsStateMap={state.columnsStateMap}
-        // onColumnsStateChange={handleOnColumnsChange}
         scroll={getScrollRef}
         columnsState={{
           defaultValue: state.columnsStateMap,
           onChange: handleOnColumnsChange
-          // persistenceKey: ColumnStateEnum[columnStateType],
-          // persistenceType: 'localStorage'
         }}
         bordered={isNullOrUnDef(bordered) ? bordered : true}
         onLoad={dataSource => setState({ ...state, dataSource })}

src/pages/Customer/Client/components/ClientDetail/AddRecord.jsx

@@ -40,9 +40,8 @@ const AddRecord = props => {
             }
             const isSuccess = await onConfirm(newVal)
             isSuccess && resetModalProps.onCancel()
-            setState({ ...state, loading: false })
           })
-          .catch(() => {
+          .finally(() => {
             setState({ ...state, loading: false })
           })
       }}

src/pages/Customer/Company/components/ConnectCompany/index.jsx

@@ -11,7 +11,14 @@ import { formatValues } from '@/components/LazyCascader'
 import { apiChangeCustomer } from '@/services/customer'
 import { useModal } from '@/components/ModalStore'
 
-const ConnectCompany = ({ onCancel, dataId, onSelect, preUrl = 'Client', defaultAddibleValue, ...resetModalProps }) => {
+const ConnectCompany = ({
+  onCancel,
+  dataId,
+  onSelect,
+  preUrl = 'Client',
+  defaultAddibleValue,
+  ...resetModalProps
+}) => {
   const hasAddPerm = useAccess()?.validatePermByType('company_add')
   const dispatchModal = useModal()
   const scrollRef = useRef()
@@ -102,6 +109,7 @@ const ConnectCompany = ({ onCancel, dataId, onSelect, preUrl = 'Client', default
       {...resetModalProps}
       onCancel={onCancel}
       width="60vw"
+      getContainer={() => document.getElementById('root')}
       title={
         <Input
           prefix={<SearchOutlined />}
@@ -121,11 +129,13 @@ const ConnectCompany = ({ onCancel, dataId, onSelect, preUrl = 'Client', default
                 dataType: preUrl,
                 defaultValue: defaultAddibleValue
               })
-            }>
+            }
+          >
             添加单位
           </Button>
         )
-      }>
+      }
+    >
       <div className={styles.modalContainer}>
         <div className={styles.modalContent} ref={scrollRef} onScroll={handleListScroll}>
           <Spin spinning={state.laoding}>
@@ -138,7 +148,8 @@ const ConnectCompany = ({ onCancel, dataId, onSelect, preUrl = 'Client', default
                     title="确认关联ta"
                     onConfirm={() => connectCustomer(item.id)}
                     okText="确认"
-                    cancelText="取消">
+                    cancelText="取消"
+                  >
                     <Button type="primary" size="small">
                       关联
                     </Button>