kts-components-document-access-point 2.0.0 → 2.0.2

package/dist/index.esm.js

@@ -4,9 +4,9 @@ import GreyReactBox from 'grey-react-box';
 import { v4 } from 'uuid';
 import Icon, { InfoCircleOutlined } from '@ant-design/icons';
 import moment from 'moment';
-import { Modal, DatePicker as DatePicker$1, Search, Select as Select$2, searchUnFormat, Radio as Radio$1, PageHeaderFoot, Button as Button$1, Dropdown, AutoTableContainer, Table as Table$1, Pagination, Form as Form$1, message as message$1, Input as Input$1 } from 'kts-xui';
+import { Modal, Search, Select as Select$1, searchUnFormat, Radio as Radio$2, PageHeaderFoot, Button as Button$1, Dropdown, AutoTableContainer, Table as Table$1, Pagination, Form as Form$1, message as message$1, Input as Input$1 } from 'kts-xui';
+import { DatePicker as DatePicker$1, Radio as Radio$1, Checkbox, Select as Select$2 } from 'antd';
 import { useHistory, MemoryRouter, Switch as Switch$1, Route, Redirect } from 'react-router-dom';
-import { Select as Select$1, DatePicker as DatePicker$2 } from 'antd';
 import zhCN from 'kts-components-antd-x4/lib/locale/zh_CN';
 import qs from 'query-string';
 import { AdvancedSearch, KtsForm } from 'kts-components';
@@ -2891,9 +2891,10 @@ function modalcomfirm(props) {
   }))));
 }
 
-var SubMenu = Menu.SubMenu;
-var Option$2 = Select$1.Option;
 var RangePicker = DatePicker$1.RangePicker;
+var RadioGroup = Radio$1.Group;
+var CheckboxGroup = Checkbox.Group;
+var SubMenu = Menu.SubMenu;
 var PageHeader = (function () {
   var history = useHistory();
   var controller = DocumentsList.useController();
@@ -2916,199 +2917,12 @@ var PageHeader = (function () {
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
     profileEnum = _useState4[0],
-    setProfile = _useState4[1];
+    setProfileEnum = _useState4[1];
   var ktsRef = useRef(null);
   var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
     didlist = _useState6[0],
     setDidList = _useState6[1]; //我司对应DID
-  // 动态生成 formItems
-  var formItems = useMemo(function () {
-    var items = [];
-    var didEnum = didlist.map(function (item) {
-      return {
-        label: item.remarkName + ':' + item.participantId,
-        value: item.participantId
-      };
-    });
-    if (type === 1) {
-      // 配置名称
-      items.push({
-        name: "configName",
-        label: "配置名称",
-        children: /*#__PURE__*/React.createElement(Search.Input, null)
-      });
-      // 单据大类
-      items.push({
-        name: "type",
-        label: "单据大类",
-        children: (/*#__PURE__*/React.createElement(Select$2, {
-          className: "underline",
-          allowClear: true
-        }, billEnum.map(function (item) {
-          return /*#__PURE__*/React.createElement(Option$2, {
-            key: item.value,
-            value: item.value
-          }, item.label);
-        })))
-      });
-      // 单据子类
-      items.push({
-        name: "profile",
-        label: "单据子类",
-        children: (/*#__PURE__*/React.createElement(Select$2, {
-          className: "underline",
-          allowClear: true
-        }, profileEnum.map(function (item) {
-          return /*#__PURE__*/React.createElement(Option$2, {
-            key: item.value,
-            value: item.value
-          }, item.name);
-        })))
-      });
-      // 收发角色
-      items.push({
-        name: "attributionList",
-        label: "收发角色",
-        children: (/*#__PURE__*/React.createElement(Select$2, {
-          className: "underline",
-          allowClear: true,
-          mode: "multiple"
-        }, /*#__PURE__*/React.createElement(Option$2, {
-          value: 1
-        }, "\u53D1\u9001\u65B9"), /*#__PURE__*/React.createElement(Option$2, {
-          value: 2
-        }, "\u63A5\u6536\u65B9")))
-      });
-      // 创建时间
-      items.push({
-        name: "createTime",
-        label: "创建时间",
-        children: (/*#__PURE__*/React.createElement(RangePicker, {
-          style: {
-            width: "100%"
-          },
-          format: "YYYY-MM-DD",
-          placeholder: ["开始时间", "结束时间"],
-          className: "underline-datepicker"
-        }))
-      });
-      // 更新时间
-      items.push({
-        name: "sendTime",
-        label: "更新时间",
-        children: (/*#__PURE__*/React.createElement(RangePicker, {
-          style: {
-            width: "100%"
-          },
-          format: "YYYY-MM-DD",
-          placeholder: ["开始时间", "结束时间"],
-          className: "underline-datepicker"
-        }))
-      });
-    } else if (type === 2) {
-      // 配置名称
-      items.push({
-        name: "configName",
-        label: "配置名称",
-        children: /*#__PURE__*/React.createElement(Search.Input, null)
-      });
-      // 使用标识
-      items.push({
-        name: "effectStatus",
-        label: "使用标识",
-        children: (/*#__PURE__*/React.createElement(Select$2, {
-          className: "underline",
-          allowClear: true
-        }, /*#__PURE__*/React.createElement(Option$2, {
-          value: 0
-        }, "\u5DF2\u5931\u6548"), /*#__PURE__*/React.createElement(Option$2, {
-          value: 1
-        }, "\u4F7F\u7528\u4E2D")))
-      });
-      // 我的收发角色
-      items.push({
-        name: "attribution",
-        label: "我的收发角色",
-        children: (/*#__PURE__*/React.createElement(Select$2, {
-          className: "underline",
-          allowClear: true
-        }, /*#__PURE__*/React.createElement(Option$2, {
-          value: 1
-        }, "\u53D1\u9001\u65B9"), /*#__PURE__*/React.createElement(Option$2, {
-          value: 2
-        }, "\u63A5\u6536\u65B9")))
-      });
-      // 我司对应DID
-      items.push({
-        name: "senderParticipantId",
-        label: "我司对应DID",
-        children: (/*#__PURE__*/React.createElement(Select$2, {
-          className: "underline",
-          allowClear: true
-        }, didEnum.map(function (item) {
-          return /*#__PURE__*/React.createElement(Option$2, {
-            key: item.value,
-            value: item.value
-          }, item.label);
-        })))
-      });
-      // 接受对象
-      items.push({
-        name: "receiverParticipantId",
-        label: "接受对象",
-        children: /*#__PURE__*/React.createElement(Search.Input, null)
-      });
-      // 接受对象所属公司
-      items.push({
-        name: "receiverCompany",
-        label: "接受对象所属公司",
-        children: /*#__PURE__*/React.createElement(Search.Input, null)
-      });
-      // 单据大类
-      items.push({
-        name: "type",
-        label: "单据大类",
-        children: (/*#__PURE__*/React.createElement(Select$2, {
-          className: "underline",
-          allowClear: true
-        }, billEnum.map(function (item) {
-          return /*#__PURE__*/React.createElement(Option$2, {
-            key: item.value,
-            value: item.value
-          }, item.label);
-        })))
-      });
-      // 单据子类
-      items.push({
-        name: "profile",
-        label: "单据子类",
-        children: (/*#__PURE__*/React.createElement(Select$2, {
-          className: "underline",
-          allowClear: true
-        }, profileEnum.map(function (item) {
-          return /*#__PURE__*/React.createElement(Option$2, {
-            key: item.value,
-            value: item.value
-          }, item.name);
-        })))
-      });
-      // 发布时间
-      items.push({
-        name: "createTime",
-        label: "发布时间",
-        children: (/*#__PURE__*/React.createElement(RangePicker, {
-          style: {
-            width: "100%"
-          },
-          format: "YYYY-MM-DD",
-          placeholder: ["开始时间", "结束时间"],
-          className: "underline-datepicker"
-        }))
-      });
-    }
-    return items;
-  }, [billEnum, type, profileEnum, didlist]);
   useEffect(function () {
     _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var _DocumentsService$ins;
@@ -3124,37 +2938,21 @@ var PageHeader = (function () {
             });
           case 1:
             res = _context.v;
+            if (res) {
+              _context.n = 2;
+              break;
+            }
+            return _context.a(2, false);
+          case 2:
             if (res.res) {
               setDidList(res.res);
             }
-          case 2:
+          case 3:
             return _context.a(2);
         }
       }, _callee);
     }))();
   }, []);
