fix: 修改数据采集

src/pages/link/DataCollect/components/Channel/Save/index.tsx

@@ -68,14 +68,14 @@ export default (props: Props) => {
 
   registerValidateRules({
     testHost(val: string) {
-      if (val) return '';
-      if (!testIP(val) || !testIPv6(val) || !testDomain(val)) {
+      if (!(testIP(val) || testIPv6(val) || testDomain(val))) {
         return {
           type: 'error',
           message: '请输入正确格式的IP地址',
         };
+      } else {
+        return true;
       }
-      return '';
     },
   });
 
@@ -140,6 +140,7 @@ export default (props: Props) => {
             'x-decorator': 'FormItem',
             'x-decorator-props': {
               gridSpan: 2,
+              tooltip: '支持ipv4、ipv6、域名',
             },
             'x-component-props': {
               placeholder: '请输入Modbus主机IP',

src/pages/link/DataCollect/components/Channel/index.tsx

@@ -28,22 +28,18 @@ const ChannelModel = model<{
 export default observer((props: Props) => {
   const intl = useIntl();
   const { minHeight } = useDomFullHeight(`.data-collect-channel`, 24);
-  const [param, setParam] = useState({});
+  const [param, setParam] = useState({ pageSize: 12, terms: [] });
   const { permission } = PermissionButton.usePermission('device/Instance');
   const [loading, setLoading] = useState<boolean>(true);
   const [dataSource, setDataSource] = useState<any>({
     data: [],
-    pageSize: 10,
+    pageSize: 12,
     pageIndex: 0,
     total: 0,
   });
 
   const columns: ProColumns<ChannelItem>[] = [
     {
-      title: 'ID',
-      dataIndex: 'id',
-    },
-    {
       title: '名称',
       dataIndex: 'name',
     },
@@ -72,7 +68,7 @@ export default observer((props: Props) => {
           status: 'enabled',
         },
         disabled: {
-          text: '禁用',
+          text: '异常',
           status: 'disabled',
         },
       },
@@ -185,7 +181,7 @@ export default observer((props: Props) => {
                         pageSize: size,
                       });
                     }}
-                    pageSizeOptions={[10, 20, 50, 100]}
+                    pageSizeOptions={[12, 24, 48, 96]}
                     pageSize={dataSource?.pageSize}
                     showTotal={(num) => {
                       const minSize = dataSource?.pageIndex * dataSource?.pageSize + 1;

src/pages/link/DataCollect/components/Device/index.tsx

@@ -29,25 +29,19 @@ const CollectorModel = model<{
 
 export default observer((props: Props) => {
   const { minHeight } = useDomFullHeight(`.data-collect-collector`, 24);
-  const [param, setParam] = useState({
-    terms: [],
-  });
+  const [param, setParam] = useState({ pageSize: 12, terms: [] });
   const [loading, setLoading] = useState<boolean>(true);
   const intl = useIntl();
   const { permission } = PermissionButton.usePermission('device/Instance');
   const [dataSource, setDataSource] = useState<any>({
     data: [],
-    pageSize: 10,
+    pageSize: 12,
     pageIndex: 0,
     total: 0,
   });
 
   const columns: ProColumns<CollectorItem>[] = [
     {
-      title: 'ID',
-      dataIndex: 'id',
-    },
-    {
       title: '名称',
       dataIndex: 'name',
     },
@@ -271,7 +265,7 @@ export default observer((props: Props) => {
                         pageSize: size,
                       });
                     }}
-                    pageSizeOptions={[10, 20, 50, 100]}
+                    pageSizeOptions={[12, 24, 48, 96]}
                     pageSize={dataSource?.pageSize}
                     showTotal={(num) => {
                       const minSize = dataSource?.pageIndex * dataSource?.pageSize + 1;

src/pages/link/DataCollect/components/Point/index.tsx

@@ -32,25 +32,19 @@ const PointModel = model<{
 export default observer((props: Props) => {
   const [subscribeTopic] = useSendWebsocketMessage();
   const { minHeight } = useDomFullHeight(`.data-collect-point`, 24);
-  const [param, setParam] = useState({
-    terms: [],
-  });
+  const [param, setParam] = useState({ pageSize: 12, terms: [] });
   const [loading, setLoading] = useState<boolean>(true);
   const { permission } = PermissionButton.usePermission('device/Instance');
   const [propertyValue, setPropertyValue] = useState<any>({});
   const [dataSource, setDataSource] = useState<any>({
     data: [],
-    pageSize: 10,
+    pageSize: 12,
     pageIndex: 0,
     total: 0,
   });
 
   const columns: ProColumns<PointItem>[] = [
     {
-      title: 'ID',
-      dataIndex: 'id',
-    },
-    {
       title: '名称',
       dataIndex: 'name',
     },
@@ -79,7 +73,7 @@ export default observer((props: Props) => {
           status: 'enabled',
         },
         disabled: {
-          text: '禁用',
+          text: '异常',
           status: 'disabled',
         },
       },
@@ -206,7 +200,7 @@ export default observer((props: Props) => {
                         pageSize: size,
                       });
                     }}
-                    pageSizeOptions={[10, 20, 50, 100]}
+                    pageSizeOptions={[12, 24, 48, 96]}
                     pageSize={dataSource?.pageSize}
                     showTotal={(num) => {
                       const minSize = dataSource?.pageIndex * dataSource?.pageSize + 1;

src/utils/util.ts

@@ -108,7 +108,7 @@ export const testIPv6 = (str: string) => {
 };
 
 export const testDomain = (str: string) => {
-  const re = /^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,6}$/;
+  const re = /([0-9a-z-]{2,}\.[0-9a-z-]{2,3}\.[0-9a-z-]{2,3}|[0-9a-z-]{2,}\.[0-9a-z-]{2,3})$/i;
   return re.test(str);
 };