fix: merge next

src/global.less

@@ -150,3 +150,7 @@ input[type='tel'] {
 .ant-pagination.mini .ant-pagination-jump-next {
   display: none;
 }
+
+.ant-popover-buttons {
+  display: flex;
+}

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

@@ -168,7 +168,10 @@ export default (props: Props) => {
           key={2}
           onClick={async () => {
             const value = await form.submit<any>();
-            const obj = props.data[0];
+            const obj = {
+              ...props.data[0],
+              accessModes: value?.accessModes.map((item: any) => item?.value || item),
+            };
             if (value?.accessModes && value?.accessModes?.length) {
               obj.accessModes = value.accessModes;
             }

src/pages/media/Cascade/Publish/index.tsx

@@ -33,8 +33,10 @@ const Publish = (props: Props) => {
         et += 1;
         setCountErr(et);
         setFlag(false);
-        errMessages.push({ ...res });
-        setErrMessage([...errMessages]);
+        if (errMessages.length <= 5) {
+          errMessages.push({ ...res });
+          setErrMessage([...errMessages]);
+        }
       }
     };
     source.onerror = () => {

src/pages/system/Menu/Setting/baseMenu.ts

@@ -1411,24 +1411,46 @@ export default [
                 permissions: [],
                 buttons: [
                   {
+                    id: 'view',
+                    name: '查看',
+                    permissions: [
+                      {
+                        permission: 'data-collect-channel',
+                        actions: ['query'],
+                      },
+                      {
+                        permission: 'data-collector',
+                        actions: ['query'],
+                      },
+                      {
+                        permission: 'data-collect-opc',
+                        actions: ['query'],
+                      },
+                      {
+                        permission: 'things-collector',
+                        actions: ['query'],
+                      },
+                    ],
+                  },
+                  {
                     id: 'add',
                     name: '新增',
                     permissions: [
                       {
                         permission: 'data-collect-channel',
-                        actions: ['save'],
+                        actions: ['save', 'query'],
                       },
                       {
                         permission: 'data-collector',
-                        actions: ['save'],
+                        actions: ['save', 'query'],
                       },
                       {
                         permission: 'data-collect-opc',
-                        actions: ['save'],
+                        actions: ['save', 'query'],
                       },
                       {
                         permission: 'things-collector',
-                        actions: ['save'],
+                        actions: ['save', 'query'],
                       },
                     ],
                   },
@@ -1452,6 +1474,10 @@ export default [
                         permission: 'things-collector',
                         actions: ['save', 'query'],
                       },
+                      {
+                        permission: 'certificate',
+                        actions: ['query'],
+                      },
                     ],
                   },
                   {
@@ -1482,19 +1508,19 @@ export default [
                     permissions: [
                       {
                         permission: 'data-collect-channel',
-                        actions: ['delete'],
+                        actions: ['delete', 'query'],
                       },
                       {
                         permission: 'data-collector',
-                        actions: ['delete'],
+                        actions: ['delete', 'query'],
                       },
                       {
                         permission: 'data-collect-opc',
-                        actions: ['delete'],
+                        actions: ['delete', 'query'],
                       },
                       {
                         permission: 'things-collector',
-                        actions: ['delete'],
+                        actions: ['delete', 'query'],
                       },
                     ],
                   },
@@ -1516,24 +1542,46 @@ export default [
                 permissions: [],
                 buttons: [
                   {
+                    id: 'view',
+                    name: '查看',
+                    permissions: [
+                      {
+                        permission: 'data-collect-channel',
+                        actions: ['query'],
+                      },
+                      {
+                        permission: 'data-collector',
+                        actions: ['query'],
+                      },
+                      {
+                        permission: 'data-collect-opc',
+                        actions: ['query'],
+                      },
+                      {
+                        permission: 'things-collector',
+                        actions: ['query'],
+                      },
+                    ],
+                  },
+                  {
                     id: 'add',
                     name: '新增',
                     permissions: [
                       {
                         permission: 'data-collect-channel',
-                        actions: ['save'],
+                        actions: ['save', 'query'],
                       },
                       {
                         permission: 'data-collector',
-                        actions: ['save'],
+                        actions: ['save', 'query'],
                       },
                       {
                         permission: 'data-collect-opc',
-                        actions: ['save'],
+                        actions: ['save', 'query'],
                       },
                       {
                         permission: 'things-collector',
-                        actions: ['save'],
+                        actions: ['save', 'query'],
                       },
                     ],
                   },
@@ -1557,6 +1605,10 @@ export default [
                         permission: 'things-collector',
                         actions: ['save', 'query'],
                       },
+                      {
+                        permission: 'certificate',
+                        actions: ['query'],
+                      },
                     ],
                   },
                   {
@@ -1587,19 +1639,19 @@ export default [
                     permissions: [
                       {
                         permission: 'data-collect-channel',
-                        actions: ['delete'],
+                        actions: ['delete', 'query'],
                       },
                       {
                         permission: 'data-collector',
-                        actions: ['delete'],
+                        actions: ['delete', 'query'],
                       },
                       {
                         permission: 'data-collect-opc',
-                        actions: ['delete'],
+                        actions: ['delete', 'query'],
                       },
                       {
                         permission: 'things-collector',
-                        actions: ['delete'],
+                        actions: ['delete', 'query'],
                       },
                     ],
                   },