From b827b54a71ffddfb67e367aee5b2140d1b4e732c Mon Sep 17 00:00:00 2001 From: easy <1358086367@qq.com> Date: Tue, 28 Feb 2023 15:49:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=20=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/index.vue | 14 +- .../system/Apply/Api/components/ApiDoes.vue | 380 ------------------ .../system/Apply/Api/components/ApiTest.vue | 134 ------ .../system/Apply/Api/components/ChooseApi.vue | 66 --- .../system/Apply/Api/components/InputCard.vue | 35 -- .../system/Apply/Api/components/LeftTree.vue | 97 ----- src/views/system/Apply/Api/index.vue | 95 +---- src/views/system/Apply/Api/typing.d.ts | 25 -- .../system/Apply/Save/components/EditForm.vue | 14 +- src/views/system/Apply/index.vue | 10 +- .../Platforms/Api/components/HomePage.vue | 229 +++++++++++ .../Platforms/Api/components/LeftTree.vue | 20 +- src/views/system/Platforms/Api/index.vue | 93 +++-- src/views/system/Platforms/index.vue | 11 +- 14 files changed, 341 insertions(+), 882 deletions(-) delete mode 100644 src/views/system/Apply/Api/components/ApiDoes.vue delete mode 100644 src/views/system/Apply/Api/components/ApiTest.vue delete mode 100644 src/views/system/Apply/Api/components/ChooseApi.vue delete mode 100644 src/views/system/Apply/Api/components/InputCard.vue delete mode 100644 src/views/system/Apply/Api/components/LeftTree.vue delete mode 100644 src/views/system/Apply/Api/typing.d.ts create mode 100644 src/views/system/Platforms/Api/components/HomePage.vue diff --git a/src/views/home/index.vue b/src/views/home/index.vue index b4702e4d..3bf9d267 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,10 +1,12 @@ - - diff --git a/src/views/system/Apply/Api/components/ApiTest.vue b/src/views/system/Apply/Api/components/ApiTest.vue deleted file mode 100644 index 58241d93..00000000 --- a/src/views/system/Apply/Api/components/ApiTest.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - - diff --git a/src/views/system/Apply/Api/components/ChooseApi.vue b/src/views/system/Apply/Api/components/ChooseApi.vue deleted file mode 100644 index dbf13a39..00000000 --- a/src/views/system/Apply/Api/components/ChooseApi.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - diff --git a/src/views/system/Apply/Api/components/InputCard.vue b/src/views/system/Apply/Api/components/InputCard.vue deleted file mode 100644 index c1742737..00000000 --- a/src/views/system/Apply/Api/components/InputCard.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - - diff --git a/src/views/system/Apply/Api/components/LeftTree.vue b/src/views/system/Apply/Api/components/LeftTree.vue deleted file mode 100644 index b4b6e4f3..00000000 --- a/src/views/system/Apply/Api/components/LeftTree.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - diff --git a/src/views/system/Apply/Api/index.vue b/src/views/system/Apply/Api/index.vue index 95ab2522..f42c9b7c 100644 --- a/src/views/system/Apply/Api/index.vue +++ b/src/views/system/Apply/Api/index.vue @@ -1,95 +1,12 @@ - + diff --git a/src/views/system/Apply/Api/typing.d.ts b/src/views/system/Apply/Api/typing.d.ts deleted file mode 100644 index 7937398b..00000000 --- a/src/views/system/Apply/Api/typing.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -export type treeNodeTpye = { - name: string; - key: string; - schemas?:object; - link?: string; - apiList?: object[]; - children?: treeNodeTpye[]; - -}; -export type methodType = { - [key: string]: object -} -export type apiObjType = { - url: string, - method: methodType -} - -export type apiDetailsType = { - url: string; - method: string; - summary: string; - parameters: any[]; - requestBody?: any; - responses:object; -} \ No newline at end of file diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue index 2e0be394..1146df17 100644 --- a/src/views/system/Apply/Save/components/EditForm.vue +++ b/src/views/system/Apply/Save/components/EditForm.vue @@ -1022,9 +1022,9 @@ .logoUrl " alt="avatar" - width="100%" + style="width: 150px;" /> -
+
+
@@ -374,7 +374,13 @@ const table = { title: '赋权', }, icon: 'icon-fuquan', - onClick: () => {}, + onClick: () => { + menuStory.jumpPage( + 'system/Apply/Api', + {}, + { code: data.id }, + ); + }, }, { permission: true, diff --git a/src/views/system/Platforms/Api/components/HomePage.vue b/src/views/system/Platforms/Api/components/HomePage.vue new file mode 100644 index 00000000..e39b1d1f --- /dev/null +++ b/src/views/system/Platforms/Api/components/HomePage.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/views/system/Platforms/Api/components/LeftTree.vue b/src/views/system/Platforms/Api/components/LeftTree.vue index 63d31d99..7c63f1bd 100644 --- a/src/views/system/Platforms/Api/components/LeftTree.vue +++ b/src/views/system/Platforms/Api/components/LeftTree.vue @@ -19,8 +19,9 @@ import type { modeType, treeNodeTpye } from '../typing'; const emits = defineEmits(['select']); const props = defineProps<{ - mode:modeType -}>() + mode: modeType; + hasHome?: boolean; +}>(); const treeData = ref([]); @@ -35,14 +36,23 @@ const getTreeData = () => { Promise.all(allPromise).then((values) => { values.forEach((item: any, i) => { tree[i].children = combData(item?.paths); - tree[i].schemas = item.components.schemas + tree[i].schemas = item.components.schemas; }); + if (props.hasHome) + tree.unshift({ + key: 'home', + name: '首页', + schemas: {}, + children: [], + }); treeData.value = tree; }); }); }; -const clickSelectItem: TreeProps['onSelect'] = (key, node: any) => { - if(!node.node.parent) return +const clickSelectItem: TreeProps['onSelect'] = (key: any[], node: any) => { + if (key[0] === 'home') return emits('select',node.node.dataRef, {}); + + if (!node.node.parent && key[0] !== 'home') return; emits('select', node.node.dataRef, node.node?.parent.node.schemas); }; diff --git a/src/views/system/Platforms/Api/index.vue b/src/views/system/Platforms/Api/index.vue index 3e505b8f..15a06a0b 100644 --- a/src/views/system/Platforms/Api/index.vue +++ b/src/views/system/Platforms/Api/index.vue @@ -1,49 +1,58 @@ - \ No newline at end of file diff --git a/src/views/device/components/Metadata/Base/index.vue b/src/views/device/components/Metadata/Base/index.vue index 04be78d2..c7cae06d 100644 --- a/src/views/device/components/Metadata/Base/index.vue +++ b/src/views/device/components/Metadata/Base/index.vue @@ -9,7 +9,7 @@ title: operateLimits('add', type) ? '当前的存储方式不支持新增' : '新增', }"> 新增 @@ -38,7 +38,7 @@ :udisabled="operateLimits('updata', type)" @click="handleEditClick(slotProps)" :tooltip="{ title: operateLimits('updata', type) ? '当前的存储方式不支持编辑' : '编辑', }"> - + - + @@ -62,7 +62,6 @@ import { useInstanceStore } from '@/store/instance' import { useProductStore } from '@/store/product' import { useMetadataStore } from '@/store/metadata' import PermissionButton from '@/components/PermissionButton/index.vue' -import { DeleteOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons-vue' import { message } from 'ant-design-vue/es' import { SystemConst } from '@/utils/consts' import { Store } from 'jetlinks-store' diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue index eb5de412..7d8867b1 100644 --- a/src/views/device/components/Metadata/Import/index.vue +++ b/src/views/device/components/Metadata/Import/index.vue @@ -3,7 +3,7 @@ @ok="handleImport" :confirm-loading="loading">

