Kaynağa Gözat

Merge wzy

Next wzy
XieYongHong 3 yıl önce
ebeveyn
işleme
76d8a00640

+ 1 - 1
src/pages/device/DashBoard/index.tsx

@@ -283,7 +283,7 @@ const DeviceBoard = () => {
           grid: {
           grid: {
             top: '2%',
             top: '2%',
             bottom: '5%',
             bottom: '5%',
-            left: '2%',
+            left: '4%',
             right: '2%',
             right: '2%',
           },
           },
           series: [
           series: [

+ 5 - 5
src/pages/device/Instance/Detail/Parsing/index.tsx

@@ -262,11 +262,11 @@ const Parsing = (props: Props) => {
                   return {
                   return {
                     suggestions: [
                     suggestions: [
                       {
                       {
-                        label: 'test()',
-                        kind: editor.languages.CompletionItemKind['Function'],
-                        insertText: 'test()',
-                        detail: '测试语法',
-                        range: range,
+                        label: 'test()', //提示内容
+                        kind: editor.languages.CompletionItemKind['Function'], //图标
+                        insertText: 'test()', //填充
+                        detail: '这是一个测试语法', //提示的解释
+                        range: range, //范围
                       },
                       },
                     ],
                     ],
                   };
                   };

+ 2 - 2
src/pages/link/Channel/Modbus/Access/bindDevice/index.tsx

@@ -96,8 +96,8 @@ const BindDevice = (props: Props) => {
         save();
         save();
       }}
       }}
       width={1300}
       width={1300}
-      permissionCode={'link/Channel/Modbus'}
-      permission={['add', 'edit', 'view']}
+      permissionCode={'device/Instance'}
+      permission={['edit', 'view']}
     >
     >
       <SearchComponent
       <SearchComponent
         field={columns}
         field={columns}

+ 2 - 2
src/pages/link/Channel/Opcua/Access/bindDevice/index.tsx

@@ -106,8 +106,8 @@ const BindDevice = (props: Props) => {
         save();
         save();
       }}
       }}
       width={1300}
       width={1300}
-      permissionCode={'link/Channel/Opcua'}
-      permission={['add', 'edit', 'view']}
+      permissionCode={'device/Instance'}
+      permission={['edit', 'view']}
     >
     >
       <SearchComponent
       <SearchComponent
         field={columns}
         field={columns}

+ 3 - 0
src/pages/link/Type/Detail/index.tsx

@@ -128,6 +128,9 @@ const Save = observer(() => {
                 state.value = '0.0.0.0';
                 state.value = '0.0.0.0';
                 state.disabled = true;
                 state.disabled = true;
               });
               });
+              f.setFieldState('grid.configuration.panel1.layout2.secure', (state) => {
+                state.value = false;
+              });
             }
             }
             const _host = filterConfigByType(_.cloneDeep(configRef.current), value);
             const _host = filterConfigByType(_.cloneDeep(configRef.current), value);
             f.setFieldState('grid.configuration.panel1.layout2.host', (state) => {
             f.setFieldState('grid.configuration.panel1.layout2.host', (state) => {