fix(设备管理): 物模型优化

物模型表单优化 re #https://gitee.com/jetlinks/dashboard/programs/143727/issues?assignee_ids=632306&issue_id=I26MQV
jetlinks · Nov 24, 2020 · 3805452 · 3805452
1 parent ba879ab
commit 3805452
Show file tree

Hide file tree

Showing 8 changed files with 489 additions and 432 deletions.
diff --git a/src/pages/device/product/component/event/index.tsx b/src/pages/device/product/component/event/index.tsx
diff --git a/src/pages/device/product/component/function/index.tsx b/src/pages/device/product/component/function/index.tsx
diff --git a/src/pages/device/product/component/paramter/index.tsx b/src/pages/device/product/component/paramter/index.tsx
diff --git a/src/pages/device/product/component/properties/index.tsx b/src/pages/device/product/component/properties/index.tsx
diff --git a/src/pages/device/product/component/tags/index.tsx b/src/pages/device/product/component/tags/index.tsx
diff --git a/src/pages/device/product/context.ts b/src/pages/device/product/context.ts
@@ -0,0 +1,3 @@
+import React from "react";
+
+export const ProductContext = React.createContext({});
diff --git a/src/pages/device/product/save/definition/index.tsx b/src/pages/device/product/save/definition/index.tsx
@@ -1,15 +1,16 @@
-import React, {useState} from 'react';
-import {Button, Card, message, Spin, Tabs} from 'antd';
+import React, { useState } from 'react';
+import { Button, Card, message, Spin, Tabs } from 'antd';
 import Property from './Properties';
 import Functions from './Functions';
 import Events from './Events';
 import Tags from '@/pages/device/product/save/definition/Tags';
 import Form from "antd/es/form";
-import {FormComponentProps} from "antd/lib/form";
+import { FormComponentProps } from "antd/lib/form";
 import MetaData from "@/pages/device/product/save/model/metaData";
 import QuickImport from "@/pages/device/product/save/model/quickImport";
 import apis from "@/services";
-import {DeviceProduct} from "@/pages/device/product/data";
+import { DeviceProduct } from "@/pages/device/product/data";
+import { ProductContext } from '../../context';
 
 interface Props extends FormComponentProps {
   basicInfo: Partial<DeviceProduct>
@@ -77,7 +78,7 @@ const Definition: React.FC<Props> = props => {
         快速导入
       </Button>
       {props.basicInfo.metadata && (
-        <Button style={{marginLeft: 10}} onClick={() => {
+        <Button style={{ marginLeft: 10 }} onClick={() => {
           setMetaDataVisible(true);
         }}>
           物模型 TSL
@@ -90,49 +91,53 @@ const Definition: React.FC<Props> = props => {
     <Card>
       <Spin spinning={spinning}>
         <TenantContext.Provider value={importData}>
-          <Tabs defaultActiveKey="1" tabPosition="top" type="card" tabBarExtraContent={operations}>
-            <Tabs.TabPane tab="属性定义" key="1">
-              <Property
-                data={props.propertyData}
-                unitsData={props.unitsData}
-                save={(data: any) => {
-                  props.saveProperty(data);
-                }}
-              />
-            </Tabs.TabPane>
-            <Tabs.TabPane tab="功能定义" key="2">
-              <Functions
-                data={props.functionsData}
-                unitsData={props.unitsData}
-                save={(data: any) => {
-                  props.saveFunctions(data);
-                }}
-              />
-            </Tabs.TabPane>
-            <Tabs.TabPane tab="事件定义" key="3">
-              <Events
-                data={props.eventsData}
-                unitsData={props.unitsData}
-                save={(data: any) => {
-                  props.saveEvents(data);
-                }}
-              />
-            </Tabs.TabPane>
-            <Tabs.TabPane tab="标签定义" key="4">
-              <Tags
-                data={props.tagsData}
-                unitsData={props.unitsData}
-                save={(data: any) => {
-                  props.saveTags(data);
-                }}
-              />
-            </Tabs.TabPane>
-          </Tabs>
+          <ProductContext.Provider value={props.basicInfo}>
+
+            <Tabs defaultActiveKey="1" tabPosition="top" type="card" tabBarExtraContent={operations}>
+              <Tabs.TabPane tab="属性定义" key="1">
+                <Property
+                  data={props.propertyData}
+                  unitsData={props.unitsData}
+                  save={(data: any) => {
+                    props.saveProperty(data);
+                  }}
+                />
+              </Tabs.TabPane>
+              <Tabs.TabPane tab="功能定义" key="2">
+                <Functions
+                  data={props.functionsData}
+                  unitsData={props.unitsData}
+                  save={(data: any) => {
+                    props.saveFunctions(data);
+                  }}
+                />
+              </Tabs.TabPane>
+              <Tabs.TabPane tab="事件定义" key="3">
+                <Events
+                  data={props.eventsData}
+                  unitsData={props.unitsData}
+                  save={(data: any) => {
+                    props.saveEvents(data);
+                  }}
+                />
+              </Tabs.TabPane>
+              <Tabs.TabPane tab="标签定义" key="4">
+                <Tags
+                  data={props.tagsData}
+                  unitsData={props.unitsData}
+                  save={(data: any) => {
+                    props.saveTags(data);
+                  }}
+                />
+              </Tabs.TabPane>
+            </Tabs>
+
+          </ProductContext.Provider>
         </TenantContext.Provider>
         {metaDataVisible && (
           <MetaData close={() => {
             setMetaDataVisible(false);
-          }} productId={basicInfo.id}/>
+          }} productId={basicInfo.id} />
         )}
         {quickImportVisible && (
           <QuickImport
@@ -142,7 +147,7 @@ const Definition: React.FC<Props> = props => {
             update={(item: any) => {
               setQuickImportVisible(false);
               setSpinning(true);
-              updateModel({metadata: item});
+              updateModel({ metadata: item });
             }}
           />
         )}

diff --git a/src/pages/device/product/service.ts b/src/pages/device/product/service.ts
@@ -91,14 +91,14 @@ export async function protocolConfiguration(support: string, transport: string)
 }
 
 //产品协议配置
-export async function productConfiguration(productId:string) {
-  return request(`/jetlinks/device/product/${productId}/config-metadata`,{
+export async function productConfiguration(productId: string) {
+  return request(`/jetlinks/device/product/${productId}/config-metadata`, {
     method: 'GET'
   })
 }
 //设备协议配置
-export async function deviceConfiguration(deviceId:string) {
-  return request(`/jetlinks/device/instance/${deviceId}/config-metadata`,{
+export async function deviceConfiguration(deviceId: string) {
+  return request(`/jetlinks/device/instance/${deviceId}/config-metadata`, {
     method: 'GET'
   })
 }
@@ -156,4 +156,14 @@ export async function deviceBind() {
   return request(`/jetlinks/device/instance/bind-providers`, {
     method: 'get'
   });
+}
+
+export async function configMetadata(params: {
+  productId: string,
+  modelType: string,
+  modelId: string,
+  typeId: string
+}) {
+  return request(`/jetlinks/device/product/${params.productId}/config-metadata/${params.modelType}/${params.modelId}/${params.typeId}`,
+    { method: 'GET' })
 }