Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

src/pages/commodity/products/TableOperation/index.tsx

@@ -5,7 +5,7 @@ import { CaretDownOutlined } from '@ant-design/icons'
 export interface TableOperationProps {
   record: any,
   statusOperationMap: any, // 所有状态和操作名称的映射
-  operationHandler: any, // 所有的操作句柄
+  operationHandler: any, // 所有的操作句柄函数
   priorityOperationName?: string, // 优先靠前的操作名称
 }
 
@@ -16,13 +16,14 @@ const TableOperation:React.FC<TableOperationProps> = (props) => {
   const [operationName, setOperationName] = useState<string[]>([])
 
   useEffect(() => {
-    // let maps = statusOperationMap[record.status]
-    // if(maps.length > 2){
-    //   setOperationName(() => statusOperationMap[record.status].filter(_ => _ != priorityOperationName))  
-    // }else{
-
-    // }
-    setOperationName(() => statusOperationMap[record.status])
+    let maps = statusOperationMap[record.status]
+    if(maps.length > 2 && priorityOperationName && maps.includes(priorityOperationName)){
+      let temp = maps.filter(_ => _ != priorityOperationName)
+      temp.unshift(priorityOperationName)
+      setOperationName(temp)  
+    }else{
+      setOperationName(() => statusOperationMap[record.status])
+    }
   }, [])
 
   return ( <>
@@ -30,13 +31,7 @@ const TableOperation:React.FC<TableOperationProps> = (props) => {
       operationName.length > 2
       ?
       <>
-        {/* {
-          priorityOperationName 
-          ?
-          <Button type='link' onClick={operationHandler[priorityOperationName]}>{priorityOperationName}</Button>
-          : */}
-          <Button type='link' onClick={operationHandler[operationName[0]]}>{operationName[0]}</Button>
-        {/* } */}
+        <Button type='link' onClick={operationHandler[operationName[0]]}>{operationName[0]}</Button>
         <Dropdown overlay={
           <Menu>
             {

src/pages/handling/components/ModalForTable/SearchForm.tsx

@@ -20,7 +20,7 @@ const SearchForm = (props) => {
 
     onFieldValueChange$('pagination').subscribe((state) => {
       console.log("pagination")
-      // handleSearch({...state.value})
+      handleSubmit({...state.value})
     })
     !!effects && effects();
   }

src/pages/handling/components/ProcessProducts/index.tsx

@@ -23,6 +23,7 @@ const tableSchema = {
       "columns": columns,
       "rowKey": "id",
       "pagination":false,
+      // loading: true,
       "rowSelection": "{{rowSelection}}"
     }
   },
@@ -62,8 +63,8 @@ const ProcessProducts = ({visible, cancel, actions, ...restProps}) => {
     // const status = actions.getFieldValue('status'); // 状态
     const postData = {
       name: name || '',
-      current: 1, 
-      pageSize: 10,
+      ...paginationParams,
+      ...params
     }
     fetchData(postData).then((data) => {
       setTableStatus({dataSource:data.data, totalCount: data.totalCount})

src/pages/handling/schema/processProductSchema.tsx

 /*
  * @Author: Bill
  * @Date: 2020-10-14 18:45:31
- * @LastEditTime: 2020-10-16 17:39:55
+ * @LastEditTime: 2020-10-19 09:56:52
  * @desc 选择加工商品schema
  * 这里其实就是两个flex 布局加一个table， 通过expressScrope 注入代码 
  */