Sfoglia il codice sorgente

fix: 屏蔽物模型映射

wzyyy 3 anni fa
parent
commit
cee7a9d9f9

+ 23 - 23
src/pages/device/Instance/Detail/index.tsx

@@ -12,7 +12,7 @@ import Functions from '@/pages/device/Instance/Detail/Functions';
 import Running from '@/pages/device/Instance/Detail/Running';
 import Running from '@/pages/device/Instance/Detail/Running';
 import ChildDevice from '@/pages/device/Instance/Detail/ChildDevice';
 import ChildDevice from '@/pages/device/Instance/Detail/ChildDevice';
 import Diagnose from '@/pages/device/Instance/Detail/Diagnose';
 import Diagnose from '@/pages/device/Instance/Detail/Diagnose';
-import MetadataMap from '@/pages/device/Instance/Detail/MetadataMap';
+// import MetadataMap from '@/pages/device/Instance/Detail/MetadataMap';
 import Opcua from '@/pages/device/Instance/Detail/Opcua';
 import Opcua from '@/pages/device/Instance/Detail/Opcua';
 import Modbus from '@/pages/device/Instance/Detail/Modbus';
 import Modbus from '@/pages/device/Instance/Detail/Modbus';
 import { useIntl } from '@@/plugin-locale/localeExports';
 import { useIntl } from '@@/plugin-locale/localeExports';
@@ -27,7 +27,7 @@ import { Ellipsis, PermissionButton } from '@/components';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import Service from '@/pages/device/Instance/service';
 import Service from '@/pages/device/Instance/service';
 import useLocation from '@/hooks/route/useLocation';
 import useLocation from '@/hooks/route/useLocation';
-import { onlyMessage, isNoCommunity } from '@/utils/util';
+import { onlyMessage } from '@/utils/util';
 import Parsing from './Parsing';
 import Parsing from './Parsing';
 // import EdgeMap from './EdgeMap';
 // import EdgeMap from './EdgeMap';
 
 
@@ -151,15 +151,15 @@ const InstanceDetail = observer(() => {
     },
     },
   ];
   ];
 
 
-  const pList = [
-    'websocket-server',
-    'http-server-gateway',
-    'udp-device-gateway',
-    'coap-server-gateway',
-    'mqtt-client-gateway',
-    'mqtt-server-gateway',
-    'tcp-server-gateway',
-  ];
+  // const pList = [
+  //   'websocket-server',
+  //   'http-server-gateway',
+  //   'udp-device-gateway',
+  //   'coap-server-gateway',
+  //   'mqtt-client-gateway',
+  //   'mqtt-server-gateway',
+  //   'tcp-server-gateway',
+  // ];
   const [list, setList] =
   const [list, setList] =
     useState<{ key: string; tab: string | ReactNode; component: ReactNode }[]>(baseList);
     useState<{ key: string; tab: string | ReactNode; component: ReactNode }[]>(baseList);
 
 
@@ -168,18 +168,18 @@ const InstanceDetail = observer(() => {
     if (response.status === 200) {
     if (response.status === 200) {
       InstanceModel.detail = response?.result;
       InstanceModel.detail = response?.result;
       const datalist = [...baseList];
       const datalist = [...baseList];
-      if (
-        InstanceModel.detail?.accessProvider &&
-        pList.includes(InstanceModel.detail?.accessProvider)
-      ) {
-        if (isNoCommunity) {
-          datalist.push({
-            key: 'metadata-map',
-            tab: '物模型映射',
-            component: <MetadataMap type="device" />,
-          });
-        }
-      }
+      // if (
+      //   InstanceModel.detail?.accessProvider &&
+      //   pList.includes(InstanceModel.detail?.accessProvider)
+      // ) {
+      //   if (isNoCommunity) {
+      //     datalist.push({
+      //       key: 'metadata-map',
+      //       tab: '物模型映射',
+      //       component: <MetadataMap type="device" />,
+      //     });
+      //   }
+      // }
       const paring = response.result?.features?.find((item: any) => item.id === 'transparentCodec');
       const paring = response.result?.features?.find((item: any) => item.id === 'transparentCodec');
       if (paring) {
       if (paring) {
         datalist.push({
         datalist.push({

+ 23 - 23
src/pages/device/Product/Detail/index.tsx

@@ -13,11 +13,11 @@ import { Store } from 'jetlinks-store';
 import MetadataAction from '@/pages/device/components/Metadata/DataBaseAction';
 import MetadataAction from '@/pages/device/components/Metadata/DataBaseAction';
 import { getMenuPathByCode, MENUS_CODE } from '@/utils/menu';
 import { getMenuPathByCode, MENUS_CODE } from '@/utils/menu';
 import encodeQuery from '@/utils/encodeQuery';
 import encodeQuery from '@/utils/encodeQuery';
-import MetadataMap from '@/pages/device/Instance/Detail/MetadataMap';
+// import MetadataMap from '@/pages/device/Instance/Detail/MetadataMap';
 import SystemConst from '@/utils/const';
 import SystemConst from '@/utils/const';
 import { Ellipsis, PermissionButton } from '@/components';
 import { Ellipsis, PermissionButton } from '@/components';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import { QuestionCircleOutlined } from '@ant-design/icons';
-import { isNoCommunity, onlyMessage } from '@/utils/util';
+import { onlyMessage } from '@/utils/util';
 import Parsing from '../../Instance/Detail/Parsing';
 import Parsing from '../../Instance/Detail/Parsing';
 
 
 export const ModelEnum = {
 export const ModelEnum = {
@@ -93,15 +93,15 @@ const ProductDetail = observer(() => {
     },
     },
   ];
   ];
 
 
-  const pList = [
-    'websocket-server',
-    'http-server-gateway',
-    'udp-device-gateway',
-    'coap-server-gateway',
-    'mqtt-client-gateway',
-    'mqtt-server-gateway',
-    'tcp-server-gateway',
-  ];
+  // const pList = [
+  //   'websocket-server',
+  //   'http-server-gateway',
+  //   'udp-device-gateway',
+  //   'coap-server-gateway',
+  //   'mqtt-client-gateway',
+  //   'mqtt-server-gateway',
+  //   'tcp-server-gateway',
+  // ];
   const [list, setList] = useState<any[]>([]);
   const [list, setList] = useState<any[]>([]);
 
 
   const { minHeight } = useDomFullHeight('.product-detail-body');
   const { minHeight } = useDomFullHeight('.product-detail-body');
@@ -153,18 +153,18 @@ const ProductDetail = observer(() => {
     });
     });
   };
   };
   const getDetail = async () => {
   const getDetail = async () => {
-    if (
-      productModel.current?.accessProvider &&
-      pList.includes(productModel.current?.accessProvider)
-    ) {
-      if (isNoCommunity) {
-        initList.push({
-          key: 'metadata-map',
-          tab: '物模型映射',
-          component: <MetadataMap type="product" />,
-        });
-      }
-    }
+    // if (
+    //   productModel.current?.accessProvider &&
+    //   pList.includes(productModel.current?.accessProvider)
+    // ) {
+    //   if (isNoCommunity) {
+    //     initList.push({
+    //       key: 'metadata-map',
+    //       tab: '物模型映射',
+    //       component: <MetadataMap type="product" />,
+    //     });
+    //   }
+    // }
     if (productModel.current?.messageProtocol) {
     if (productModel.current?.messageProtocol) {
       const res = await service.getProtocolDetail(productModel.current?.messageProtocol);
       const res = await service.getProtocolDetail(productModel.current?.messageProtocol);
       if (res.status === 200) {
       if (res.status === 200) {