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

src/pages/Customer/Contact/index.jsx

@@ -11,6 +11,7 @@ import consts from '@/consts'
 import { queryContact, apiAddClient } from '@/services/contact'
 import styles from './index.less'
 import LazyCascader from '@/components/LazyCascader'
+import { useDebounceFn } from 'ahooks'
 
 const Contact = props => {
   const { collapsed } = props
@@ -291,11 +292,7 @@ const Contact = props => {
       width: 150
     }
   ]
-  // const { data = [], total = 0 } = props
-  // const { contactName: { list } } = props // 将contact中的pros.list命名为list
-  // const contanctlist = [...list]
-  // console.log(props)
-  // console.log(contanctlist)
+
   const [columnsStateMap, setColumnsStateMap] = useState({
     telephone: {
       show: false
@@ -349,6 +346,12 @@ const Contact = props => {
     initData({ search: value })
   }
 
+  const searchOnchange = e => {
+    const { value = '' } = e.target
+    initData({ search: value })
+  }
+  const { run: handleSearchInputChange } = useDebounceFn(searchOnchange)
+
   const onDistrictChange = value => {
     const [province = '', city = '', area = ''] = value
     initData({ province, city, area })
@@ -371,7 +374,8 @@ const Contact = props => {
           search={false}
           toolbar={{
             search: {
-              onSearch: handleSearch
+              onSearch: handleSearch,
+              onChange: handleSearchInputChange
             },
             actions: [
               <LazyCascader onChange={onDistrictChange} key="LazyCascader" />,

src/pages/Product/Lock/Lockstore/index.jsx

@@ -133,4 +133,20 @@ const Lockstore = props => {
   )
 }
 
+// 渲染产品标签
+export const RenderProductLabel = product => {
+  let newProduct = product
+  if (!Array.isArray(product)) {
+    newProduct = product.split('+')
+  }
+  return (
+    <div>
+      {newProduct.map((item, index) => (
+        <Tag key={index} color="#886ab5">
+          {item}
+        </Tag>
+      ))}
+    </div>
+  )
+}
 export default Lockstore