-  // 处理单据子类的动态更新
-  useEffect(function () {
-    var selectedType = params.type;
-    if (selectedType) {
-      var target = billEnum.find(function (item) {
-        return item.value === selectedType;
-      });
-      if (target && target.profileList) {
-        var list = target.profileList.map(function (item) {
-          return {
-            label: item.name,
-            value: item.value
-          };
-        });
-        setProfile(list);
-      } else {
-        setProfile([]);
-      }
-    } else {
-      setProfile([]);
-    }
-  }, [billEnum, params]);
   useEffect(function () {
     _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
       var _DocumentsService$ins2;
@@ -3170,12 +2968,18 @@ var PageHeader = (function () {
             });
           case 1:
             res = _context2.v;
-            if (!res.err) {
+            if (res) {
               _context2.n = 2;
               break;
             }
             return _context2.a(2, false);
           case 2:
+            if (!res.err) {
+              _context2.n = 3;
+              break;
+            }
+            return _context2.a(2, false);
+          case 3:
             list = res.res.map(function (item) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 label: item.name,
@@ -3183,7 +2987,7 @@ var PageHeader = (function () {
               });
             });
             setBill(list);
-          case 3:
+          case 4:
             return _context2.a(2);
         }
       }, _callee2);
@@ -3215,50 +3019,23 @@ var PageHeader = (function () {
       };
     }())();
   }, [controller]);