- + 导入的物模型会覆盖原来的属性、功能、事件、标签,请谨慎操作。

@@ -37,8 +37,7 @@ - - + @@ -62,9 +61,8 @@ import { Store } from 'jetlinks-store'; import { SystemConst } from '@/utils/consts'; import { useInstanceStore } from '@/store/instance' import { useProductStore } from '@/store/product'; -import { UploadOutlined, ExclamationCircleOutlined } from '@ant-design/icons-vue'; import { FILE_UPLOAD } from '@/api/comm'; -import { LocalStore, getToken } from '@/utils/comm'; +import { getToken } from '@/utils/comm'; import MonacoEditor from '@/components/MonacoEditor/index.vue' const route = useRoute() @@ -258,13 +256,15 @@ const handleImport = async () => { if (resp.status === 200) { if (props?.type === 'device') { const metadata: DeviceMetadata = JSON.parse(paramsDevice || '{}') + // TODO导入 // MetadataAction.insert(metadata); - instanceStore.setCurrent(metadata) + // instanceStore.setCurrent(metadata) message.success('导入成功') } else { const metadata: ProductItem = JSON.parse(params?.metadata || '{}') + // TODO导入 // MetadataAction.insert(metadata); - productStore.setCurrent(metadata) + // productStore.setCurrent(metadata) message.success('导入成功') } } diff --git a/src/views/device/components/Metadata/index.vue b/src/views/device/components/Metadata/index.vue index 42f3d46d..36ea3747 100644 --- a/src/views/device/components/Metadata/index.vue +++ b/src/views/device/components/Metadata/index.vue @@ -6,7 +6,7 @@ ? '该设备已脱离产品物模型,修改产品物模型对该设备无影响' : '设备会默认继承产品的物模型,修改设备物模型后将脱离产品物模型'">
- + {{ instanceStore.detail?.independentMetadata && type === 'device' ? '该设备已脱离产品物模型,修改产品物模型对该设备无影响' @@ -47,7 +47,6 @@ + + diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue index 153eebba..967e61de 100644 --- a/src/views/system/Apply/index.vue +++ b/src/views/system/Apply/index.vue @@ -390,7 +390,13 @@ const table = { title: '查看API', }, icon: 'icon-chakanAPI', - onClick: () => {}, + onClick: () => { + menuStory.jumpPage( + 'system/Apply/View', + {}, + { code: data.id }, + ); + }, }, ); // 其他不为空 diff --git a/src/views/system/Platforms/Api/components/HomePage.vue b/src/views/system/Platforms/Api/components/HomePage.vue index e39b1d1f..8576eb8d 100644 --- a/src/views/system/Platforms/Api/components/HomePage.vue +++ b/src/views/system/Platforms/Api/components/HomePage.vue @@ -60,9 +60,10 @@

示例数据

- + -
+

验签说明

使用和签名相同的算法(不需要对响应结果排序)

-
@@ -122,19 +119,19 @@

添加 SDK 依赖

将以下Maven依赖加入到pom.xml文件中
-

SDK 客户端的初始化和请求方式

-
@@ -144,7 +141,7 @@ diff --git a/src/views/system/Platforms/Api/components/LeftTree.vue b/src/views/system/Platforms/Api/components/LeftTree.vue index 7c63f1bd..7420a355 100644 --- a/src/views/system/Platforms/Api/components/LeftTree.vue +++ b/src/views/system/Platforms/Api/components/LeftTree.vue @@ -2,6 +2,7 @@ @@ -14,17 +15,23 @@