AuditPage修改

FormInsertDiy/AuditPage/index.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PageTypeMatching from '@/highOrderComponent/PageTypeMatching';
 import getInfoGenerator from '../getInfoGenerator';
 
-export { DataType } from '../getInfoGenerator'
+export { DataType } from '../getInfoGenerator';
 
 const defaultNameSpan = { big: 9, small: 9 };
 const defaultFieldSpan = { big: 4, small: 4 };
@@ -14,13 +14,12 @@ const defaultPageSetting = {
   buttonArea: true, // 是否拥有 按钮区,
 };
 
-
 export default function AuditPage({ appId, tab1 = {}, tab2 = {} }) {
   const pageSearch = {
     tab1: {
       search: {
         searchType: 'cascadeSearchNew',
-        getInfo: getInfoGenerator(tab1.condition),
+        getInfo: tab1.getInfo || getInfoGenerator(tab1.condition),
         url: '/common/assigneeTasks',
         field: {
           appId: {
@@ -38,7 +37,7 @@ export default function AuditPage({ appId, tab1 = {}, tab2 = {} }) {
     tab2: {
       search: {
         searchType: 'cascadeSearchNew',
-        getInfo: getInfoGenerator(tab2.condition),
+        getInfo: tab2.getInfo || getInfoGenerator(tab2.condition),
         url: '/common/assigneeDTasks',
         field: {
           appId: {

FormInsertDiy/getInfoGenerator.js

@@ -18,7 +18,7 @@ export default function getInfoGenerator(condition) {
         item => item.key === key && typeof item.dataType !== 'undefined'
       );
 
-      if (conditionItemHasDataType) {
+      if (conditionItemHasDataType && typeof value !== 'undefined') {
         const oldQueryInfo = acc.queryInfo || [];
         return {
           ...acc,