-  // 创建搜索组件
-  var _SearchXui$useCreate = Search.useCreate({
-      labelCol: 9,
-      onSubmit: function onSubmit(e) {
-        var processedValues = _objectSpread2(_objectSpread2({}, e), {}, {
-          beginCreateTime: e.createTime && e.createTime[0] ? e.createTime[0].format('YYYY-MM-DD 00:00:00') : undefined,
-          endCreateTime: e.createTime && e.createTime[1] ? e.createTime[1].format('YYYY-MM-DD 23:59:59') : undefined,
-          beginSendTime: e.sendTime && e.sendTime[0] ? e.sendTime[0].format('YYYY-MM-DD 00:00:00') : undefined,
-          endSendTime: e.sendTime && e.sendTime[1] ? e.sendTime[1].format('YYYY-MM-DD 23:59:59') : undefined,
-          pageNum: 1,
-          pageSize: 10
-        });
-        // 移除原始的日期字段
-        delete processedValues.createTime;
-        delete processedValues.sendTime;
-        onSearchFormSubmit(processedValues);
-      },
-      values: React.useMemo(function () {
-        // 转换搜索值格式
-        var convertedValues = _objectSpread2({}, params);
-        var paramsAny = params;
-        if (paramsAny.beginCreateTime && paramsAny.endCreateTime) {
-          convertedValues.createTime = [paramsAny.beginCreateTime, paramsAny.endCreateTime];
-        }
-        if (paramsAny.beginSendTime && paramsAny.endSendTime) {
-          convertedValues.sendTime = [paramsAny.beginSendTime, paramsAny.endSendTime];
-        }
-        return searchUnFormat(convertedValues, formItems);
-      }, [params, formItems]),
-      formItems: formItems
-    }),
-    search = _SearchXui$useCreate.search,
-    setSearchValues = _SearchXui$useCreate.setSearchValues;
-  useEffect(function () {
-    var convertedValues = _objectSpread2({}, params);
-    var paramsAny = params;
-    if (paramsAny.beginCreateTime && paramsAny.endCreateTime) {
-      convertedValues.createTime = [paramsAny.beginCreateTime, paramsAny.endCreateTime];
-    }
-    if (paramsAny.beginSendTime && paramsAny.endSendTime) {
-      convertedValues.sendTime = [paramsAny.beginSendTime, paramsAny.endSendTime];
-    }
-    setSearchValues(searchUnFormat(convertedValues, formItems));
-  }, [formItems, params, setSearchValues]);
+  // 处理单据大类变化
+  var handleTypeChange = useCallback(function (value) {
+    var _target$profileList;
+    var target = billEnum.find(function (item) {
+      return item.value === value;
+    });
+    var newProfileEnum = (target === null || target === void 0 ? void 0 : (_target$profileList = target.profileList) === null || _target$profileList === void 0 ? void 0 : _target$profileList.map(function (item) {
+      return {
+        label: item.name,
+        value: item.value
+      };
+    })) || [];
+    setProfileEnum(newProfileEnum);
+    form === null || form === void 0 ? void 0 : form.setFieldsValue({
+      profile: undefined
+    });
+  }, [billEnum, controller]);
   var switchType = React.useCallback(function (e) {
     controller.pipeline(/*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(s) {
@@ -3285,6 +3062,8 @@ var PageHeader = (function () {
         return _ref4.apply(this, arguments);
       };
     }())();
+    // 切换类型时也清空单据子类的值并重新创建表单
+    setProfileEnum([]);
   }, []);
   var handleCancel = React.useCallback(function () {
     controller.pipeline(/*#__PURE__*/function () {
@@ -3320,40 +3099,205 @@ var PageHeader = (function () {
       };
     }())();
   }, [controller]);
+  // 动态生成 formItems
+  var formItems = useMemo(function () {
+    var didEnum = didlist.map(function (item) {
+      return {
+        label: item.remarkName + ':' + item.participantId,
+        value: item.participantId
+      };
+    });
+    var items = [];
+    if (type === 1) {
+      // 配置名称
+      items.push({
+        name: "configName",
+        label: "配置名称",
+        children: /*#__PURE__*/React.createElement(Search.Input, null)
+      });
+      // 单据大类
+      items.push({
+        name: "type",
+        label: "单据大类",
+        children: (/*#__PURE__*/React.createElement(Select$1, {
+          className: "underline",
+          allowClear: true,
+          onChange: handleTypeChange,
+          options: billEnum
+        }))
+      });
+      // 单据子类
+      items.push({
+        name: 'profile',
+        label: '单据子类',
+        hidden: profileEnum.length === 0,
+        children: (/*#__PURE__*/React.createElement(Select$1, {
+          key: "profile-".concat((params === null || params === void 0 ? void 0 : params.type) || 'none'),
+          className: "underline",
+          allowClear: true,
+          options: profileEnum
+        }))
+      });
+      // 收发角色
+      items.push({
+        name: "attributionList",
+        label: "收发角色",
+        children: (/*#__PURE__*/React.createElement(CheckboxGroup, {
+          options: [{
+            label: "发送方",
+            value: 1
+          }, {
+            label: "接收方",
+            value: 2
+          }]
+        }))
+      });
+      // 创建时间
+      items.push({
+        name: "createTime",
+        label: "创建时间",
+        children: /*#__PURE__*/React.createElement(RangePicker, {
+          className: "underline-datepicker"
+        })
+      });
+      // 更新时间
+      items.push({
+        name: "sendTime",
+        label: "更新时间",
+        children: /*#__PURE__*/React.createElement(RangePicker, {
+          className: "underline-datepicker"
+        })
+      });
+    } else if (type === 2) {
+      // 配置名称
+      items.push({
+        name: "configName",
+        label: "配置名称",
+        children: /*#__PURE__*/React.createElement(Search.Input, null)
+      });
+      // 使用标识
+      items.push({
+        name: "effectStatus",
+        label: "使用标识",
+        children: (/*#__PURE__*/React.createElement(RadioGroup, null, /*#__PURE__*/React.createElement(Radio$1, {
+          value: 0
+        }, "\u5DF2\u5931\u6548"), /*#__PURE__*/React.createElement(Radio$1, {
+          value: 1
+        }, "\u4F7F\u7528\u4E2D")))
+        // options: [
+        //     { label: '已失效', value: 0 },
+        //     { label: '使用中', value: 1 },
+        // ],
+      });
+      // 我的收发角色
+      items.push({
+        name: "attribution",
+        label: "我的收发角色",
+        children: (/*#__PURE__*/React.createElement(RadioGroup, null, /*#__PURE__*/React.createElement(Radio$1, {
+          value: 1
+        }, "\u53D1\u9001\u65B9"), /*#__PURE__*/React.createElement(Radio$1, {
+          value: 2
+        }, "\u63A5\u6536\u65B9")))
+        // options: [
+        //     { label: '发送方', value: 1 },
+        //     { label: '接收方', value: 2 },
+        // ],
+      });
+      // 我司对应DID
+      items.push({
+        name: "senderParticipantId",
+        label: "我司对应DID",
+        children: (/*#__PURE__*/React.createElement(Select$1, {
+          className: "underline",
+          allowClear: true,
+          options: didEnum
+        }))
+      });
+      // 接受对象
+      items.push({
+        name: "receiverParticipantId",
+        label: "接受对象",
+        children: /*#__PURE__*/React.createElement(Search.Input, null)
+      });
+      // 接受对象所属公司
+      items.push({
+        name: "receiverCompany",
+        label: "接受对象所属公司",
+        children: /*#__PURE__*/React.createElement(Search.Input, null)
+      });
+      // 单据大类
+      items.push({
+        name: "type",
+        label: "单据大类",
+        children: (/*#__PURE__*/React.createElement(Select$1, {
+          className: "underline",
+          allowClear: true,
+          onChange: handleTypeChange,
+          options: billEnum
+        }))
+      });
+      // 单据子类
+      items.push({
+        name: 'profile',
+        label: '单据子类',
+        hidden: profileEnum.length === 0,
+        children: (/*#__PURE__*/React.createElement(Select$1, {
+          className: "underline",
+          allowClear: true,
+          options: profileEnum
+        }))
+      });
+      // 发布时间
+      items.push({
+        name: "createTime",
+        label: "发布时间",
+        children: /*#__PURE__*/React.createElement(RangePicker, {
+          className: "underline-datepicker"
+        })
+      });
+    }
+    return items;
+  }, [billEnum, type, didlist, profileEnum]);
   var onCreateType = useCallback(function (category, record) {
     history.push({
       pathname: "/rule",
       search: "?type=config&profile=".concat(record && record.value || '', "&billtype=").concat(category)
     });
   }, []);
+  // 创建搜索组件
+  var _SearchXui$useCreate = Search.useCreate({
+      labelCol: 9,
+      onSubmit: function onSubmit(e) {
+        onSearchFormSubmit(e);
+      },
+      values: React.useMemo(function () {
+        return searchUnFormat(params, formItems);
+      }, [params, formItems]),
+      formItems: formItems
+    }),
+    search = _SearchXui$useCreate.search,
+    inventory = _SearchXui$useCreate.inventory,
+    form = _SearchXui$useCreate.form;
   var topExpand = useCallback(function () {
     return /*#__PURE__*/React.createElement("div", {
       style: {
-        display: 'flex'
+        width: "100%"
       }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: 'unifiedSearch'
     }, /*#__PURE__*/React.createElement("div", {
       style: {
-        marginRight: 10
-      }
-    }, /*#__PURE__*/React.createElement(Radio$1.Group, {
-      value: type,
-      onChange: switchType
-    }, /*#__PURE__*/React.createElement(Radio$1.Button, {
-      value: 1,
-      style: {
-        whiteSpace: 'nowrap'
-      }
-    }, "\u5355\u636E\u6821\u9A8C\u89C4\u5219\u914D\u7F6E"), /*#__PURE__*/React.createElement(Radio$1.Button, {
-      value: 2,
-      style: {
-        whiteSpace: 'nowrap'
+        display: "flex",
+        alignItems: "flex-start",
+        gap: "16px",
+        padding: '10px 0px'
       }
-    }, "\u53D1\u5E03\u8BB0\u5F55"))), /*#__PURE__*/React.createElement("div", {
+    }, /*#__PURE__*/React.createElement("div", {
       style: {
         flex: 1
       }
-    }, search));
-  }, [type, search]);
+    }, search)), inventory));
+  }, [type, search, inventory]);
   var menu = useMemo(function () {
     return /*#__PURE__*/React.createElement(Menu, null, billEnum && billEnum.map(function (item, key) {
       if (item.profileList) {
@@ -3378,7 +3322,25 @@ var PageHeader = (function () {
       }
     }));
   }, [billEnum]);
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: "16px 20px",
+      borderBottom: "1px solid rgb(240, 240, 240)"
+    }
+  }, /*#__PURE__*/React.createElement(Radio$2.Group, {
+    value: type,
+    onChange: switchType
+  }, /*#__PURE__*/React.createElement(Radio$2.Button, {
+    value: 1,
+    style: {
+      whiteSpace: 'nowrap'
+    }
+  }, "\u5355\u636E\u6821\u9A8C\u89C4\u5219\u914D\u7F6E"), /*#__PURE__*/React.createElement(Radio$2.Button, {
+    value: 2,
+    style: {
+      whiteSpace: 'nowrap'
+    }
+  }, "\u53D1\u5E03\u8BB0\u5F55"))), /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 'none',
       position: 'relative',
