fix: 扫描验证

src/components/ProTableCard/CardItems/networkCard.tsx

@@ -34,14 +34,21 @@ export default (props: NoticeCardProps) => {
             item.configuration?.publicPort || item.configuration?.remotePort
           }`,
       );
+      const str = log
+        .map((item) => {
+          return `${networkMap[record.type]}${item}`;
+        })
+        .join(',');
+
       return (
         <>
-          {log.slice(0, 2).map((item) => (
-            <div key={item} className={'ellipsis-type-item'}>
-              {networkMap[record.type]}
-              {item}
-            </div>
-          ))}
+          {/*{[...log, ...log].slice(0, 2).map((item) => (*/}
+          {/*  <div key={item} className={'ellipsis-type-item'}>*/}
+          {/*    {networkMap[record.type]}*/}
+          {/*    {item}*/}
+          {/*  </div>*/}
+          {/*))}*/}
+          {str}
         </>
       );
     }

src/components/ProTableCard/index.less

@@ -110,16 +110,15 @@
           }
 
           .ellipsis-type {
+            display: -webkit-box;
+            width: 100%;
+            overflow: hidden;
             font-weight: bold;
             font-size: 14px;
-
-            .ellipsis-type-item {
-              width: 100%;
-              overflow: hidden;
-              white-space: nowrap;
-              text-align: left;
-              text-overflow: ellipsis;
-            }
+            text-overflow: ellipsis;
+            word-break: break-all;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
           }
         }
       }

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

@@ -274,6 +274,9 @@ export default observer((props: Props) => {
                                 if (resp.status === 200) {
                                   onlyMessage('操作成功！');
                                   handleSearch(param);
+                                  if (props?.reload) {
+                                    props.reload();
+                                  }
                                 } else {
                                   onlyMessage('操作失败！', 'error');
                                 }
@@ -318,6 +321,9 @@ export default observer((props: Props) => {
                                     }),
                                   );
                                   handleSearch(param);
+                                  if (props?.reload) {
+                                    props.reload();
+                                  }
                                 } else {
                                   onlyMessage(
                                     intl.formatMessage({ id: 'pages.device.instance.deleteTip' }),

src/pages/link/DataCollect/components/Point/Save/modbus.tsx

@@ -83,10 +83,10 @@ export default (props: Props) => {
           message: '最多可输入64个字符',
         };
       }
-      if (!(Number(value) % 1 === 0) || Number(value) <= 0) {
+      if (!(Number(value) % 1 === 0) || Number(value) < 0) {
         return {
           type: 'error',
-          message: '请输入非0正整数',
+          message: '请输入0或正整数',
         };
       }
       return '';

src/pages/link/DataCollect/components/Point/Save/opc-ua.tsx

@@ -83,10 +83,10 @@ export default (props: Props) => {
           message: '最多可输入64个字符',
         };
       }
-      if (!(value % 1 === 0)) {
+      if (!(Number(value) % 1 === 0) || Number(value) < 0) {
         return {
           type: 'error',
-          message: '请输入非0正整数',
+          message: '请输入0或正整数',
         };
       }
       return '';
@@ -165,17 +165,10 @@ export default (props: Props) => {
               gridSpan: 2,
             },
             default: 3000,
-            // 'x-reactions': {
-            //   dependencies: ['..accessModes'],
-            //   fulfill: {
-            //     state: {
-            //       visible: '{{($deps[0] || []).includes("subscribe")}}',
-            //     },
-            //   },
-            // },
             'x-component-props': {
               placeholder: '请输入采集频率',
               addonAfter: '毫秒',
+              stringMode: true,
               style: {
                 width: '100%',
               },

src/pages/link/DataCollect/components/Point/Save/scan.tsx

@@ -4,7 +4,7 @@ import service from '@/pages/link/DataCollect/service';
 import './scan.less';
 import { onlyMessage } from '@/utils/util';
 import { createSchemaField, FormProvider } from '@formily/react';
-import { ArrayTable, FormItem, Input } from '@formily/antd';
+import { ArrayTable, FormItem, Input, Select } from '@formily/antd';
 import MyInput from '@/pages/link/DataCollect/components/Point/Save/components/MyInput';
 import MySelect from '@/pages/link/DataCollect/components/Point/Save/components/MySelect';
 import {
@@ -112,6 +112,7 @@ export default (props: Props) => {
       MyInput,
       MySelect,
       RemoveData,
+      Select,
     },
   });
 
@@ -184,14 +185,13 @@ export default (props: Props) => {
       return '';
     },
     checkAccessModes(value) {
-      if (value?.value && value?.value.length) {
-        return '';
-      } else {
+      if (!value?.value.length) {
         return {
           type: 'error',
           message: '请选择访问类型',
         };
       }
+      return '';
     },
   });
 
@@ -216,6 +216,7 @@ export default (props: Props) => {
               properties: {
                 name: {
                   'x-component': 'Input',
+                  'x-decorator': 'FormItem',
                   'x-component-props': {
                     placeholder: '请输入点位名称',
                   },
@@ -253,6 +254,7 @@ export default (props: Props) => {
               properties: {
                 accessModes: {
                   'x-component': 'MySelect',
+                  'x-decorator': 'FormItem',
                   'x-component-props': {
                     placeholder: '请选择访问类型',
                     mode: 'multiple',