fix: merge

Next wzy

src/pages/iot-card/Record/index.tsx

@@ -1,4 +1,66 @@
+import SearchComponent from '@/components/SearchComponent';
+import useDomFullHeight from '@/hooks/document/useDomFullHeight';
+import { PageContainer } from '@ant-design/pro-layout';
+import ProTable, { ActionType, ProColumns } from '@jetlinks/pro-table';
+import moment from 'moment';
+import { useRef, useState } from 'react';
+import Service from './service';
+
+export const service = new Service('');
+
 const Record = () => {
-  return <>操作记录</>;
+  const { minHeight } = useDomFullHeight(`.record`, 24);
+  const actionRef = useRef<ActionType>();
+  const [param, setParam] = useState({});
+
+  const columns: ProColumns<any>[] = [
+    {
+      dataIndex: 'cardId',
+      title: '卡号',
+    },
+    {
+      dataIndex: 'type',
+      title: '操作类型',
+    },
+    {
+      dataIndex: 'time',
+      title: '操作时间',
+      valueType: 'dateTime',
+      render: (_: any, record) => {
+        return record.time ? moment(record.time).format('YYYY-MM-DD HH:mm:ss') : '';
+      },
+    },
+    {
+      dataIndex: 'operator',
+      title: '操作人',
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <SearchComponent
+        field={columns}
+        target="record"
+        onSearch={(data) => {
+          // 重置分页数据
+          actionRef.current?.reset?.();
+          setParam(data);
+        }}
+      />
+      <ProTable
+        actionRef={actionRef}
+        params={param}
+        columns={columns}
+        search={false}
+        rowKey="id"
+        tableClassName={'record'}
+        columnEmptyText={''}
+        tableStyle={{ minHeight }}
+        request={async (params) =>
+          service.getList({ ...params, sorts: [{ name: 'createTime', order: 'desc' }] })
+        }
+      />
+    </PageContainer>
+  );
 };
 export default Record;

src/pages/iot-card/Record/service.ts

@@ -0,0 +1,12 @@
+import { request } from 'umi';
+import SystemConst from '@/utils/const';
+import BaseService from '@/utils/BaseService';
+
+class Service extends BaseService<any> {
+  getList = (data: any) =>
+    request(`${SystemConst.API_BASE}/network/card/stateOperate/_log`, {
+      method: 'POST',
+      data,
+    });
+}
+export default Service;

src/pages/notice/Config/Detail/index.tsx

@@ -319,12 +319,7 @@ const Detail = observer(() => {
                 'x-component-props': {
                   placeholder: '请输入webhook',
                 },
-                'x-validator': [
-                  {
-                    max: 64,
-                    message: '最多可输入64个字符',
-                  },
-                ],
+
                 'x-reactions': {
                   dependencies: ['provider'],
                   fulfill: {