@@ -3402,7 +3364,7 @@ var PageHeader = (function () {
   }), visible && /*#__PURE__*/React.createElement(modalcomfirm, {
     handleCancel: handleCancel,
     list: selectedRowKey
-  }));
+  })));
 });
 
 var css_248z$3 = "";
@@ -3456,17 +3418,23 @@ function validaterule(props) {
             });
           case 1:
             res = _context.v;
-            if (!res.err) {
+            if (res) {
               _context.n = 2;
               break;
             }
             return _context.a(2, false);
           case 2:
+            if (!res.err) {
+              _context.n = 3;
+              break;
+            }
+            return _context.a(2, false);
+          case 3:
             if (res.res) {
               setList(res.res.items);
               setpageMeta(res.res.pageMeta);
             }
-          case 3:
+          case 4:
             return _context.a(2);
         }
       }, _callee);
@@ -3487,12 +3455,18 @@ function validaterule(props) {
             });
           case 1:
             res = _context2.v;
-            if (!res.err) {
+            if (res) {
               _context2.n = 2;
               break;
             }
             return _context2.a(2, false);
           case 2:
+            if (!res.err) {
+              _context2.n = 3;
+              break;
+            }
+            return _context2.a(2, false);
+          case 3:
             _list = res.res.map(function (item) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 label: item.name,
@@ -3500,7 +3474,7 @@ function validaterule(props) {
               });
             });
             setBill(_list);
-          case 3:
+          case 4:
             return _context2.a(2);
         }
       }, _callee2);
@@ -5033,10 +5007,10 @@ function Rule(props) {
       message: '请输入必填项'
     }],
     initialValue: queryType
