Merge xyh

Next xyh

src/pages/init-home/index.tsx

@@ -31,7 +31,7 @@ const InitHome = () => {
   useEffect(() => {
     service.getInit().then(res => {
       if (res.status === 200 && res.result.length) {
-        jump()
+        // jump()
       }
     })
   }, [])

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

@@ -214,23 +214,21 @@ const Debug = observer(() => {
     // 应该取选择的配置信息
     if (!state.current) return;
     const templateId = data.templateId;
-    const list = Store.get('notice-template-list');
-    const _template = list.find((item: any) => item.id === templateId);
+    // const list = Store.get('notice-template-list');
+    // const _template = list.find((item: any) => item.id === templateId);
 
-    const resp = await service.debug(state?.current.id, templateId, {
-      template: _template,
-      context: data.variableDefinitions?.reduce(
-        (previousValue: any, currentValue: { id: any; value: any }) => {
-          return {
-            ...previousValue,
-            [currentValue.id]: currentValue.value,
-          };
-        },
-        {},
-      ),
-    });
+    const resp = await service.debug(state?.current.id, templateId, data.variableDefinitions?.reduce(
+      (previousValue: any, currentValue: { id: any; value: any }) => {
+        return {
+          ...previousValue,
+          [currentValue.id]: currentValue.value,
+        };
+      },
+      {},
+    ));
     if (resp.status === 200) {
       onlyMessage('操作成功!');
+      state.debug = false;
     }
   };
   return (

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

@@ -588,6 +588,13 @@ export default [
                 url: '/iot/link/Channel/Modbus',
                 icon: 'icon-changjingliandong',
                 permissions: [],
+                buttons: [
+                  {id: "update", name: "编辑", permissions: [{permission: "modbus-master", actions: ["query", "save"]}]},
+                  {id: "action", name: "启/禁用", permissions: [{permission: "modbus-master", actions: ["query", "save"]}]},
+                  {id: "view", name: "设备接入", permissions: [{permission: "modbus-master", actions: ["query", "save"]}]},
+                  {id: "delete", name: "删除", permissions: [{permission: "modbus-master", actions: ["query", "delete"]}]},
+                  {id: "add", name: "新增", permissions: [{permission: "modbus-master", actions: ["query", "save"]}]},
+                ]
               },
             ],
           },
@@ -1310,6 +1317,7 @@ export default [
         ],
         buttons: [
           { id: 'view', name: '查看', permissions: [{ permission: 'menu', actions: ['query'] }] },
+          { id: 'setting', name: '配置', permissions: [{ permission: 'menu', actions: ['query', 'save', 'grant'] }] },
           {
             id: 'update',
             name: '编辑',