wzyyy 3 سال پیش
والد
کامیت
c35eda89a8

+ 13 - 6
src/pages/device/Instance/Detail/Running/index.tsx

@@ -13,7 +13,8 @@ const Running = () => {
   const { minHeight } = useDomFullHeight(`.device-detail-running`);
 
   useEffect(() => {
-    setList(metadata?.events || []);
+    // setList(metadata?.events || []);
+    setList([{ id: 'properties', name: '属性' }, ...(metadata?.events || [])]);
   }, [InstanceModel.detail?.metadata]);
 
   const operations = () => (
@@ -22,14 +23,16 @@ const Running = () => {
       allowClear
       placeholder="请输入名称"
       onSearch={(value: string) => {
+        console.log(list);
         if (value) {
           const li = list.filter((i) => {
             return i?.name.indexOf(value) !== -1;
           });
-          console.log(li, value);
+          console.log(list, value);
           setList(li);
         } else {
-          setList(metadata?.events || []);
+          // setList(metadata?.events || []);
+          setList([{ id: 'properties', name: '属性' }, ...(metadata?.events || [])]);
         }
       }}
     />
@@ -48,12 +51,16 @@ const Running = () => {
       ) : (
         <div className="tabs-full-active">
           <Tabs defaultActiveKey="1" tabPosition="left" tabBarExtraContent={{ left: operations() }}>
-            <Tabs.TabPane tab="属性" key="1">
+            {/* <Tabs.TabPane tab="属性" key="1">
               <Property data={metadata?.properties || []} />
-            </Tabs.TabPane>
+            </Tabs.TabPane> */}
             {list?.map((item) => (
               <Tabs.TabPane tab={item.name} key={item.id}>
-                <Event data={item} />
+                {item.id === 'properties' ? (
+                  <Property data={metadata?.properties || []} />
+                ) : (
+                  <Event data={item} />
+                )}
               </Tabs.TabPane>
             ))}
           </Tabs>

+ 8 - 6
src/pages/device/Instance/Detail/index.tsx

@@ -27,7 +27,7 @@ import { Ellipsis, PermissionButton } from '@/components';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import Service from '@/pages/device/Instance/service';
 import useLocation from '@/hooks/route/useLocation';
-import { onlyMessage } from '@/utils/util';
+import { onlyMessage, isNoCommunity } from '@/utils/util';
 import Parsing from './Parsing';
 
 export const deviceStatus = new Map();
@@ -171,11 +171,13 @@ const InstanceDetail = observer(() => {
         InstanceModel.detail?.accessProvider &&
         pList.includes(InstanceModel.detail?.accessProvider)
       ) {
-        datalist.push({
-          key: 'metadata-map',
-          tab: '物模型映射',
-          component: <MetadataMap type="device" />,
-        });
+        if (isNoCommunity) {
+          datalist.push({
+            key: 'metadata-map',
+            tab: '物模型映射',
+            component: <MetadataMap type="device" />,
+          });
+        }
       }
       const paring = response.result?.features?.find((item: any) => item.id === 'transparentCodec');
       if (paring) {

+ 8 - 6
src/pages/device/Product/Detail/index.tsx

@@ -17,7 +17,7 @@ import MetadataMap from '@/pages/device/Instance/Detail/MetadataMap';
 import SystemConst from '@/utils/const';
 import { Ellipsis, PermissionButton } from '@/components';
 import { QuestionCircleOutlined } from '@ant-design/icons';
-import { onlyMessage } from '@/utils/util';
+import { isNoCommunity, onlyMessage } from '@/utils/util';
 import Parsing from '../../Instance/Detail/Parsing';
 
 export const ModelEnum = {
@@ -157,11 +157,13 @@ const ProductDetail = observer(() => {
       productModel.current?.accessProvider &&
       pList.includes(productModel.current?.accessProvider)
     ) {
-      initList.push({
-        key: 'metadata-map',
-        tab: '物模型映射',
-        component: <MetadataMap type="product" />,
-      });
+      if (isNoCommunity) {
+        initList.push({
+          key: 'metadata-map',
+          tab: '物模型映射',
+          component: <MetadataMap type="product" />,
+        });
+      }
     }
     if (productModel.current?.messageProtocol) {
       const res = await service.getProtocolDetail(productModel.current?.messageProtocol);