-  }, /*#__PURE__*/React.createElement(Select$2, {
+  }, /*#__PURE__*/React.createElement(Select$1, {
     disabled: true
   }, billEnum && billEnum.map(function (item, key) {
-    return /*#__PURE__*/React.createElement(Select$2.Option, {
+    return /*#__PURE__*/React.createElement(Select$1.Option, {
       value: item.value,
       key: key
     }, item.label);
@@ -5049,15 +5023,15 @@ function Rule(props) {
       required: true,
       message: '请输入必填项'
     }]
-  }, /*#__PURE__*/React.createElement(Select$2, {
+  }, /*#__PURE__*/React.createElement(Select$1, {
     disabled: disabled
-  }, /*#__PURE__*/React.createElement(Select$2.Option, {
+  }, /*#__PURE__*/React.createElement(Select$1.Option, {
     value: 1,
     key: 1
-  }, "\u53D1\u9001\u65B9"), /*#__PURE__*/React.createElement(Select$2.Option, {
+  }, "\u53D1\u9001\u65B9"), /*#__PURE__*/React.createElement(Select$1.Option, {
     value: 2,
     key: 2
-  }, "\u63A5\u6536\u65B9"), /*#__PURE__*/React.createElement(Select$2.Option, {
+  }, "\u63A5\u6536\u65B9"), /*#__PURE__*/React.createElement(Select$1.Option, {
     value: 3,
     key: 3
   }, "\u63A5\u6536\u65B9,\u53D1\u9001\u65B9"))))), profile && /*#__PURE__*/React.createElement(Row, null, /*#__PURE__*/React.createElement(Col, {
@@ -5070,10 +5044,10 @@ function Rule(props) {
       message: '请输入必填项'
     }],
     initialValue: profile
-  }, /*#__PURE__*/React.createElement(Select$2, {
+  }, /*#__PURE__*/React.createElement(Select$1, {
     disabled: true
   }, profileEnum && profileEnum.map(function (item, key) {
-    return /*#__PURE__*/React.createElement(Select$2.Option, {
+    return /*#__PURE__*/React.createElement(Select$1.Option, {
       value: item.value,
       key: key
     }, item.label);
@@ -5092,11 +5066,11 @@ function Rule(props) {
     visible: visible,
     onOk: handleOk,
     onCancel: handleCancel
-  }, /*#__PURE__*/React.createElement(Radio$1.Group, {
+  }, /*#__PURE__*/React.createElement(Radio$2.Group, {
     onChange: targetSelect,
     value: targetId
   }, targetList.map(function (item, key) {
-    return /*#__PURE__*/React.createElement(Radio$1, {
+    return /*#__PURE__*/React.createElement(Radio$2, {
       style: radioStyle,
       key: key,
       value: item.participantId
@@ -5211,16 +5185,22 @@ var getWhitelist = (/*#__PURE__*/function () {
           });
         case 1:
           res = _context.v;
-          if (!res.err) {
+          if (res) {
             _context.n = 2;
             break;
           }
           return _context.a(2, false);
         case 2:
-          if (!res.res) {
+          if (!res.err) {
             _context.n = 3;
             break;
           }
+          return _context.a(2, false);
+        case 3:
+          if (!res.res) {
+            _context.n = 4;
+            break;
+          }
           res.res.items = res.res.items.map(function (item, index) {
             return _objectSpread2(_objectSpread2({}, item), {}, {
               index: index
@@ -5228,7 +5208,7 @@ var getWhitelist = (/*#__PURE__*/function () {
           });
           s.whiteblacklist = res.res.items || [];
           return _context.a(2, res);
-        case 3:
+        case 4:
           return _context.a(2);
       }
     }, _callee);
@@ -5253,16 +5233,22 @@ var getBlacklist = (/*#__PURE__*/function () {
           });
         case 1:
           res = _context.v;
-          if (!res.err) {
+          if (res) {
             _context.n = 2;
             break;
           }
           return _context.a(2, false);
         case 2:
-          if (!res.res) {
+          if (!res.err) {
             _context.n = 3;
             break;
           }
+          return _context.a(2, false);
+        case 3:
+          if (!res.res) {
+            _context.n = 4;
+            break;
+          }
           res.res.items = res.res.items.map(function (item, index) {
             return _objectSpread2(_objectSpread2({}, item), {}, {
               index: index
@@ -5270,7 +5256,7 @@ var getBlacklist = (/*#__PURE__*/function () {
           });
           s.blacklist = res.res.items || [];
           return _context.a(2, res);
-        case 3:
+        case 4:
           return _context.a(2);
       }
     }, _callee);
@@ -5332,19 +5318,25 @@ var enablewhitelist = (/*#__PURE__*/function () {
           });
         case 1:
           res = _context.v;
-          if (!res.err) {
+          if (res) {
             _context.n = 2;
             break;
           }
           return _context.a(2, false);
         case 2:
-          if (!res.res) {
+          if (!res.err) {
             _context.n = 3;
             break;
           }
+          return _context.a(2, false);
+        case 3:
+          if (!res.res) {
+            _context.n = 4;
+            break;
+          }
           message.success('操作成功');
           return _context.a(2, res);
-        case 3:
+        case 4:
           return _context.a(2);
       }
     }, _callee);
@@ -5369,19 +5361,25 @@ var enablelist = (/*#__PURE__*/function () {
           });
         case 1:
           res = _context.v;
-          if (!res.err) {
+          if (res) {
             _context.n = 2;
             break;
           }
           return _context.a(2, false);
         case 2:
-          if (!res.res) {
+          if (!res.err) {
             _context.n = 3;
             break;
           }
+          return _context.a(2, false);
+        case 3:
+          if (!res.res) {
+            _context.n = 4;
+            break;
+          }
           message.success('操作成功');
           return _context.a(2, res);
-        case 3:
+        case 4:
           return _context.a(2);
       }
     }, _callee);
@@ -5406,19 +5404,25 @@ var enableblacklist = (/*#__PURE__*/function () {
           });
         case 1:
           res = _context.v;
-          if (!res.err) {
+          if (res) {
             _context.n = 2;
             break;
           }
           return _context.a(2, false);
         case 2:
-          if (!res.res) {
+          if (!res.err) {
             _context.n = 3;
             break;
           }
+          return _context.a(2, false);
+        case 3:
+          if (!res.res) {
+            _context.n = 4;
+            break;
+          }
           message.success('操作成功');
           return _context.a(2, res);
-        case 3:
+        case 4:
           return _context.a(2);
       }
     }, _callee);
@@ -5430,31 +5434,38 @@ var enableblacklist = (/*#__PURE__*/function () {
 
 var checkclient = (/*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(s) {
+    var _DocumentsService$ins;
     var res;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           _context.n = 1;
-          return DocumentsService.instance.service.call({
+          return (_DocumentsService$ins = DocumentsService.instance.service) === null || _DocumentsService$ins === void 0 ? void 0 : _DocumentsService$ins.call({
             url: '/whiteblacklist/config/showButton',
             data: {},
             type: 'post'
           });
         case 1:
           res = _context.v;
-          if (!res.err) {
+          if (res) {
             _context.n = 2;
             break;
           }
           return _context.a(2, false);
         case 2:
+          if (!res.err) {
+            _context.n = 3;
+            break;
+          }
+          return _context.a(2, false);
+        case 3:
           if (res.res) {
             s.clientInfo = res.res || {
               showButton: false
             };
             // s.pageMeta = res.res.pageMeta;
           }
-        case 3:
+        case 4:
           return _context.a(2);
       }
     }, _callee);
@@ -5479,18 +5490,24 @@ var synclist = (/*#__PURE__*/function () {
           });
         case 1:
           res = _context.v;
-          if (!res.err) {
+          if (res) {
             _context.n = 2;
             break;
           }
           return _context.a(2, false);
         case 2:
-          if (!res.res) {
+          if (!res.err) {
             _context.n = 3;
             break;
           }
-          return _context.a(2, res);
+          return _context.a(2, false);
         case 3:
+          if (!res.res) {
+            _context.n = 4;
+            break;
+          }
+          return _context.a(2, res);
+        case 4:
           return _context.a(2);
       }
     }, _callee);
@@ -5620,19 +5637,25 @@ var didList = (/*#__PURE__*/function () {
           });
         case 1:
           res = _context.v;
-          if (!res.err) {
+          if (res) {
             _context.n = 2;
             break;
           }
           return _context.a(2, false);
         case 2:
-          if (!res.res) {
+          if (!res.err) {
             _context.n = 3;
             break;
           }
+          return _context.a(2, false);
+        case 3:
+          if (!res.res) {
+            _context.n = 4;
+            break;
+          }
           s.didlist = res.res;
           return _context.a(2, res);
-        case 3:
+        case 4:
           return _context.a(2);
       }
     }, _callee);
@@ -5671,137 +5694,8 @@ var Controller$1 = /*#__PURE__*/function (_GreyReactBox) {
   return _createClass(Controller);
 }(GreyReactBox);
 
-var Option$3 = Select$1.Option;
-var RangePicker$1 = DatePicker$2.RangePicker;
-function UnifiedSearch(props) {
-  var searchFormSubmit = props.searchFormSubmit,
-    searchValues = props.searchValues,
-    right = props.right,
-    onRefresh = props.onRefresh,
-    _props$didlist = props.didlist,
-    didlist = _props$didlist === void 0 ? [] : _props$didlist,
-    _props$labelCol = props.labelCol,
-    labelCol = _props$labelCol === void 0 ? 7 : _props$labelCol;
-  // 动态生成 formItems
-  var formItems = useMemo(function () {
-    var items = [];
-    // DID
-    items.push({
-      name: "customerDid",
-      label: "DID",
-      children: /*#__PURE__*/createElement(Search.Input, null)
-    });
-    // 所属公司
-    items.push({
-      name: "customerName",
-      label: "所属公司",
-      children: /*#__PURE__*/createElement(Search.Input, null)
-    });
-    // 我司对应DID
-    items.push({
-      name: "companyDid",
-      label: "我司对应DID",
-      children: (/*#__PURE__*/createElement(Select$2, {
-        className: "underline",
-        allowClear: true
-      }, didlist.map(function (item) {
-        return /*#__PURE__*/createElement(Option$3, {
-          key: item.participantId,
-          value: item.participantId
-        }, item.remarkName + ':' + item.participantId);
-      })))
-    });
-    // 数据状态
-    items.push({
-      name: "dataStatus",
-      label: "数据状态",
-      children: (/*#__PURE__*/createElement(Select$2, {
-        className: "underline",
-        allowClear: true
-      }, /*#__PURE__*/createElement(Option$3, {
-        value: 1
-      }, "\u4F7F\u7528\u4E2D"), /*#__PURE__*/createElement(Option$3, {
-        value: 2
-      }, "\u505C\u7528")))
-    });
-    // 创建时间
-    items.push({
-      name: "createTime",
-      label: "创建时间",
-      children: (/*#__PURE__*/createElement(RangePicker$1, {
-        style: {
-          width: "100%"
-        },
-        showTime: true,
-        format: "YYYY-MM-DD HH:mm:ss",
-        placeholder: ["开始时间", "结束时间"],
-        className: "underline-datepicker"
-      }))
-    });
-    return items;
-  }, [didlist]);
-  var _SearchXui$useCreate = Search.useCreate({
-      labelCol: labelCol,
-      onSubmit: function onSubmit(e) {
-        if (searchFormSubmit) {
-          // 处理日期字段格式转换
-          var processedValues = _objectSpread2(_objectSpread2({}, e), {}, {
-            beginCreateTime: e.createTime && e.createTime[0] ? e.createTime[0].format('YYYY-MM-DD 00:00:00') : undefined,
-            endCreateTime: e.createTime && e.createTime[1] ? e.createTime[1].format('YYYY-MM-DD 23:59:59') : undefined,
-            pageNum: 1,
-            pageSize: 10
-          });
-          // 移除原始的 createTime 字段，因为已经转换了
-          delete processedValues.createTime;
-          searchFormSubmit(processedValues);
-        }
-      },
-      values: useMemo(function () {
-        // 将搜索值转换回组件所需的格式
-        var convertedValues = _objectSpread2({}, searchValues);
-        if (searchValues.beginCreateTime && searchValues.endCreateTime) {
-          // 如果有处理过的日期字段，需要转换回来
-          // 这里可能需要根据实际需求调整
-          convertedValues.createTime = [searchValues.beginCreateTime, searchValues.endCreateTime];
-        }
-        return searchUnFormat(convertedValues, formItems);
-      }, [searchValues, formItems]),
-      formItems: formItems
-    }),
-    search = _SearchXui$useCreate.search,
-    inventory = _SearchXui$useCreate.inventory,
-    setSearchValues = _SearchXui$useCreate.setSearchValues;
-  useEffect(function () {
-    var convertedValues = _objectSpread2({}, searchValues);
-    if (searchValues.beginCreateTime && searchValues.endCreateTime) {
-      convertedValues.createTime = [searchValues.beginCreateTime, searchValues.endCreateTime];
-    }
-    setSearchValues(searchUnFormat(convertedValues, formItems));
-  }, [formItems, searchValues, setSearchValues]);
-  return /*#__PURE__*/createElement("div", {
-    style: {
-      width: "100%"
-    },
-    className: 'unifiedSearch'
-  }, /*#__PURE__*/createElement("div", {
-    style: {
-      display: "flex",
-      alignItems: "flex-start",
-      gap: "16px"
-    }
-  }, /*#__PURE__*/createElement("div", {
-    style: {
-      flex: 1
-    }
-  }, search), right && (/*#__PURE__*/createElement("div", {
-    style: {
-      display: "flex",
-      alignItems: "center",
-      gap: "8px"
-    }
-  }, right))));
-}
-
+var Option$2 = Select$2.Option;
+var RangePicker$1 = DatePicker$1.RangePicker;
 var Header = (function () {
   var controller = WhiteList.useController();
   var pageMeta = controller.useMemo(function (s) {
@@ -5821,6 +5715,12 @@ var Header = (function () {
     return s.didlist;
   }, []);
   var onSearchFormSubmit = React.useCallback(function (value) {
+    value = _objectSpread2(_objectSpread2({}, value), {}, {
+      beginCreateTime: value['beginCreateTime'] && moment(value['beginCreateTime']).format('YYYY-MM-DD 00:00:00'),
+      endCreateTime: value['endCreateTime'] && moment(value['endCreateTime']).format('YYYY-MM-DD 23:59:59'),
+      pageNum: 1,
+      pageSize: 10
+    });
     controller.pipeline(/*#__PURE__*/function () {
       var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(s) {
         return _regenerator().w(function (_context) {
@@ -5873,7 +5773,63 @@ var Header = (function () {
       }, _callee3);
     }))();
   }, []);
-  // UnifiedSearch 组件内部处理字段定义，不需要 schema
+  // 动态生成 formItems
+  var formItems = React.useMemo(function () {
+    var didEnum = didlist === null || didlist === void 0 ? void 0 : didlist.map(function (item) {
+      return {
+        label: item.remarkName + ':' + item.participantId,
+        value: item.participantId
+      };
+    });
+    var items = [];
+    // DID
+    items.push({
+      name: "customerDid",
+      label: "DID",
+      children: /*#__PURE__*/React.createElement(Search.Input, null)
+    });
+    // 所属公司
+    items.push({
+      name: "customerName",
+      label: "所属公司",
+      children: /*#__PURE__*/React.createElement(Search.Input, null)
+    });
+    // 我司对应DID
+    items.push({
+      name: "companyDid",
+      label: "我司对应DID",
+      children: (/*#__PURE__*/React.createElement(Select$1, {
+        className: "underline",
+        allowClear: true,
+        options: didEnum
+      }))
+    });
+    // 数据状态
+    items.push({
+      name: "dataStatus",
+      label: "数据状态",
+      children: (/*#__PURE__*/React.createElement(Select$1, {
+        className: "underline",
+        allowClear: true,
+        options: [{
+          label: '使用中',
+          value: 1
+        }, {
+          label: '停用',
+          value: 2
+        }]
+      }))
+    });
+    // 创建时间
+    items.push({
+      name: "createTime",
+      label: "创建时间",
+      children: /*#__PURE__*/React.createElement(RangePicker$1, {
+        className: "underline-datepicker"
+      })
+    });
+    return items;
+  }, [didlist]);
   var batchBlockList = useCallback(function (type) {
     _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
       var res;
@@ -5932,14 +5888,39 @@ var Header = (function () {
       };
     }())();
   }, []);
+  // 创建搜索组件
+  var _SearchXui$useCreate = Search.useCreate({
+      labelCol: 9,
+      onSubmit: function onSubmit(e) {
+        onSearchFormSubmit(e);
+      },
+      values: React.useMemo(function () {
+        return searchUnFormat(whiteParams, formItems);
+      }, [whiteParams, formItems]),
+      formItems: formItems
+    }),
+    search = _SearchXui$useCreate.search,
+    inventory = _SearchXui$useCreate.inventory;
   var topExpand = useCallback(function () {
-    return /*#__PURE__*/React.createElement(UnifiedSearch, {
-      searchFormSubmit: onSearchFormSubmit,
-      searchValues: whiteParams,
-      didlist: didlist,
-      labelCol: 9
-    });
-  }, [whiteParams, didlist]);
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: "100%"
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: 'unifiedSearch'
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: "flex",
+        alignItems: "flex-start",
+        gap: "16px",
+        padding: '10px 0px'
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        flex: 1
+      }
+    }, search))), inventory);
+  }, [search, inventory]);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 'none',
@@ -6191,6 +6172,8 @@ function Rule$1(props) {
   }));
 }
 
+var Option$3 = Select$2.Option;
+var RangePicker$2 = DatePicker$1.RangePicker;
 var Header$1 = (function () {
   var controller = WhiteList.useController();
   var pageMeta = controller.useMemo(function (s) {
@@ -6209,11 +6192,13 @@ var Header$1 = (function () {
   var didlist = controller.useMemo(function (s) {
     return s.didlist;
   }, []);
-  var _useState = useState(''),
-    _useState2 = _slicedToArray(_useState, 2),
-    companyDidNote = _useState2[0],
-    setNote = _useState2[1];
   var onSearchFormSubmit = React.useCallback(function (value) {
+    value = _objectSpread2(_objectSpread2({}, value), {}, {
+      beginCreateTime: value['beginCreateTime'] && moment(value['beginCreateTime']).format('YYYY-MM-DD 00:00:00'),
+      endCreateTime: value['endCreateTime'] && moment(value['endCreateTime']).format('YYYY-MM-DD 23:59:59'),
+      pageNum: 1,
+      pageSize: 10
+    });
     controller.pipeline(/*#__PURE__*/function () {
       var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(s) {
         return _regenerator().w(function (_context) {
@@ -6236,7 +6221,63 @@ var Header$1 = (function () {
   useEffect(function () {
     controller.didList({});
   }, []);
-  // UnifiedSearch 组件内部处理字段定义，不需要 schema
+  // 动态生成 formItems
+  var formItems = React.useMemo(function () {
+    var didEnum = didlist === null || didlist === void 0 ? void 0 : didlist.map(function (item) {
+      return {
+        label: item.remarkName + ':' + item.participantId,
+        value: item.participantId
+      };
+    });
+    var items = [];
+    // DID
+    items.push({
+      name: "customerDid",
+      label: "DID",
+      children: /*#__PURE__*/React.createElement(Search.Input, null)
+    });
+    // 所属公司
+    items.push({
+      name: "customerName",
+      label: "所属公司",
+      children: /*#__PURE__*/React.createElement(Search.Input, null)
+    });
+    // 我司对应DID
+    items.push({
+      name: "companyDid",
+      label: "我司对应DID",
+      children: (/*#__PURE__*/React.createElement(Select$1, {
+        className: "underline",
+        allowClear: true,
+        options: didEnum
+      }))
+    });
+    // 数据状态
+    items.push({
+      name: "dataStatus",
+      label: "数据状态",
+      children: (/*#__PURE__*/React.createElement(Select$1, {
+        className: "underline",
+        allowClear: true,
+        options: [{
+          label: '使用中',
+          value: 1
+        }, {
+          label: '停用',
+          value: 2
+        }]
+      }))
+    });
+    // 创建时间
+    items.push({
+      name: "createTime",
+      label: "创建时间",
+      children: /*#__PURE__*/React.createElement(RangePicker$2, {
+        className: "underline-datepicker"
+      })
+    });
+    return items;
+  }, [didlist]);
   var batchBlockList = useCallback(function (type) {
     _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
       var res;
@@ -6295,14 +6336,37 @@ var Header$1 = (function () {
       };
     }())();
   }, []);
+  // 创建搜索组件
+  var _SearchXui$useCreate = Search.useCreate({
+      labelCol: 9,
+      onSubmit: function onSubmit(e) {
+        onSearchFormSubmit(e);
+      },
+      values: React.useMemo(function () {
+        return searchUnFormat(params, formItems);
+      }, [params, formItems]),
+      formItems: formItems
+    }),
+    search = _SearchXui$useCreate.search,
+    inventory = _SearchXui$useCreate.inventory;
   var topExpand = useCallback(function () {
-    return /*#__PURE__*/React.createElement(UnifiedSearch, {
-      searchFormSubmit: onSearchFormSubmit,
-      searchValues: params,
-      didlist: didlist,
-      labelCol: 9
-    });
-  }, [params, didlist]);
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: "100%"
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: "flex",
+        alignItems: "flex-start",
+        gap: "16px",
+        padding: '10px 0px'
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        flex: 1
+      }
+    }, search)), inventory);
+  }, [search, inventory]);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 'none',
@@ -6633,9 +6697,9 @@ function Rule$3(props) {
     labelAlign: "left",
     name: "status",
     label: "\u60A8\u671F\u671B\u7528\u54EA\u4E2A\u540D\u5355\u6765\u8FC7\u6EE4\u4F60\u7684\u5355\u636E\u6536\u53D1?"
-  }, /*#__PURE__*/React.createElement(Radio$1.Group, null, /*#__PURE__*/React.createElement(Radio$1, {
+  }, /*#__PURE__*/React.createElement(Radio$2.Group, null, /*#__PURE__*/React.createElement(Radio$2, {
     value: 1
-  }, "\u4F7F\u7528\u767D\u540D\u5355\u8FC7\u6EE4"), /*#__PURE__*/React.createElement(Radio$1, {
+  }, "\u4F7F\u7528\u767D\u540D\u5355\u8FC7\u6EE4"), /*#__PURE__*/React.createElement(Radio$2, {
     value: 2
   }, "\u4F7F\u7528\u9ED1\u540D\u5355\u8FC7\u6EE4")))), /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("a", null, /*#__PURE__*/React.createElement(InfoCircleOutlined, null), " \u6E29\u99A8\u63D0\u793A\uFF1A"), "\u5F53\u60A8\u4F7F\u7528\u767D\u540D\u5355\u8FC7\u6EE4\u65F6\uFF0C\u53EA\u6709\u767D\u540D\u5355\u91CC\u9762\u7684DID\u624D\u53EF\u4EE5\u8DDF\u60A8\u53D1\u9001\u6216\u63A5\u6536\u5355\u636E\uFF1B\u5F53\u60A8\u4F7F\u7528\u9ED1\u540D\u5355\u8FC7\u6EE4\u65F6\uFF0C\u9664\u4E86\u9ED1\u540D\u5355\u91CC\u9762\u7684DID\u4E0D\u80FD\u7ED9\u60A8\u53D1\u9001\u548C\u63A5\u6536\u5355\u636E\u5916\uFF0C\u5176\u4ED6DID\u90FD\u53EF\u4EE5\u7ED9\u60A8\u53D1\u9001\u548C\u63A5\u6536\u5355\u636E\u3002"));
 }
@@ -6692,14 +6756,14 @@ function Rule$4(props) {
       justifyContent: "space-between",
       borderBottom: '1px solid #f0f0f0'
     }
-  }, /*#__PURE__*/React.createElement(Radio$1.Group, {
+  }, /*#__PURE__*/React.createElement(Radio$2.Group, {
     defaultValue: "/whitelist",
     onChange: tabsOnChange
-  }, /*#__PURE__*/React.createElement(Radio$1.Button, {
+  }, /*#__PURE__*/React.createElement(Radio$2.Button, {
     value: "/whitelist"
-  }, "\u767D\u540D\u5355\u8BBE\u7F6E"), /*#__PURE__*/React.createElement(Radio$1.Button, {
+  }, "\u767D\u540D\u5355\u8BBE\u7F6E"), /*#__PURE__*/React.createElement(Radio$2.Button, {
     value: "/blacklist"
-  }, "\u9ED1\u540D\u5355\u8BBE\u7F6E"), /*#__PURE__*/React.createElement(Radio$1.Button, {
+  }, "\u9ED1\u540D\u5355\u8BBE\u7F6E"), /*#__PURE__*/React.createElement(Radio$2.Button, {
     value: "/switchmode"
   }, "\u5207\u6362\u8FC7\u6EE4\u65B9\u5F0F")), activeKey === '/switchmode' && /*#__PURE__*/React.createElement(Button$1, {
     onClick: onClickHandler,