From c60410c1d49bde6c50593457256a41da6d4e1808 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Mon, 27 Feb 2023 14:40:49 +0800
Subject: [PATCH 01/23] =?UTF-8?q?feat:=20=E9=80=9A=E9=81=93=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/media/channel.ts                     |  15 ++
 src/components/AIcon/index.tsx               |   4 +-
 src/views/media/Device/Channel/index.vue     | 254 ++++++++++++-------
 src/views/media/Device/Playback/index.vue    |   7 +
 src/views/media/Device/Playback/typings.d.ts |  15 ++
 5 files changed, 200 insertions(+), 95 deletions(-)
 create mode 100644 src/api/media/channel.ts
 create mode 100644 src/views/media/Device/Playback/index.vue
 create mode 100644 src/views/media/Device/Playback/typings.d.ts

diff --git a/src/api/media/channel.ts b/src/api/media/channel.ts
new file mode 100644
index 00000000..3c4a67bd
--- /dev/null
+++ b/src/api/media/channel.ts
@@ -0,0 +1,15 @@
+import server from '@/utils/request'
+
+export default {
+    // 列表
+    list: (data: any, id: string) => server.post(`/media/device/${id}/channel/_query`, data),
+    // 详情
+    detail: (id: string): any => server.get(`/media/channel/${id}`),
+    // 验证通道ID是否存在
+    validateField: (params: string): any => server.get(`/media/channel/channelId/_validate`, params),
+    // 新增
+    save: (data: any) => server.post(`/media/channel`, data),
+    // 修改
+    update: (data: any) => server.put(`/media/channel`, data),
+    del: (id: string) => server.remove(`media/channel/${id}`),
+}
\ No newline at end of file
diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx
index 1c119785..b723fbde 100644
--- a/src/components/AIcon/index.tsx
+++ b/src/components/AIcon/index.tsx
@@ -55,7 +55,9 @@ const iconKeys = [
     'LikeOutlined',
     'ArrowLeftOutlined',
     'DownloadOutlined',
-    'PauseOutlined'
+    'PauseOutlined',
+    'VideoCameraOutlined',
+    'HistoryOutlined',
 ]
 
 const Icon = (props: {type: string}) => {
diff --git a/src/views/media/Device/Channel/index.vue b/src/views/media/Device/Channel/index.vue
index 4ef66e6d..6ca977e2 100644
--- a/src/views/media/Device/Channel/index.vue
+++ b/src/views/media/Device/Channel/index.vue
@@ -8,106 +8,129 @@
         />
 
         <JTable
-            ref="instanceRef"
+            ref="listRef"
             :columns="columns"
-            :request="(e:any) => templateApi.getHistory(e, data.id)"
+            :request="(e:any) => ChannelApi.list(e, route?.query.id as string)"
             :defaultParams="{
                 sorts: [{ name: 'notifyTime', order: 'desc' }],
-                terms: [{ column: 'notifyType$IN', value: data.type }],
             }"
             :params="params"
             model="table"
         >
-            <template #notifyTime="slotProps">
-                {{ moment(slotProps.notifyTime).format('YYYY-MM-DD HH:mm:ss') }}
+            <template #headerTitle>
+                <a-tooltip
+                    v-if="route?.query.type === 'gb28181-2016'"
+                    title="接入方式为GB/T28281时，不支持新增"
+                >
+                    <a-button type="primary" disabled> 新增 </a-button>
+                </a-tooltip>
+                <a-button type="primary" @click="handleAdd" v-else>
+                    新增
+                </a-button>
             </template>
-            <template #state="slotProps">
+            <template #status="slotProps">
                 <a-space>
                     <a-badge
-                        :status="slotProps.state.value"
-                        :text="slotProps.state.text"
+                        :status="
+                            slotProps.status.value === 'online'
+                                ? 'success'
+                                : 'error'
+                        "
+                        :text="slotProps.status.text"
                     ></a-badge>
-                    <AIcon
-                        v-if="slotProps.state.value === 'error'"
-                        type="ExclamationCircleOutlined"
-                        style="color: #1d39c4; cursor: pointer"
-                        @click="handleError(slotProps.errorStack)"
-                    />
                 </a-space>
             </template>
             <template #action="slotProps">
-                <AIcon
-                    type="ExclamationCircleOutlined"
-                    style="color: #1d39c4; cursor: pointer"
-                    @click="handleDetail(slotProps.context)"
-                />
+                <a-space :size="16">
+                    <a-tooltip
+                        v-for="i in getActions(slotProps, 'table')"
+                        :key="i.key"
+                        v-bind="i.tooltip"
+                    >
+                        <a-popconfirm
+                            v-if="i.popConfirm"
+                            v-bind="i.popConfirm"
+                            :disabled="i.disabled"
+                        >
+                            <a-button
+                                :disabled="i.disabled"
+                                style="padding: 0"
+                                type="link"
+                                ><AIcon :type="i.icon"
+                            /></a-button>
+                        </a-popconfirm>
+                        <a-button
+                            style="padding: 0"
+                            type="link"
+                            v-else
+                            @click="i.onClick && i.onClick(slotProps)"
+                        >
+                            <a-button
+                                :disabled="i.disabled"
+                                style="padding: 0"
+                                type="link"
+                                ><AIcon :type="i.icon"
+                            /></a-button>
+                        </a-button>
+                    </a-tooltip>
+                </a-space>
             </template>
         </JTable>
     </page-container>
 </template>
 
 <script setup lang="ts">
-import templateApi from '@/api/notice/template';
-import { PropType } from 'vue';
-import moment from 'moment';
-import { Modal } from 'ant-design-vue';
+import ChannelApi from '@/api/media/channel';
+import type { ActionsType } from '@/components/Table/index.vue';
+import { useMenuStore } from 'store/menu';
+import { message } from 'ant-design-vue';
 
-type Emits = {
-    (e: 'update:visible', data: boolean): void;
-};
-// const emit = defineEmits<Emits>();
-
-const props = defineProps({
-    visible: { type: Boolean, default: false },
-    data: {
-        type: Object as PropType<Partial<Record<string, any>>>,
-        default: () => ({}),
-    },
-});
-
-// const _vis = computed({
-//     get: () => props.visible,
-//     set: (val) => emit('update:visible', val),
-// });
-
-// watch(
-//     () => _vis.value,
-//     (val) => {
-//         if (val) handleSearch({ terms: [] });
-//     },
-// );
+const menuStory = useMenuStore();
+const route = useRoute();
 
 const columns = [
     {
-        title: 'ID',
-        dataIndex: 'id',
-        key: 'id',
+        title: '通道ID',
+        dataIndex: 'channelId',
+        key: 'channelId',
         search: {
             type: 'string',
         },
     },
     {
-        title: '发送时间',
-        dataIndex: 'notifyTime',
-        key: 'notifyTime',
-        scopedSlots: true,
+        title: '名称',
+        dataIndex: 'name',
+        key: 'name',
         search: {
-            type: 'date',
-            handleValue: (v: any) => {
-                return v;
-            },
+            type: 'string',
+        },
+    },
+    {
+        title: '厂商',
+        dataIndex: 'manufacturer',
+        key: 'manufacturer',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '安装地址',
+        dataIndex: 'address',
+        key: 'address',
+        search: {
+            type: 'string',
         },
     },
     {
         title: '状态',
-        dataIndex: 'state',
-        key: 'state',
+        dataIndex: 'status',
+        key: 'status',
         scopedSlots: true,
         search: {
             type: 'select',
             options: [
-                { label: '成功', value: 'success' },
-                { label: '失败', value: 'error' },
+                { label: '已连接', value: 'online' },
+                { label: '未连接', value: 'offline' },
             ],
             handleValue: (v: any) => {
                 return v;
@@ -133,41 +156,84 @@ const handleSearch = (e: any) => {
     // console.log('params.value: ', params.value);
 };
 
-/**
- * 查看错误信息
- */
-const handleError = (e: any) => {
-    Modal.info({
-        title: '错误信息',
-        content: h(
-            'p',
-            {
-                style: {
-                    maxHeight: '300px',
-                    overflowY: 'auto',
-                },
-            },
-            JSON.stringify(e),
-        ),
-    });
+const saveVis = ref(false);
+const handleAdd = () => {
+    saveVis.value = true;
 };
-/**
- * 查看详情
- */
-const handleDetail = (e: any) => {
-    Modal.info({
-        title: '详情信息',
-        content: h(
-            'p',
-            {
-                style: {
-                    maxHeight: '300px',
-                    overflowY: 'auto',
+
+const listRef = ref();
+const playVis = ref(false);
+const getActions = (
+    data: Partial<Record<string, any>>,
+    type: 'card' | 'table',
+): ActionsType[] => {
+    if (!data) return [];
+    const actions = [
+        {
+            key: 'edit',
+            text: '编辑',
+            tooltip: {
+                title: '编辑',
+            },
+            icon: 'EditOutlined',
+            onClick: () => {
+                saveVis.value = true;
+            },
+        },
+        {
+            key: 'play',
+            text: '播放',
+            tooltip: {
+                title: '播放',
+            },
+            icon: 'VideoCameraOutlined',
+            onClick: () => {
+                playVis.value = true;
+            },
+        },
+        {
+            key: 'backPlay',
+            text: '回放',
+            tooltip: {
+                title: '回放',
+            },
+            icon: 'HistoryOutlined',
+            onClick: () => {
+                menuStory.jumpPage(
+                    'media/Device/Playback',
+                    {},
+                    {
+                        id: route.query.id,
+                        type: route.query.type,
+                        channelId: data.channelId,
+                    },
+                );
+            },
+        },
+        {
+            key: 'delete',
+            text: '删除',
+            tooltip: {
+                title: '删除',
+            },
+            popConfirm: {
+                title: '确认删除?',
+                onConfirm: async () => {
+                    const resp = await ChannelApi.del(data.id);
+                    if (resp.status === 200) {
+                        message.success('操作成功！');
+                        listRef.value?.reload();
+                    } else {
+                        message.error('操作失败！');
+                    }
                 },
             },
-            JSON.stringify(e),
-        ),
-    });
+            icon: 'DeleteOutlined',
+        },
+    ];
+    return route?.query.type === 'gb28181-2016'
+        ? actions.filter((f) => f.key !== 'delete')
+        : actions;
 };
 </script>
 
diff --git a/src/views/media/Device/Playback/index.vue b/src/views/media/Device/Playback/index.vue
new file mode 100644
index 00000000..e0d2ef94
--- /dev/null
+++ b/src/views/media/Device/Playback/index.vue
@@ -0,0 +1,7 @@
+<template>
+    <page-container> 回放 </page-container>
+</template>
+
+<script setup lang="ts"></script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/media/Device/Playback/typings.d.ts b/src/views/media/Device/Playback/typings.d.ts
new file mode 100644
index 00000000..5f8a6c5d
--- /dev/null
+++ b/src/views/media/Device/Playback/typings.d.ts
@@ -0,0 +1,15 @@
+export type recordsItemType = {
+    channelId: string;
+    deviceId: string;
+    endTime: number;
+    fileSize: number;
+    name: string;
+    secrecy: string;
+    startTime: number;
+    mediaEndTime: number;
+    mediaStartTime: number;
+    filePath: string;
+    type: string;
+    id: string;
+    isServer?: boolean;
+};

From 89e12712060fef0d0f10955e07fa411ec03c6b75 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Mon, 27 Feb 2023 16:13:49 +0800
Subject: [PATCH 02/23] fix: bug#10229

---
 src/views/notice/Template/Detail/index.vue | 52 ++++++++++++----------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue
index d16395f3..0d31a97d 100644
--- a/src/views/notice/Template/Detail/index.vue
+++ b/src/views/notice/Template/Detail/index.vue
@@ -670,33 +670,38 @@
                                 </div>
                             </a-form-item>
                         </template>
-                        <a-form-item
+                        <template
                             v-if="
                                 formData.type !== 'webhook' &&
                                 formData.type !== 'voice'
                             "
-                            v-bind="validateInfos['template.message']"
                         >
-                            <template #label>
-                                <span>
-                                    模版内容
-                                    <a-tooltip title="发送的内容，支持录入变量">
-                                        <AIcon
-                                            type="QuestionCircleOutlined"
-                                            style="margin-left: 2px"
-                                        />
-                                    </a-tooltip>
-                                </span>
-                            </template>
-                            <a-textarea
-                                v-model:value="formData.template.message"
-                                :maxlength="200"
-                                :rows="5"
-                                :disabled="formData.type === 'sms'"
-                                placeholder="变量格式:${name};
+                            <a-form-item
+                                v-bind="validateInfos['template.message']"
+                            >
+                                <template #label>
+                                    <span>
+                                        模版内容
+                                        <a-tooltip
+                                            title="发送的内容，支持录入变量"
+                                        >
+                                            <AIcon
+                                                type="QuestionCircleOutlined"
+                                                style="margin-left: 2px"
+                                            />
+                                        </a-tooltip>
+                                    </span>
+                                </template>
+                                <a-textarea
+                                    v-model:value="formData.template.message"
+                                    :maxlength="200"
+                                    :rows="5"
+                                    :disabled="formData.type === 'sms'"
+                                    placeholder="变量格式:${name};
     示例:尊敬的${name},${time}有设备触发告警,请注意处理"
-                            />
-                        </a-form-item>
+                                />
+                            </a-form-item>
+                        </template>
                         <a-form-item
                             label="变量列表"
                             v-if="
@@ -804,6 +809,7 @@ const formData = ref<TemplateFormData>({
  * 重置字段值
  */
 const resetPublicFiles = () => {
+    formData.value.template = {};
     switch (formData.value.provider) {
         case 'dingTalkMessage':
             formData.value.template.agentId = '';
@@ -854,6 +860,7 @@ const resetPublicFiles = () => {
     formData.value.configId = undefined;
     formData.value.variableDefinitions = [];
     handleMessageTypeChange();
+    // console.log('formData.value.template: ', formData.value.template);
 };
 
 // 根据通知方式展示对应的字段
@@ -1049,7 +1056,7 @@ const handleMessageTypeChange = () => {
         };
     }
     formData.value.variableDefinitions = [];
-    formData.value.template.message = '';
+    // formData.value.template.message = '';
 };
 
 /**
@@ -1085,7 +1092,6 @@ const handleTypeChange = () => {
     setTimeout(() => {
         formData.value.template =
             TEMPLATE_FIELD_MAP[formData.value.type][formData.value.provider];
-        // console.log('formData.value.template: ', formData.value.template);
         resetPublicFiles();
     }, 0);
 };

From e4a124a4332bb8811c40b0b9da40d6d0991faf7f Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Mon, 27 Feb 2023 16:40:53 +0800
Subject: [PATCH 03/23] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E8=81=94=E5=8A=A8-=E8=A7=A6=E5=8F=91=E8=A7=84?=
 =?UTF-8?q?=E5=88=99-=E5=B1=9E=E6=80=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scene/Save/Device/ReadProperties.vue      | 82 +++++++++++++++
 .../Scene/Save/Device/ReportEvent.vue         | 66 +++++++++++++
 .../rule-engine/Scene/Save/Device/Type.vue    | 55 +++++++++--
 .../Scene/Save/Device/WriteProperty.vue       | 99 +++++++++++++++++++
 .../components/FunctionCall/FunctionCall.vue  | 38 +++++++
 .../Save/components/FunctionCall/index.ts     |  0
 .../Save/components/Timer/WhenOption.vue      | 98 ++++++++++++++++++
 .../Scene/Save/components/Timer/index.ts      |  3 +
 .../components/{Timer.vue => Timer/index.vue} | 57 +++++++++--
 .../Scene/Save/components/Timer/util.ts       |  9 ++
 .../Scene/Save/components/index.ts            |  3 +
 src/views/rule-engine/Scene/typings.ts        |  2 +-
 12 files changed, 495 insertions(+), 17 deletions(-)
 create mode 100644 src/views/rule-engine/Scene/Save/Device/ReadProperties.vue
 create mode 100644 src/views/rule-engine/Scene/Save/Device/ReportEvent.vue
 create mode 100644 src/views/rule-engine/Scene/Save/Device/WriteProperty.vue
 create mode 100644 src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
 create mode 100644 src/views/rule-engine/Scene/Save/components/FunctionCall/index.ts
 create mode 100644 src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
 create mode 100644 src/views/rule-engine/Scene/Save/components/Timer/index.ts
 rename src/views/rule-engine/Scene/Save/components/{Timer.vue => Timer/index.vue} (68%)
 create mode 100644 src/views/rule-engine/Scene/Save/components/Timer/util.ts
 create mode 100644 src/views/rule-engine/Scene/Save/components/index.ts

diff --git a/src/views/rule-engine/Scene/Save/Device/ReadProperties.vue b/src/views/rule-engine/Scene/Save/Device/ReadProperties.vue
new file mode 100644
index 00000000..e81f3bb9
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Device/ReadProperties.vue
@@ -0,0 +1,82 @@
+<template>
+  <a-row :gutter='[24]'>
+    <a-col :span='10'>
+      <a-form-item
+        name='readProperties'
+        :rules="[{ required: true, message: '请选择属性' }]"
+      >
+        <a-select
+          show-search
+          mode='multiple'
+          max-tag-count='responsive'
+          placeholder='请选择属性'
+          style='width: 100%'
+          v-model:value='readProperties'
+          :options='properties'
+          :filter-option='filterSelectNode'
+          @change='change'
+        />
+      </a-form-item>
+    </a-col>
+    <a-col :span='14'>
+      <a-form-item>定时读取所选属性值</a-form-item>
+    </a-col>
+  </a-row>
+</template>
+
+<script setup lang='ts' name='ReadProperties'>
+import { filterSelectNode } from '@/utils/comm'
+import type { PropType } from 'vue'
+
+type Emit = {
+  (e: 'update:value', data: Array<string>): void
+  (e: 'update:action', data: string): void
+}
+
+const props = defineProps({
+  value: {
+    type: Array as PropType<Array<string>>,
+    default: () => []
+  },
+  action: {
+    type: String,
+    default: ''
+  },
+  properties: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const emit = defineEmits<Emit>()
+
+const readProperties = ref<string[]>(props.value)
+
+const change = (values: string[], optionItems: any[]) => {
+  console.log(values, optionItems)
+  const names = optionItems.map((item) => item.name);
+  let extraStr = '';
+  let isLimit = false;
+  let indexOf = 0;
+  extraStr = names.reduce((_prev, next, index) => {
+    if (_prev.length <= 30) {
+      indexOf = index;
+      return index === 0 ? next : _prev + '、' + next;
+    } else {
+      isLimit = true;
+    }
+    return _prev;
+  }, '');
+
+  if (isLimit && names.length - 1 > indexOf) {
+    extraStr += `等${optionItems.length}个属性`;
+  }
+  emit('update:value', values)
+  emit('update:action', `读取 ${extraStr}`)
+}
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Device/ReportEvent.vue b/src/views/rule-engine/Scene/Save/Device/ReportEvent.vue
new file mode 100644
index 00000000..c127df2d
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Device/ReportEvent.vue
@@ -0,0 +1,66 @@
+<template>
+  <a-row :futter='[24]'>
+    <a-col :span='10'>
+      <a-select
+        showSearch
+        max-tag-count='responsive'
+        style='width: 100%'
+        placeholder='placeholder'
+        v-model:value='reportKey'
+        :options='properties'
+        :filter-option='filterSelectNode'
+      />
+    </a-col>
+    <a-col :span='14'>定时调用所选属性</a-col>
+    <a-col :span='24' v-if='showTable'>
+
+    </a-col>
+  </a-row>
+</template>
+
+<script setup lang='ts' name='ReportEvent'>
+import { filterSelectNode } from '@/utils/comm'
+import type { PropType } from 'vue'
+
+type Emit = {
+  (e: 'update:value', data: Array<string>): void
+  (e: 'update:action', data: string): void
+}
+
+const props = defineProps({
+  value: {
+    type: Array as PropType<Array<string>>,
+    default: () => []
+  },
+  action: {
+    type: String,
+    default: ''
+  },
+  properties: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const emit = defineEmits<Emit>()
+
+const reportKey = ref<Array<string>>([])
+const callData = ref<Array<{}>>()
+
+const showTable = computed(() => {
+  return !!reportKey.value
+})
+
+watch([props.value, props.properties], () => {
+  if (props.value && props.properties?.length) {
+
+  } else {
+
+  }
+}, { immediate: true })
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Device/Type.vue b/src/views/rule-engine/Scene/Save/Device/Type.vue
index 7d1e0c23..a6d84d3a 100644
--- a/src/views/rule-engine/Scene/Save/Device/Type.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Type.vue
@@ -7,23 +7,33 @@
       >
         <TopCard
           :label-bottom='true'
-          :options='options'
+          :options='topOptions'
           v-model:value='formModel.operator'
         />
       </a-form-item>
-      <Timer v-if='showTimer' />
+      <Timer v-if='showTimer' v-model:value='formModel.timer' />
+      <ReadProperties v-if='showReadProperty' v-model:value='formModel.readProperties' v-model:action='optionCache.action' :properties='readProperties' />
+      <a-form-item
+        v-if='showWriteProperty'
+        name='writeProperties'
+        :rules="[{ required: true, message: '请输入修改值' }]"
+      >
+        <WriteProperty v-model:value='formModel.writeProperties' v-model:action='optionCache.action' :properties='writeProperties' />
+      </a-form-item>
     </a-form>
   </div>
 </template>
 
 <script setup lang='ts'>
 
-import TopCard from '@/views/rule-engine/Scene/Save/components/TopCard.vue'
+import { TopCard, Timer } from '@/views/rule-engine/Scene/Save/components'
 import { getImage } from '@/utils/comm'
 import { metadataType } from '@/views/rule-engine/Scene/typings'
 import type { PropType } from 'vue'
 import { TypeEnum } from '@/views/rule-engine/Scene/Save/Device/util'
-import Timer from '../components/Timer.vue'
+import ReadProperties from './ReadProperties.vue'
+import ReportEvent from './ReportEvent.vue'
+import WriteProperty from './WriteProperty.vue'
 
 const props = defineProps({
   metadata: {
@@ -34,12 +44,19 @@ const props = defineProps({
 
 const formModel = reactive({
   operator: 'online',
+  timer: {},
+  readProperties: [],
+  writeProperties: {}
+})
+
+const optionCache = reactive({
+  action: ''
 })
 
 const readProperties = ref<any[]>([])
 const writeProperties = ref<any[]>([])
 
-const options = computed(() => {
+const topOptions = computed(() => {
   const baseOptions = [
     {
       label: '设备上线',
@@ -59,9 +76,9 @@ const options = computed(() => {
 
   if (props.metadata.properties?.length) {
     const _properties = props.metadata.properties
-    readProperties.value = _properties.filter((item: any) => item.expands.type?.includes('read'))
-    writeProperties.value = _properties.filter((item: any) => item.expands.type?.includes('write'))
-    const reportProperties = _properties.filter((item: any) => item.expands.type?.includes('report'))
+    readProperties.value = _properties.filter((item: any) => item.expands.type?.includes('read')).map(item => ({...item, label: item.name, value: item.id }))
+    writeProperties.value = _properties.filter((item: any) => item.expands.type?.includes('write')).map(item => ({...item, label: item.name, value: item.id }))
+    const reportProperties = _properties.filter((item: any) => item.expands.type?.includes('report')).map(item => ({...item, label: item.name, value: item.id }))
 
     if (readProperties.value.length) {
       baseOptions.push(TypeEnum.readProperty)
@@ -84,8 +101,28 @@ const options = computed(() => {
   return baseOptions
 })
 
+const showReadProperty = computed(() => {
+  return formModel.operator === TypeEnum.readProperty.value
+})
+
+const showWriteProperty = computed(() => {
+  return formModel.operator === TypeEnum.writeProperty.value
+})
+
+const showReportEvent = computed(() => {
+  return formModel.operator === TypeEnum.reportEvent.value
+})
+
+const showInvokeFunction = computed(() => {
+  return formModel.operator === TypeEnum.invokeFunction.value
+})
+
 const showTimer = computed(() => {
-  return ['readProperty', 'writeProperty', 'invokeFunction'].includes(formModel.operator)
+  return [
+    TypeEnum.readProperty.value,
+    TypeEnum.writeProperty.value,
+    TypeEnum.invokeFunction.value
+  ].includes(formModel.operator)
 })
 
 </script>
diff --git a/src/views/rule-engine/Scene/Save/Device/WriteProperty.vue b/src/views/rule-engine/Scene/Save/Device/WriteProperty.vue
new file mode 100644
index 00000000..e75f2071
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Device/WriteProperty.vue
@@ -0,0 +1,99 @@
+<template>
+  <a-row :futter='[24, 24]'>
+    <a-col :span='10'>
+      <a-select
+        showSearch
+        style='width: 100%'
+        placeholder='请选择属性'
+        v-model:value='reportKey'
+        :options='properties'
+        :filter-option='filterSelectNode'
+        @change='change'
+      />
+    </a-col>
+    <a-col :span='14'>
+      <span style='line-height: 32px;padding-left: 24px'>
+        定时调用所选属性
+      </span>
+    </a-col>
+    <a-col :span='24' v-if='showTable'>
+
+    </a-col>
+  </a-row>
+</template>
+
+<script setup lang='ts' name='WriteProperties'>
+import { filterSelectNode } from '@/utils/comm'
+import type { PropType } from 'vue'
+
+type Emit = {
+  (e: 'update:value', data: Record<string, any>): void
+  (e: 'update:action', data: string): void
+}
+
+const props = defineProps({
+  value: {
+    type: Object as PropType<Record<string, any>>,
+    default: () => []
+  },
+  action: {
+    type: String,
+    default: ''
+  },
+  properties: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const emit = defineEmits<Emit>()
+
+const reportKey = ref<string>()
+const callData = ref<Array<Record<string, any>>>()
+
+const callDataOptions = computed(() => {
+  const _valueKeys = Object.keys(props.value)
+  if (_valueKeys.length) {
+    return _valueKeys.map(key => {
+      const item: any = props.properties.find((p: any) => p.id === key)
+      if (item) {
+        return {
+          id: item.id,
+          name: item.name,
+          type: item.valueType ? item.valueType.type : '-',
+          format: item.valueType ? item.valueType.format : undefined,
+          options: item.valueType ? item.valueType.element : undefined,
+          value: props.value[key]
+        }
+      }
+      return {
+        id: key,
+        name: key,
+        type: '',
+        format: undefined,
+        options: undefined,
+        value: props.value[key]
+      }
+    })
+  }
+  return []
+})
+
+const showTable = computed(() => {
+  return !!reportKey.value
+})
+
+const change = (v: string, option: any) => {
+  console.log(v, option)
+  const _data = {
+    [v]: undefined
+  }
+  callData.value = [_data]
+  emit('update:value', _data)
+}
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
new file mode 100644
index 00000000..74c99134
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
@@ -0,0 +1,38 @@
+<template>
+  <a-table
+    :data-source='dataSource'
+    :columns='columns'
+  >
+    <template #bodyCell="{ column, record, index }">
+      <template v-if='column.key'>
+
+      </template>
+    </template>
+  </a-table>
+</template>
+
+<script setup lang='ts' name='FunctionCall'>
+
+const dataSource = []
+
+const columns = [
+  {
+    title: '参数名称',
+    dataIndex: 'name'
+  },
+  {
+    title: '参数名称',
+    dataIndex: 'name'
+  },
+  {
+    title: '值',
+    dataIndex: 'value',
+    align: 'center',
+    width: 260
+  },
+]
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/FunctionCall/index.ts b/src/views/rule-engine/Scene/Save/components/FunctionCall/index.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
new file mode 100644
index 00000000..345f3fb1
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class='timer-when-warp'>
+    <div :class='["when-item-option", allActive ? "active" : ""]' @click='() => change(0)'>每天</div>
+    <div
+      v-for='item in timeOptions'
+      :class='["when-item-option", rowKeys.includes(item.value) ? "active" : ""]'
+      @click='() => change(item.value)'
+    >
+      {{ item.label }}
+    </div>
+  </div>
+</template>
+
+<script setup lang='ts' name='WhenOption'>
+import type { PropType } from 'vue'
+import { numberToString } from './util'
+
+type Emit = {
+  (e: 'update:value', data: Array<number>):void
+}
+
+const props = defineProps({
+  value: {
+    type: Array as PropType<Array<number>>,
+    default: []
+  },
+  type: {
+    type: String,
+    default: ''
+  }
+})
+
+const emit = defineEmits<Emit>()
+
+const timeOptions = ref<Array<{ label: string, value: number}>>([])
+const rowKeys = ref<Array<number>>(props.value)
+
+const change = (number: number) => {
+  const _keys = new Set(rowKeys.value)
+  if (number === 0) { // 全选
+    _keys.clear()
+  } else {
+    if (_keys.has(number)) {
+      _keys.delete(number)
+    } else {
+      _keys.add(number)
+    }
+  }
+  rowKeys.value = [..._keys.values()]
+  emit('update:value', rowKeys.value)
+}
+
+const allActive = computed(() => {
+  return !rowKeys.value.length
+})
+
+watch(() => props.type, () => {
+  const isMonth = props.type === 'month'
+  const day = isMonth ? 31 : 7
+  change(0)
+  timeOptions.value = new Array(day)
+    .fill(1)
+    .map((_, index) => {
+      const _value = index + 1
+      return {
+        label: isMonth ? `${_value}号` : numberToString[_value],
+        value: _value
+      }
+    })
+}, { immediate: true })
+
+</script>
+
+<style scoped lang='less'>
+.timer-when-warp {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px 16px;
+  padding: 16px;
+  background: #fafafa;
+
+  .when-item-option {
+    width: 76px;
+    padding: 6px 0;
+    text-align: center;
+    background: #fff;
+    border: 1px solid #e6e6e6;
+    border-radius: 2px;
+    cursor: pointer;
+  }
+
+  .active {
+    color: #233dd7;
+    border-color: #233dd7;
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/index.ts b/src/views/rule-engine/Scene/Save/components/Timer/index.ts
new file mode 100644
index 00000000..79dacbf1
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/components/Timer/index.ts
@@ -0,0 +1,3 @@
+import Timer from './index.vue'
+
+export default Timer
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/Timer.vue b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
similarity index 68%
rename from src/views/rule-engine/Scene/Save/components/Timer.vue
rename to src/views/rule-engine/Scene/Save/components/Timer/index.vue
index 5f4977f6..03054f3e 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
@@ -17,12 +17,26 @@
         button-style='solid'
       />
     </a-form-item>
-    <a-form-item v-if='showCron' name='cron'>
-      <a-input placeholder='corn表达式' v-model='formModel.cron' />
+    <a-form-item v-if='showCron' name='cron' :rules="[
+      { max: 64, message: '最多可输入64个字符' },
+      {
+        validator: async (_, v) => {
+           if (v) {
+             if (!isCron(v)) {
+               return Promise.reject(new Error('请输入正确的cron表达式'));
+             }
+           } else {
+             return Promise.reject(new Error('请输入cron表达式'));
+           }
+           return Promise.resolve();
+        }
+      }
+    ]">
+      <a-input placeholder='corn表达式' v-model:value='formModel.cron' />
     </a-form-item>
     <template v-else>
       <a-form-item name='when'>
-
+        <WhenOption v-model:value='formModel.when' :type='formModel.trigger' />
       </a-form-item>
       <a-form-item name='mod'>
         <a-radio-group
@@ -38,9 +52,10 @@
     </template>
     <a-space v-if='showOnce' style='display: flex;gap: 24px'>
       <a-form-item :name="['once', 'time']">
-        <a-time-picker valueFormat='HH:mm:ss' v-model:value='formModel.once.time' style='width: 100%' format='HH:mm:ss' />
+        <a-time-picker valueFormat='HH:mm:ss' v-model:value='formModel.once.time' style='width: 100%'
+                       format='HH:mm:ss' />
       </a-form-item>
-      <a-form-item> 执行一次 </a-form-item>
+      <a-form-item> 执行一次</a-form-item>
     </a-space>
     <a-space v-if='showPeriod' style='display: flex;gap: 24px'>
       <a-form-item>
@@ -89,9 +104,17 @@
 <script setup lang='ts' name='Timer'>
 import type { PropType } from 'vue'
 import moment from 'moment'
+import WhenOption from './WhenOption.vue'
+import { cloneDeep } from 'lodash-es'
+import type { OperationTimer } from '../../../typings'
+import { isCron } from '@/utils/regular'
 
 type NameType = string[] | string
 
+type Emit = {
+  (e: 'update:value', data: OperationTimer): void
+}
+
 const props = defineProps({
   name: {
     type: [String, Array] as PropType<NameType>,
@@ -103,13 +126,15 @@ const props = defineProps({
   }
 })
 
-const formModel = reactive({
+const emit = defineEmits<Emit>()
+
+const formModel = reactive<OperationTimer>({
   trigger: 'week',
   when: [],
   mod: 'period',
   cron: undefined,
   once: {
-    time: ''
+    time: moment(new Date()).format('HH:mm:ss')
   },
   period: {
     from: moment(new Date()).startOf('day').format('HH:mm:ss'),
@@ -119,6 +144,8 @@ const formModel = reactive({
   }
 })
 
+Object.assign(formModel, props.value)
+
 const showCron = computed(() => {
   return formModel.trigger === 'cron'
 })
@@ -131,6 +158,22 @@ const showPeriod = computed(() => {
   return formModel.trigger !== 'cron' && formModel.mod === 'period'
 })
 
+watch(() => formModel, () => {
+  const cloneValue = cloneDeep(formModel)
+  if (cloneValue.trigger === 'cron') {
+    delete cloneValue.when
+  } else {
+    delete cloneValue.cron
+  }
+
+  if (cloneValue.mod === 'period') {
+    delete cloneValue.once
+  } else {
+    delete cloneValue.period
+  }
+  emit('update:value', cloneValue)
+}, { deep: true })
+
 </script>
 
 <style scoped lang='less'>
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/util.ts b/src/views/rule-engine/Scene/Save/components/Timer/util.ts
new file mode 100644
index 00000000..861859ba
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/components/Timer/util.ts
@@ -0,0 +1,9 @@
+export const numberToString = {
+  1: '星期一',
+  2: '星期二',
+  3: '星期三',
+  4: '星期四',
+  5: '星期五',
+  6: '星期六',
+  7: '星期日',
+};
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/index.ts b/src/views/rule-engine/Scene/Save/components/index.ts
new file mode 100644
index 00000000..504835c4
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/components/index.ts
@@ -0,0 +1,3 @@
+export { default as Timer } from './Timer'
+export { default as TopCard } from './TopCard.vue'
+export { default as TriggerWay } from './TriggerWay.vue'
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/typings.ts b/src/views/rule-engine/Scene/typings.ts
index f1cfdcc9..eff7cdbb 100644
--- a/src/views/rule-engine/Scene/typings.ts
+++ b/src/views/rule-engine/Scene/typings.ts
@@ -93,7 +93,7 @@ export enum ActionAlarmMode {
 export interface OperationTimerPeriod {
   from: string;
   to: string;
-  every: string[];
+  every: number;
   unit: keyof typeof TimeUnit;
 }
 

From 72c72888dfea7f57d416f2904ed975cafbc32b5d Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Mon, 27 Feb 2023 17:49:40 +0800
Subject: [PATCH 04/23] =?UTF-8?q?update:=20=E5=BA=94=E7=94=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E9=9B=86=E6=88=90=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E3=80=81cardbox=E7=BB=84=E4=BB=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=81=AE=E7=BD=A9=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/apply.ts                       |  23 +-
 src/components/CardBox/index.vue              |  49 +++--
 .../system/Apply/Save/components/EditForm.vue |  76 +++++--
 .../Apply/Save/components/MenuDialog.vue      |  49 -----
 .../Apply/Save/components/RequestTable.vue    |   1 +
 src/views/system/Apply/Save/typing.d.ts       |   4 +-
 .../system/Apply/componenets/MenuDialog.vue   | 196 ++++++++++++++++++
 src/views/system/Apply/index.vue              |  21 +-
 8 files changed, 323 insertions(+), 96 deletions(-)
 delete mode 100644 src/views/system/Apply/Save/components/MenuDialog.vue
 create mode 100644 src/views/system/Apply/componenets/MenuDialog.vue

diff --git a/src/api/system/apply.ts b/src/api/system/apply.ts
index 9bf97443..b3b4c218 100644
--- a/src/api/system/apply.ts
+++ b/src/api/system/apply.ts
@@ -4,17 +4,30 @@ import server from '@/utils/request';
 // 获取应用管理列表
 export const getApplyList_api = (data: any) => server.post(`/application/_query/`, data)
 // 修改应用状态
-export const changeApplyStatus_api = (id:string,data: any) => server.put(`/application/${id}`, data)
+export const changeApplyStatus_api = (id: string, data: any) => server.put(`/application/${id}`, data)
 // 删除应用
-export const delApply_api = (id:string) => server.remove(`/application/${id}`)
+export const delApply_api = (id: string) => server.remove(`/application/${id}`)
 
 
 
 // 获取组织列表
 export const getDepartmentList_api = () => server.get(`/organization/_all/tree`);
 // 获取组织列表
-export const getAppInfo_api = (id:string) => server.get(`/application/${id}`);
+export const getAppInfo_api = (id: string) => server.get(`/application/${id}`);
 // 新增应用
-export const addApp_api = (data:object) => server.post(`/application`, data);
+export const addApp_api = (data: object) => server.post(`/application`, data);
 // 更新应用
-export const updateApp_api = (id:string, data:object) => server.put(`/application/${id}`, data);
\ No newline at end of file
+export const updateApp_api = (id: string, data: object) => server.put(`/application/${id}`, data);
+
+
+// ---------集成菜单-----------
+
+// 获取所属系统
+export const getOwner_api = (data: object) => server.post(`/menu/owner`, data);
+export const getOwnerStandalone_api = (appId: string, data: object) => server.post(`/application/${appId}/_/api/menu/owner`, data);
+
+// 获取对应系统菜单树
+export const getOwnerTree_api = (owner: string) => server.post(`/menu/owner/tree/${owner}`, {});
+export const getOwnerTreeStandalone_api = (appId: string, owner: string) => server.post(`/application/${appId}/_/api/menu/owner/tree/${owner}`, {});
+// 保存集成菜单
+export const saveOwnerMenu_api = (owner: string, appId: string, data: object) => server.patch(`/menu/owner/${owner}/${appId}/_all`, data);
diff --git a/src/components/CardBox/index.vue b/src/components/CardBox/index.vue
index dee607c8..bfe32ab1 100644
--- a/src/components/CardBox/index.vue
+++ b/src/components/CardBox/index.vue
@@ -40,11 +40,19 @@
                     </div>
                 </div>
             </div>
+            <div class="card-mask" v-if="props.hasMark">
+                <div class="mask-content">
+                    <slot name="mark" />
+                </div>
+            </div>
         </div>
 
         <!-- 按钮 -->
         <slot name="bottom-tool">
-            <div v-if="showTool && actions && actions.length" class="card-tools">
+            <div
+                v-if="showTool && actions && actions.length"
+                class="card-tools"
+            >
                 <div
                     v-for="item in actions"
                     :key="item.key"
@@ -53,8 +61,8 @@
                         delete: item.key === 'delete',
                     }"
                 >
-                <slot name="actions" v-bind="item"></slot>
-                <!-- <a-popconfirm  v-if="item.popConfirm" v-bind="item.popConfirm">
+                    <slot name="actions" v-bind="item"></slot>
+                    <!-- <a-popconfirm  v-if="item.popConfirm" v-bind="item.popConfirm">
                     <a-button :disabled="item.disabled">
                         <DeleteOutlined v-if="item.key === 'delete'" />
                         <template v-else>
@@ -79,10 +87,14 @@
 </template>
 
 <script setup lang="ts">
-import { SearchOutlined, CheckOutlined, DeleteOutlined } from '@ant-design/icons-vue';
+import {
+    SearchOutlined,
+    CheckOutlined,
+    DeleteOutlined,
+} from '@ant-design/icons-vue';
 import BadgeStatus from '@/components/BadgeStatus/index.vue';
 import { StatusColorEnum } from '@/utils/consts.ts';
-import type { ActionsType } from '@/components/Table/index.vue'
+import type { ActionsType } from '@/components/Table/index.vue';
 import { PropType } from 'vue';
 
 type EmitProps = {
@@ -90,14 +102,14 @@ type EmitProps = {
     (e: 'click', data: Record<string, any>): void;
 };
 
-type TableActionsType  = Partial<ActionsType>
+type TableActionsType = Partial<ActionsType>;
 
 const emit = defineEmits<EmitProps>();
 
 const props = defineProps({
     value: {
         type: Object as PropType<Record<string, any>>,
-        default: () => {}
+        default: () => {},
     },
     showStatus: {
         type: Boolean,
@@ -124,8 +136,12 @@ const props = defineProps({
     },
     active: {
         type: Boolean,
-        default: false
-    }
+        default: false,
+    },
+    hasMark: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const handleClick = () => {
@@ -167,9 +183,13 @@ const handleClick = () => {
         position: relative;
         border: 1px solid #e6e6e6;
 
-        &.hover {
+        &:hover {
             cursor: pointer;
             box-shadow: 0 0 24px rgba(#000, 0.1);
+
+            .card-mask {
+                visibility: visible;
+            }
         }
 
         &.active {
@@ -269,12 +289,12 @@ const handleClick = () => {
             width: 100%;
             height: 100%;
             color: #fff;
-            background-color: rgba(#000, 0);
+            background-color: rgba(#000, .5);
             visibility: hidden;
             cursor: pointer;
             transition: all 0.3s;
 
-            > div {
+            .mask-content {
                 display: flex;
                 align-items: center;
                 justify-content: center;
@@ -282,11 +302,6 @@ const handleClick = () => {
                 height: 100%;
                 padding: 0 !important;
             }
-
-            &.show {
-                background-color: rgba(#000, 0.5);
-                visibility: visible;
-            }
         }
     }
 
diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index 7ba9c83b..2e0be394 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -710,6 +710,7 @@
                         <a-select
                             v-model:value="form.data.apiServer.roleIdList"
                             :options="form.roleIdList"
+                            mode="multiple"
                             placeholder="请选中角色"
                         ></a-select>
                         <PermissionButton
@@ -869,7 +870,7 @@
                                 'sso',
                                 'configuration',
                                 'oauth2',
-                                'client_id',
+                                'clientId',
                             ]"
                             :rules="[
                                 {
@@ -1003,7 +1004,6 @@
                                 v-model:file-list="form.fileList"
                                 accept=".jpg,.png,.jfif,.pjp,.pjpeg,.jpeg"
                                 :maxCount="1"
-                                name="avatar"
                                 list-type="picture-card"
                                 :show-upload-list="false"
                                 :headers="{
@@ -1022,6 +1022,7 @@
                                             .logoUrl
                                     "
                                     alt="avatar"
+                                    width="100%"
                                 />
                                 <div v-else>
                                     <AIcon
@@ -1295,6 +1296,7 @@
                         <a-form-item label="角色">
                             <a-select
                                 v-model:value="form.data.sso.roleIdList"
+                                mode="multiple"
                                 :options="form.roleIdList"
                                 placeholder="请选中角色"
                             ></a-select>
@@ -1372,7 +1374,10 @@
         </a-button>
 
         <div class="dialog">
-            <MenuDialog ref="dialogRef" />
+            <MenuDialog
+                ref="dialogRef"
+                :mode="routeQuery.id ? 'edit' : 'add'"
+            />
         </div>
     </div>
 </template>
@@ -1389,7 +1394,7 @@ import {
 } from '@/api/system/apply';
 import FormLabel from './FormLabel.vue';
 import RequestTable from './RequestTable.vue';
-import MenuDialog from './MenuDialog.vue';
+import MenuDialog from '../../componenets/MenuDialog.vue';
 import { getImage } from '@/utils/comm';
 import type { formType, dictType, optionsType } from '../typing';
 import { getRoleList_api } from '@/api/system/user';
@@ -1400,32 +1405,34 @@ import {
     UploadFile,
 } from 'ant-design-vue';
 import { randomString } from '@/utils/utils';
-import { cloneDeep } from 'lodash';
+import { cloneDeep, difference } from 'lodash';
+import { useMenuStore } from '@/store/menu';
 
 const emit = defineEmits(['changeApplyType']);
 const routeQuery = useRoute().query;
+const menuStory = useMenuStore();
 
 const deptPermission = 'system/Department';
 const rolePermission = 'system/Role';
 
 const dialogRef = ref();
+// 初始化表单
 const initForm: formType = {
     name: '',
     provider: 'internal-standalone',
     integrationModes: [],
-    config: '',
     description: '',
     page: {
         // 页面集成
         baseUrl: '',
         routeType: 'hash',
-        parameters: [{ label: '', value: '' }],
+        parameters: [],
     },
     apiClient: {
         // API客户端
         baseUrl: '',
-        headers: [{ label: '', value: '' }], // 请求头
-        parameters: [{ label: '', value: '' }], // 请求参数
+        headers: [], // 请求头
+        parameters: [], // 请求参数
         authConfig: {
             // API客户端
             type: 'oauth2', // 类型, 可选值：none, bearer, oauth2, basic, other
@@ -1447,13 +1454,12 @@ const initForm: formType = {
     },
     apiServer: {
         // API服务
-        appId: '',
+        appId: randomString(16),
         secureKey: randomString(), // 密钥
         redirectUri: '', // 重定向URL
         roleIdList: [], // 角色列表
         orgIdList: [], // 部门列表
         ipWhiteList: '', // IP白名单
-        signature: '', // 签名方式, 可选值：MD5，SHA256
         enableOAuth2: false, // 是否启用OAuth2
     },
     sso: {
@@ -1497,9 +1503,9 @@ const initForm: formType = {
 const formRef = ref<FormInstance>();
 const form = reactive({
     data: { ...initForm },
-    integrationModesISO: [] as string[],
-    roleIdList: [] as optionsType,
-    orgIdList: [] as dictType,
+    integrationModesISO: [] as string[], // 接入方式镜像  折叠面板使用
+    roleIdList: [] as optionsType, // 角色列表
+    orgIdList: [] as dictType, // 组织列表
 
     errorNumInfo: {
         page: new Set(),
@@ -1509,7 +1515,6 @@ const form = reactive({
     },
 
     fileList: [] as any[],
-    fileUrlList: [] as string[],
     uploadLoading: false,
 });
 // 接入方式的选项
@@ -1591,6 +1596,7 @@ function init() {
         () => form.data.provider,
         (n) => {
             emit('changeApplyType', n);
+            if (routeQuery.id) return;
             if (n === 'wechat-webapp' || n === 'dingtalk-ent-app') {
                 form.data.integrationModes = ['ssoClient'];
                 form.integrationModesISO = ['ssoClient'];
@@ -1616,6 +1622,7 @@ function getInfo(id: string) {
                 (item: any) => item.value,
             ),
         } as formType;
+        form.data.apiServer && (form.data.apiServer.appId = id);
     });
 }
 // 获取角色列表
@@ -1651,6 +1658,23 @@ function clickAddItem(data: string[], target: string) {
 function clickSave() {
     formRef.value?.validate().then(() => {
         const params = cloneDeep(form.data);
+        // 删除多余的参数
+        const list = ['page', 'apiClient', 'apiServer', 'ssoClient'];
+        difference(list, params.integrationModes).forEach((item) => {
+            if (item === 'ssoClient') {
+                // @ts-ignore
+                delete params['sso'];
+            }
+            delete params[item];
+        });
+        clearNullProp(params);
+        if (
+            params.provider === 'internal-standalone' &&
+            params.integrationModes.includes('page')
+        ) {
+            // @ts-ignore
+            delete params.page.parameters;
+        }
 
         if (
             params.provider === 'internal-standalone' &&
@@ -1674,15 +1698,19 @@ function clickSave() {
         const request = routeQuery.id
             ? updateApp_api(routeQuery.id as string, params)
             : addApp_api(params);
-        request.then((resp) => {
+        request.then((resp: any) => {
             if (resp.status === 200) {
                 const isPage = params.integrationModes.includes('page');
                 if (isPage) {
                     form.data = params;
-                    dialogRef.value && dialogRef.value.openDialog();
+                    dialogRef.value &&
+                        dialogRef.value.openDialog(
+                            routeQuery.id || resp.result.id,
+                            form.data.provider,
+                        );
                 } else {
                     message.success('保存成功');
-                    jumpPage('system/Apply');
+                    menuStory.jumpPage('system/Apply');
                 }
             }
         });
@@ -1722,9 +1750,15 @@ function changeBackUpload(info: UploadChangeParam<UploadFile<any>>) {
 function test(...args: any[]) {
     console.log('test:', args);
 }
-
-function jumpPage(arg0: string) {
-    throw new Error('Function not implemented.');
+function clearNullProp(obj: object) {
+    if (typeof obj !== 'object') return;
+    for (const prop in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, prop)) {
+            const val = obj[prop];
+            if (val === '') delete obj[prop];
+            else if (typeof val === 'object') clearNullProp(obj[prop]);
+        }
+    }
 }
 </script>
 
diff --git a/src/views/system/Apply/Save/components/MenuDialog.vue b/src/views/system/Apply/Save/components/MenuDialog.vue
deleted file mode 100644
index b706bf1e..00000000
--- a/src/views/system/Apply/Save/components/MenuDialog.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-    <a-modal
-        v-model:visible="dialog.visible"
-        title="集成菜单"
-        width="600px"
-        @ok="dialog.handleOk"
-        class="edit-dialog-container"
-        :confirmLoading="dialog.loading"
-        cancelText="取消"
-        okText="确定"
-    >
-    
-    
-    
-    </a-modal>
-</template>
-
-<script setup lang="ts">
-
-
-const emits = defineEmits(['confirm']);
-// 弹窗相关
-const dialog = reactive({
-    visible: false,
-    loading: false,
-
-    handleOk: () => {
-        emits('confirm');
-    },
-    /**
-     * 设置表单类型
-     * @param type 弹窗类型
-     * @param defaultForm 表单回显对象
-     */
-    changeVisible: () => {
-        dialog.visible = true;
-    }
-});
-// 将打开弹窗的操作暴露给父组件
-defineExpose({
-    openDialog: dialog.changeVisible,
-});
-
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/system/Apply/Save/components/RequestTable.vue b/src/views/system/Apply/Save/components/RequestTable.vue
index 888d5e76..4c8ff9ee 100644
--- a/src/views/system/Apply/Save/components/RequestTable.vue
+++ b/src/views/system/Apply/Save/components/RequestTable.vue
@@ -88,6 +88,7 @@ const tableData = computed(() => {
     return props.value.slice((current.value - 1) * 10, current.value * 10);
 });
 
+if(props.value.length < 1) addRow()
 watch(
     () => props.value,
     (n, o) => {
diff --git a/src/views/system/Apply/Save/typing.d.ts b/src/views/system/Apply/Save/typing.d.ts
index af68633c..2bc07a2f 100644
--- a/src/views/system/Apply/Save/typing.d.ts
+++ b/src/views/system/Apply/Save/typing.d.ts
@@ -19,7 +19,7 @@ export type formType = {
     name: string;
     provider: applyType;
     integrationModes: string[];
-    config: string;
+    config?: string;
     description: string;
     page: { // 页面集成
         baseUrl: string,
@@ -54,7 +54,7 @@ export type formType = {
         roleIdList: string[], // 角色列表	
         orgIdList: string[], // 部门列表	
         ipWhiteList: string, // IP白名单	
-        signature: 'MD5' | 'SHA256' | '', // 签名方式, 可选值：MD5，SHA256
+        signature?: 'MD5' | 'SHA256' | '', // 签名方式, 可选值：MD5，SHA256
         enableOAuth2: boolean, // 是否启用OAuth2	
     },
     sso: { // 统一单点登陆集成
diff --git a/src/views/system/Apply/componenets/MenuDialog.vue b/src/views/system/Apply/componenets/MenuDialog.vue
new file mode 100644
index 00000000..bc4a5d7a
--- /dev/null
+++ b/src/views/system/Apply/componenets/MenuDialog.vue
@@ -0,0 +1,196 @@
+<template>
+    <a-modal
+        v-model:visible="dialog.visible"
+        title="集成菜单"
+        width="600px"
+        @ok="dialog.handleOk"
+        @cancel="dialog.cancel"
+        class="edit-dialog-container"
+        :confirmLoading="dialog.loading"
+        cancelText="取消"
+        okText="确定"
+    >
+        <a-select
+            v-model:value="form.checkedSystem"
+            @change="(value) => value && getTree(value as string)"
+            style="width: 200px"
+            placeholder="请选择集成系统"
+        >
+            <a-select-option
+                v-for="item in form.systemList"
+                :value="item.value"
+                >{{ item.label }}</a-select-option
+            >
+        </a-select>
+
+        <p style="margin: 20px 0 0 0" v-show="form.menuTree.length > 0">当前集成菜单</p>
+        <a-tree
+            v-model:checkedKeys="form.checkedMenu"
+            v-model:expandedKeys="form.expandedKeys"
+            checkable
+            :tree-data="form.menuTree"
+            :fieldNames="{ key: 'id', title: 'name' }"
+            @check="treeCheck"
+        >
+            <template #title="{ name }">
+                <span>{{ name }}</span>
+            </template>
+        </a-tree>
+    </a-modal>
+</template>
+
+<script setup lang="ts">
+import { optionItemType } from '@/views/system/DataSource/typing';
+import { applyType } from '../Save/typing';
+import {
+    getOwner_api,
+    getOwnerStandalone_api,
+    getOwnerTree_api,
+    getOwnerTreeStandalone_api,
+    saveOwnerMenu_api,
+} from '@/api/system/apply';
+import { CheckInfo } from 'ant-design-vue/lib/vc-tree/props';
+import { useMenuStore } from '@/store/menu';
+import { message } from 'ant-design-vue';
+import { getMenuTree_api } from '@/api/system/menu';
+
+const menuStory = useMenuStore();
+
+const props = defineProps<{
+    mode: 'add' | 'edit';
+}>();
+// 弹窗相关
+const dialog = reactive({
+    visible: false,
+    loading: false,
+
+    handleOk: () => {
+        const items = filterTree(form.menuTree, [
+            ...form.checkedMenu,
+            ...form.half,
+        ]);
+        if (form.checkedSystem) {
+            if (items && items.length !== 0) {
+                saveOwnerMenu_api('iot', form.id, items).then((resp) => {
+                    if (resp.status === 200) {
+                        message.success('操作成功');
+                        dialog.visible = false;
+                    }
+                });
+            } else {
+                message.warning('请勾选配置菜单');
+            }
+        } else {
+            message.warning('请选择所属系统');
+        }
+    },
+    cancel: () => {
+        if (props.mode === 'add')
+            menuStory.jumpPage('system/Apply/Save', {}, { id: form.id });
+        dialog.visible = false;
+    },
+    changeVisible: (id: string, provider: applyType) => {
+        form.id = id;
+        form.provider = provider;
+        form.checkedSystem = undefined;
+        form.checkedMenu = [];
+        dialog.visible = true;
+
+        if (id) {
+            getSystemList();
+            getMenus();
+        }
+    },
+});
+// 将打开弹窗的操作暴露给父组件
+defineExpose({
+    openDialog: dialog.changeVisible,
+});
+
+const form = reactive({
+    id: '',
+    checkedSystem: '' as undefined | string,
+    checkedMenu: [] as string[],
+    expandedKeys: [] as string[],
+    half: [] as string[],
+
+    provider: '' as applyType,
+    systemList: [] as optionItemType[],
+    menuTree: [] as any[],
+});
+/**
+ * 与集成系统关联的菜单
+ * @param params
+ */
+function getTree(params: string) {
+    const api =
+        form.provider === 'internal-standalone'
+            ? getOwnerTreeStandalone_api(form.id, params)
+            : getOwnerTree_api(params);
+    api.then((resp: any) => {
+        form.menuTree = resp.result;
+        form.expandedKeys = resp.result.map((item: any) => item.id);
+    });
+}
+/**
+ * 获取当前用户可访问菜单
+ */
+function getMenus() {
+    const params = {
+        terms: [
+            {
+                column: 'appId',
+                value: form.id,
+            },
+        ],
+    };
+    getMenuTree_api(params).then((resp: any) => {
+        if (resp.status === 200) {
+            form.menuTree = resp.result;
+            const keys = resp.result.map((item: any) => item.id) as string[];
+            form.expandedKeys = keys;
+            form.checkedMenu = keys;
+        }
+    });
+}
+/**
+ * 获取集成系统选项
+ */
+function getSystemList() {
+    const api =
+        form.provider === 'internal-standalone'
+            ? getOwnerStandalone_api(form.id, ['iot'])
+            : getOwner_api(['iot']);
+
+    api.then((resp: any) => {
+        if (resp.status === 200) {
+            form.systemList = resp.result.map((item: string) => ({
+                label: item,
+                value: item,
+            }));
+        }
+    });
+}
+// 树选中事件
+function treeCheck(checkedKeys: any, e: CheckInfo) {
+    form.checkedMenu = checkedKeys;
+    form.half = e.halfCheckedKeys as string[];
+}
+//过滤节点-默认带上父节点
+function filterTree(nodes: any[], list: any[]) {
+    if (!nodes?.length) {
+        return nodes;
+    }
+    return nodes.filter((it) => {
+        // 不符合条件的直接砍掉
+        if (list.indexOf(it.id) <= -1) {
+            return false;
+        }
+        // 符合条件的保留，并且需要递归处理其子节点
+        it.children = filterTree(it.children, list);
+        return true;
+    });
+}
+</script>
+
+<style scoped></style>
diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index aa8d8021..d5b557f9 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -42,6 +42,7 @@
                             enabled: 'success',
                             disabled: 'error',
                         }"
+                        hasMark
                     >
                         <template #img>
                             <slot name="img">
@@ -118,6 +119,14 @@
                                 </PermissionButton>
                             </a-tooltip>
                         </template>
+
+                        <template #mark>
+                            <AIcon
+                                type="EyeOutlined"
+                                style="font-size: 24px"
+                                @click="() => table.toSave(slotProps.id, true)"
+                            />
+                        </template>
                     </CardBox>
                 </template>
 
@@ -151,11 +160,15 @@
                 </template>
             </JTable>
         </div>
+        <div class="dialogs">
+            <MenuDialog ref="dialogRef" mode="edit" />
+        </div>
     </page-container>
 </template>
 
 <script setup lang="ts" name="Apply">
 import PermissionButton from '@/components/PermissionButton/index.vue';
+import MenuDialog from './componenets/MenuDialog.vue';
 import {
     getApplyList_api,
     changeApplyStatus_api,
@@ -251,9 +264,10 @@ const columns = [
     },
 ];
 const params = ref({});
-const search = (newParams: any) => (params.value = {...newParams});
+const search = (newParams: any) => (params.value = { ...newParams });
 
 const tableRef = ref();
+const dialogRef = ref();
 const table = {
     refresh: () => {
         tableRef.value.reload();
@@ -344,7 +358,10 @@ const table = {
                     title: '集成菜单',
                 },
                 icon: 'MenuUnfoldOutlined',
-                onClick: () => {},
+                onClick: () => {
+                    dialogRef.value &&
+                        dialogRef.value.openDialog(data.id, data.provider);
+                },
             });
         // 有api操作权限
         if (otherServers.includes('apiServer'))

From 5c9ad767adb380cc708edfc35b784769f1a79f4d Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Mon, 27 Feb 2023 18:13:06 +0800
Subject: [PATCH 05/23] =?UTF-8?q?feat:=20=E9=80=9A=E9=81=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/media/Device/Channel/Save.vue  | 147 +++++++++++++++++++++++
 src/views/media/Device/Channel/index.vue |  10 ++
 2 files changed, 157 insertions(+)
 create mode 100644 src/views/media/Device/Channel/Save.vue

diff --git a/src/views/media/Device/Channel/Save.vue b/src/views/media/Device/Channel/Save.vue
new file mode 100644
index 00000000..51762e16
--- /dev/null
+++ b/src/views/media/Device/Channel/Save.vue
@@ -0,0 +1,147 @@
+<!-- Modal 弹窗，用于新增、修改数据 -->
+<template>
+    <a-modal
+        v-model:visible="_vis"
+        :title="!!formData.id ? '编辑' : '新增'"
+        width="650px"
+        cancelText="取消"
+        okText="确定"
+        @ok="handleSubmit"
+        @cancel="handleCancel"
+    >
+        <a-form ref="formRef" :model="formData" layout="vertical">
+            <a-row :gutter="10">
+                <a-col :span="12">
+                    <a-form-item name="channelId">
+                        <template #label>
+                            通道ID
+                            <a-tooltip title="若不填写，系统将自动生成唯一ID">
+                                <AIcon
+                                    type="QuestionCircleOutlined"
+                                    style="margin-left: 2px"
+                                />
+                            </a-tooltip>
+                        </template>
+                        <a-input v-model:value="formData.channelId" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item
+                        name="name"
+                        label="通道名称"
+                        :rules="{ required: true, message: '请输入通道名称' }"
+                    >
+                        <a-input v-model:value="formData.name" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item
+                        name="media_url"
+                        :rules="{ required: true, message: '请输入视频地址' }"
+                    >
+                        <template #label>
+                            视频地址
+                            <a-tooltip
+                                title="不同厂家的RTSP固定地址规则不同，请按对应厂家的规则填写"
+                            >
+                                <AIcon
+                                    type="QuestionCircleOutlined"
+                                    style="margin-left: 2px"
+                                />
+                            </a-tooltip>
+                        </template>
+                        <a-input v-model:value="formData.others.media_url" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item name="media_username" label="用户名">
+                        <a-input
+                            v-model:value="formData.others.media_username"
+                        />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item name="media_password" label="密码">
+                        <a-input-password
+                            v-model:value="formData.others.media_password"
+                        />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item name="address" label="安装地址">
+                        <a-input v-model:value="formData.address" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item name="description" label="说明">
+                        <a-textarea
+                            v-model:value="formData.description"
+                            :rows="4"
+                            :maxlength="200"
+                            showCount
+                        />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
+</template>
+
+<script setup lang="ts">
+import templateApi from '@/api/notice/template';
+import { PropType } from 'vue';
+
+type Emits = {
+    (e: 'update:visible', data: boolean): void;
+    (e: 'submit'): void;
+};
+const emit = defineEmits<Emits>();
+
+const props = defineProps({
+    visible: { type: Boolean, default: false },
+    channelData: {
+        type: Object as PropType<Partial<Record<string, any>>>,
+        default: () => ({}),
+    },
+});
+
+const _vis = computed({
+    get: () => props.visible,
+    set: (val) => emit('update:visible', val),
+});
+
+const formRef = ref();
+const formData = ref({
+    id: '',
+    address: '',
+    channelId: '',
+    description: '',
+    deviceId: '',
+    name: '',
+    others: {
+        media_password: '',
+        media_url: '',
+        media_username: '',
+    },
+});
+// const formRules = ref({});
+
+/**
+ * 提交
+ */
+const handleSubmit = () => {
+    formRef.value
+        .validate()
+        .then(async () => {
+            emit('submit');
+        })
+        .catch((err: any) => {
+            console.log('err: ', err);
+        });
+};
+const handleCancel = () => {
+    _vis.value = false;
+};
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/media/Device/Channel/index.vue b/src/views/media/Device/Channel/index.vue
index 6ca977e2..0e17cec7 100644
--- a/src/views/media/Device/Channel/index.vue
+++ b/src/views/media/Device/Channel/index.vue
@@ -76,6 +76,12 @@
                 </a-space>
             </template>
         </JTable>
+
+        <Save
+            v-model:visible="saveVis"
+            :channelData="channelData"
+            @submit="listRef.reload()"
+        />
     </page-container>
 </template>
 
@@ -84,6 +90,7 @@ import ChannelApi from '@/api/media/channel';
 import type { ActionsType } from '@/components/Table/index.vue';
 import { useMenuStore } from 'store/menu';
 import { message } from 'ant-design-vue';
+import Save from './Save.vue';
 
 const menuStory = useMenuStore();
 const route = useRoute();
@@ -163,6 +170,8 @@ const handleAdd = () => {
 
 const listRef = ref();
 const playVis = ref(false);
+const channelData = ref();
+
 const getActions = (
     data: Partial<Record<string, any>>,
     type: 'card' | 'table',
@@ -178,6 +187,7 @@ const getActions = (
             icon: 'EditOutlined',
             onClick: () => {
                 saveVis.value = true;
+                channelData.value = data;
             },
         },
         {

From 9189d8a212d6c6310fcda95a75aa0370a7ba7555 Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Mon, 27 Feb 2023 19:24:14 +0800
Subject: [PATCH 06/23] =?UTF-8?q?fix:=20=E7=89=A9=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Metadata/Base/Edit/ExpandsForm.vue        | 25 ++++-
 .../Metadata/Base/Edit/PropertyForm.vue       | 91 ++++++++++++-------
 .../Metadata/Base/Edit/ValueTypeForm.vue      |  9 +-
 .../components/Metadata/Base/Edit/index.vue   | 31 +++++--
 .../device/components/Metadata/Base/index.vue | 35 +++----
 5 files changed, 131 insertions(+), 60 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
index 7377c4d0..d4061d54 100644
--- a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
@@ -2,20 +2,33 @@
   <a-form-item label="来源" :name="name.concat(['source'])" v-if="type === 'product'" :rules="[
     { required: true, message: '请选择来源' },
   ]">
-    <a-select v-model:value="_value.source" :options="PropertySource" size="small" :disabled="metadataStore.model.action === 'edit'"></a-select>
+    <a-select v-model:value="_value.source" :options="PropertySource" size="small"
+      :disabled="metadataStore.model.action === 'edit'"></a-select>
   </a-form-item>
-  <virtual-rule-param v-if="_value.source === 'rule'" v-model:value="_value.virtualRule" :name="name.concat(['virtualRule'])" :id="id" :showWindow="_value.source === 'rule'"></virtual-rule-param>
+  <virtual-rule-param v-if="_value.source === 'rule'" v-model:value="_value.virtualRule"
+    :name="name.concat(['virtualRule'])" :id="id" :showWindow="_value.source === 'rule'"></virtual-rule-param>
   <a-form-item label="读写类型" :name="name.concat(['type'])" :rules="[
     { required: true, message: '请选择读写类型' },
   ]">
     <a-select v-model:value="_value.type" :options="options" mode="multiple" size="small"></a-select>
   </a-form-item>
+  <a-form-item label="其他配置" v-if="config.length > 0">
+    <a-form-item v-for="(item, index) in config" :key="index">
+      <config-param v-model:value="_value" :config="item" :name="name"></config-param>
+    </a-form-item>
+  </a-form-item>
+  <a-form-item v-if="type === 'product' && ['int', 'float', 'double', 'long', 'date', 'string', 'boolean'].includes(valueType.type)"
+    label="指标配置" :name="name.concat(['metrics'])">
+    <metrics-param v-model:value="_value.metrics" :type="valueType.type" :enum="valueType"></metrics-param>
+  </a-form-item>
 </template>
 <script setup lang="ts" name="ExpandsForm">
 import { useMetadataStore } from '@/store/metadata';
 import { PropertySource } from '@/views/device/data';
 import { PropType } from 'vue';
 import VirtualRuleParam from '@/components/Metadata/VirtualRuleParam/index.vue';
+import ConfigParam from '@/components/Metadata/ConfigParam/index.vue'
+import MetricsParam from '@/components/Metadata/MetricsParam/index.vue'
 
 type ValueType = Record<any, any>;
 const props = defineProps({
@@ -34,6 +47,14 @@ const props = defineProps({
   id: {
     type: String
   },
+  config: {
+    type: Array as PropType<ValueType[]>,
+    default: () => ([])
+  },
+  valueType: {
+    type: Object,
+    default: () => ({})
+  }
 })
 
 interface Emits {
diff --git a/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue b/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue
index ccfc9b03..af11ca31 100644
--- a/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue
@@ -1,54 +1,83 @@
 <template>
-  <a-form ref="addFormRef" :model="form.model" layout="vertical">
-    <a-form-item label="标识" name="id" :rules="[
-      { required: true, message: '请输入标识' },
-      { max: 64, message: '最多可输入64个字符' },
-      {
-        pattern: /^[a-zA-Z0-9_]+$/,
-        message: '请输入英文或者数字或者-或者_',
-      },
-    ]">
-      <a-input v-model:value="form.model.id" size="small"></a-input>
-    </a-form-item>
-    <a-form-item label="名称" name="name" :rules="[
-      { required: true, message: '请输入名称' },
-      { max: 64, message: '最多可输入64个字符' },
-    ]">
-      <a-input v-model:value="form.model.name" size="small"></a-input>
-    </a-form-item>
-    <value-type-form :name="['valueType']" v-model:value="form.model.valueType" key="property"></value-type-form>
+  <a-form-item label="标识" name="id" :rules="[
+    { required: true, message: '请输入标识' },
+    { max: 64, message: '最多可输入64个字符' },
+    {
+      pattern: /^[a-zA-Z0-9_\-]+$/,
+      message: 'ID只能由数字、字母、下划线、中划线组成',
+    },
+  ]">
+    <a-input v-model:value="value.id" size="small" @change="asyncOtherConfig"></a-input>
+  </a-form-item>
+  <a-form-item label="名称" name="name" :rules="[
+    { required: true, message: '请输入名称' },
+    { max: 64, message: '最多可输入64个字符' },
+  ]">
+    <a-input v-model:value="value.name" size="small"></a-input>
+  </a-form-item>
+  <value-type-form :name="['valueType']" v-model:value="value.valueType" key="property"
+    @change-type="changeValueType"></value-type-form>
 
-    <expands-form :name="['expands']" v-model:value="form.model.expands" :type="type" :id="form.model.id"></expands-form>
+  <expands-form :name="['expands']" v-model:value="value.expands" :type="type" :id="value.id" :config="config"
+    :valueType="value.valueType"></expands-form>
 
-    <a-form-item label="说明" name="description" :rules="[
-      { max: 200, message: '最多可输入200个字符' },
-    ]">
-      <a-textarea v-model:value="form.model.description" size="small"></a-textarea>
-    </a-form-item>
-  </a-form>
+  <a-form-item label="说明" name="description" :rules="[
+    { max: 200, message: '最多可输入200个字符' },
+  ]">
+    <a-textarea v-model:value="value.description" size="small"></a-textarea>
+  </a-form-item>
 </template>
 <script setup lang="ts" name="PropertyForm">
 import { PropType } from 'vue';
 import ExpandsForm from './ExpandsForm.vue';
 import ValueTypeForm from './ValueTypeForm.vue'
+import { useProductStore } from '@/store/product';
+import { getMetadataConfig } from '@/api/device/product'
 
 const props = defineProps({
   type: {
     type: String as PropType<'product' | 'device'>,
     required: true,
     default: 'product'
+  },
+  value: {
+    type: Object,
+    default: () => ({})
   }
 })
+const productStore = useProductStore()
 
-const form = reactive({
-  model: {
-    valueType: {
-      expands: {}
+const config = ref<Record<any, any>[]>([])
+const asyncOtherConfig = async () => {
+  if (props.type !== 'product') return
+  const { valueType: { type }, id } = props.value
+  const productId = productStore.current?.id
+  if (!productId || !id || !type) return
+  const resp = await getMetadataConfig({
+    deviceId: productId,
+    metadata: {
+      id,
+      type: 'property',
+      dataType: type,
     },
-    expands: {}
-  } as any,
+  })
+  if (resp.status === 200) {
+    config.value = resp.result
+  }
+}
+onMounted(() => {
+  asyncOtherConfig()
 })
 
+const changeValueType = (val: string) => {
+  if (props.type === 'product' && ['int', 'float', 'double', 'long', 'date', 'string', 'boolean'].includes(val)) {
+    props.value.expands.metrics = []
+  } else {
+    delete props.value.expands?.metrics
+  }
+  asyncOtherConfig()
+}
+
 </script>
 <style scoped lang="less">
 :deep(.ant-form-item-label) {
diff --git a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
index 2efa7b2a..f66f5f55 100644
--- a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
@@ -2,7 +2,7 @@
   <a-form-item label="数据类型" :name="name.concat(['type'])" :rules="[
     { required: true, message: '请选择数据类型' },
   ]">
-    <a-select v-model:value="value.type" :options="_dataTypeList" size="small"></a-select>
+    <a-select v-model:value="value.type" :options="_dataTypeList" size="small" @change="changeType"></a-select>
   </a-form-item>
   <a-form-item label="单位" :name="name.concat(['unit'])" v-if="['int', 'float', 'long', 'double'].includes(value.type)">
     <InputSelect v-model:value="value.unit" :options="unit.unitOptions" size="small"></InputSelect>
@@ -48,7 +48,7 @@
 </template>
 <script lang="ts" setup mame="BaseForm">
 import { DataTypeList, FileTypeList } from '@/views/device/data';
-import { DefaultOptionType } from 'ant-design-vue/es/select';
+import { DefaultOptionType, SelectValue } from 'ant-design-vue/es/select';
 import { PropType } from 'vue'
 import { getUnit } from '@/api/device/instance';
 import { Store } from 'jetlinks-store';
@@ -79,6 +79,7 @@ const props = defineProps({
 
 interface Emits {
   (e: 'update:value', data: ValueType): void;
+  (e: 'changeType', data: string): void;
 }
 const emit = defineEmits<Emits>()
 
@@ -107,6 +108,10 @@ const unit = {
 unit.getUnit()
 
 const _dataTypeList = computed(() => props.isSub ? DataTypeList.filter(item => item.value !== 'array' && item.value !== 'object') : DataTypeList)
+
+const changeType = (val: SelectValue) => {
+  emit('changeType', val as string)
+}
 </script>
 <style lang="less" scoped>
 :deep(.ant-form-item-label) {
diff --git a/src/views/device/components/Metadata/Base/Edit/index.vue b/src/views/device/components/Metadata/Base/Edit/index.vue
index bca2a281..81111112 100644
--- a/src/views/device/components/Metadata/Base/Edit/index.vue
+++ b/src/views/device/components/Metadata/Base/Edit/index.vue
@@ -4,19 +4,20 @@
     <template #extra>
       <a-button :loading="save.loading" type="primary" @click="save.saveMetadata">保存</a-button>
     </template>
-    <PropertyForm v-if="metadataStore.model.type === 'properties'" :type="type"></PropertyForm>
+    <a-form ref="formRef" :model="form.model" layout="vertical">
+        <PropertyForm v-if="metadataStore.model.type === 'properties'" :type="type" ref="propertyForm" v-model:value="form.model"></PropertyForm>
+    </a-form>
   </a-drawer>
 </template>
 <script lang="ts" setup name="Edit">
 import { useInstanceStore } from '@/store/instance';
 import { useMetadataStore } from '@/store/metadata';
 import { useProductStore } from '@/store/product';
-import { MetadataItem, ProductItem } from '@/views/device/Product/typings';
+import { ProductItem } from '@/views/device/Product/typings';
 import { message } from 'ant-design-vue/es';
 import type { FormInstance } from 'ant-design-vue/es';
 import { updateMetadata, asyncUpdateMetadata } from '../../metadata'
 import { Store } from 'jetlinks-store';
-import { SystemConst } from '@/utils/consts';
 import { detail } from '@/api/device/instance';
 import { DeviceInstance } from '@/views/device/Instance/typings';
 import PropertyForm from './PropertyForm.vue';
@@ -50,7 +51,21 @@ const close = () => {
 
 const title = computed(() => metadataStore.model.action === 'add' ? '新增' : '修改')
 
-const addFormRef = ref<FormInstance>()
+const propertyForm = ref()
+
+const form = reactive({
+  model: {
+    valueType: {
+      expands: {}
+    },
+    expands: {}
+  } as any,
+})
+if (metadataStore.model.action === 'edit') {
+  form.model = metadataStore.model.item
+}
+
+const formRef = ref<FormInstance>()
 /**
  * 保存按钮
  */
@@ -58,7 +73,7 @@ const save = reactive({
   loading: false,
   saveMetadata: (deploy?: boolean) => {
     save.loading = true
-    addFormRef.value?.validateFields().then(async (formValue) => {
+    formRef.value?.validateFields().then(async (formValue) => {
       const type = metadataStore.model.type
       const _detail: ProductItem | DeviceInstance = props.type === 'device' ? instanceStore.detail : productStore.current
       const _metadata = JSON.parse(_detail?.metadata || '{}')
@@ -90,8 +105,9 @@ const save = reactive({
             setTimeout(() => window.close(), 300);
           }
         } else {
-          Store.set(SystemConst.REFRESH_METADATA_TABLE, true);
+          // Store.set(SystemConst.REFRESH_METADATA_TABLE, true);
           if (deploy) {
+            // TODO 是否发布
             Store.set('product-deploy', deploy);
           } else {
             save.resetMetadata();
@@ -121,9 +137,6 @@ const save = reactive({
   }
 })
 
-const form = reactive({
-  model: {} as Record<string, any>
-})
 </script>
 <style lang="less" scoped>
 
diff --git a/src/views/device/components/Metadata/Base/index.vue b/src/views/device/components/Metadata/Base/index.vue
index 196cb6b7..0671faf0 100644
--- a/src/views/device/components/Metadata/Base/index.vue
+++ b/src/views/device/components/Metadata/Base/index.vue
@@ -33,22 +33,24 @@
       </a-tag>
     </template>
     <template #action="slotProps">
-      <PermissionButton :uhas-permission="`${permission}:update`" type="link" key="edit" style="padding: 0"
-        :udisabled="operateLimits('updata', type)" @click="handleEditClick(slotProps)" :tooltip="{
-          title: operateLimits('updata', type) ? '当前的存储方式不支持编辑' : '编辑',
-        }">
-        <EditOutlined />
-      </PermissionButton>
-      <PermissionButton :uhas-permission="`${permission}:delete`" type="link" key="delete" style="padding: 0"
-        :pop-confirm="{
-          title: '确认删除？', onConfirm: async () => {
-            await removeItem(slotProps);
-          },
-        }" :tooltip="{
-          title: '删除',
-        }">
-        <DeleteOutlined />
-      </PermissionButton>
+      <a-space>
+        <PermissionButton :uhas-permission="`${permission}:update`" type="link" key="edit" style="padding: 0"
+          :udisabled="operateLimits('updata', type)" @click="handleEditClick(slotProps)" :tooltip="{
+            title: operateLimits('updata', type) ? '当前的存储方式不支持编辑' : '编辑',
+          }">
+          <EditOutlined />
+        </PermissionButton>
+        <PermissionButton :uhas-permission="`${permission}:delete`" type="link" key="delete" style="padding: 0"
+          :pop-confirm="{
+            title: '确认删除？', onConfirm: async () => {
+              await removeItem(slotProps);
+            },
+          }" :tooltip="{
+            title: '删除',
+          }">
+          <DeleteOutlined />
+        </PermissionButton>
+      </a-space>
     </template>
   </JTable>
 </template>
@@ -123,6 +125,7 @@ onMounted(() => {
 })
 
 watch([route.params.id, type], () => {
+  loading.value = true
   // const res = target === 'product'
   //       ? await productDetail(route.params.id as string)
   //       : await detail(route.params.id as string);

From 02153a63daf3633291d10dbd1dfbd781a7f8612c Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Mon, 27 Feb 2023 19:34:51 +0800
Subject: [PATCH 07/23] =?UTF-8?q?fix:=20=E7=89=A9=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device/product.ts                     |  11 +-
 src/components/JIndicators/index.vue          | 115 ++++++++++
 .../Metadata/BooleanParam/index.vue           |   3 +
 src/components/Metadata/ConfigParam/index.vue |  74 +++++++
 src/components/Metadata/EnumParam/index.vue   |   4 +
 src/components/Metadata/JsonParam/index.vue   |   8 +-
 .../Metadata/MetricsParam/index.vue           | 202 ++++++++++++++++++
 .../components/Metadata/Base/Edit/index.vue   |   6 +
 .../device/components/Metadata/Base/index.vue |   7 +-
 9 files changed, 424 insertions(+), 6 deletions(-)
 create mode 100644 src/components/JIndicators/index.vue
 create mode 100644 src/components/Metadata/ConfigParam/index.vue
 create mode 100644 src/components/Metadata/MetricsParam/index.vue

diff --git a/src/api/device/product.ts b/src/api/device/product.ts
index dca448a4..f6a31e9d 100644
--- a/src/api/device/product.ts
+++ b/src/api/device/product.ts
@@ -184,4 +184,13 @@ export const getOperator = () => server.get<OperatorItem>('/property-calculate-r
 /**
  * 获取聚合函数列表
  */
-export const getStreamingAggType = () => server.get<Record<string, string>[]>('/dictionary/streaming-agg-type/items')
\ No newline at end of file
+export const getStreamingAggType = () => server.get<Record<string, string>[]>('/dictionary/streaming-agg-type/items')
+
+export const getMetadataConfig = (params: {
+  deviceId: string;
+  metadata: {
+    type: MetadataType | 'property';
+    id: string;
+    dataType: string;
+  };
+}) => server.get<Record<any, any>[]>(`/device/product/${params.deviceId}/config-metadata/${params.metadata.type}/${params.metadata.id}/${params.metadata.dataType}`)
\ No newline at end of file
diff --git a/src/components/JIndicators/index.vue b/src/components/JIndicators/index.vue
new file mode 100644
index 00000000..6d2c744d
--- /dev/null
+++ b/src/components/JIndicators/index.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="indicator-box">
+    <template v-if="['int', 'long', 'double', 'float'].includes(type)">
+      <template v-if="value.range">
+        <a-input-number v-model:value="value.value[0]" :max="value.value[1]" size="small"
+          style="width: 100%;"></a-input-number>
+        ~
+        <a-input-number v-model:value="value.value[1]" :min="value.value[0]" size="small"
+          style="width: 100%;"></a-input-number>
+      </template>
+      <a-input-number v-else v-model:value="value.value" size="small" style="width: 100%;"></a-input-number>
+    </template>
+    <template v-else-if="type === 'date'">
+      <a-range-picker v-if="value.range" show-time v-model:value="value.value" size="small" />
+      <a-date-picker v-else show-time v-model:value="value.value" size="small" />
+    </template>
+    <template v-else-if="type === 'boolean'">
+      <a-select v-model:value="value.value[0]" :options="list" size="small" placeholder="请选择"></a-select>
+    </template>
+    <template v-else-if="type === 'string'">
+      <a-input v-model:value="value.value" size="small" placeholder="请输入"></a-input>
+    </template>
+    <template v-else>
+      <template v-if="value.range">
+        <a-input v-model:value="value.value[0]" :max="value.value[1]" size="small" placeholder="请输入"></a-input>
+        ~
+        <a-input v-model:value="value.value[1]" :min="value.value[0]" size="small" placeholder="请输入"></a-input>
+      </template>
+      <a-input-number v-else v-model:value="value.value" size="small" placeholder="请输入"></a-input-number>
+    </template>
+    <div v-if="type !== 'boolean' && type !== 'string'">
+      <a-checkbox style="min-width: 60px; margin-left: 5px;" v-model:checked="value.range" @change="changeChecked">
+        范围
+      </a-checkbox>
+    </div>
+  </div>
+</template>
+<script setup lang="ts" name="JIndicators">
+import { CheckboxChangeEvent } from 'ant-design-vue/es/checkbox/interface';
+import { Form } from 'ant-design-vue'
+
+const props = defineProps({
+  type: {
+    type: String,
+    required: true
+  },
+  range: {
+    type: Boolean,
+    default: false
+  },
+  value: {
+    type: [String, Number, Array] as any
+  },
+  enum: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+Form.useInjectFormItemContext()
+
+const changeChecked = (e: CheckboxChangeEvent) => {
+  if (e.target.checked) {
+    props.value.value = []
+  } else {
+    delete props.value.value
+  }
+}
+
+const list = ref<{ label: any; value: any; }[]>([])
+watch(() => props.enum,
+  () => {
+    const arr = [];
+    if (!!props.enum?.falseText && props.enum?.falseValue !== undefined) {
+      arr.push({ label: props.enum?.falseText, value: props.enum?.falseValue });
+    }
+    if (!!props.enum?.trueText && props.enum?.trueValue !== undefined) {
+      arr.push({ label: props.enum?.trueText, value: props.enum?.trueValue });
+    }
+    list.value = arr
+  },
+  { immediate: true, deep: true })
+
+watch(() => props.type,
+  (value) => {
+    if (value === 'boolean') {
+      if (!props.value.value) props.value.value = []
+    }
+  },
+  { immediate: true })
+
+</script>
+<style lang="less" scoped>
+.indicator-box {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+:deep(.ant-form-item-label) {
+  line-height: 1;
+
+  >label {
+    font-size: 12px;
+
+    &.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before {
+      font-size: 12px;
+    }
+  }
+}
+
+:deep(input) {
+  height: 22px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Metadata/BooleanParam/index.vue b/src/components/Metadata/BooleanParam/index.vue
index 4e14a89a..4b93bf4d 100644
--- a/src/components/Metadata/BooleanParam/index.vue
+++ b/src/components/Metadata/BooleanParam/index.vue
@@ -77,5 +77,8 @@ onMounted(() => {
       }
     }
   }
+  :deep(input) {
+    height: 22px;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/components/Metadata/ConfigParam/index.vue b/src/components/Metadata/ConfigParam/index.vue
new file mode 100644
index 00000000..802d3c99
--- /dev/null
+++ b/src/components/Metadata/ConfigParam/index.vue
@@ -0,0 +1,74 @@
+<template>
+  <a-popover placement="left" trigger="click">
+    <template #title>
+      <div class="edit-title" style="display: flex; justify-content: space-between; align-items: center;">
+        <div style="width: 150px;">{{ config.name }}</div>
+      </div>
+    </template>
+    <template #content>
+      <div style="max-width: 400px;" class="ant-form-vertical">
+        <a-form-item v-for="item in config.properties" :name="name.concat([item.property])" :label="item.name">
+          <a-select v-model:value="value[item.property]" :options="item.type?.elements?.map((e: { 'text': string, 'value': string }) => ({
+            label: e.text,
+            value: e.value,
+          }))" size="small"></a-select>
+        </a-form-item>
+      </div>
+    </template>
+    <a-button type="dashed" block>
+      存储配置<edit-outlined class="item-icon" />
+    </a-button>
+  </a-popover>
+</template>
+<script setup lang="ts" name="ConfigParam">
+import { PropType } from 'vue';
+import { EditOutlined } from '@ant-design/icons-vue';
+
+type ValueType = Record<any, any>;
+const props = defineProps({
+  value: {
+    type: Object,
+    default: () => ({})
+  },
+  name: {
+    type: Array as PropType<string[]>,
+    default: () => ([]),
+    required: true
+  },
+  config: {
+    type: Array as PropType<ValueType>,
+    default: () => ({ properties: [] })
+  }
+})
+
+interface Emits {
+  (e: 'update:value', data: string | undefined): void;
+}
+const emit = defineEmits<Emits>()
+
+const visible = ref(false)
+
+// const _value = computed({
+//   get: () => props.value,
+//   set: (val: string | undefined) => {
+//     emit('update:value', val)
+//   }
+// })
+</script>
+<style lang="less" scoped>
+.item-icon {
+  color: rgb(136, 136, 136);
+  font-size: 12px;
+}
+:deep(.ant-form-item-label) {
+  >label {
+    font-size: 12px;
+  }
+}
+:deep(.ant-select) {
+  font-size: 12px;
+}
+:deep(input) {
+  height: 22px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Metadata/EnumParam/index.vue b/src/components/Metadata/EnumParam/index.vue
index bb9daf5d..a67eac0b 100644
--- a/src/components/Metadata/EnumParam/index.vue
+++ b/src/components/Metadata/EnumParam/index.vue
@@ -157,4 +157,8 @@ const handleAdd = () => {
 :deep(.ant-select) {
   font-size: 12px;
 }
+
+:deep(input) {
+  height: 22px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/Metadata/JsonParam/index.vue b/src/components/Metadata/JsonParam/index.vue
index 868b44fa..f28dc516 100644
--- a/src/components/Metadata/JsonParam/index.vue
+++ b/src/components/Metadata/JsonParam/index.vue
@@ -19,8 +19,8 @@
                   { required: true, message: '请输入标识' },
                   { max: 64, message: '最多可输入64个字符' },
                   {
-                    pattern: /^[a-zA-Z0-9_]+$/,
-                    message: '请输入英文或者数字或者-或者_',
+                    pattern: /^[a-zA-Z0-9_\-]+$/,
+                    message: 'ID只能由数字、字母、下划线、中划线组成',
                   },
                 ]">
                   <a-input v-model:value="_value[index].id" size="small"></a-input>
@@ -169,4 +169,8 @@ const handleAdd = () => {
 :deep(.ant-select) {
   font-size: 12px;
 }
+
+:deep(input) {
+  height: 22px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/Metadata/MetricsParam/index.vue b/src/components/Metadata/MetricsParam/index.vue
new file mode 100644
index 00000000..954e6be9
--- /dev/null
+++ b/src/components/Metadata/MetricsParam/index.vue
@@ -0,0 +1,202 @@
+<template>
+  <div class="json-param">
+    <div class="list-item" v-for="(item, index) in _value" :key="`object_${index}`">
+      <div class="item-left">
+        <menu-outlined class="item-drag item-icon" />
+        {{ `#${index + 1}.` }}
+      </div>
+      <div class="item-middle item-editable">
+        <a-popover :visible="editIndex === index" placement="top" @visible-change="change" trigger="click">
+          <template #title>
+            <div class="edit-title" style="display: flex; justify-content: space-between; align-items: center;">
+              <div style="width: 150px;">配置参数</div>
+              <close-outlined @click="handleClose" />
+            </div>
+          </template>
+          <template #content>
+            <div>
+              <a-form :model="_value[index]" layout="vertical">
+                <a-form-item label="标识" name="id" :rules="[
+                  { required: true, message: '请输入标识' },
+                  { max: 64, message: '最多可输入64个字符' },
+                  {
+                    pattern: /^[a-zA-Z0-9_\-]+$/,
+                    message: 'ID只能由数字、字母、下划线、中划线组成',
+                  },
+                ]">
+                  <a-input v-model:value="_value[index].id" size="small"></a-input>
+                </a-form-item>
+                <a-form-item label="名称" name="name" :rules="[
+                  { required: true, message: '请输入名称' },
+                  { max: 64, message: '最多可输入64个字符' },
+                ]">
+                  <a-input v-model:value="_value[index].name" size="small"></a-input>
+                </a-form-item>
+                <a-form-item label="指标值" name="value" :rules="[
+                  { required: true, message: '请输入指标值' },
+                  { validator: () => validateIndicator(_value[index]), message: '请输入指标值' }
+                ]">
+                  <JIndicators v-model:value="_value[index]" :type="type" size="small" :enum="enum"/>
+                </a-form-item>
+              </a-form>
+            </div>
+          </template>
+          <div class="item-edit" @click="handleEdit(index)">
+            {{ item.name || '配置参数' }}
+            <edit-outlined class="item-icon" />
+          </div>
+        </a-popover>
+      </div>
+      <div class="item-right">
+        <delete-outlined @click="handleDelete(index)" />
+      </div>
+    </div>
+    <a-button type="dashed" block @click="handleAdd">
+      <template #icon><plus-outlined class="item-icon" /></template>
+      添加指标
+    </a-button>
+  </div>
+</template>
+<script setup lang="ts" name="MetricsParam">
+import { PropType } from 'vue'
+import { MenuOutlined, EditOutlined, DeleteOutlined, PlusOutlined, CloseOutlined } from '@ant-design/icons-vue';
+import JIndicators from '@/components/JIndicators/index.vue';
+
+interface Emits {
+  (e: 'update:value', data: Record<any, any>[]): void;
+}
+const emit = defineEmits<Emits>()
+const props = defineProps({
+  value: {
+    type: Object as PropType<Record<any, any>[]>,
+    default: () => ([])
+  },
+  type: {
+    type: String,
+    default: ''
+  },
+  enum: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const _value = ref<Record<any, any>[]>([])
+watchEffect(() => {
+  _value.value = props.value
+})
+
+watch(_value,
+  () => {
+    emit('update:value', _value.value)
+  },
+  { deep: true })
+
+const editIndex = ref<number>(-1)
+const handleEdit = (index: number) => {
+  editIndex.value = index
+}
+const handleDelete = (index: number) => {
+  editIndex.value = -1
+  _value.value.splice(index, 1)
+}
+const handleClose = () => {
+  editIndex.value = -1
+}
+const handleAdd = () => {
+  _value.value.push({})
+  emit('update:value', _value.value)
+}
+
+const validateIndicator = (value: any) => {
+  if (value?.range) {
+    if (!value?.value || !value?.value[0] || !value?.value[1]) {
+      return Promise.reject(new Error('请输入指标值'));
+    }
+  } else {
+    if (value?.value === '' || value?.value === undefined) {
+      return Promise.reject(new Error('请输入指标值'));
+    }
+  }
+  return Promise.resolve();
+}
+
+const change = (visible: boolean) => {
+  if (!visible) {
+    editIndex.value = -1
+  }
+}
+</script>
+<style lang="less" scoped>
+.json-param {
+  .list-item {
+    border: 1px solid #f0f0f0;
+    display: flex;
+    justify-content: space-between;
+    color: rgba(0, 0, 0, 0.85);
+    padding: 3px 6px;
+    margin-bottom: 10px;
+    background-color: #fff;
+    line-height: 26px;
+    font-size: 14px;
+
+    // .item-left {
+    //   .item-drag {
+    //     cursor: move;
+    //   }
+    // }
+    .item-edit {
+      cursor: pointer;
+    }
+
+    .item-icon {
+      color: rgb(136, 136, 136);
+      font-size: 12px;
+    }
+  }
+}
+
+:deep(.ant-form-item-label) {
+  line-height: 1;
+
+  >label {
+    font-size: 12px;
+
+    &.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before {
+      font-size: 12px;
+    }
+  }
+}
+
+:deep(.ant-form-item-explain) {
+  font-size: 12px;
+}
+
+:deep(.ant-form-item-with-help) {
+  .ant-form-item-explain {
+    min-height: 20px;
+    line-height: 20px;
+  }
+}
+
+:deep(.ant-form-item) {
+  margin-bottom: 20px;
+
+  &.ant-form-item-with-help {
+    margin-bottom: 0;
+  }
+
+  input {
+    font-size: 12px;
+  }
+}
+
+:deep(.ant-input),
+:deep(.ant-select) {
+  font-size: 12px;
+}
+
+:deep(input) {
+  height: 22px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/Base/Edit/index.vue b/src/views/device/components/Metadata/Base/Edit/index.vue
index 81111112..2ae6b5ff 100644
--- a/src/views/device/components/Metadata/Base/Edit/index.vue
+++ b/src/views/device/components/Metadata/Base/Edit/index.vue
@@ -33,6 +33,11 @@ const props = defineProps({
     type: String
   }
 })
+interface Emits {
+  (e: 'refresh'): void;
+}
+const emit = defineEmits<Emits>()
+
 const route = useRoute()
 
 const instanceStore = useInstanceStore()
@@ -95,6 +100,7 @@ const save = reactive({
           detail.metadata = metadata
           productStore.setCurrent(detail)
         }
+        emit('refresh')
       }
       const _data = updateMetadata(type, [formValue], _detail, updateStore)
       const result = await asyncUpdateMetadata(props.type, _data)
diff --git a/src/views/device/components/Metadata/Base/index.vue b/src/views/device/components/Metadata/Base/index.vue
index 0671faf0..04be78d2 100644
--- a/src/views/device/components/Metadata/Base/index.vue
+++ b/src/views/device/components/Metadata/Base/index.vue
@@ -13,7 +13,7 @@
         </template>
         新增
       </PermissionButton>
-      <Edit v-if="metadataStore.model.edit" :type="target" :tabs="type"></Edit>
+      <Edit v-if="metadataStore.model.edit" :type="target" :tabs="type" @refresh="refreshMetadata"></Edit>
     </template>
     <template #level="slotProps">
       {{ levelMap[slotProps.expands?.level] || '-' }}
@@ -124,7 +124,7 @@ onMounted(() => {
 
 })
 
-watch([route.params.id, type], () => {
+const refreshMetadata = () => {
   loading.value = true
   // const res = target === 'product'
   //       ? await productDetail(route.params.id as string)
@@ -133,7 +133,8 @@ watch([route.params.id, type], () => {
   const item = JSON.parse(result || '{}') as MetadataItem[]
   data.value = item[type]?.sort((a: any, b: any) => b?.sortsIndex - a?.sortsIndex)
   loading.value = false
-}, { immediate: true })
+}
+watch([route.params.id, type], refreshMetadata, { immediate: true })
 
 const metadataStore = useMetadataStore()
 const handleAddClick = () => {

From a0f9d8d44c35ce0e94b9d3f8413c18074bfe0a8c Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Tue, 28 Feb 2023 08:47:53 +0800
Subject: [PATCH 08/23] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E8=81=94=E5=8A=A8-=E8=A7=A6=E5=8F=91=E8=A7=84?=
 =?UTF-8?q?=E5=88=99-=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scene/Save/Device/InvokeFunction.vue      | 106 ++++++++++++++++++
 .../Scene/Save/Device/ReadProperties.vue      |   1 -
 .../Scene/Save/Device/ReportEvent.vue         |  66 -----------
 .../rule-engine/Scene/Save/Device/Type.vue    |  28 ++++-
 .../Scene/Save/Device/WriteProperty.vue       |  28 ++++-
 .../components/FunctionCall/FunctionCall.vue  |  86 +++++++++++++-
 .../Save/components/FunctionCall/index.ts     |   1 +
 .../Scene/Save/components/index.ts            |   3 +-
 8 files changed, 240 insertions(+), 79 deletions(-)
 create mode 100644 src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
 delete mode 100644 src/views/rule-engine/Scene/Save/Device/ReportEvent.vue

diff --git a/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
new file mode 100644
index 00000000..2c71b4a1
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
@@ -0,0 +1,106 @@
+<template>
+  <a-row :gutter='24'>
+    <a-col :span='10'>
+      <a-form-item
+        name='functionId'
+        :rules="[{ required: true, message: '请选择功能' }]"
+      >
+        <a-select
+          showSearch
+          allowClear
+          v-model='functionId'
+          style='width: 100%'
+          placeholder='请选择功能'
+          :filterOption='filterSelectNode'
+          @select='onSelect'
+        />
+      </a-form-item>
+    </a-col>
+    <a-col :span='14'>
+      <a-form-item>定时调用所选功能</a-form-item>
+    </a-col>
+    <a-col :span='24'>
+      <a-form-item
+        style='margin-top: 24px'
+        name='functionParameters'
+      >
+        <FunctionCall
+          v-model:value='_value'
+          :data='callDataOptions'
+          @change='callDataChange'
+        />
+      </a-form-item>
+    </a-col>
+  </a-row>
+</template>
+
+<script setup lang='ts' name='InvokeFunction'>
+import { filterSelectNode } from '@/utils/comm'
+import { FunctionCall } from '../components'
+
+type Emit = {
+  (e: 'update:value', data: Record<string, any>): void
+  (e: 'update:action', data: string): void
+}
+
+const props = defineProps({
+  value: {
+    type: Object,
+    default: () => ({})
+  },
+  action: {
+    type: String,
+    default: ''
+  },
+  functions: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const emit = defineEmits<Emit>()
+
+const functionId = ref()
+const _value = ref([])
+
+const callDataOptions = computed(() => {
+  const _valueKeys = Object.keys(props.value)
+  if (_valueKeys.length) {
+    return _valueKeys.map(key => {
+      const item: any = props.functions.find((p: any) => p.id === key)
+      if (item) {
+        return {
+          id: item.id,
+          name: item.name,
+          type: item.valueType ? item.valueType.type : '-',
+          format: item.valueType ? item.valueType.format : undefined,
+          options: item.valueType ? item.valueType.element : undefined,
+          value: props.value[key]
+        }
+      }
+      return {
+        id: key,
+        name: key,
+        type: '',
+        format: undefined,
+        options: undefined,
+        value: props.value[key]
+      }
+    })
+  }
+  return []
+})
+
+const onSelect = (v: string, item: any) => {
+  emit('update:action', `执行${item.name}`)
+}
+
+const callDataChange = () => {
+
+}
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Device/ReadProperties.vue b/src/views/rule-engine/Scene/Save/Device/ReadProperties.vue
index e81f3bb9..c5b191a4 100644
--- a/src/views/rule-engine/Scene/Save/Device/ReadProperties.vue
+++ b/src/views/rule-engine/Scene/Save/Device/ReadProperties.vue
@@ -53,7 +53,6 @@ const emit = defineEmits<Emit>()
 const readProperties = ref<string[]>(props.value)
 
 const change = (values: string[], optionItems: any[]) => {
-  console.log(values, optionItems)
   const names = optionItems.map((item) => item.name);
   let extraStr = '';
   let isLimit = false;
diff --git a/src/views/rule-engine/Scene/Save/Device/ReportEvent.vue b/src/views/rule-engine/Scene/Save/Device/ReportEvent.vue
deleted file mode 100644
index c127df2d..00000000
--- a/src/views/rule-engine/Scene/Save/Device/ReportEvent.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <a-row :futter='[24]'>
-    <a-col :span='10'>
-      <a-select
-        showSearch
-        max-tag-count='responsive'
-        style='width: 100%'
-        placeholder='placeholder'
-        v-model:value='reportKey'
-        :options='properties'
-        :filter-option='filterSelectNode'
-      />
-    </a-col>
-    <a-col :span='14'>定时调用所选属性</a-col>
-    <a-col :span='24' v-if='showTable'>
-
-    </a-col>
-  </a-row>
-</template>
-
-<script setup lang='ts' name='ReportEvent'>
-import { filterSelectNode } from '@/utils/comm'
-import type { PropType } from 'vue'
-
-type Emit = {
-  (e: 'update:value', data: Array<string>): void
-  (e: 'update:action', data: string): void
-}
-
-const props = defineProps({
-  value: {
-    type: Array as PropType<Array<string>>,
-    default: () => []
-  },
-  action: {
-    type: String,
-    default: ''
-  },
-  properties: {
-    type: Array,
-    default: () => []
-  }
-})
-
-const emit = defineEmits<Emit>()
-
-const reportKey = ref<Array<string>>([])
-const callData = ref<Array<{}>>()
-
-const showTable = computed(() => {
-  return !!reportKey.value
-})
-
-watch([props.value, props.properties], () => {
-  if (props.value && props.properties?.length) {
-
-  } else {
-
-  }
-}, { immediate: true })
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Device/Type.vue b/src/views/rule-engine/Scene/Save/Device/Type.vue
index a6d84d3a..8df13881 100644
--- a/src/views/rule-engine/Scene/Save/Device/Type.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Type.vue
@@ -20,19 +20,32 @@
       >
         <WriteProperty v-model:value='formModel.writeProperties' v-model:action='optionCache.action' :properties='writeProperties' />
       </a-form-item>
+      <a-form-item
+        v-if='showReportEvent'
+        name='eventId'
+        :rules="[{ required: true, message: '请选择事件' }]"
+      >
+        <a-select
+          v-model:value='formModel.eventId'
+          :filter-option='filterSelectNode'
+          :options='eventOptions'
+          placeholder='请选择事件'
+          style='width: 100%'
+          @select='eventSelect'
+        />
+      </a-form-item>
     </a-form>
   </div>
 </template>
 
 <script setup lang='ts'>
-
+import { filterSelectNode } from '@/utils/comm'
 import { TopCard, Timer } from '@/views/rule-engine/Scene/Save/components'
 import { getImage } from '@/utils/comm'
 import { metadataType } from '@/views/rule-engine/Scene/typings'
 import type { PropType } from 'vue'
 import { TypeEnum } from '@/views/rule-engine/Scene/Save/Device/util'
 import ReadProperties from './ReadProperties.vue'
-import ReportEvent from './ReportEvent.vue'
 import WriteProperty from './WriteProperty.vue'
 
 const props = defineProps({
@@ -46,7 +59,10 @@ const formModel = reactive({
   operator: 'online',
   timer: {},
   readProperties: [],
-  writeProperties: {}
+  writeProperties: {},
+  eventId: undefined,
+  functionId: undefined,
+  functionParameters: []
 })
 
 const optionCache = reactive({
@@ -55,6 +71,7 @@ const optionCache = reactive({
 
 const readProperties = ref<any[]>([])
 const writeProperties = ref<any[]>([])
+const eventOptions = ref<any[]>([])
 
 const topOptions = computed(() => {
   const baseOptions = [
@@ -72,6 +89,7 @@ const topOptions = computed(() => {
 
   if (props.metadata.events?.length) {
     baseOptions.push(TypeEnum.reportEvent)
+    eventOptions.value = props.metadata.events.map(item => ({ ...item, label: item.name, value: item.id }))
   }
 
   if (props.metadata.properties?.length) {
@@ -125,6 +143,10 @@ const showTimer = computed(() => {
   ].includes(formModel.operator)
 })
 
+const eventSelect = (_: string, eventItem: any) => {
+  optionCache.action = `${eventItem.name}上报`
+}
+
 </script>
 
 <style scoped lang='less'>
diff --git a/src/views/rule-engine/Scene/Save/Device/WriteProperty.vue b/src/views/rule-engine/Scene/Save/Device/WriteProperty.vue
index e75f2071..9ee56204 100644
--- a/src/views/rule-engine/Scene/Save/Device/WriteProperty.vue
+++ b/src/views/rule-engine/Scene/Save/Device/WriteProperty.vue
@@ -17,13 +17,20 @@
       </span>
     </a-col>
     <a-col :span='24' v-if='showTable'>
-
+      <div style='margin-top: 24px'>
+        <FunctionCall
+          :value='_value'
+          :data='callDataOptions'
+          @change='callDataChange'
+        />
+      </div>
     </a-col>
   </a-row>
 </template>
 
 <script setup lang='ts' name='WriteProperties'>
 import { filterSelectNode } from '@/utils/comm'
+import { FunctionCall } from '../components'
 import type { PropType } from 'vue'
 
 type Emit = {
@@ -49,7 +56,8 @@ const props = defineProps({
 const emit = defineEmits<Emit>()
 
 const reportKey = ref<string>()
-const callData = ref<Array<Record<string, any>>>()
+const callData = ref<Array<{ id: string, value: string | undefined }>>()
+const _value = ref([])
 
 const callDataOptions = computed(() => {
   const _valueKeys = Object.keys(props.value)
@@ -88,8 +96,22 @@ const change = (v: string, option: any) => {
   const _data = {
     [v]: undefined
   }
-  callData.value = [_data]
+  callData.value = [{ id: v, value: undefined }]
   emit('update:value', _data)
+  emit('update:action', `修改${option.name}`)
+}
+
+const callDataChange = (v: any[]) => {
+  emit('update:value', {
+    [reportKey.value!]: v[0]?.value
+  })
+}
+
+const initRowKey = () => {
+  if (props.value.length) {
+    const keys = Object.keys(props.value)
+    reportKey.value = keys[0]
+  }
 }
 
 </script>
diff --git a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
index 74c99134..2244b82d 100644
--- a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
+++ b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
@@ -1,19 +1,72 @@
 <template>
   <a-table
-    :data-source='dataSource'
+    :data-source='dataSource.value'
     :columns='columns'
   >
     <template #bodyCell="{ column, record, index }">
-      <template v-if='column.key'>
+      <template v-if='column.dataIndex === "name"'>
+        {{ record.name }}
+      </template>
+      <template v-if='column.dataIndex === "type"'>
+        {{ record.type }}
+        <a-tooltip
+          v-if="record.type === 'object'"
+        >
+          <template slot="title">
+            请按照json格式输入
+          </template>
 
+          <AIcon
+            type="QuestionCircleOutlined"
+            :style="{
+               marginLeft: '5px',
+               cursor: 'help',
+            }"
+          />
+        </a-tooltip>
+      </template>
+      <template v-if='column.dataIndex === "value"'>
+        <ValueItem
+          v-model:modelValue='record.value'
+          :itemType="record.type"
+          :options="handleOptions(record)"
+        />
       </template>
     </template>
   </a-table>
 </template>
 
 <script setup lang='ts' name='FunctionCall'>
+import type { PropType } from 'vue'
 
-const dataSource = []
+type Emit = {
+  (e: 'change', data: Array<{ name: string, value: any}>): void
+  (e: 'update:value', data: Array<{ name: string, value: any}>): void
+}
+
+const emit = defineEmits<Emit>()
+
+const props = defineProps({
+  value: {
+    type: Array as PropType<Array<{ label: string, value: any}>>,
+    default: () => []
+  },
+  data: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const dataSource = reactive<{value: any[]}>({
+  value: []
+})
+
+watch(() => props.data, () => {
+  dataSource.value = props.data.map((item: any) => {
+    const oldValue = props.value.find((oldItem: any) => oldItem.name === item.id)
+    return oldValue ? { ...item, value: oldValue.value } : item
+  })
+}, { immediate: true })
 
 const columns = [
   {
@@ -21,8 +74,8 @@ const columns = [
     dataIndex: 'name'
   },
   {
-    title: '参数名称',
-    dataIndex: 'name'
+    title: '类型',
+    dataIndex: 'type'
   },
   {
     title: '值',
@@ -31,6 +84,29 @@ const columns = [
     width: 260
   },
 ]
+
+const handleOptions = (record: any) => {
+  switch(record.type) {
+    case 'enum':
+      return (record?.options?.elements || []).map((item: any) => ({ label: item.text, value: item.value }))
+    case 'boolean':
+      return [
+        { label: '是', value: true },
+        { label: '否', value: false },
+      ]
+    default:
+      return undefined
+  }
+}
+
+watch(() => dataSource.value, () => {
+  const _value = dataSource.value.map(item => ({
+    name: item.id, value: item.value
+  }))
+  emit('change', _value)
+  emit('update:value', _value)
+}, { deep: true })
+
 </script>
 
 <style scoped>
diff --git a/src/views/rule-engine/Scene/Save/components/FunctionCall/index.ts b/src/views/rule-engine/Scene/Save/components/FunctionCall/index.ts
index e69de29b..d2ab9e1e 100644
--- a/src/views/rule-engine/Scene/Save/components/FunctionCall/index.ts
+++ b/src/views/rule-engine/Scene/Save/components/FunctionCall/index.ts
@@ -0,0 +1 @@
+export { default as FunctionCall } from './FunctionCall.vue'
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/index.ts b/src/views/rule-engine/Scene/Save/components/index.ts
index 504835c4..df83389a 100644
--- a/src/views/rule-engine/Scene/Save/components/index.ts
+++ b/src/views/rule-engine/Scene/Save/components/index.ts
@@ -1,3 +1,4 @@
 export { default as Timer } from './Timer'
 export { default as TopCard } from './TopCard.vue'
-export { default as TriggerWay } from './TriggerWay.vue'
\ No newline at end of file
+export { default as TriggerWay } from './TriggerWay.vue'
+export { default as FunctionCall } from './FunctionCall/FunctionCall.vue'
\ No newline at end of file

From 46264b3696c6e24f6b378eeb6ab21db011d9ce05 Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Tue, 28 Feb 2023 10:26:49 +0800
Subject: [PATCH 09/23] =?UTF-8?q?fix:=20=E7=89=A9=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Metadata/ConfigParam/index.vue | 10 +++---
 src/utils/consts.ts                           |  1 -
 .../Metadata/Base/Edit/CommonForm.vue         |  2 ++
 .../Metadata/Base/Edit/PropertyForm.vue       | 36 ++++++++++++++++---
 .../components/Metadata/Base/Edit/index.vue   |  2 +-
 5 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 src/views/device/components/Metadata/Base/Edit/CommonForm.vue

diff --git a/src/components/Metadata/ConfigParam/index.vue b/src/components/Metadata/ConfigParam/index.vue
index 802d3c99..c202fdc9 100644
--- a/src/components/Metadata/ConfigParam/index.vue
+++ b/src/components/Metadata/ConfigParam/index.vue
@@ -41,12 +41,10 @@ const props = defineProps({
   }
 })
 
-interface Emits {
-  (e: 'update:value', data: string | undefined): void;
-}
-const emit = defineEmits<Emits>()
-
-const visible = ref(false)
+// interface Emits {
+//   (e: 'update:value', data: string | undefined): void;
+// }
+// const emit = defineEmits<Emits>()
 
 // const _value = computed({
 //   get: () => props.value,
diff --git a/src/utils/consts.ts b/src/utils/consts.ts
index 93c2cc39..73b2fb0b 100644
--- a/src/utils/consts.ts
+++ b/src/utils/consts.ts
@@ -44,6 +44,5 @@ export const SystemConst = {
   REFRESH_METADATA_TABLE: 'refresh_metadata_table',
   GET_METADATA: 'get_metadata',
   REFRESH_DEVICE: 'refresh_device',
-  AMAP_KEY: 'amap_key',
   VERSION_CODE: 'version_code',
 }
diff --git a/src/views/device/components/Metadata/Base/Edit/CommonForm.vue b/src/views/device/components/Metadata/Base/Edit/CommonForm.vue
new file mode 100644
index 00000000..9d4e7f46
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/Edit/CommonForm.vue
@@ -0,0 +1,2 @@
+<template></template>
+<script setup lang="ts" name="CommonForm"></script>
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue b/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue
index af11ca31..3a8c4464 100644
--- a/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue
@@ -15,12 +15,35 @@
   ]">
     <a-input v-model:value="value.name" size="small"></a-input>
   </a-form-item>
-  <value-type-form :name="['valueType']" v-model:value="value.valueType" key="property"
-    @change-type="changeValueType"></value-type-form>
+  {{ modelType }}
+  <template v-if="modelType === 'properties'">
+    <value-type-form :name="['valueType']" v-model:value="value.valueType" key="property"
+      @change-type="changeValueType"></value-type-form>
 
-  <expands-form :name="['expands']" v-model:value="value.expands" :type="type" :id="value.id" :config="config"
-    :valueType="value.valueType"></expands-form>
+    <expands-form :name="['expands']" v-model:value="value.expands" :type="type" :id="value.id" :config="config"
+      :valueType="value.valueType"></expands-form>
+  </template>
+  <template v-if="modelType === 'functions'">
+    <a-form-item label="是否异步" name="async" :rules="[
+      { required: true, message: '请选择是否异步' },
+    ]">
+      <a-radio-group v-model:value="value.async">
+        <a-radio :value="true">是</a-radio>
+        <a-radio :value="false">否</a-radio>
+      </a-radio-group>
+    </a-form-item>
+    <a-form-item label="输入参数" name="inputs" :rules="[
+      { required: true, message: '请输入输入参数' },
+    ]">
+      <JsonParam v-model:value="value.inputs" :name="['inputs']"></JsonParam>
+    </a-form-item>
+    <a-form-item label="输出参数" name="output">
+      <JsonParam v-model:value="value.output" :name="['output']"></JsonParam>
 
+      <value-type-form :name="['output']" v-model:value="value.valueType" key="function"
+      @change-type="changeValueType"></value-type-form>
+    </a-form-item>
+  </template>
   <a-form-item label="说明" name="description" :rules="[
     { max: 200, message: '最多可输入200个字符' },
   ]">
@@ -33,6 +56,7 @@ import ExpandsForm from './ExpandsForm.vue';
 import ValueTypeForm from './ValueTypeForm.vue'
 import { useProductStore } from '@/store/product';
 import { getMetadataConfig } from '@/api/device/product'
+import JsonParam from '@/components/Metadata/JsonParam/index.vue'
 
 const props = defineProps({
   type: {
@@ -43,6 +67,10 @@ const props = defineProps({
   value: {
     type: Object,
     default: () => ({})
+  },
+  modelType: {
+    type: String,
+    default: ''
   }
 })
 const productStore = useProductStore()
diff --git a/src/views/device/components/Metadata/Base/Edit/index.vue b/src/views/device/components/Metadata/Base/Edit/index.vue
index 2ae6b5ff..ff710022 100644
--- a/src/views/device/components/Metadata/Base/Edit/index.vue
+++ b/src/views/device/components/Metadata/Base/Edit/index.vue
@@ -5,7 +5,7 @@
       <a-button :loading="save.loading" type="primary" @click="save.saveMetadata">保存</a-button>
     </template>
     <a-form ref="formRef" :model="form.model" layout="vertical">
-        <PropertyForm v-if="metadataStore.model.type === 'properties'" :type="type" ref="propertyForm" v-model:value="form.model"></PropertyForm>
+        <PropertyForm :model-type="metadataStore.model.type" :type="type" ref="propertyForm" v-model:value="form.model"></PropertyForm>
     </a-form>
   </a-drawer>
 </template>

From b92fe008061cb3b3de79e277ea93be3ba6103156 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Tue, 28 Feb 2023 11:16:04 +0800
Subject: [PATCH 10/23] =?UTF-8?q?feat:=20=E5=91=8A=E8=AD=A6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/rule-engine/log.ts                    |  21 ++
 src/store/alarm.ts                            |  37 ++
 src/views/device/Product/index.vue            |  17 +-
 src/views/init-home/Basic/index.vue           |   2 +
 .../Alarm/Log/TabComponent/indev.vue          | 316 ++++++++++++++++++
 src/views/rule-engine/Alarm/Log/index.vue     |  65 +++-
 6 files changed, 447 insertions(+), 11 deletions(-)
 create mode 100644 src/api/rule-engine/log.ts
 create mode 100644 src/store/alarm.ts
 create mode 100644 src/views/rule-engine/Alarm/Log/TabComponent/indev.vue

diff --git a/src/api/rule-engine/log.ts b/src/api/rule-engine/log.ts
new file mode 100644
index 00000000..05eddf37
--- /dev/null
+++ b/src/api/rule-engine/log.ts
@@ -0,0 +1,21 @@
+import server from '@/utils/request';
+
+/**
+ * 获取产品列表
+ */
+export const getProductList  = (parmas?:any)  => server.get('/device/product/_query/no-paging?paging=false',parmas);
+
+/**
+ * 获取设备列表
+ */
+export const getDeviceList = (parmas?:any) => server.get('/device-instance/_query/no-paging?paging=false',parmas);
+
+/**
+ * 获取组织列表
+ */
+export const getOrgList = (parmas?:any) => server.get('/organization/_query/no-paging?paging=false',parmas);
+
+/**
+ * 搜索
+ */
+export const query = (data:any) => server.post('/alarm/record/_query/',data);
\ No newline at end of file
diff --git a/src/store/alarm.ts b/src/store/alarm.ts
new file mode 100644
index 00000000..bb255798
--- /dev/null
+++ b/src/store/alarm.ts
@@ -0,0 +1,37 @@
+import { defineStore } from "pinia";
+
+export const useAlarmStore = defineStore('alarm',()=>{
+    const data = reactive({
+        tab: 'all',
+        current: {},
+        solveVisible: false,
+        logVisible: false,
+        defaultLevel: [],
+        columns: [
+          {
+            dataIndex: 'alarmConfigName',
+            title: '告警名称',
+            // hideInSearch: true,
+          },
+          {
+            dataIndex: 'alarmTime',
+            title: '告警时间',
+            valueType: 'dateTime',
+          },
+          {
+            dataIndex: 'description',
+            title: '说明',
+            // hideInSearch: true,
+          },
+          {
+            dataIndex: 'action',
+            title: '操作',
+            hideInSearch: true,
+            valueType: 'option',
+          },
+        ],
+    })
+    return {
+        data
+    }
+})
\ No newline at end of file
diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index 456eedbe..6f5076fd 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -35,7 +35,6 @@
             <template #card="slotProps">
                 <CardBox
                     :value="slotProps"
-                    @click="handleClick"
                     :actions="getActions(slotProps, 'card')"
                     v-bind="slotProps"
                     :active="_selectedRowKeys.includes(slotProps.id)"
@@ -272,14 +271,14 @@ const cancelSelect = () => {
     _selectedRowKeys.value = [];
 };
 
-const handleClick = (dt: any) => {
-    if (_selectedRowKeys.value.includes(dt.id)) {
-        const _index = _selectedRowKeys.value.findIndex((i) => i === dt.id);
-        _selectedRowKeys.value.splice(_index, 1);
-    } else {
-        _selectedRowKeys.value = [..._selectedRowKeys.value, dt.id];
-    }
-};
+// const handleClick = (dt: any) => {
+//     if (_selectedRowKeys.value.includes(dt.id)) {
+//         const _index = _selectedRowKeys.value.findIndex((i) => i === dt.id);
+//         _selectedRowKeys.value.splice(_index, 1);
+//     } else {
+//         _selectedRowKeys.value = [..._selectedRowKeys.value, dt.id];
+//     }
+// };
 
 const getActions = (
     data: Partial<Record<string, any>>,
diff --git a/src/views/init-home/Basic/index.vue b/src/views/init-home/Basic/index.vue
index 55401fab..d1819694 100644
--- a/src/views/init-home/Basic/index.vue
+++ b/src/views/init-home/Basic/index.vue
@@ -278,6 +278,7 @@ import { ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
 import { message } from 'ant-design-vue';
 import { LocalStore } from '@/utils/comm';
 import { TOKEN_KEY } from '@/utils/variable';
+import { SystemConst } from '@/utils/consts'
 const formRef = ref();
 const menuRef = ref();
 const formBasicRef = ref();
@@ -352,6 +353,7 @@ const saveBasicInfo = () =>{
             const res = await save(item);
             if (res.status === 200) {
                 resolve(true);
+                localStorage.setItem(SystemConst.AMAP_KEY,form.value.apikey);
                 const ico: any = document.querySelector('link[rel="icon"]');
                 if (ico !== null) {
                     ico.href = form.value.ico;
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
new file mode 100644
index 00000000..fede21b6
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
@@ -0,0 +1,316 @@
+<template>
+    <div class="alarm-log-card">
+        <Search
+            :columns="columns"
+            target="alarm-log"
+            v-if="['all', 'detail'].includes(props.type)"
+            @search="search"
+        ></Search>
+        <Search
+            :columns="produtCol"
+            target="alarm-log"
+            v-if="['product', 'other'].includes(props.type)"
+            @search="search"
+        ></Search>
+        <Search
+            :columns="deviceCol"
+            target="alarm-log"
+            v-if="props.type === 'device'"
+            @search="search"
+        ></Search>
+        <Search
+            :columns="orgCol"
+            target="alarm-log"
+            v-if="props.type === 'org'"
+            @search="search"
+        ></Search>
+        <JTable :columns="columns" :request="handleSearch" :params="params">
+            <template #card="slotProps">
+                <CardBox
+                    :value="slotProps"
+                    v-bind="slotProps"
+                    :statusText="
+                        data.defaultLevel.find(
+                            (i) => i.level === slotProps.level,
+                        )?.title || slotProps.level
+                    "
+                >
+                    <template #img>
+                        <img :src="imgMap.get(slotProps.targetType)" alt="" />
+                    </template>
+                    <template #content>
+                        <Ellipsis>
+                            <span style="font-weight: 500">
+                                {{ slotProps.alarmName }}
+                            </span>
+                        </Ellipsis>
+                        <a-row :gutter="24">
+                            <a-col :span="8">
+                                <div class="content-des-title">
+                                    {{ titleMap.get(slotProps.targetType) }}
+                                </div>
+                                <Ellipsis
+                                    ><div>
+                                        {{ slotProps?.targetName }}
+                                    </div></Ellipsis
+                                >
+                            </a-col>
+                            <a-col :span="8">
+                                <div class="content-des-title">
+                                    最近告警时间
+                                </div>
+                                <Ellipsis
+                                    ><div>
+                                        {{
+                                            moment(slotProps?.alarmTime).format(
+                                                'YYYY-MM-DD HH:mm:ss',
+                                            )
+                                        }}
+                                    </div></Ellipsis
+                                >
+                            </a-col>
+                            <a-col :span="8">
+                                <div class="content-des-title">状态</div>
+                                <a-badge
+                                    :status="
+                                        slotProps.state.value === 'warning'
+                                            ? 'error'
+                                            : 'default'
+                                    "
+                                >
+                                </a-badge
+                                ><span
+                                    :style="
+                                        slotProps.state.value === 'warning'
+                                            ? 'color: #E50012'
+                                            : 'color:black'
+                                    "
+                                >
+                                    {{ slotProps.state.text }}
+                                </span>
+                            </a-col>
+                        </a-row>
+                    </template>
+                </CardBox>
+            </template>
+        </JTable>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { getImage } from '@/utils/comm';
+import {
+    getProductList,
+    getDeviceList,
+    getOrgList,
+    query,
+} from '@/api/rule-engine/log';
+import { queryLevel } from '@/api/rule-engine/config';
+import Search from '@/components/Search';
+import { useAlarmStore } from '@/store/alarm';
+import { storeToRefs } from 'pinia';
+import { Store } from 'jetlinks-store';
+import moment from 'moment';
+const alarmStore = useAlarmStore();
+const { data } = storeToRefs(alarmStore);
+const getDefaulitLevel = () => {
+    queryLevel().then((res) => {
+        if (res.status === 200) {
+            Store.set('default-level', res.result?.levels || []);
+            data.value.defaultLevel = res.result?.levels || [];
+        }
+    });
+};
+getDefaulitLevel();
+const props = defineProps<{
+    type: string;
+    id?: string;
+}>();
+
+const imgMap = new Map();
+imgMap.set('product', getImage('/alarm/product.png'));
+imgMap.set('device', getImage('/alarm/device.png'));
+imgMap.set('other', getImage('/alarm/other.png'));
+imgMap.set('org', getImage('/alarm/org.png'));
+
+const titleMap = new Map();
+titleMap.set('product', '产品');
+titleMap.set('device', '设备');
+titleMap.set('other', '其他');
+titleMap.set('org', '组织');
+
+const colorMap = new Map();
+colorMap.set(1, '#E50012');
+colorMap.set(2, '#FF9457');
+colorMap.set(3, '#FABD47');
+colorMap.set(4, '#999999');
+colorMap.set(5, '#C4C4C4');
+
+const columns = [
+    {
+        title: '名称',
+        dataIndex: 'alarmName',
+        key: 'alarmName',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '最近告警事件',
+        dataIndex: 'alarmTime',
+        key: 'alarmTime',
+        search: {
+            type: 'dateTime',
+        },
+    },
+    {
+        title: '状态',
+        dataIndex: 'state',
+        key: 'state',
+        search: {
+            type: 'select',
+            options: [
+                {
+                    label: '告警中',
+                    value: 'warning',
+                },
+                {
+                    label: '无告警',
+                    value: 'normal',
+                },
+            ],
+        },
+    },
+];
+const produtCol = [
+    ...columns,
+    {
+        title: '产品名称',
+        dataIndex: 'targetName',
+        key: 'targetName',
+        search: {
+            type: 'select',
+            options: async () => {
+                const resq = await getProductList();
+                if (resq.status === 200) {
+                    return resq.result.map((item: any) => ({
+                        label: item.name,
+                        value: item.name,
+                    }));
+                }
+                return [];
+            },
+        },
+    },
+];
+const deviceCol = [
+    ...columns,
+    {
+        title: '设备名称',
+        dataIndex: 'targetName',
+        key: 'targetName',
+        search: {
+            type: 'select',
+            opstions: async () => {
+                const res = await getDeviceList();
+                if (res.status === 200) {
+                    return res.result.map((item: any) => ({
+                        label: item.name,
+                        value: item.name,
+                    }));
+                }
+                return [];
+            },
+        },
+    },
+];
+const orgCol = [
+    ...columns,
+    {
+        title: '组织名称',
+        dataIndex: 'targetName',
+        key: 'targetName',
+        search: {
+            type: 'select',
+            options: async () => {
+                const res = await getOrgList();
+                if (res.status === 200) {
+                    return res.result.map((item: any) => ({
+                        label: item.name,
+                        value: item.name,
+                    }));
+                }
+                return [];
+            },
+        },
+    },
+];
+
+let params = ref({
+    sorts: [{ name: 'alarmTime', order: 'desc' }],
+    terms: [],
+});
+let param = reactive({
+    pageSize: 10,
+    terms: [],
+});
+// let dataSource = reactive({
+//     data: [],
+//     pageSize: 10,
+//     pageIndex: 0,
+//     total: 0,
+// });
+const handleSearch = async (params: any) => {
+    const resp = await query(params);
+    if (resp.status === 200) {
+        const res = await getOrgList();
+        if (res.status === 200) {
+            resp.result.data.map((item: any) => {
+                if (item.targetType === 'org') {
+                    res.result.forEach((item2: any) => {
+                        if (item2.id === item.targetId) {
+                            item.targetName = item2.name;
+                        }
+                        //targetName处理之后的
+                        if (item.targetId === item.targetName) {
+                            item.targetName = '无';
+                        }
+                    });
+                }
+            });
+            return resp;
+        }
+    }
+};
+watchEffect(() => {
+    if (props.type !== 'all' && !props.id) {
+        params.value.terms.push({
+            termType: 'eq',
+            column: 'targetType',
+            value: props.type,
+            type: 'and',
+        });
+    }
+    if (props.id) {
+        params.value.terms.push({
+            termType: 'eq',
+            column: 'alarmConfigId',
+            value: props.id,
+            type: 'and',
+        });
+    }
+});
+
+const search = (data: any) => {
+    const dt = {
+        pageSize: 10,
+        terms: [...data?.terms],
+    };
+};
+const log = () => {
+    console.log(data.value.defaultLevel);
+};
+log();
+</script>
+<style lang="less" scoped>
+</style>
diff --git a/src/views/rule-engine/Alarm/Log/index.vue b/src/views/rule-engine/Alarm/Log/index.vue
index d9e0a826..da7e6983 100644
--- a/src/views/rule-engine/Alarm/Log/index.vue
+++ b/src/views/rule-engine/Alarm/Log/index.vue
@@ -1,9 +1,70 @@
 <template>
-  <div></div>
+    <page-container :tabList="isNoCommunity ? list : noList" :tabActiveKey="data.tab" @tabChange="onTabChange">
+        <TableComponents :type="data.tab"></TableComponents>
+    </page-container>
 </template>
 
 <script lang="ts" setup>
-
+import { isNoCommunity } from '@/utils/utils';
+import { useAlarmStore } from '@/store/alarm';
+import { storeToRefs } from 'pinia';
+import { queryLevel } from '@/api/rule-engine/config';
+import { Store } from 'jetlinks-store';
+import  TableComponents  from './TabComponent/indev.vue';
+const list = [
+    {
+        key: 'all',
+        tab: '全部',
+    },
+    {
+        key: 'product',
+        tab: '产品',
+    },
+    {
+        key: 'device',
+        tab: '设备',
+    },
+    {
+        key: 'org',
+        tab: '组织',
+    },
+    {
+        key: 'other',
+        tab: '其他',
+    },
+];
+const noList = [
+    {
+        key: 'all',
+        tab: '全部',
+    },
+    {
+        key: 'product',
+        tab: '产品',
+    },
+    {
+        key: 'device',
+        tab: '设备',
+    },
+    {
+        key: 'other',
+        tab: '其他',
+    },
+];
+const alarmStore = useAlarmStore();
+const { data }  = storeToRefs(alarmStore);
+const getDefaulitLevel = () => {
+    queryLevel().then((res)=>{
+        if(res.status === 200 ){
+            Store.set('default-level', res.result?.levels || []);
+            data.value.defaultLevel = res.result?.levels || [];
+        }
+    })
+}
+getDefaulitLevel();
+const onTabChange = (key:string) =>{
+    data.value.tab = key;
+}
 </script>
 <style lang="less" scoped>
 </style>
\ No newline at end of file

From 18b0f25993e005852352ae7075bc5fe70a58d572 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Tue, 28 Feb 2023 13:41:04 +0800
Subject: [PATCH 11/23] fix: bug#10231

---
 src/views/notice/Config/index.vue   | 4 +++-
 src/views/notice/Template/index.vue | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/notice/Config/index.vue b/src/views/notice/Config/index.vue
index cd89502e..2ac2df0e 100644
--- a/src/views/notice/Config/index.vue
+++ b/src/views/notice/Config/index.vue
@@ -70,7 +70,9 @@
                             </a-col>
                             <a-col :span="12">
                                 <div class="card-item-content-text">说明</div>
-                                <div>{{ slotProps.description }}</div>
+                                <Ellipsis>
+                                    {{ slotProps.description }}
+                                </Ellipsis>
                             </a-col>
                         </a-row>
                     </template>
diff --git a/src/views/notice/Template/index.vue b/src/views/notice/Template/index.vue
index f5ecbb08..e18ec895 100644
--- a/src/views/notice/Template/index.vue
+++ b/src/views/notice/Template/index.vue
@@ -70,7 +70,9 @@
                             </a-col>
                             <a-col :span="12">
                                 <div class="card-item-content-text">说明</div>
-                                <div>{{ slotProps.description }}</div>
+                                <Ellipsis>
+                                    {{ slotProps.description }}
+                                </Ellipsis>
                             </a-col>
                         </a-row>
                     </template>

From 7dbf13888f8c2fbdf5ac709378cfd8b62d482a14 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Tue, 28 Feb 2023 14:25:38 +0800
Subject: [PATCH 12/23] =?UTF-8?q?feat:=20=E5=9C=B0=E5=9B=BE=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AMapComponent/PathSimplifier.vue          | 106 ++++++++++++++
 src/components/AMapComponent/index.vue        |  71 ++++++++++
 src/components/AMapComponent/types.d.ts       | 130 ++++++++++++++++++
 src/components/AMapComponent/utils.ts         |  26 ++++
 src/components/index.ts                       |   4 +
 .../Detail/Running/Property/Detail/AMap.vue   |  54 --------
 .../Running/Property/Detail/PropertyAMap.vue  |  23 +++-
 .../Detail/Running/Property/Detail/index.vue  |   2 +-
 8 files changed, 356 insertions(+), 60 deletions(-)
 create mode 100644 src/components/AMapComponent/PathSimplifier.vue
 create mode 100644 src/components/AMapComponent/index.vue
 create mode 100644 src/components/AMapComponent/types.d.ts
 create mode 100644 src/components/AMapComponent/utils.ts
 delete mode 100644 src/views/device/Instance/Detail/Running/Property/Detail/AMap.vue

diff --git a/src/components/AMapComponent/PathSimplifier.vue b/src/components/AMapComponent/PathSimplifier.vue
new file mode 100644
index 00000000..a34d05d1
--- /dev/null
+++ b/src/components/AMapComponent/PathSimplifier.vue
@@ -0,0 +1,106 @@
+<template>
+</template>
+
+<script lang="ts">
+import { registerMixin } from '@vuemap/vue-amap';
+import { defineComponent, PropType } from 'vue';
+import type { PathSimplifier, PathDataItemType, PathNavigator } from './types';
+
+export default defineComponent({
+    name: 'PathSimplifier',
+    mixins: [registerMixin],
+    props: {
+        pathData: Array as PropType<PathDataItemType[]>,
+    },
+    data(): {
+        pathSimplifierRef: PathSimplifier | null,
+        PathNavigatorRef: PathNavigator | null,
+        distance: number
+    }{
+        return {
+            pathSimplifierRef: null,
+            PathNavigatorRef: null,
+            distance: 0,
+        };
+    },
+    methods: {
+        pathSimplifier(PathObj: PathSimplifier) {
+            this.pathSimplifierRef = new PathObj({
+                zIndex: 100,
+                getPath: (_pathData: any) => {
+                    return _pathData.path;
+                },
+                getHoverTitle: (_pathData: any) => {
+                    return _pathData.name;
+                },
+                map: this.parentInstance?.$amapComponent
+            });
+
+            this.PathNavigatorRef?.destroy();
+
+            if (this.pathData) {
+                this.pathSimplifierRef?.setData(
+                    this.pathData.map((item) => ({
+                        name: item.name || '路线',
+                        path: item.path,
+                    })),
+                );
+
+                const pathData = this.pathSimplifierRef?.getPathData(0);
+
+                if (pathData?.path && pathData?.path.length) {
+                    this.PathNavigatorRef =
+                        this.pathSimplifierRef?.createPathNavigator(0, {
+                            speed: this.distance
+                                ? (this.distance / 5) * 3.6
+                                : 10,
+                        }) as any;
+                }
+            }
+        },
+        loadUI() {
+            if ((window as any).AMapUI) {
+                (window as any).AMapUI.load(
+                    ['ui/misc/PathSimplifier', 'lib/$'],
+                    (path: PathSimplifier) => {
+                        if (!path.supportCanvas) {
+                            console.warn('当前环境不支持 Canvas！');
+                            return;
+                        }
+                        this.pathSimplifier(path);
+                    },
+                );
+            }
+        },
+        start() {
+            this.PathNavigatorRef?.start();
+        },
+        stop() {
+            this.PathNavigatorRef?.moveToPoint(0, 0);
+            this.PathNavigatorRef?.stop();
+        },
+    },
+    watch: {
+        pathData: {
+            handler(newVal) {
+                if (
+                    this.parentInstance.$amapComponent &&
+                    newVal?.[0]?.path &&
+                    newVal?.[0]?.path.length >= 2
+                ) {
+                    this.loadUI()
+                    // 计算速度
+                    const pointArr = newVal?.[0]?.path.map(
+                        (point: number[]) => new (AMap as any).LngLat(point[0], point[1]),
+                    );
+                    const distanceOfLine = (AMap as any).GeometryUtil.distanceOfLine(pointArr);
+                    this.distance = Math.round(distanceOfLine);
+                }
+            },
+            immediate: true,
+            deep: true,
+        },
+    },
+    expose: ['start', 'stop']
+});
+</script>
\ No newline at end of file
diff --git a/src/components/AMapComponent/index.vue b/src/components/AMapComponent/index.vue
new file mode 100644
index 00000000..03e9befd
--- /dev/null
+++ b/src/components/AMapComponent/index.vue
@@ -0,0 +1,71 @@
+<template>
+    <div
+        :style="props.style || { width: '100%', height: '100%' }"
+        :class="props.class"
+    >
+        <el-amap v-if="amapKey" :zooms="[3, 20]" @init="initMap" ref="mapRef">
+            <template v-if="isOpenUi">
+                <template v-if="uiLoading">
+                    <slot></slot>
+                </template>
+            </template>
+            <template v-else><slot></slot></template>
+        </el-amap>
+        <JEmpty v-else description="请配置高德地图key" style="padding: 20%" />
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { CSSProperties, PropType } from 'vue';
+import AMap, { initAMapApiLoader } from '@vuemap/vue-amap';
+import '@vuemap/vue-amap/dist/style.css';
+import { getAMapUiPromise } from './utils';
+
+interface AMapProps {
+    style?: CSSProperties;
+    class?: string;
+    AMapUI?: string | boolean;
+}
+const amapKey = localStorage.getItem('amap_key') || 'a0415acfc35af15f10221bfa5a6850b4';
+
+initAMapApiLoader({
+    key: amapKey || '',
+    securityJsCode: 'cae6108ec3dd222f946d1a7237c78be0',
+});
+
+const props = defineProps({
+    style: Object as PropType<AMapProps['style']>,
+    class: String as PropType<AMapProps['class']>,
+    AMapUI: [String, Boolean],
+    center: Array,
+});
+
+const mapRef = ref();
+
+const uiLoading = ref<boolean>(false);
+
+const map = ref<any>(null);
+
+const isOpenUi = computed(() => {
+    return 'AMapUI' in props || props.AMapUI;
+});
+
+const getAMapUI = () => {
+    const version = typeof props.AMapUI === 'string' ? props.AMapUI : '1.1';
+    getAMapUiPromise(version).then(() => {
+        uiLoading.value = true;
+    });
+};
+
+const marker = ref<any[]>([]);
+
+const initMap = (e: any) => {
+    map.value = e;
+    if (isOpenUi.value) {
+        getAMapUI();
+    }
+};
+</script>
+
+<style lang="less" scoped>
+</style>
\ No newline at end of file
diff --git a/src/components/AMapComponent/types.d.ts b/src/components/AMapComponent/types.d.ts
new file mode 100644
index 00000000..db4f66b6
--- /dev/null
+++ b/src/components/AMapComponent/types.d.ts
@@ -0,0 +1,130 @@
+export type PathDataType = number[][];
+
+export type PathSimplifierOptions = {
+  map?: any;
+  zIndex?: number;
+  data?: number[][];
+  getPath?: (pathData: {}, pathIndex: number) => PathDataType;
+  getZIndex?: (pathData: any, pathIndex: number) => number;
+  getHoverTitle?: (pathData: any, pathIndex: number, pointIndex: number) => string;
+  autoSetFitView?: boolean;
+  clickToSelectPath?: boolean;
+  onTopWhenSelected?: boolean;
+  renderConstructor?: Function;
+  renderOptions?: {};
+};
+
+export type PathDataItemType = {
+  name?: string;
+  path: PathDataType;
+};
+
+export interface PathSimplifier {
+  new (options: PathSimplifierOptions);
+
+  readonly supportCanvas: boolean;
+
+  getZIndexOfPath: (pathIndex: number) => number;
+
+  setZIndexOfPath: (pathIndex: number, zIndex: number) => void;
+
+  /**
+   * 是否置顶显示pathIndex对应的轨迹
+   * @param pathIndex
+   * @param isTop isTop为真，设置 zIndex 为 现存最大zIndex+1; isTop为假，设置 zIndex 为 构造参数中 getZIndex 的返回值
+   */
+  toggleTopOfPath: (pathIndex: number, isTop: boolean) => void;
+
+  getPathData: (pathIndex: number) => any;
+
+  createPathNavigator: (pathIndex: number, options: {}) => PathNavigator;
+
+  getPathNavigators: () => any[];
+
+  clearPathNavigators: () => void;
+
+  getSelectedPathData: () => any;
+
+  getSelectedPathIndex: () => number;
+
+  isSelectedPathIndex: (pathIndex: number) => boolean;
+
+  setSelectedPathIndex: (pathIndex: number) => void;
+
+  render: () => void;
+
+  renderLater: (delay: number[]) => void;
+
+  setData: (data: any[]) => void;
+
+  setFitView: (pathIndex: number) => void;
+
+  on: (eventName: string, handler: Function) => void;
+
+  off: (eventName: string, handler: Function) => void;
+
+  hide: () => void;
+
+  show: () => void;
+
+  isHidden: () => boolean;
+
+  getRender: () => boolean;
+
+  getRenderOptions: () => any;
+}
+
+export interface PathNavigatorOptions {
+  loop?: boolean;
+  speed?: number;
+  pathNavigatorStyle?: {};
+  animInterval?: number;
+  dirToPosInMillsecs?: number;
+  range?: [number, number];
+}
+
+export interface PathNavigator {
+  new (options: PathNavigatorOptions);
+
+  start: (pointIndex?: number) => void;
+
+  pause: () => void;
+
+  resume: () => void;
+
+  stop: () => void;
+
+  destroy: () => void;
+
+  getCursor: () => any;
+
+  getNaviStatus: () => string;
+
+  getPathIndex: () => number;
+
+  getPosition: () => [number, number];
+
+  getSpeed: () => number;
+
+  getMovedDistance: () => number;
+
+  getPathStartIdx: () => number;
+
+  getPathEndIdx: () => number;
+
+  moveByDistance: (distance: number) => void;
+
+  moveToPoint: (idx: number, tail: number) => void;
+
+  isCursorAtPathEnd: () => boolean;
+
+  isCursorAtPathStart: () => boolean;
+
+  setSpeed: (speed: number) => void;
+
+  setRange: (startIndex: number, endIndex: number) => void;
+
+  on: (eventName: string, handler: Function) => void;
+
+  off: (eventName: string, handler: Function) => void;
+}
diff --git a/src/components/AMapComponent/utils.ts b/src/components/AMapComponent/utils.ts
new file mode 100644
index 00000000..dd7f91ec
--- /dev/null
+++ b/src/components/AMapComponent/utils.ts
@@ -0,0 +1,26 @@
+const protocol = window.location.protocol;
+
+const buildScriptTag = (src: string): HTMLScriptElement => {
+    const script = document.createElement('script');
+    script.type = 'text/javascript';
+    script.async = true;
+    script.defer = true;
+    script.src = src;
+    return script;
+};
+
+export const getAMapUiPromise = (version: string = '1.0'): Promise<any> => {
+    if ((window as any).AMapUI) {
+        return Promise.resolve();
+    }
+    const script = buildScriptTag(`${protocol}//webapi.amap.com/ui/${version}/main-async.js`);
+    const pro = new Promise((resolve) => {
+        script.onload = () => {
+            (window as any).initAMapUI();
+            resolve(true);
+        };
+    });
+
+    document.body.append(script);
+    return pro;
+};
\ No newline at end of file
diff --git a/src/components/index.ts b/src/components/index.ts
index 28d5bdb1..fe3c80f6 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -12,6 +12,8 @@ import JUpload from './JUpload/index.vue'
 import { BasicLayoutPage, BlankLayoutPage, PageContainer } from './Layout'
 import Ellipsis from './Ellipsis/index.vue'
 import JEmpty from './Empty/index.vue'
+import AMapComponent from './AMapComponent/index.vue'
+import PathSimplifier from './AMapComponent/PathSimplifier.vue'
 
 export default  {
     install(app: App) {
@@ -30,5 +32,7 @@ export default  {
             .component('PageContainer', PageContainer)
             .component('Ellipsis', Ellipsis)
             .component('JEmpty', JEmpty)
+            .component('AMapComponent', AMapComponent)
+            .component('PathSimplifier', PathSimplifier)
     }
 }
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/AMap.vue b/src/views/device/Instance/Detail/Running/Property/Detail/AMap.vue
deleted file mode 100644
index e0656cec..00000000
--- a/src/views/device/Instance/Detail/Running/Property/Detail/AMap.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- 坐标点拾取组件 -->
-<template>
-    <div style="width: 100%; height: 400px">
-        <div style="position: relative">
-            <div style="position: absolute; right: 0; top: 5px; z-index: 999">
-                <a-space>
-                    <a-button type="primary" @click="start">开始动画</a-button>
-                    <a-button type="primary" @click="stop">停止动画</a-button>
-                </a-space>
-            </div>
-        </div>
-        <el-amap :center="center" :zooms="[3, 20]" @init="initMap" ref="map"></el-amap>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { initAMapApiLoader } from '@vuemap/vue-amap';
-import AMapUI from '@vuemap/vue-amap'
-import '@vuemap/vue-amap/dist/style.css';
-
-initAMapApiLoader({
-    key: 'a0415acfc35af15f10221bfa5a6850b4',
-    securityJsCode: 'cae6108ec3dd222f946d1a7237c78be0',
-});
-
-interface EmitProps {
-    (e: 'update:points', data: string): void;
-}
-const props = defineProps({
-    points: { type: Array, default: () => [] },
-});
-const emit = defineEmits<EmitProps>();
-
-// 地图拾取的坐标点(经纬度字符串)
-const mapPoint = ref('');
-
-const map = ref(null);
-
-const center = ref([106.55, 29.56]);
-const marker = ref(null);
-
-/**
- * 地图初始化
- * @param e
- */
-const initMap = (e: any) => {
-    console.log(e)
-    // map = e;
-    // const pointStr = mapPoint.value as string;
-};
-</script>
-
-<style lang="less" scoped>
-</style>
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue b/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue
index b7860f91..e6380a17 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue
@@ -3,12 +3,14 @@
         <div style="position: relative">
             <div style="position: absolute; right: 0; top: 5px; z-index: 999">
                 <a-space>
-                    <a-button type="primary">开始动画</a-button>
-                    <a-button type="primary">停止动画</a-button>
+                    <a-button type="primary" @click="onStart">开始动画</a-button>
+                    <a-button type="primary" @click="onStop">停止动画</a-button>
                 </a-space>
             </div>
         </div>
-        <AMap :points="geoList" />
+        <AMapComponent style="height: 500px">
+            <PathSimplifier :pathData="geoList" ref="amapPath"></PathSimplifier>
+        </AMapComponent>
     </a-spin>
 </template>
 
@@ -16,7 +18,6 @@
 import { getPropertyData } from '@/api/device/instance';
 import { useInstanceStore } from '@/store/instance';
 import encodeQuery from '@/utils/encodeQuery';
-import AMap from './AMap.vue';
 
 const instanceStore = useInstanceStore();
 
@@ -33,6 +34,15 @@ const prop = defineProps({
 
 const geoList = ref<any[]>([]);
 const loading = ref<boolean>(false);
+const amapPath = ref()
+
+const onStart = () => {
+    amapPath.value.start()
+}
+
+const onStop = () => {
+    amapPath.value.stop()
+}
 
 const query = async () => {
     loading.value = true;
@@ -53,7 +63,10 @@ const query = async () => {
         ((resp.result as any)?.data || []).forEach((item: any) => {
             list.push([item.value.lon, item.value.lat]);
         });
-        geoList.value = list
+        geoList.value = [{
+            name: prop?.data?.name,
+            path: list
+        }]
     }
 };
 
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/index.vue b/src/views/device/Instance/Detail/Running/Property/Detail/index.vue
index 6bdb9c4b..39d3d376 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/index.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/index.vue
@@ -2,7 +2,7 @@
     <a-modal title="详情" visible width="50vw" @ok="onCancel" @cancel="onCancel">
         <div style="margin-bottom: 10px"><TimeComponent v-model="dateValue" /></div>
         <div>
-            <a-tabs v-model:activeKey="activeKey" style="max-height: 600px; overflow-y: auto">
+            <a-tabs :destroyInactiveTabPane="true" v-model:activeKey="activeKey" style="max-height: 600px; overflow-y: auto">
                 <a-tab-pane key="table" tab="列表">
                     <Table :data="props.data" :time="_getTimes" />
                 </a-tab-pane>

From e0be36fe33b9567ed6296de497fc084d15e72e7f Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Tue, 28 Feb 2023 15:01:16 +0800
Subject: [PATCH 13/23] =?UTF-8?q?feat:=20=E9=80=9A=E9=81=93=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E/=E7=BC=96=E8=BE=91/=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/media/channel.ts                 |   5 +-
 src/views/media/Device/Channel/Save.vue  | 172 +++++++++++++++++++----
 src/views/media/Device/Channel/index.vue |  13 +-
 3 files changed, 157 insertions(+), 33 deletions(-)

diff --git a/src/api/media/channel.ts b/src/api/media/channel.ts
index 3c4a67bd..da64173a 100644
--- a/src/api/media/channel.ts
+++ b/src/api/media/channel.ts
@@ -6,10 +6,11 @@ export default {
     // 详情
     detail: (id: string): any => server.get(`/media/channel/${id}`),
     // 验证通道ID是否存在
-    validateField: (params: string): any => server.get(`/media/channel/channelId/_validate`, params),
+    validateField: (params: any): any => server.get(`/media/channel/channelId/_validate`, params),
     // 新增
     save: (data: any) => server.post(`/media/channel`, data),
     // 修改
-    update: (data: any) => server.put(`/media/channel`, data),
+    update: (id: string, data: any) => server.put(`/media/channel/${id}`, data),
+    // 删除
     del: (id: string) => server.remove(`media/channel/${id}`),
 }
\ No newline at end of file
diff --git a/src/views/media/Device/Channel/Save.vue b/src/views/media/Device/Channel/Save.vue
index 51762e16..3a6de43c 100644
--- a/src/views/media/Device/Channel/Save.vue
+++ b/src/views/media/Device/Channel/Save.vue
@@ -12,7 +12,18 @@
         <a-form ref="formRef" :model="formData" layout="vertical">
             <a-row :gutter="10">
                 <a-col :span="12">
-                    <a-form-item name="channelId">
+                    <a-form-item
+                        name="channelId"
+                        :rules="[
+                            {
+                                max: 64,
+                                message: '最多可输入64个字符',
+                            },
+                            {
+                                validator: validateChannelId,
+                            },
+                        ]"
+                    >
                         <template #label>
                             通道ID
                             <a-tooltip title="若不填写，系统将自动生成唯一ID">
@@ -22,22 +33,35 @@
                                 />
                             </a-tooltip>
                         </template>
-                        <a-input v-model:value="formData.channelId" />
+                        <a-input
+                            v-model:value="formData.channelId"
+                            :disabled="!!formData.id"
+                            placeholder="请输入通道ID"
+                        />
                     </a-form-item>
                 </a-col>
                 <a-col :span="12">
                     <a-form-item
                         name="name"
                         label="通道名称"
-                        :rules="{ required: true, message: '请输入通道名称' }"
+                        :rules="[
+                            { required: true, message: '请输入通道名称' },
+                            { max: 64, message: '最多可输入64个字符' },
+                        ]"
                     >
-                        <a-input v-model:value="formData.name" />
+                        <a-input
+                            v-model:value="formData.name"
+                            placeholder="请输入通道名称"
+                        />
                     </a-form-item>
                 </a-col>
                 <a-col :span="24">
                     <a-form-item
                         name="media_url"
-                        :rules="{ required: true, message: '请输入视频地址' }"
+                        :rules="[
+                            { required: true, message: '请输入视频地址' },
+                            { max: 128, message: '最多可输入128个字符' },
+                        ]"
                     >
                         <template #label>
                             视频地址
@@ -50,26 +74,42 @@
                                 />
                             </a-tooltip>
                         </template>
-                        <a-input v-model:value="formData.others.media_url" />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item name="media_username" label="用户名">
                         <a-input
-                            v-model:value="formData.others.media_username"
+                            v-model:value="formData.media_url"
+                            placeholder="请输入视频地址"
                         />
                     </a-form-item>
                 </a-col>
                 <a-col :span="12">
-                    <a-form-item name="media_password" label="密码">
+                    <a-form-item
+                        name="media_username"
+                        label="用户名"
+                        :rules="{ max: 64, message: '最多可输入64个字符' }"
+                    >
+                        <a-input
+                            v-model:value="formData.media_username"
+                            placeholder="请输入用户名"
+                        />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item
+                        name="media_password"
+                        label="密码"
+                        :rules="{ max: 64, message: '最多可输入64个字符' }"
+                    >
                         <a-input-password
-                            v-model:value="formData.others.media_password"
+                            v-model:value="formData.media_password"
+                            placeholder="请输入密码"
                         />
                     </a-form-item>
                 </a-col>
                 <a-col :span="24">
                     <a-form-item name="address" label="安装地址">
-                        <a-input v-model:value="formData.address" />
+                        <a-input
+                            v-model:value="formData.address"
+                            placeholder="请输入安装地址"
+                        />
                     </a-form-item>
                 </a-col>
                 <a-col :span="24">
@@ -88,13 +128,18 @@
 </template>
 
 <script setup lang="ts">
-import templateApi from '@/api/notice/template';
+import ChannelApi from '@/api/media/channel';
 import { PropType } from 'vue';
+import { message } from 'ant-design-vue';
+import type { Rule } from 'ant-design-vue/es/form';
+
+const route = useRoute();
 
 type Emits = {
     (e: 'update:visible', data: boolean): void;
     (e: 'submit'): void;
 };
+
 const emit = defineEmits<Emits>();
 
 const props = defineProps({
@@ -112,28 +157,95 @@ const _vis = computed({
 
 const formRef = ref();
 const formData = ref({
-    id: '',
+    id: undefined,
     address: '',
     channelId: '',
     description: '',
-    deviceId: '',
+    deviceId: route.query.id,
     name: '',
-    others: {
-        media_password: '',
-        media_url: '',
-        media_username: '',
-    },
+    // 以下三个字段, 提交时需提取到others字段当中
+    media_password: '',
+    media_url: '',
+    media_username: '',
 });
-// const formRules = ref({});
+
+watch(
+    () => props.channelData,
+    (val: any) => {
+        const {
+            id,
+            address,
+            channelId,
+            description,
+            deviceId,
+            name,
+            others,
+            ...extra
+        } = val;
+        formData.value = {
+            id,
+            address,
+            channelId,
+            description,
+            deviceId,
+            name,
+            ...others,
+        };
+    },
+    { deep: true },
+);
+
+/**
+ * 通道ID字段验证是否存在
+ * @param _rule
+ * @param value
+ */
+let validateChannelId = async (_rule: Rule, value: string) => {
+    const { result } = await ChannelApi.validateField({
+        deviceId: route.query.id,
+        channelId: value,
+    });
+
+    if (!result.passed) {
+        return Promise.reject('该ID已存在');
+    } else {
+        return Promise.resolve();
+    }
+};
 
 /**
  * 提交
  */
+const btnLoading = ref<boolean>(false);
 const handleSubmit = () => {
     formRef.value
         .validate()
         .then(async () => {
-            emit('submit');
+            const {
+                media_url,
+                media_password,
+                media_username,
+                ...extraFormData
+            } = formData.value;
+            if (media_url || media_password || media_username) {
+                extraFormData.others = {
+                    media_url,
+                    media_password,
+                    media_username,
+                };
+            }
+            btnLoading.value = true;
+            const res = formData.value.id
+                ? await ChannelApi.update(formData.value.id, extraFormData)
+                : await ChannelApi.save(extraFormData);
+            btnLoading.value = false;
+            if (res.success) {
+                message.success('操作成功');
+                _vis.value = false;
+                emit('submit');
+            } else {
+                message.error('操作失败');
+            }
         })
         .catch((err: any) => {
             console.log('err: ', err);
@@ -142,6 +254,14 @@ const handleSubmit = () => {
 const handleCancel = () => {
     _vis.value = false;
 };
+watch(
+    () => _vis.value,
+    (val) => {
+        if (!val) {
+            formRef.value.resetFields();
+            // 以下字段非表单所填, 重置字段需手动置空
+            formData.value.id = undefined;
+        }
+    },
+);
 </script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/media/Device/Channel/index.vue b/src/views/media/Device/Channel/index.vue
index 0e17cec7..a01bb5ae 100644
--- a/src/views/media/Device/Channel/index.vue
+++ b/src/views/media/Device/Channel/index.vue
@@ -1,3 +1,4 @@
+<!-- 视频设备-通道列表 -->
 <template>
     <page-container>
         <Search
@@ -91,6 +92,7 @@ import type { ActionsType } from '@/components/Table/index.vue';
 import { useMenuStore } from 'store/menu';
 import { message } from 'ant-design-vue';
 import Save from './Save.vue';
+import { cloneDeep } from 'lodash-es';
 
 const menuStory = useMenuStore();
 const route = useRoute();
@@ -158,9 +160,7 @@ const params = ref<Record<string, any>>({});
  * @param params
  */
 const handleSearch = (e: any) => {
-    // console.log('handleSearch e:', e);
     params.value = e;
-    // console.log('params.value: ', params.value);
 };
 
 const saveVis = ref(false);
@@ -172,6 +172,11 @@ const listRef = ref();
 const playVis = ref(false);
 const channelData = ref();
 
+/**
+ * 表格操作按钮
+ * @param data 表格数据项
+ * @param type 表格展示类型
+ */
 const getActions = (
     data: Partial<Record<string, any>>,
     type: 'card' | 'table',
@@ -186,8 +191,8 @@ const getActions = (
             },
             icon: 'EditOutlined',
             onClick: () => {
+                channelData.value = cloneDeep(data);
                 saveVis.value = true;
-                channelData.value = data;
             },
         },
         {
@@ -246,5 +251,3 @@ const getActions = (
         : actions;
 };
 </script>
-
-<style lang="less" scoped></style>

From 74fb1cc40348b7b8218ec579cc2cff21ed5d4459 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Tue, 28 Feb 2023 15:25:38 +0800
Subject: [PATCH 14/23] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87-=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device/instance.ts                    |  17 +-
 .../device/Instance/Detail/Info/index.vue     |   2 +-
 .../device/Instance/Detail/Log/index.vue      | 153 ++++++++++++++++++
 src/views/device/Instance/Detail/index.vue    |   6 +
 src/views/device/Instance/index.vue           |   1 -
 5 files changed, 176 insertions(+), 3 deletions(-)
 create mode 100644 src/views/device/Instance/Detail/Log/index.vue

diff --git a/src/api/device/instance.ts b/src/api/device/instance.ts
index 5148bca8..d9290b4b 100644
--- a/src/api/device/instance.ts
+++ b/src/api/device/instance.ts
@@ -482,4 +482,19 @@ export const getPropertiesInfo = (deviceId: string, data: Record<string, unknown
  * @param data 
  * @returns 
  */
-export const getPropertiesList = (deviceId: string, property: string, data: Record<string, unknown>) => server.post(`/device-instance/${deviceId}/property/${property}/_query`, data)
\ No newline at end of file
+export const getPropertiesList = (deviceId: string, property: string, data: Record<string, unknown>) => server.post(`/device-instance/${deviceId}/property/${property}/_query`, data)
+
+/**
+ * 查询设备日志
+ * @param deviceId 
+ * @param data 
+ * @returns 
+ */
+export const queryLog = (deviceId: string, data: Record<string, unknown>) => server.post(`/device-instance/${deviceId}/logs`, data)
+
+/**
+ * 查询设备日志类型
+ * @returns 
+ */
+export const queryLogsType = () => server.get(`/dictionary/device-log-type/items`)
+
diff --git a/src/views/device/Instance/Detail/Info/index.vue b/src/views/device/Instance/Detail/Info/index.vue
index 8b11977c..61e9af99 100644
--- a/src/views/device/Instance/Detail/Info/index.vue
+++ b/src/views/device/Instance/Detail/Info/index.vue
@@ -28,7 +28,7 @@
                 instanceStore.current.firmwareInfo?.version
             }}</a-descriptions-item>
             <a-descriptions-item label="连接协议">{{
-                instanceStore.current.protocolName
+                instanceStore.current?.protocolName
             }}</a-descriptions-item>
             <a-descriptions-item label="消息协议">{{
                 instanceStore.current.transport
diff --git a/src/views/device/Instance/Detail/Log/index.vue b/src/views/device/Instance/Detail/Log/index.vue
new file mode 100644
index 00000000..157fe19a
--- /dev/null
+++ b/src/views/device/Instance/Detail/Log/index.vue
@@ -0,0 +1,153 @@
+<template>
+    <a-card>
+        <Search
+            :columns="columns"
+            target="device-instance-log"
+            @search="handleSearch"
+        />
+        <JTable
+            ref="instanceRefLog"
+            :columns="columns"
+            :request="(e: Record<string, any>) => queryLog(instanceStore.current.id, e)"
+            model="TABLE"
+            :defaultParams="{ sorts: [{ name: 'timestamp', order: 'desc' }] }"
+            :params="params"
+        >
+            <template #type="slotProps">
+                {{ slotProps?.type?.text }}
+            </template>
+            <template #timestamp="slotProps">
+                {{
+                    slotProps.timestamp
+                        ? moment(slotProps.timestamp).format(
+                              'YYYY-MM-DD HH:mm:ss',
+                          )
+                        : ''
+                }}
+            </template>
+            <template #action="slotProps">
+                <a-space>
+                    <template
+                        v-for="i in getActions(slotProps, 'table')"
+                        :key="i.key"
+                    >
+                        <a-button
+                            @click="i.onClick"
+                            type="link"
+                            style="padding: 0px"
+                        >
+                            <template #icon><AIcon :type="i.icon" /></template>
+                        </a-button>
+                    </template>
+                </a-space>
+            </template>
+        </JTable>
+    </a-card>
+</template>
+
+<script lang="ts" setup>
+import type { ActionsType } from '@/components/Table';
+import { queryLog, queryLogsType } from '@/api/device/instance';
+import { useInstanceStore } from '@/store/instance';
+import moment from 'moment';
+import { Modal, Textarea } from 'ant-design-vue';
+
+const params = ref<Record<string, any>>({});
+const instanceStore = useInstanceStore();
+
+const columns = [
+    {
+        title: '类型',
+        dataIndex: 'type',
+        key: 'type',
+        scopedSlots: true,
+        ellipsis: true,
+        search: {
+            type: 'select',
+            options: () =>
+                new Promise((resolve) => {
+                    queryLogsType().then((resp: any) => {
+                        resolve(
+                            resp.result.map((item: any) => ({
+                                label: item.text,
+                                value: item.value,
+                            })),
+                        );
+                    });
+                }),
+        },
+    },
+    {
+        title: '时间',
+        dataIndex: 'timestamp',
+        key: 'timestamp',
+        scopedSlots: true,
+        ellipsis: true,
+        search: {
+            type: 'date',
+        },
+    },
+    {
+        title: '内容',
+        ellipsis: true,
+        dataIndex: 'content',
+        key: 'content',
+        scopedSlots: true,
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '操作',
+        key: 'action',
+        fixed: 'right',
+        width: 250,
+        scopedSlots: true,
+    },
+];
+
+const getActions = (
+    data: Partial<Record<string, any>>,
+    type: 'card' | 'table',
+): ActionsType[] => {
+    if (!data) return [];
+    return [
+        {
+            key: 'view',
+            text: '查看',
+            tooltip: {
+                title: '查看',
+            },
+            icon: 'SearchOutlined',
+            onClick: () => {
+                let content = '';
+                try {
+                    content = JSON.stringify(
+                        JSON.parse(data.content),
+                        null,
+                        2,
+                    );
+                } catch (error) {
+                    content = data.content;
+                }
+                Modal.info({
+                    title: '详细信息',
+                    width: 700,
+                    content: h(Textarea, {
+                        bordered: false,
+                        rows: 15,
+                        value: content
+                    }),
+                });
+            },
+        },
+    ];
+};
+
+const handleSearch = (_params: any) => {
+    params.value = _params;
+};
+</script>
+
+<style lang="less" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue
index f775e847..e42f0687 100644
--- a/src/views/device/Instance/Detail/index.vue
+++ b/src/views/device/Instance/Detail/index.vue
@@ -116,6 +116,7 @@ import Function from './Function/index.vue';
 import Modbus from './Modbus/index.vue';
 import OPCUA from './OPCUA/index.vue';
 import EdgeMap from './EdgeMap/index.vue';
+import Log from './Log/index.vue'
 import { _deploy, _disconnect } from '@/api/device/instance';
 import { message } from 'ant-design-vue';
 import { getImage } from '@/utils/comm';
@@ -147,6 +148,10 @@ const list = ref([
         key: 'Metadata',
         tab: '物模型',
     },
+    {
+        key: 'Log',
+        tab: '日志管理',
+    },
     {
         key: 'Function',
         tab: '设备功能',
@@ -167,6 +172,7 @@ const tabs = {
     Modbus,
     OPCUA,
     EdgeMap,
+    Log
 };
 
 const getStatus = (id: string) => {
diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue
index bf1e1393..cfa46224 100644
--- a/src/views/device/Instance/index.vue
+++ b/src/views/device/Instance/index.vue
@@ -694,7 +694,6 @@ const saveBtn = () => {
 };
 
 const handleSearch = (_params: any) => {
-    console.log(_params);
     params.value = _params;
 };
 </script>

From 5ee1eec52dc5795b93434877a577d73c84084528 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Tue, 28 Feb 2023 15:47:40 +0800
Subject: [PATCH 15/23] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E7=BA=A7?=
 =?UTF-8?q?=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/media/cascade.ts             |  16 ++
 src/views/media/Cascade/index.vue    | 323 +++++++++++++++++++++++++++
 src/views/media/Cascade/typings.d.ts |  41 ++++
 3 files changed, 380 insertions(+)
 create mode 100644 src/api/media/cascade.ts
 create mode 100644 src/views/media/Cascade/index.vue
 create mode 100644 src/views/media/Cascade/typings.d.ts

diff --git a/src/api/media/cascade.ts b/src/api/media/cascade.ts
new file mode 100644
index 00000000..ec315392
--- /dev/null
+++ b/src/api/media/cascade.ts
@@ -0,0 +1,16 @@
+import server from '@/utils/request'
+
+export default {
+    // 列表
+    list: (data: any, id: string) => server.post(`/media/gb28181-cascade/_query`, data),
+    // 列表字段通道数量, 来自下面接口的total
+    queryCount: (id: string) => server.post(`/media/gb28181-cascade/${id}/bindings/_query`),
+    // 详情
+    detail: (id: string): any => server.get(`/media/gb28181-cascade/${id}`),
+    // 新增
+    save: (data: any) => server.post(`/media/gb28181-cascade`, data),
+    // 修改
+    update: (id: string, data: any) => server.put(`/media/gb28181-cascade/${id}`, data),
+    // 删除
+    del: (id: string) => server.remove(`media/gb28181-cascade/${id}`),
+}
\ No newline at end of file
diff --git a/src/views/media/Cascade/index.vue b/src/views/media/Cascade/index.vue
new file mode 100644
index 00000000..a5eb66c0
--- /dev/null
+++ b/src/views/media/Cascade/index.vue
@@ -0,0 +1,323 @@
+<template>
+    <page-container>
+        <Search
+            :columns="columns"
+            target="notice-config"
+            @search="handleSearch"
+        />
+        <JTable
+            ref="listRef"
+            :columns="columns"
+            :request="DeviceApi.list"
+            :defaultParams="{
+                sorts: [{ name: 'createTime', order: 'desc' }],
+            }"
+            :params="params"
+        >
+            <template #headerTitle>
+                <a-button type="primary" @click="handleAdd"> 新增 </a-button>
+            </template>
+            <template #card="slotProps">
+                <CardBox
+                    :value="slotProps"
+                    :actions="getActions(slotProps, 'card')"
+                    v-bind="slotProps"
+                    :showStatus="true"
+                    :status="
+                        slotProps.state.value === 'online' ? 'success' : 'error'
+                    "
+                    :statusText="slotProps.state.text"
+                    :statusNames="{ success: 'success', error: 'error' }"
+                >
+                    <template #img>
+                        <slot name="img">
+                            <img :src="getImage('/device-media.png')" />
+                        </slot>
+                    </template>
+                    <template #content>
+                        <h3 class="card-item-content-title">
+                            {{ slotProps.name }}
+                        </h3>
+                        <a-row>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">厂商</div>
+                                <div>{{ slotProps.manufacturer }}</div>
+                            </a-col>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">
+                                    通道数量
+                                </div>
+                                <div>{{ slotProps.channelNumber }}</div>
+                            </a-col>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">型号</div>
+                                <div>{{ slotProps.model }}</div>
+                            </a-col>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">
+                                    接入方式
+                                </div>
+                                <!-- <div>
+                                    {{ providerType[slotProps.provider] }}
+                                </div> -->
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <template #actions="item">
+                        <a-tooltip
+                            v-bind="item.tooltip"
+                            :title="item.disabled && item.tooltip.title"
+                        >
+                            <a-popconfirm
+                                v-if="item.popConfirm"
+                                v-bind="item.popConfirm"
+                                :disabled="item.disabled"
+                            >
+                                <a-button :disabled="item.disabled">
+                                    <AIcon type="DeleteOutlined" />
+                                </a-button>
+                            </a-popconfirm>
+                            <template v-else>
+                                <a-button
+                                    :disabled="item.disabled"
+                                    @click="item.onClick"
+                                >
+                                    <AIcon :type="item.icon" />
+                                    <span>{{ item.text }}</span>
+                                </a-button>
+                            </template>
+                        </a-tooltip>
+                    </template>
+                </CardBox>
+            </template>
+            <template #action="slotProps">
+                <a-space :size="16">
+                    <a-tooltip
+                        v-for="i in getActions(slotProps, 'table')"
+                        :key="i.key"
+                        v-bind="i.tooltip"
+                    >
+                        <a-popconfirm
+                            v-if="i.popConfirm"
+                            v-bind="i.popConfirm"
+                            :disabled="i.disabled"
+                        >
+                            <a-button
+                                :disabled="i.disabled"
+                                style="padding: 0"
+                                type="link"
+                                ><AIcon :type="i.icon"
+                            /></a-button>
+                        </a-popconfirm>
+                        <a-button
+                            style="padding: 0"
+                            type="link"
+                            v-else
+                            @click="i.onClick && i.onClick(slotProps)"
+                        >
+                            <a-button
+                                :disabled="i.disabled"
+                                style="padding: 0"
+                                type="link"
+                                ><AIcon :type="i.icon"
+                            /></a-button>
+                        </a-button>
+                    </a-tooltip>
+                </a-space>
+            </template>
+        </JTable>
+    </page-container>
+</template>
+
+<script setup lang="ts">
+import DeviceApi from '@/api/media/device';
+import type { ActionsType } from '@/components/Table/index.vue';
+import { message } from 'ant-design-vue';
+import { getImage } from '@/utils/comm';
+import { PROVIDER_OPTIONS } from '@/views/media/Device/const';
+
+import { useMenuStore } from 'store/menu';
+
+const menuStory = useMenuStore();
+
+const listRef = ref<Record<string, any>>({});
+const params = ref<Record<string, any>>({});
+
+const columns = [
+    {
+        title: '名称',
+        dataIndex: 'name',
+        key: 'name',
+        width: 200,
+        fixed: 'left',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '上级SIP ID',
+        dataIndex: 'sipConfigs',
+        key: 'sipConfigs',
+        scopedSlots: true,
+    },
+    {
+        title: '上级SIP 地址',
+        dataIndex: 'sipConfigs',
+        key: 'sipConfigs',
+        scopedSlots: true,
+    },
+    {
+        title: '通道数量',
+        dataIndex: 'count',
+        key: 'count',
+    },
+    {
+        title: '状态',
+        dataIndex: 'status',
+        key: 'status',
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: '正常', value: 'enabled' },
+                { label: '禁用', value: 'disabled' },
+            ],
+            handleValue: (v: any) => {
+                return v;
+            },
+        },
+    },
+    {
+        title: '级联状态',
+        dataIndex: 'onlineStatus',
+        key: 'onlineStatus',
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: '已连接', value: 'online' },
+                { label: '未连接', value: 'offline' },
+            ],
+            handleValue: (v: any) => {
+                return v;
+            },
+        },
+    },
+    {
+        title: '操作',
+        key: 'action',
+        fixed: 'right',
+        width: 200,
+        scopedSlots: true,
+    },
+];
+
+/**
+ * 搜索
+ * @param params
+ */
+const handleSearch = (e: any) => {
+    // console.log('handleSearch:', e);
+    params.value = e;
+};
+
+/**
+ * 新增
+ */
+const handleAdd = () => {
+    menuStory.jumpPage('media/Device/Save', {
+        id: ':id',
+    });
+};
+
+const getActions = (
+    data: Partial<Record<string, any>>,
+    type: 'card' | 'table',
+): ActionsType[] => {
+    if (!data) return [];
+    const actions = [
+        {
+            key: 'edit',
+            text: '编辑',
+            tooltip: {
+                title: '编辑',
+            },
+            icon: 'EditOutlined',
+            onClick: () => {
+                menuStory.jumpPage(
+                    'media/Device/Save',
+                    {},
+                    {
+                        id: data.id,
+                    },
+                );
+            },
+        },
+        {
+            key: 'view',
+            text: '查看通道',
+            tooltip: {
+                title: '查看通道',
+            },
+            icon: 'PartitionOutlined',
+            onClick: () => {
+                // router.push(
+                //     `/media/device/Channel?id=${data.id}&type=${data.provider}`,
+                // );
+                menuStory.jumpPage(
+                    'media/Device/Channel',
+                    {},
+                    {
+                        id: data.id,
+                        type: data.provider,
+                    },
+                );
+            },
+        },
+        {
+            key: 'debug',
+            text: '更新通道',
+            tooltip: {
+                title:
+                    data.provider === 'fixed-media'
+                        ? '固定地址无法更新通道'
+                        : data.state.value === 'offline'
+                        ? '设备已离线'
+                        : data.state.value === 'notActive'
+                        ? '设备已禁用'
+                        : '',
+            },
+            disabled:
+                data.state.value === 'offline' ||
+                data.state.value === 'notActive' ||
+                data.provider === 'fixed-media',
+            icon: 'SyncOutlined',
+            onClick: () => {
+                // updateChannel()
+            },
+        },
+        {
+            key: 'delete',
+            text: '删除',
+            tooltip: {
+                title: '在线设备无法删除',
+            },
+            disabled: data.state.value === 'online',
+            popConfirm: {
+                title: '确认删除?',
+                onConfirm: async () => {
+                    const resp = await DeviceApi.del(data.id);
+                    if (resp.status === 200) {
+                        message.success('操作成功！');
+                        listRef.value?.reload();
+                    } else {
+                        message.error('操作失败！');
+                    }
+                },
+            },
+            icon: 'DeleteOutlined',
+        },
+    ];
+    return actions;
+};
+</script>
diff --git a/src/views/media/Cascade/typings.d.ts b/src/views/media/Cascade/typings.d.ts
new file mode 100644
index 00000000..531cab1d
--- /dev/null
+++ b/src/views/media/Cascade/typings.d.ts
@@ -0,0 +1,41 @@
+type BaseItem = {
+    id: string;
+    name: string;
+};
+
+type State = {
+    value: string;
+    text: string;
+};
+
+type SipConfig = {
+    catalogEach: number;
+    charset: string;
+    clusterNodeId: string;
+    domain: string;
+    firmware: string;
+    hostAndPort: string;
+    keepaliveInterval: number;
+    keepaliveTimeoutTimes: number;
+    localAddress: string;
+    localSipId: string;
+    manufacturer: string;
+    model: string;
+    name: string;
+    password: string;
+    port: number;
+    publicAddress: string;
+    publicPort: number;
+    sipId: string;
+    stackName: string;
+    transport: string;
+    user: string;
+};
+type CascadeItem = {
+    mediaServerId: string;
+    onlineStatus: State;
+    proxyStream: boolean;
+    sipConfigs: Partial<SipConfig>[];
+    status: State;
+    count?: number;
+} & BaseItem;

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 16/23] =?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 @@
 <template>
-    <div class="iot-home-container" v-loading="loading">
-        <InitHome v-if="currentView === 'init'" @refresh="setCurrentView" />
-        <DeviceHome v-else-if="currentView === 'device'" />
-        <DevOpsHome v-else-if="currentView === 'ops'" />
-        <ComprehensiveHome v-else-if="currentView === 'comprehensive'" />
-    </div>
+    <page-container>
+        <div class="iot-home-container" v-loading="loading">
+            <InitHome v-if="currentView === 'init'" @refresh="setCurrentView" />
+            <DeviceHome v-else-if="currentView === 'device'" />
+            <DevOpsHome v-else-if="currentView === 'ops'" />
+            <ComprehensiveHome v-else-if="currentView === 'comprehensive'" />
+        </div>
+    </page-container>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/system/Apply/Api/components/ApiDoes.vue b/src/views/system/Apply/Api/components/ApiDoes.vue
deleted file mode 100644
index 69283f0f..00000000
--- a/src/views/system/Apply/Api/components/ApiDoes.vue
+++ /dev/null
@@ -1,380 +0,0 @@
-<template>
-    <div class="api-does-container">
-        <div class="top">
-            <h5>{{ selectApi.summary }}</h5>
-            <div class="input">
-                <InputCard :value="selectApi.method" />
-                <a-input :value="selectApi?.url" disabled />
-            </div>
-        </div>
-
-        <p>
-            <span class="label">请求数据类型</span>
-            <span>{{
-                getContent(selectApi.requestBody) ||
-                'application/x-www-form-urlencoded'
-            }}</span>
-            <span class="label">响应数据类型</span>
-            <span>{{ `["/"]` }}</span>
-        </p>
-
-        <div class="api-card">
-            <h5>请求参数</h5>
-            <div class="content">
-                <JTable
-                    :columns="requestCard.columns"
-                    :dataSource="requestCard.tableData"
-                    noPagination
-                    model="TABLE"
-                >
-                    <template #required="slotProps">
-                        <span>{{ Boolean(slotProps.required) + '' }}</span>
-                    </template>
-                    <template #type="slotProps">
-                        <span>{{ slotProps.schema.type }}</span>
-                    </template>
-                </JTable>
-            </div>
-        </div>
-        <div class="api-card">
-            <h5>响应状态</h5>
-            <div class="content">
-                <JTable
-                    :columns="responseStatusCard.columns"
-                    :dataSource="responseStatusCard.tableData"
-                    noPagination
-                    model="TABLE"
-                >
-                </JTable>
-
-                <a-tabs v-model:activeKey="responseStatusCard.activeKey">
-                    <a-tab-pane
-                        :key="key"
-                        :tab="key"
-                        v-for="key in tabs"
-                    ></a-tab-pane>
-                </a-tabs>
-            </div>
-        </div>
-
-        <div class="api-card">
-            <h5>响应参数</h5>
-            <div class="content">
-                <JTable
-                    :columns="respParamsCard.columns"
-                    :dataSource="respParamsCard.tableData"
-                    noPagination
-                    model="TABLE"
-                >
-                </JTable>
-            </div>
-
-            <MonacoEditor
-                v-model:modelValue="codeText"
-                style="height: 300px; width: 100%"
-                theme="vs"
-            />
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import MonacoEditor from '@/components/MonacoEditor/index.vue';
-import type { apiDetailsType } from '../typing';
-import InputCard from './InputCard.vue';
-import { PropType } from 'vue';
-
-const emit = defineEmits(['update:paramsTable'])
-const props = defineProps({
-    selectApi: {
-        type: Object as PropType<apiDetailsType>,
-        required: true,
-    },
-    schemas: {
-        type: Object,
-        required: true,
-    },
-});
-const { selectApi } = toRefs(props);
-
-type tableCardType = {
-    columns: object[];
-    tableData: object[];
-    codeText?: any;
-    activeKey?: any;
-    getData?: any;
-};
-const requestCard = reactive<tableCardType>({
-    columns: [
-        {
-            title: '参数名',
-            dataIndex: 'name',
-            key: 'name',
-        },
-        {
-            title: '参数说明',
-            dataIndex: 'description',
-            key: 'description',
-        },
-        {
-            title: '请求类型',
-            dataIndex: 'in',
-            key: 'in',
-        },
-        {
-            title: '是否必须',
-            dataIndex: 'required',
-            key: 'required',
-            scopedSlots: true,
-        },
-        {
-            title: '参数类型',
-            dataIndex: 'type',
-            key: 'type',
-            scopedSlots: true,
-        },
-    ],
-    tableData: [],
-    getData: () => {
-        requestCard.tableData = props.selectApi.parameters;
-    },
-});
-const responseStatusCard = reactive<tableCardType>({
-    activeKey: '',
-    columns: [
-        {
-            title: '状态码',
-            dataIndex: 'code',
-            key: 'code',
-        },
-        {
-            title: '说明',
-            dataIndex: 'desc',
-            key: 'desc',
-        },
-        {
-            title: 'schema',
-            dataIndex: 'schema',
-            key: 'schema',
-        },
-    ],
-    tableData: [],
-    getData: () => {
-        if (!Object.keys(props.selectApi.responses).length)
-            return (responseStatusCard.tableData = []);
-
-        const tableData = <any>[];
-        Object.entries(props.selectApi.responses || {}).forEach((item: any) => {
-            const desc = item[1].description;
-            const schema = item[1].content['*/*'].schema.$ref?.split('/') || '';
-
-            tableData.push({
-                code: item[0],
-                desc,
-                schema: schema && schema.pop(),
-            });
-        });
-        responseStatusCard.activeKey = tableData[0]?.code;
-        responseStatusCard.tableData = tableData;
-    },
-});
-const tabs = computed(() =>
-    responseStatusCard.tableData
-        .map((item: any) => item.code + '')
-        .filter((code: string) => code !== '400'),
-);
-const respParamsCard = reactive<tableCardType>({
-    columns: [
-        {
-            title: '参数名称',
-            dataIndex: 'paramsName',
-        },
-        {
-            title: '参数说明',
-            dataIndex: 'desc',
-        },
-        {
-            title: '类型',
-            dataIndex: 'paramsType',
-        },
-    ],
-    tableData: [],
-    codeText: '',
-    getData: (code: string) => {
-        type schemaObjType = {
-            paramsName: string;
-            paramsType: string;
-            desc?: string;
-            children?: schemaObjType[];
-        };
-
-        const schemaName = responseStatusCard.tableData.find(
-            (item: any) => item.code === code,
-        )?.schema;
-        const schemas = toRaw(props.schemas);
-        const basicType = ['string', 'integer', 'boolean'];
-
-        const tableData = findData(schemaName);
-        const codeText = getCodeText(tableData, 3);
-
-        emit('update:paramsTable', tableData)
-        respParamsCard.tableData = tableData;
-        respParamsCard.codeText = JSON.stringify(codeText);
-
-        function findData(schemaName: string) {
-            if (!schemaName || !schemas[schemaName]) {
-                return [];
-            }
-            const result: schemaObjType[] = [];
-            const schema = schemas[schemaName];
-            Object.entries(schema.properties).forEach((item: [string, any]) => {
-                const paramsType =
-                    item[1].type ||
-                    (item[1].$ref && item[1].$ref.split('/').pop()) ||
-                    (item[1].items && item[1].items.$ref.split('/').pop()) ||
-                    '';
-                const schemaObj: schemaObjType = {
-                    paramsName: item[0],
-                    paramsType,
-                    desc: item[1].description || '',
-                };
-                if (!basicType.includes(paramsType))
-                    schemaObj.children = findData(paramsType);
-                result.push(schemaObj);
-            });
-
-            return result;
-        }
-        function getCodeText(arr: schemaObjType[], level: number): object {
-            const result = {};
-
-            arr.forEach((item) => {
-                switch (item.paramsType) {
-                    case 'string':
-                        result[item.paramsName] = '';
-                        break;
-                    case 'integer':
-                        result[item.paramsName] = 0;
-                        break;
-                    case 'boolean':
-                        result[item.paramsName] = true;
-                        break;
-                    case 'array':
-                        result[item.paramsName] = [];
-                        break;
-                    case 'object':
-                        result[item.paramsName] = {};
-                        break;
-                    default: {
-                        const properties = schemas[item.paramsType]
-                            .properties as object;
-                        const newArr = Object.entries(properties).map(
-                            (item: [string, any]) => ({
-                                paramsName: item[0],
-                                paramsType: level
-                                    ? (item[1].$ref &&
-                                          item[1].$ref.split('/').pop()) ||
-                                      (item[1].items &&
-                                          item[1].items.$ref
-                                              .split('/')
-                                              .pop()) ||
-                                      item[1].type ||
-                                      ''
-                                    : item[1].type,
-                            }),
-                        );
-                        result[item.paramsName] = getCodeText(
-                            newArr,
-                            level - 1,
-                        );
-                    }
-                }
-            });
-
-            return result;
-        }
-    },
-});
-
-const { codeText } = toRefs(requestCard);
-
-const getContent = (data: any) => {
-    if (data && data.content) {
-        return Object.keys(data.content || {})[0];
-    }
-    return '';
-};
-onMounted(() => {
-    requestCard.getData();
-    responseStatusCard.getData();
-});
-watch(
-    () => props.selectApi,
-    () => {
-        requestCard.getData();
-        responseStatusCard.getData();
-    },
-);
-
-watch([() => responseStatusCard.activeKey, () => props.selectApi], (n) => {
-    n[0] && respParamsCard.getData(n[0]);
-});
-</script>
-
-<style lang="less" scoped>
-.api-does-container {
-    .top {
-        width: 100%;
-
-        h5 {
-            font-weight: bold;
-            font-size: 16px;
-        }
-
-        .input {
-            display: flex;
-            margin: 24px 0;
-        }
-    }
-    p {
-        display: flex;
-        justify-content: space-between;
-        font-size: 14px;
-
-        .label {
-            font-weight: bold;
-        }
-    }
-    .api-card {
-        margin-top: 24px;
-        h5 {
-            position: relative;
-            padding-left: 10px;
-            font-weight: 600;
-            font-size: 16px;
-
-            &::before {
-                position: absolute;
-                top: 0;
-                left: 0;
-                width: 4px;
-                height: 100%;
-                background-color: #1d39c4;
-                border-radius: 0 3px 3px 0;
-                content: ' ';
-            }
-        }
-        .content {
-            padding-left: 10px;
-
-            :deep(.jtable-body) {
-                padding: 0;
-
-                .jtable-body-header {
-                    display: none;
-                }
-            }
-        }
-    }
-}
-</style>
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 @@
-<template>
-    <div class="api-test-container">
-        <div class="top">
-            <h5>{{ props.selectApi.summary }}</h5>
-            <div class="input">
-                <InputCard :value="props.selectApi.method" />
-                <a-input :value="props.selectApi?.url" disabled />
-                <span class="send">发送</span>
-            </div>
-        </div>
-
-        <div class="api-card">
-            <h5>请求参数</h5>
-            <div class="content">
-                <!-- <VueJsoneditor
-                    height="400"
-                    mode="tree"
-                    v-model:text="requestBody.paramsText"
-                /> -->
-                <MonacoEditor
-                    v-model:modelValue="requestBody.paramsText"
-                    style="height: 300px; width: 100%"
-                    theme="vs"
-                />
-            </div>
-        </div>
-        <div class="api-card">
-            <h5>响应参数</h5>
-            <div class="content">
-                <VueJsoneditor
-                    height="400"
-                    mode="tree"
-                    v-model:text="responsesContent"
-                />
-                <!-- <MonacoEditor
-                    v-model:modelValue="responsesContent"
-                    style="height: 300px; width: 100%"
-                    theme="vs"
-                /> -->
-            </div>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import VueJsoneditor from 'vue3-ts-jsoneditor';
-import MonacoEditor from '@/components/MonacoEditor/index.vue';
-import type { apiDetailsType } from '../typing';
-import InputCard from './InputCard.vue';
-
-const props = defineProps<{
-    selectApi: apiDetailsType;
-    paramsTable: any[];
-}>();
-
-const requestBody = reactive({
-    paramsTable: [] as requestObj[],
-    paramsText: '',
-});
-
-const responsesContent = ref('{"a":123}');
-
-watch(
-    () => props.paramsTable,
-    (n) => {
-        const table = n?.map((item: any) => ({
-            paramsName: item.paramsName,
-            value: '',
-        }));
-        requestBody.paramsTable = table;
-    },
-);
-
-type requestObj = {
-    paramsName: string;
-    value: string;
-};
-</script>
-
-<style lang="less" scoped>
-.api-test-container {
-    .top {
-        width: 100%;
-
-        h5 {
-            font-weight: bold;
-            font-size: 16px;
-        }
-
-        .input {
-            display: flex;
-
-            .send {
-                width: 65px;
-                padding: 4px 15px;
-                font-size: 14px;
-                color: #fff;
-                background-color: #1890ff;
-            }
-        }
-    }
-    .api-card {
-        margin-top: 24px;
-        h5 {
-            position: relative;
-            padding-left: 10px;
-            font-weight: 600;
-            font-size: 16px;
-
-            &::before {
-                position: absolute;
-                top: 0;
-                left: 0;
-                width: 4px;
-                height: 100%;
-                background-color: #1d39c4;
-                border-radius: 0 3px 3px 0;
-                content: ' ';
-            }
-        }
-        .content {
-            padding-left: 10px;
-
-            :deep(.jtable-body) {
-                padding: 0;
-
-                .jtable-body-header {
-                    display: none;
-                }
-            }
-        }
-    }
-}
-</style>
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 @@
-<template>
-    <div class="choose-api-container">
-        <JTable
-            :columns="columns"
-            :dataSource="props.tableData"
-            :rowSelection="rowSelection"
-            noPagination
-            model="TABLE"
-        >
-            <template #url="slotProps">
-                <span
-                    style="color: #1d39c4; cursor: pointer"
-                    @click="jump(slotProps)"
-                    >{{  slotProps.url}}</span
-                >
-            </template>
-        </JTable>
-
-        <a-button type="primary">保存</a-button>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { TableProps } from 'ant-design-vue';
-
-const emits = defineEmits(['update:clickApi'])
-const props = defineProps({
-    tableData: Array,
-    clickApi: Object
-});
-
-const columns = [
-    {
-        title: 'API',
-        dataIndex: 'url',
-        key: 'url',
-        scopedSlots: true,
-    },
-    {
-        title: '说明',
-        dataIndex: 'summary',
-        key: 'summary',
-    },
-];
-const rowSelection: TableProps['rowSelection'] = {
-    onChange: (selectedRowKeys, selectedRows) => {
-        console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
-    },
-};
-
-const jump = (row:any) => {
-    emits('update:clickApi',row)
-    
-};
-</script>
-
-<style lang="less" scoped>
-.choose-api-container {
-    height: 100%;
-    
-    :deep(.jtable-body-header) {
-        display: none !important;
-    }
-}
-
-</style>
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 @@
-<template>
-    <span class="input-card-container" :class="props.value">
-        {{ props.value?.toLocaleUpperCase() }}
-    </span>
-</template>
-
-<script setup lang="ts">
-const props = defineProps({
-    value: String,
-});
-</script>
-
-<style lang="less" scoped>
-.input-card-container {
-    padding: 4px 15px;
-    font-size: 14px;
-    color: #fff;
-
-    &.get {
-        background-color: #1890ff;
-    }
-    &.put {
-        background-color: #fa8c16;
-    }
-    &.post {
-        background-color: #52c41a;
-    }
-    &.delete {
-        background-color: #f5222d;
-    }
-    &.patch {
-        background-color: #a0d911;
-    }
-}
-</style>
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 @@
-<template>
-    <a-tree
-        :tree-data="treeData"
-        @select="clickSelectItem"
-        showLine
-        class="left-tree-container"
-    >
-        <template #title="{ name }">
-            {{ name }}
-        </template>
-    </a-tree>
-</template>
-
-<script setup lang="ts">
-import { TreeProps } from 'ant-design-vue';
-
-import { getTreeOne_api, getTreeTwo_api } from '@/api/system/apiPage';
-import { treeNodeTpye } from '../typing';
-
-const emits = defineEmits(['select']);
-
-const treeData = ref<TreeProps['treeData']>([]);
-
-const getTreeData = () => {
-    let tree: treeNodeTpye[] = [];
-    getTreeOne_api().then((resp: any) => {
-        tree = resp.urls.map((item: any) => ({
-            ...item,
-            key: item.url,
-        }));
-        const allPromise = tree.map((item) => getTreeTwo_api(item.name));
-        Promise.all(allPromise).then((values) => {
-            values.forEach((item: any, i) => {
-                tree[i].children = combData(item?.paths);
-                tree[i].schemas = item.components.schemas
-            });
-            treeData.value = tree;
-        });
-    });
-};
-const clickSelectItem: TreeProps['onSelect'] = (key, node: any) => {
-    if(!node.node.parent) return
-    emits('select', node.node.dataRef, node.node?.parent.node.schemas);
-};
-
-onMounted(() => {
-    getTreeData();
-});
-
-const combData = (dataSource: object) => {
-    const apiList: treeNodeTpye[] = [];
-    const keys = Object.keys(dataSource);
-
-    keys.forEach((key) => {
-        const method = Object.keys(dataSource[key] || {})[0];
-        const name = dataSource[key][method].tags[0];
-        let apiObj: treeNodeTpye | undefined = apiList.find(
-            (item) => item.name === name,
-        );
-        if (apiObj) {
-            apiObj.apiList?.push({
-                url: key,
-                method: dataSource[key],
-            });
-        } else {
-            apiObj = {
-                name,
-                key: name,
-                apiList: [
-                    {
-                        url: key,
-                        method: dataSource[key],
-                    },
-                ],
-            };
-            apiList.push(apiObj);
-        }
-    });
-
-    return apiList;
-};
-</script>
-
-<style lang="less">
-.left-tree-container {
-    border-right: 1px solid #e9e9e9;
-    height: calc(100vh - 150px);
-    overflow-y: auto;
-    .ant-tree-list {
-        .ant-tree-list-holder-inner {
-            .ant-tree-switcher-noop {
-                display: none !important;
-            }
-        }
-    }
-}
-</style>
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 @@
 <template>
-    <a-card class="api-page-container">
-        <a-row :gutter="24">
-            <a-col :span="5">
-                <LeftTree @select="treeSelect" />
-            </a-col>
-            <a-col :span="19">
-                <ChooseApi
-                    v-show="!selectedApi.url"
-                    v-model:click-api="selectedApi"
-                    :table-data="tableData"
-                />
-
-                <div
-                    class="api-details"
-                    v-if="selectedApi.url && tableData.length > 0"
-                >
-                    <a-button
-                        @click="selectedApi = initSelectedApi"
-                        style="margin-bottom: 24px"
-                        >返回</a-button
-                    >
-                    <a-tabs v-model:activeKey="activeKey" type="card">
-                        <a-tab-pane key="does" tab="文档">
-                            <ApiDoes
-                                :select-api="selectedApi"
-                                :schemas="schemas"
-                                v-model:params-table="paramsTable"
-                            />
-                        </a-tab-pane>
-                        <a-tab-pane key="test" tab="调试">
-                            <ApiTest :select-api="selectedApi" :params-table="paramsTable" />
-                        </a-tab-pane>
-                    </a-tabs>
-                </div>
-            </a-col>
-        </a-row>
-    </a-card>
+    <page-container>
+        <Api :mode="'appManger'" hasHome> 
+        </Api>
+    </page-container>
 </template>
 
 <script setup lang="ts" name="apiPage">
-import type { treeNodeTpye, apiObjType, apiDetailsType } from './typing';
-import LeftTree from './components/LeftTree.vue';
-import ChooseApi from './components/ChooseApi.vue';
-import ApiDoes from './components/ApiDoes.vue';
-import ApiTest from './components/ApiTest.vue';
-
-const tableData = ref([]);
-const treeSelect = (node: treeNodeTpye, nodeSchemas: object = {}) => {
-    schemas.value = nodeSchemas;
-    if (!node.apiList) return;
-    const apiList: apiObjType[] = node.apiList as apiObjType[];
-    const table: any = [];
-    // 将对象形式的数据转换为表格需要的形式
-    apiList?.forEach((apiItem) => {
-        const { method, url } = apiItem;
-        for (const key in method) {
-            if (Object.prototype.hasOwnProperty.call(method, key)) {
-                table.push({
-                    ...method[key],
-                    url,
-                    method: key,
-                });
-            }
-        }
-    });
-    tableData.value = table;
-};
-
-const activeKey = ref<'does' | 'test'>('does');
-const schemas = ref({});
-const paramsTable = ref([])
-const initSelectedApi: apiDetailsType = {
-    url: '',
-    method: '',
-    summary: '',
-    parameters: [],
-    responses: {},
-    requestBody: {},
-};
-const selectedApi = ref<apiDetailsType>(initSelectedApi);
-
-watch(tableData, () => {
-    activeKey.value = 'does';
-    selectedApi.value = initSelectedApi;
-});
+import Api from '@/views/system/Platforms/Api/index.vue';
 </script>
 
-<style scoped>
-.api-page-container {
-    padding: 24px;
-    height: 100%;
-    background-color: transparent;
-}
-</style>
+<style scoped></style>
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;"
                                 />
-                                <div v-else>
+                                <div v-else style="width: 150px;">  
                                     <AIcon
                                         :type="
                                             form.uploadLoading
@@ -1777,6 +1777,16 @@ function clearNullProp(obj: object) {
             :deep(.ant-form-item-control) {
                 .ant-form-item-control-input-content {
                     display: flex;
+                    .ant-upload-select-picture-card {
+                        width: auto;
+                        height: auto;
+                        max-width: 150px;
+                        max-height: 150px;
+
+                        >.ant-upload {
+                            height: 150px;
+                        }
+                    }
                 }
             }
         }
diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index d5b557f9..153eebba 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <page-container class="apply-container">
+    <page-container>
         <div class="apply-container">
             <Search :columns="columns" @search="search" />
 
@@ -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 @@
+<template>
+    <div class="home">
+        <h1>第三方接入说明</h1>
+        <div style="color: #666666">
+            第三方平台接口请求基于数据签名调用方式，使用签名来校验客户端请求的完整性以及合法性，您可以参看如下文档，来构造
+            HTTP 接口以调用对应的第三方平台接口 。
+        </div>
+        <h2>签名示例说明</h2>
+        <div class="h2-text">1. 签名方式,支持MD5和Sha256两种方式.</div>
+        <div class="h2-text">
+            2. 发起请求的签名信息都需要放到请求头中,而不是请求体.
+        </div>
+        <div
+            style="
+                display: flex;
+                border: 1px solid #e6e6e6;
+                padding: 15;
+                justify-content: space-between;
+            "
+        >
+            <div>
+                <h3>签名规则</h3>
+                <p>
+                    注意：签名时间戳与服务器时间不能相差五分钟以上，否则服务器将拒绝本次请求
+                </p>
+                <div class="div-border">
+                    <div class="h3-text">
+                        将参数key按ascii排序得到: pageIndex=0&pageSize=20
+                    </div>
+                    <div class="h3-text">
+                        使用拼接时间戳以及密钥得到:
+                        pageIndex=0&pageSize=201574993804802testSecure
+                    </div>
+                    <div class="h3-text">
+                        使用md5(pageIndex=0&pageSize=201574993804802testSecure)得到837fe7fa29e7a5e4852d447578269523
+                    </div>
+                </div>
+                <h3>请求头示例</h3>
+                <div class="div-border">
+                    <div class="h3-text">
+                        GET /api/device?pageIndex=0&amp;pageSize=20
+                    </div>
+                    <div class="h3-text">X-Client-Id: testId</div>
+                    <div class="h3-text">X-Timestamp: 1574993804802</div>
+                    <div class="h3-text">
+                        X-Sign: 837fe7fa29e7a5e4852d447578269523
+                    </div>
+                </div>
+                <h3>响应结果示例</h3>
+                <div class="div-border">
+                    <div class="h3-text">xxx</div>
+                    <div class="h3-text">HTTP/1.1 200 OK</div>
+                    <div class="h3-text">X-Timestamp: 1574994269075</div>
+                    <div class="h3-text">
+                        X-Sign: c23faa3c46784ada64423a8bba433f25
+                    </div>
+                    <div class="h3-text">status:200,result:[ ]</div>
+                </div>
+            </div>
+            <div style="width: 50%">
+                <h3>示例数据</h3>
+                <div>
+                    <Table
+                        :dataSource="data"
+                        :pagination="false"
+                        :columns="[
+                            {
+                                title: '示例数据类型',
+                                dataIndex: 'type',
+                            },
+                            {
+                                title: '示例数据',
+                                dataIndex: 'data',
+                            },
+                        ]"
+                    />
+                </div>
+            </div>
+        </div>
+        <div
+            :style="{
+                display: 'flex',
+                border: '1px solid #e6e6e6',
+                padding: 15,
+                justifyContent: 'space-between',
+                marginTop: 20,
+            }"
+        >
+            <div>
+                <h3>服务器验签流程</h3>
+                <div>
+                    <img
+                        :src="getImage('/public/images/apiHome.png')"
+                        style="width: 80%"
+                    />
+                </div>
+            </div>
+            <div style="width: 505">
+                <h3>验签说明</h3>
+                <div>
+                    <p>使用和签名相同的算法(不需要对响应结果排序)</p>
+                    <div>
+                        <JMonacoEditor
+                            style="width: 100%; height: 620px"
+                            theme="vs-dark"
+                            language="java"
+                            :v-model:modelValue="`String secureKey = ...; //密钥\r\nString responseBody = ...;//服务端响应结果\r\nString timestampHeader = ...;//响应头: X-Timestamp\r\nString signHeader = ...; //响应头: X-Sign\r\n\r\nString sign = DigestUtils.md5Hex(responseBody+timestampHeader+secureKey);\r\nif(sign.equalsIgnoreCase(signHeader)){\r\n //验签通过\r\n}
+                                    \r\n\r\n`"
+                        />
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div>
+            <h2>java SDK接入说明</h2>
+            <div class="div-border">
+                <div class="h3-text">
+                    JetLinks平台java SDK基于java 8版本开发。
+                </div>
+            </div>
+
+            <h3>添加 SDK 依赖</h3>
+            <div class="h3-text">将以下Maven依赖加入到pom.xml文件中</div>
+            <div>
+                <JMonacoEditor
+                    style="width: 100%; height: 100px"
+                    theme="vs-dark"
+                    :v-model:modelValue="'<dependency>\r\n    <groupId>org.jetlinks.sdk</groupId>\r\n    <artifactId>api-sdk</artifactId>\r\n    <version>1.0.0</version>\r\n</dependency>'"
+                    language="java"
+                />
+            </div>
+            <h3>SDK 客户端的初始化和请求方式</h3>
+            <div>
+                <JMonacoEditor
+                    style="width: 100%; height: 370px"
+                    theme="vs-dark"
+                    :v-model:modelValue="javaStr"
+                    language="java"
+                />
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { getImage } from '@/utils/comm';
+import JMonacoEditor from '@/components/MonacoEditor/index.vue';
+
+const data = [
+    {
+        key: '1',
+        type: 'clientId',
+        data: 'testId',
+    },
+    {
+        key: '2',
+        type: 'secureKey',
+        data: 'testSecure',
+    },
+    {
+        key: '3',
+        type: '请求URI',
+        data: '/api/v1/device/dev0001/log/_query',
+    },
+    {
+        key: '4',
+        type: '请求方式',
+        data: 'GET',
+    },
+    {
+        key: '5',
+        type: '请求参数',
+        data: 'pageSize=20&pageIndex=0',
+    },
+    {
+        key: '6',
+        type: '签名方式',
+        data: 'MD5',
+    },
+    {
+        key: '7',
+        type: '签名示例时间戳',
+        data: '1574993804802 ',
+    },
+];
+const javaStr =
+    '\r\n        //服务器的baseUrl\r\n        String baseUrl = "http://localhost:9000/jetlinks";\r\n  //客户端Id\r\n        String clientId = "aSoq98aAxzP";\r\n  //访问秘钥\r\n        String secureKey = "DaYsxpiWSfdTAPJyKW8rP2WAGyWErnsR";\r\n\r\n        ClientConfig clientConfig = new ClientConfig(baseUrl, clientId, secureKey);\r\n\r\n        ApiClient client = new WebApiClient(clientConfig);\r\n\r\nApiResponse < PagerResult < DeviceInfo >> response = client\r\n    .request(QueryDeviceRequest\r\n        .of(query -> query\r\n            .where("productId", "demo-device")\r\n            .doPaging(0, 100)));';
+</script>
+
+<style lang="less" scoped>
+.home {
+    padding: 20px;
+
+    h1 {
+        font-weight: 600;
+        font-size: 20px;
+    }
+
+    h2 {
+        font-weight: 600;
+        font-size: 18px;
+    }
+
+    .h2-text {
+        color: #999;
+    }
+
+    h3 {
+        margin-top: 10px;
+        font-weight: 600;
+        font-size: 16px;
+    }
+
+    .h3-text {
+        max-width: 530px;
+        margin-top: 3px;
+        color: #999;
+    }
+
+    p {
+        color: #666;
+    }
+
+    .div-border {
+        padding: 10px;
+        border-left: 10px solid #eee;
+    }
+}
+</style>
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<TreeProps['treeData']>([]);
 
@@ -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 @@
 <template>
-    <a-card class="api-page-container">
-        <p>
-            <AIcon type="ExclamationCircleOutlined" style="margin-right: 12px;" />配置系统支持API赋权的范围
-        </p>
-        <a-row :gutter="24">
+    <div class="api-page-container">
+        <div class="top">
+            <slot name="top" />
+        </div>
+        <a-row :gutter="24" style="background-color: #fff;padding: 20px;">
+            <a-col :span="24" v-if="props.showTitle">API文档</a-col>
             <a-col :span="5">
-                <LeftTree @select="treeSelect" :mode="props.mode" />
+                <LeftTree
+                    @select="treeSelect"
+                    :mode="props.mode"
+                    :has-home="props.hasHome"
+                />
             </a-col>
             <a-col :span="19">
-                <ChooseApi
-                    v-show="!selectedApi.url"
-                    v-model:click-api="selectedApi"
-                    :table-data="tableData"
-                    v-model:selectedRowKeys="selectedKeys"
-                    :source-keys="selectSourceKeys" :mode="props.mode"
-                />
+                <HomePage v-show="showHome" />
+                <div class="url-page" v-show="!showHome">
+                    <ChooseApi
+                        v-show="!selectedApi.url"
+                        v-model:click-api="selectedApi"
+                        :table-data="tableData"
+                        v-model:selectedRowKeys="selectedKeys"
+                        :source-keys="selectSourceKeys"
+                        :mode="props.mode"
+                    />
 
-                <div
-                    class="api-details"
-                    v-if="selectedApi.url && tableData.length > 0"
-                >
-                    <a-button
-                        @click="selectedApi = initSelectedApi"
-                        style="margin-bottom: 24px"
-                        >返回</a-button
+                    <div
+                        class="api-details"
+                        v-if="selectedApi.url && tableData.length > 0"
                     >
-                    <a-tabs v-model:activeKey="activeKey" type="card">
-                        <a-tab-pane key="does" tab="文档">
-                            <ApiDoes
-                                :select-api="selectedApi"
-                                :schemas="schemas"
-                            />
-                        </a-tab-pane>
-                        <a-tab-pane key="test" tab="调试">
-                            <ApiTest :select-api="selectedApi" />
-                        </a-tab-pane>
-                    </a-tabs>
+                        <a-button
+                            @click="selectedApi = initSelectedApi"
+                            style="margin-bottom: 24px"
+                            >返回</a-button
+                        >
+                        <a-tabs v-model:activeKey="activeKey" type="card">
+                            <a-tab-pane key="does" tab="文档">
+                                <ApiDoes
+                                    :select-api="selectedApi"
+                                    :schemas="schemas"
+                                />
+                            </a-tab-pane>
+                            <a-tab-pane key="test" tab="调试">
+                                <ApiTest :select-api="selectedApi" />
+                            </a-tab-pane>
+                        </a-tabs>
+                    </div>
                 </div>
             </a-col>
         </a-row>
-    </a-card>
+    </div>
 </template>
 
 <script setup lang="ts" name="apiPage">
-
+import HomePage from './components/HomePage.vue';
 import { getApiGranted_api, apiOperations_api } from '@/api/system/apiPage';
 import type {
     treeNodeTpye,
@@ -59,12 +68,16 @@ import ApiTest from './components/ApiTest.vue';
 const route = useRoute();
 const props = defineProps<{
     mode: modeType;
+    showTitle?: boolean;
+    hasHome?: boolean;
 }>();
-
+const showHome = ref<boolean>(Boolean(props.hasHome))
 const tableData = ref([]);
 const treeSelect = (node: treeNodeTpye, nodeSchemas: object = {}) => {
+    if (node.key === 'home') return showHome.value = true;
     schemas.value = nodeSchemas;
     if (!node.apiList) return;
+    showHome.value = false
     const apiList: apiObjType[] = node.apiList as apiObjType[];
     const table: any = [];
     // 将对象形式的数据转换为表格需要的形式
@@ -98,7 +111,7 @@ const selectedApi = ref<apiDetailsType>(initSelectedApi);
 
 const canSelectKeys = ref<string[]>([]); // 左侧可展示的项
 const selectedKeys = ref<string[]>([]); // 右侧默认勾选的项
-let selectSourceKeys = ref<string[]>([])
+let selectSourceKeys = ref<string[]>([]);
 init();
 
 function init() {
@@ -106,10 +119,10 @@ function init() {
     if (props.mode === 'appManger') {
     } else if (props.mode === 'home') {
     } else if (props.mode === 'api') {
-        apiOperations_api().then(resp=>{
-            selectedKeys.value = resp.result as string[]
-            selectSourceKeys.value = [...resp.result as string[]]
-        })
+        apiOperations_api().then((resp) => {
+            selectedKeys.value = resp.result as string[];
+            selectSourceKeys.value = [...(resp.result as string[])];
+        });
     }
     watch(tableData, () => {
         activeKey.value = 'does';
diff --git a/src/views/system/Platforms/index.vue b/src/views/system/Platforms/index.vue
index 0c124964..3b3ea430 100644
--- a/src/views/system/Platforms/index.vue
+++ b/src/views/system/Platforms/index.vue
@@ -1,6 +1,15 @@
 <template>
     <page-container>
-        <Api mode="api" />
+        <Api mode="api">
+            <template #top>
+                <p>
+                    <AIcon
+                        type="ExclamationCircleOutlined"
+                        style="margin-right: 12px; font-size: 14px"
+                    />配置系统支持API赋权的范围
+                </p>
+            </template>
+        </Api>
     </page-container>
 </template>
 

From 7abe5adf2e516011ba11f89d0df8c5957c82834d Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Tue, 28 Feb 2023 17:18:58 +0800
Subject: [PATCH 17/23] =?UTF-8?q?fix:=20=E7=89=A9=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Metadata/ArrayParam/index.vue  |  5 +-
 src/components/Metadata/ConfigParam/index.vue |  3 +-
 src/components/Metadata/EnumParam/index.vue   | 11 +--
 src/components/Metadata/JsonParam/index.vue   | 20 ++--
 .../Metadata/MetricsParam/index.vue           | 11 +--
 .../Metadata/Base/Edit/ExpandsForm.vue        | 23 +++--
 .../Metadata/Base/Edit/PropertyForm.vue       | 31 ++++--
 .../Metadata/Base/Edit/ValueTypeForm.vue      | 94 ++++++++++++-------
 .../components/Metadata/Base/Edit/index.vue   | 47 ++++++++--
 .../device/components/Metadata/Base/index.vue |  7 +-
 .../components/Metadata/Import/index.vue      | 14 +--
 .../device/components/Metadata/index.vue      |  3 +-
 12 files changed, 175 insertions(+), 94 deletions(-)

diff --git a/src/components/Metadata/ArrayParam/index.vue b/src/components/Metadata/ArrayParam/index.vue
index 576c63fa..f0b8bcd0 100644
--- a/src/components/Metadata/ArrayParam/index.vue
+++ b/src/components/Metadata/ArrayParam/index.vue
@@ -3,7 +3,7 @@
     <template #title>
       <div style="display: flex; justify-content: space-between; align-items: center;">
         <div style="width: 150px;">配置元素</div>
-        <close-outlined @click="visible = false" />
+        <AIcon type="CloseOutlined" @click="visible = false"/>
       </div>
     </template>
     <template #content>
@@ -19,14 +19,13 @@
       </div>
     </template>
     <a-button type="dashed" block @click="visible = true">
-      配置元素<edit-outlined class="item-icon" />
+      配置元素<AIcon type="EditOutlined" class="item-icon"/>
     </a-button>
   </a-popover>
 
 </template>
 <script setup lang="ts" name="ArrayParam">
 import ValueTypeForm from '@/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue';
-import { EditOutlined, CloseOutlined } from '@ant-design/icons-vue';
 import { PropType } from 'vue';
 
 type ValueType = Record<any, any>;
diff --git a/src/components/Metadata/ConfigParam/index.vue b/src/components/Metadata/ConfigParam/index.vue
index c202fdc9..1f1247ed 100644
--- a/src/components/Metadata/ConfigParam/index.vue
+++ b/src/components/Metadata/ConfigParam/index.vue
@@ -16,13 +16,12 @@
       </div>
     </template>
     <a-button type="dashed" block>
-      存储配置<edit-outlined class="item-icon" />
+      存储配置<AIcon type="EditOutlined" class="item-icon"/>
     </a-button>
   </a-popover>
 </template>
 <script setup lang="ts" name="ConfigParam">
 import { PropType } from 'vue';
-import { EditOutlined } from '@ant-design/icons-vue';
 
 type ValueType = Record<any, any>;
 const props = defineProps({
diff --git a/src/components/Metadata/EnumParam/index.vue b/src/components/Metadata/EnumParam/index.vue
index a67eac0b..f6398e14 100644
--- a/src/components/Metadata/EnumParam/index.vue
+++ b/src/components/Metadata/EnumParam/index.vue
@@ -2,14 +2,14 @@
   <div class="enum-param">
     <div class="list-item" v-for="(item, index) in _value" :key="index">
       <div class="item-left">
-        <menu-outlined class="item-drag item-icon" />
+        <AIcon type="MenuOutlined" class="item-drag item-icon" />
       </div>
       <div class="item-middle item-editable">
         <a-popover :visible="editIndex === index" placement="top">
           <template #title>
             <div class="edit-title" style="display: flex; justify-content: space-between; align-items: center;">
               <div style="width: 150px;">枚举项配置</div>
-              <close-outlined @click="handleClose" />
+              <AIcon type="CloseOutlined" @click="handleClose" />
             </div>
           </template>
           <template #content>
@@ -28,23 +28,22 @@
           </template>
           <div class="item-edit" @click="handleEdit(index)">
             {{ item.text || '枚举项配置' }}
-            <edit-outlined class="item-icon" />
+            <AIcon type="EditOutlined" class="item-icon" />
           </div>
         </a-popover>
       </div>
       <div class="item-right">
-        <delete-outlined @click="handleDelete(index)"/>
+        <AIcon type="DeleteOutlined" @click="handleDelete(index)"/>
       </div>
     </div>
     <a-button type="dashed" block @click="handleAdd">
-      <template #icon><plus-outlined class="item-icon" /></template>
+      <template #icon><AIcon type="PlusOutlined" class="item-icon" /></template>
       新增枚举型
     </a-button>
   </div>
 </template>
 <script setup lang="ts" name="BooleanParam">
 import { PropType } from 'vue'
-import { MenuOutlined, EditOutlined, DeleteOutlined, PlusOutlined, CloseOutlined } from '@ant-design/icons-vue';
 
 type EnumType = {
   text?: string,
diff --git a/src/components/Metadata/JsonParam/index.vue b/src/components/Metadata/JsonParam/index.vue
index f28dc516..6edc0742 100644
--- a/src/components/Metadata/JsonParam/index.vue
+++ b/src/components/Metadata/JsonParam/index.vue
@@ -2,14 +2,14 @@
   <div class="json-param">
     <div class="list-item" v-for="(item, index) in _value" :key="`object_${index}`">
       <div class="item-left">
-        <menu-outlined class="item-drag item-icon" />
+        <AIcon type="MenuOutlined" class="item-drag item-icon" />
       </div>
       <div class="item-middle item-editable">
         <a-popover :visible="editIndex === index" placement="left">
           <template #title>
             <div class="edit-title" style="display: flex; justify-content: space-between; align-items: center;">
               <div style="width: 150px;">配置参数</div>
-              <close-outlined @click="handleClose" />
+              <AIcon type="CloseOutlined" @click="handleClose" />
             </div>
           </template>
           <template #content>
@@ -38,23 +38,22 @@
           </template>
           <div class="item-edit" @click="handleEdit(index)">
             {{ item.name || '配置参数' }}
-            <edit-outlined class="item-icon" />
+            <AIcon type="EditOutlined" class="item-icon" />
           </div>
         </a-popover>
       </div>
       <div class="item-right">
-        <delete-outlined @click="handleDelete(index)" />
+        <AIcon type="DeleteOutlined" @click="handleDelete(index)" />
       </div>
     </div>
     <a-button type="dashed" block @click="handleAdd">
-      <template #icon><plus-outlined class="item-icon" /></template>
+      <template #icon><AIcon type="PlusOutlined" class="item-icon" /></template>
       添加参数
     </a-button>
   </div>
 </template>
 <script setup lang="ts" name="JsonParam">
 import { PropType } from 'vue'
-import { MenuOutlined, EditOutlined, DeleteOutlined, PlusOutlined, CloseOutlined } from '@ant-design/icons-vue';
 import ValueTypeForm from '@/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue';
 
 type JsonType = Record<any, any>;
@@ -66,20 +65,23 @@ const emit = defineEmits<Emits>()
 const props = defineProps({
   value: {
     type: Object as PropType<JsonType[]>,
-    default: () => ([])
   }
 })
 
 const _value = ref<JsonType[]>([])
 watchEffect(() => {
-  _value.value = props.value
+  _value.value = props.value || [{
+    valueType: {
+      expands: {}
+    },
+  }]
 })
 
 watch(_value,
   () => {
     emit('update:value', _value.value)
   },
-  { deep: true })
+  { deep: true, immediate: true })
 
 const editIndex = ref<number>(-1)
 const handleEdit = (index: number) => {
diff --git a/src/components/Metadata/MetricsParam/index.vue b/src/components/Metadata/MetricsParam/index.vue
index 954e6be9..88e32a39 100644
--- a/src/components/Metadata/MetricsParam/index.vue
+++ b/src/components/Metadata/MetricsParam/index.vue
@@ -2,7 +2,7 @@
   <div class="json-param">
     <div class="list-item" v-for="(item, index) in _value" :key="`object_${index}`">
       <div class="item-left">
-        <menu-outlined class="item-drag item-icon" />
+        <AIcon type="MenuOutlined" class="item-drag item-icon" />
         {{ `#${index + 1}.` }}
       </div>
       <div class="item-middle item-editable">
@@ -10,7 +10,7 @@
           <template #title>
             <div class="edit-title" style="display: flex; justify-content: space-between; align-items: center;">
               <div style="width: 150px;">配置参数</div>
-              <close-outlined @click="handleClose" />
+              <AIcon type="CloseOutlined" @click="handleClose" />
             </div>
           </template>
           <template #content>
@@ -43,23 +43,22 @@
           </template>
           <div class="item-edit" @click="handleEdit(index)">
             {{ item.name || '配置参数' }}
-            <edit-outlined class="item-icon" />
+            <AIcon type="EditOutlined" class="item-icon" />
           </div>
         </a-popover>
       </div>
       <div class="item-right">
-        <delete-outlined @click="handleDelete(index)" />
+        <AIcon type="DeleteOutlined" @click="handleDelete(index)" />
       </div>
     </div>
     <a-button type="dashed" block @click="handleAdd">
-      <template #icon><plus-outlined class="item-icon" /></template>
+      <template #icon><AIcon type="PlusOutlined" class="item-icon" /></template>
       添加指标
     </a-button>
   </div>
 </template>
 <script setup lang="ts" name="MetricsParam">
 import { PropType } from 'vue'
-import { MenuOutlined, EditOutlined, DeleteOutlined, PlusOutlined, CloseOutlined } from '@ant-design/icons-vue';
 import JIndicators from '@/components/JIndicators/index.vue';
 
 interface Emits {
diff --git a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
index d4061d54..cf6d62a3 100644
--- a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
@@ -34,7 +34,6 @@ type ValueType = Record<any, any>;
 const props = defineProps({
   value: {
     type: Object as PropType<ValueType>,
-    default: () => ({})
   },
   type: {
     type: String
@@ -62,13 +61,23 @@ interface Emits {
 }
 const emit = defineEmits<Emits>()
 
-const _value = computed({
-  get: () => props.value,
-  set: val => {
-    emit('update:value', val)
-  }
+// const _value = computed({
+//   get: () => props.value || {},
+//   set: val => {
+//     emit('update:value', val)
+//   }
+// })
+const _value = ref<ValueType>({})
+watchEffect(() => {
+  _value.value = props.value || {}
 })
 
+watch(_value,
+  () => {
+    emit('update:value', _value.value)
+  },
+  { deep: true, immediate: true })
+
 const options = [
   {
     label: '读',
@@ -87,7 +96,7 @@ const options = [
 const metadataStore = useMetadataStore()
 
 onMounted(() => {
-  if (props.type === 'product' || !props.value.source) {
+  if (props.type === 'product' || !props.value?.source) {
     emit('update:value', { ...props.value, source: 'device' })
   }
 })
diff --git a/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue b/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue
index 3a8c4464..a563a43d 100644
--- a/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue
@@ -15,9 +15,8 @@
   ]">
     <a-input v-model:value="value.name" size="small"></a-input>
   </a-form-item>
-  {{ modelType }}
   <template v-if="modelType === 'properties'">
-    <value-type-form :name="['valueType']" v-model:value="value.valueType" key="property"
+    <value-type-form :name="['valueType']" v-model:value="value.valueType" key="property" title="数据类型"
       @change-type="changeValueType"></value-type-form>
 
     <expands-form :name="['expands']" v-model:value="value.expands" :type="type" :id="value.id" :config="config"
@@ -37,12 +36,15 @@
     ]">
       <JsonParam v-model:value="value.inputs" :name="['inputs']"></JsonParam>
     </a-form-item>
-    <a-form-item label="输出参数" name="output">
-      <JsonParam v-model:value="value.output" :name="['output']"></JsonParam>
-
-      <value-type-form :name="['output']" v-model:value="value.valueType" key="function"
-      @change-type="changeValueType"></value-type-form>
+    <value-type-form :name="['output']" v-model:value="value.output" key="function" title="输出参数"></value-type-form>
+  </template>
+  <template v-if="modelType === 'events'">
+    <a-form-item label="级别" :name="['expands', 'level']" :rules="[
+      { required: true, message: '请选择级别' },
+    ]">
+      <a-select v-model:value="value.expands.level" :options="EventLevel" size="small"></a-select>
     </a-form-item>
+    <value-type-form :name="['valueType']" v-model:value="value.valueType" key="function" title="输出参数"></value-type-form>
   </template>
   <a-form-item label="说明" name="description" :rules="[
     { max: 200, message: '最多可输入200个字符' },
@@ -57,6 +59,7 @@ import ValueTypeForm from './ValueTypeForm.vue'
 import { useProductStore } from '@/store/product';
 import { getMetadataConfig } from '@/api/device/product'
 import JsonParam from '@/components/Metadata/JsonParam/index.vue'
+import { EventLevel } from '@/views/device/data';
 
 const props = defineProps({
   type: {
@@ -73,12 +76,19 @@ const props = defineProps({
     default: ''
   }
 })
+if (props.modelType === 'events') {
+  if (!props.value.expands) {
+    props.value.expands = {}
+  }
+}
+
 const productStore = useProductStore()
 
 const config = ref<Record<any, any>[]>([])
 const asyncOtherConfig = async () => {
   if (props.type !== 'product') return
-  const { valueType: { type }, id } = props.value
+  const { valueType, id } = props.value
+  const { type } = valueType || {}
   const productId = productStore.current?.id
   if (!productId || !id || !type) return
   const resp = await getMetadataConfig({
@@ -93,8 +103,11 @@ const asyncOtherConfig = async () => {
     config.value = resp.result
   }
 }
+
 onMounted(() => {
-  asyncOtherConfig()
+  if (props.modelType === 'properties') {
+    asyncOtherConfig()
+  }
 })
 
 const changeValueType = (val: string) => {
diff --git a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
index f66f5f55..df7d1884 100644
--- a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
@@ -1,28 +1,25 @@
 <template>
-  <a-form-item label="数据类型" :name="name.concat(['type'])" :rules="[
-    { required: true, message: '请选择数据类型' },
+  <a-form-item :label="title" :name="name.concat(['type'])" :rules="[
+    metadataStore.model.type !== 'functions' ? { required: true, message: '请选择数据类型' } : {},
   ]">
-    <a-select v-model:value="value.type" :options="_dataTypeList" size="small" @change="changeType"></a-select>
+    <a-select v-model:value="_value.type" :options="metadataStore.model.type === 'events' ? eventDataTypeList : _dataTypeList" size="small" @change="changeType"></a-select>
   </a-form-item>
-  <a-form-item label="单位" :name="name.concat(['unit'])" v-if="['int', 'float', 'long', 'double'].includes(value.type)">
-    <InputSelect v-model:value="value.unit" :options="unit.unitOptions" size="small"></InputSelect>
+  <a-form-item label="单位" :name="name.concat(['unit'])" v-if="['int', 'float', 'long', 'double'].includes(_value.type)">
+    <InputSelect v-model:value="_value.unit" :options="unit.unitOptions" size="small"></InputSelect>
   </a-form-item>
-  <a-form-item label="精度" :name="name.concat(['scale'])" v-if="['float', 'double'].includes(value.type)">
-    <a-input-number v-model:value="value.scale" size="small" :min="0" :max="2147483647" :precision="0"
-      :default-value="2" style="width: 100%"></a-input-number>
+  <a-form-item label="精度" :name="name.concat(['scale'])" v-if="['float', 'double'].includes(_value.type)">
+    <a-input-number v-model:value="_value.scale" size="small" :min="0" :max="2147483647" :precision="0" :default-value="2"
+      style="width: 100%"></a-input-number>
   </a-form-item>
-  <a-form-item label="布尔值" name="booleanConfig" v-if="['boolean'].includes(value.type)">
-    <BooleanParam 
-      :name="name"
-      v-model:value="_value"
-    ></BooleanParam>
+  <a-form-item label="布尔值" name="booleanConfig" v-if="['boolean'].includes(_value.type)">
+    <BooleanParam :name="name" v-model:value="_value"></BooleanParam>
   </a-form-item>
-  <a-form-item label="枚举项" :name="name.concat(['elements'])" v-if="['enum'].includes(value.type)" :rules="[
+  <a-form-item label="枚举项" :name="name.concat(['elements'])" v-if="['enum'].includes(_value.type)" :rules="[
     { required: true, message: '请配置枚举项' }
   ]">
-    <EnumParam v-model:value="value.elements"></EnumParam>
+    <EnumParam v-model:value="_value.elements"></EnumParam>
   </a-form-item>
-  <a-form-item :name="name.concat(['expands', 'maxLength'])" v-if="['string', 'password'].includes(value.type)">
+  <a-form-item :name="name.concat(['expands', 'maxLength'])" v-if="['string', 'password'].includes(_value.type)">
     <template #label>
       <a-space>
         最大长度
@@ -31,19 +28,20 @@
         </a-tooltip>
       </a-space>
     </template>
-    <a-input-number v-model:value="value.expands.maxLength" size="small" :max="2147483647" :min="1" :precision="0"
+    <a-input-number v-model:value="_value.expands.maxLength" size="small" :max="2147483647" :min="1" :precision="0"
       style="width: 100%;"></a-input-number>
   </a-form-item>
-  <a-form-item label="元素配置" :name="name.concat(['elementType'])" v-if="['array'].includes(value.type)">
-    <ArrayParam v-model:value="value.elementType" :name="name.concat(['elementType'])"></ArrayParam>
+  <a-form-item label="元素配置" :name="name.concat(['elementType'])" v-if="['array'].includes(_value.type)">
+    <ArrayParam v-model:value="_value.elementType" :name="name.concat(['elementType'])"></ArrayParam>
   </a-form-item>
-  <a-form-item label="JSON对象" :name="name.concat(['properties'])" v-if="['object'].includes(value.type)">
-    <JsonParam v-model:value="value.jsonConfig" :name="name.concat(['properties'])"></JsonParam>
+  <a-form-item label="JSON对象" :name="name.concat(['properties'])" v-if="['object'].includes(_value.type)">
+    <JsonParam v-model:value="_value.jsonConfig" :name="name.concat(['properties'])"></JsonParam>
   </a-form-item>
-  <a-form-item label="文件类型" :name="name.concat(['fileType'])" v-if="['file'].includes(value.type)" initialValue="url" :rules="[
-    { required: true, message: '请选择文件类型' },
-  ]">
-    <a-select v-model:value="value.fileType" :options="FileTypeList" size="small"></a-select>
+  <a-form-item label="文件类型" :name="name.concat(['fileType'])" v-if="['file'].includes(_value.type)" initialValue="url"
+    :rules="[
+      { required: true, message: '请选择文件类型' },
+    ]">
+    <a-select v-model:value="_value.fileType" :options="FileTypeList" size="small"></a-select>
   </a-form-item>
 </template>
 <script lang="ts" setup mame="BaseForm">
@@ -57,14 +55,13 @@ import BooleanParam from '@/components/Metadata/BooleanParam/index.vue'
 import EnumParam from '@/components/Metadata/EnumParam/index.vue'
 import ArrayParam from '@/components/Metadata/ArrayParam/index.vue'
 import JsonParam from '@/components/Metadata/JsonParam/index.vue'
+import { useMetadataStore } from '@/store/metadata';
 
 type ValueType = Record<any, any>;
 const props = defineProps({
   value: {
     type: Object as PropType<ValueType>,
-    default: () => ({
-      extends: {}
-    })
+    // default: () => ({})
   },
   isSub: {
     type: Boolean,
@@ -74,6 +71,10 @@ const props = defineProps({
     type: Array as PropType<string[]>,
     default: () => ([]),
     required: true
+  },
+  title: {
+    String,
+    default: '数据类型'
   }
 })
 
@@ -83,11 +84,34 @@ interface Emits {
 }
 const emit = defineEmits<Emits>()
 
+// emit('update:value', { extends: {}, ...props.value })
 
-const _value = computed({
-  get: () => props.value,
-  set: val => {
-    emit('update:value', val)
+const metadataStore = useMetadataStore()
+// const _value = computed({
+//   get: () => props.value,
+//   set: val => {
+//     emit('update:value', val)
+//   }
+// })
+const _value = ref<ValueType>({})
+watchEffect(() => {
+  _value.value = props.value || {
+    expands: {}
+  }
+})
+
+watch(_value,
+  () => {
+    emit('update:value', _value.value)
+  },
+  { deep: true, immediate: true })
+
+onMounted(() => {
+  if (metadataStore.model.type === 'events') {
+    _value.value = {
+      type: 'object',
+      expands: {}
+    }
   }
 })
 
@@ -108,6 +132,12 @@ const unit = {
 unit.getUnit()
 
 const _dataTypeList = computed(() => props.isSub ? DataTypeList.filter(item => item.value !== 'array' && item.value !== 'object') : DataTypeList)
+const eventDataTypeList = [
+  {
+    value: 'object',
+    label: 'object(结构体)',
+  },
+]
 
 const changeType = (val: SelectValue) => {
   emit('changeType', val as string)
diff --git a/src/views/device/components/Metadata/Base/Edit/index.vue b/src/views/device/components/Metadata/Base/Edit/index.vue
index ff710022..8a06d189 100644
--- a/src/views/device/components/Metadata/Base/Edit/index.vue
+++ b/src/views/device/components/Metadata/Base/Edit/index.vue
@@ -59,12 +59,7 @@ const title = computed(() => metadataStore.model.action === 'add' ? '新增' : '
 const propertyForm = ref()
 
 const form = reactive({
-  model: {
-    valueType: {
-      expands: {}
-    },
-    expands: {}
-  } as any,
+  model: {} as any,
 })
 if (metadataStore.model.action === 'edit') {
   form.model = metadataStore.model.item
@@ -144,6 +139,44 @@ const save = reactive({
 })
 
 </script>
-<style lang="less" scoped>
+<style scoped lang="less">
+:deep(.ant-form-item-label) {
+  line-height: 1;
 
+  >label {
+    font-size: 12px;
+
+    &.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before {
+      font-size: 12px;
+    }
+  }
+}
+
+:deep(.ant-form-item-explain) {
+  font-size: 12px;
+}
+
+:deep(.ant-form-item-with-help) {
+  .ant-form-item-explain {
+    min-height: 20px;
+    line-height: 20px;
+  }
+}
+
+:deep(.ant-form-item) {
+  margin-bottom: 20px;
+
+  &.ant-form-item-with-help {
+    margin-bottom: 0;
+  }
+
+  input {
+    font-size: 12px;
+  }
+}
+
+:deep(.ant-input),
+:deep(.ant-select) {
+  font-size: 12px;
+}
 </style>
\ 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) ? '当前的存储方式不支持新增' : '新增',
         }">
         <template #icon>
-          <PlusOutlined />
+          <AIcon type="PlusOutlined" />
         </template>
         新增
       </PermissionButton>
@@ -38,7 +38,7 @@
           :udisabled="operateLimits('updata', type)" @click="handleEditClick(slotProps)" :tooltip="{
             title: operateLimits('updata', type) ? '当前的存储方式不支持编辑' : '编辑',
           }">
-          <EditOutlined />
+          <AIcon type="EditOutlined" />
         </PermissionButton>
         <PermissionButton :uhas-permission="`${permission}:delete`" type="link" key="delete" style="padding: 0"
           :pop-confirm="{
@@ -48,7 +48,7 @@
           }" :tooltip="{
             title: '删除',
           }">
-          <DeleteOutlined />
+          <Aicon type="DeleteOutlined" />
         </PermissionButton>
       </a-space>
     </template>
@@ -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">
     <div class="import-content">
       <p class="import-tip">
-        <exclamation-circle-outlined style="margin-right: 5px" />
+        <AIcon type="ExclamationCircleOutlined" style="margin-right: 5px" />
         导入的物模型会覆盖原来的属性、功能、事件、标签，请谨慎操作。
       </p>
     </div>
@@ -37,8 +37,7 @@
             <a-upload v-model:file-list="fileList" :before-upload="beforeUpload" accept=".json"
               :show-upload-list="false" :action="FILE_UPLOAD" @change="fileChange"
               :headers="{ 'X-Access-Token':  getToken()}">
-              <upload-outlined class="upload-button"/>
-              <!-- <button id="uploadFile" style="display: none;"></button> -->
+              <AIcon type="UploadOutlined" class="upload-button" />
             </a-upload>
           </template>
         </a-input>
@@ -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 @@
         ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'
         : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'">
           <div class="ellipsis">
-            <info-circle-outlined style="margin-right: 3px" />
+            <AIcon type="InfoCircleOutlined" style="margin-right: 3px" />
             {{
               instanceStore.detail?.independentMetadata && type === 'device'
                 ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'
@@ -47,7 +47,6 @@
   </a-card>
 </template>
 <script setup lang="ts" name="Metadata">
-import { InfoCircleOutlined } from '@ant-design/icons-vue';
 import PermissionButton from '@/components/PermissionButton/index.vue'
 import { deleteMetadata } from '@/api/device/instance.js'
 import { message } from 'ant-design-vue'

From 0ef7e80c5c732092dedd8d53146399f799748532 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Tue, 28 Feb 2023 18:06:57 +0800
Subject: [PATCH 18/23] =?UTF-8?q?update:=20api=E9=85=8D=E7=BD=AE=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E6=A0=91=E6=8C=89=E6=A8=A1=E5=BC=8F=E5=AF=B9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BF=9B=E8=A1=8C=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue                      |  5 ++
 src/views/system/Apply/View/index.vue         | 14 +++++
 src/views/system/Apply/index.vue              |  8 ++-
 .../Platforms/Api/components/HomePage.vue     | 30 +++++-----
 .../Platforms/Api/components/LeftTree.vue     | 59 +++++++++++++++++--
 src/views/system/Platforms/Api/index.vue      | 18 ++++--
 6 files changed, 107 insertions(+), 27 deletions(-)
 create mode 100644 src/views/system/Apply/View/index.vue

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 3bf9d267..04e6ac88 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -5,6 +5,10 @@
             <DeviceHome v-else-if="currentView === 'device'" />
             <DevOpsHome v-else-if="currentView === 'ops'" />
             <ComprehensiveHome v-else-if="currentView === 'comprehensive'" />
+
+            <Api :mode="'home'" hasHome showTitle>
+                <template #top> </template>
+            </Api>
         </div>
     </page-container>
 </template>
@@ -14,6 +18,7 @@ import InitHome from './components/InitHome/index.vue';
 import DeviceHome from './components/DeviceHome/index.vue';
 import DevOpsHome from './components/DevOpsHome/index.vue';
 import ComprehensiveHome from './components/ComprehensiveHome/index.vue';
+import Api from '@/views/system/Platforms/Api/index.vue';
 
 import { isNoCommunity } from '@/utils/utils';
 import { getMe_api, getView_api } from '@/api/home';
diff --git a/src/views/system/Apply/View/index.vue b/src/views/system/Apply/View/index.vue
new file mode 100644
index 00000000..8e67c7ce
--- /dev/null
+++ b/src/views/system/Apply/View/index.vue
@@ -0,0 +1,14 @@
+<template>
+    <page-container>
+        <Api :mode="'appManger'" hasHome showTitle :code="code"> 
+        </Api>
+    </page-container>
+</template>
+
+<script setup lang="ts" name="apiPage">
+import Api from '@/views/system/Platforms/Api/index.vue';
+const route = useRoute()
+const code = route.query.code as string
+</script>
+
+<style scoped></style>
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 @@
             <div style="width: 50%">
                 <h3>示例数据</h3>
                 <div>
-                    <Table
+                    <JTable
                         :dataSource="data"
-                        :pagination="false"
+                        model="TABLE"
+                        noPagination
                         :columns="[
                             {
                                 title: '示例数据类型',
@@ -89,23 +90,19 @@
             <div>
                 <h3>服务器验签流程</h3>
                 <div>
-                    <img
-                        :src="getImage('/public/images/apiHome.png')"
-                        style="width: 80%"
-                    />
+                    <img :src="getImage('/apiHome.png')" style="width: 80%" />
                 </div>
             </div>
-            <div style="width: 505">
+            <div style="width: 505px">
                 <h3>验签说明</h3>
                 <div>
                     <p>使用和签名相同的算法(不需要对响应结果排序)</p>
                     <div>
-                        <JMonacoEditor
+                        <MonacoEditor
                             style="width: 100%; height: 620px"
                             theme="vs-dark"
                             language="java"
-                            :v-model:modelValue="`String secureKey = ...; //密钥\r\nString responseBody = ...;//服务端响应结果\r\nString timestampHeader = ...;//响应头: X-Timestamp\r\nString signHeader = ...; //响应头: X-Sign\r\n\r\nString sign = DigestUtils.md5Hex(responseBody+timestampHeader+secureKey);\r\nif(sign.equalsIgnoreCase(signHeader)){\r\n //验签通过\r\n}
-                                    \r\n\r\n`"
+                            v-model="javaStr1"
                         />
                     </div>
                 </div>
@@ -122,19 +119,19 @@
             <h3>添加 SDK 依赖</h3>
             <div class="h3-text">将以下Maven依赖加入到pom.xml文件中</div>
             <div>
-                <JMonacoEditor
+                <MonacoEditor
                     style="width: 100%; height: 100px"
                     theme="vs-dark"
-                    :v-model:modelValue="'<dependency>\r\n    <groupId>org.jetlinks.sdk</groupId>\r\n    <artifactId>api-sdk</artifactId>\r\n    <version>1.0.0</version>\r\n</dependency>'"
+                    v-model="javaStr2"
                     language="java"
                 />
             </div>
             <h3>SDK 客户端的初始化和请求方式</h3>
             <div>
-                <JMonacoEditor
+                <MonacoEditor
                     style="width: 100%; height: 370px"
                     theme="vs-dark"
-                    :v-model:modelValue="javaStr"
+                    v-model="javaStr"
                     language="java"
                 />
             </div>
@@ -144,7 +141,7 @@
 
 <script setup lang="ts">
 import { getImage } from '@/utils/comm';
-import JMonacoEditor from '@/components/MonacoEditor/index.vue';
+import MonacoEditor from '@/components/MonacoEditor/index.vue';
 
 const data = [
     {
@@ -183,6 +180,9 @@ const data = [
         data: '1574993804802 ',
     },
 ];
+const javaStr1 = `String secureKey = ...; //密钥\r\nString responseBody = ...;//服务端响应结果\r\nString timestampHeader = ...;//响应头: X-Timestamp\r\nString signHeader = ...; //响应头: X-Sign\r\n\r\nString sign = DigestUtils.md5Hex(responseBody+timestampHeader+secureKey);\r\nif(sign.equalsIgnoreCase(signHeader)){\r\n //验签通过\r\n}`;
+const javaStr2 =
+    '<dependency>\r\n    <groupId>org.jetlinks.sdk</groupId>\r\n    <artifactId>api-sdk</artifactId>\r\n    <version>1.0.0</version>\r\n</dependency>';
 const javaStr =
     '\r\n        //服务器的baseUrl\r\n        String baseUrl = "http://localhost:9000/jetlinks";\r\n  //客户端Id\r\n        String clientId = "aSoq98aAxzP";\r\n  //访问秘钥\r\n        String secureKey = "DaYsxpiWSfdTAPJyKW8rP2WAGyWErnsR";\r\n\r\n        ClientConfig clientConfig = new ClientConfig(baseUrl, clientId, secureKey);\r\n\r\n        ApiClient client = new WebApiClient(clientConfig);\r\n\r\nApiResponse < PagerResult < DeviceInfo >> response = client\r\n    .request(QueryDeviceRequest\r\n        .of(query -> query\r\n            .where("productId", "demo-device")\r\n            .doPaging(0, 100)));';
 </script>
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 @@
     <a-tree
         :tree-data="treeData"
         @select="clickSelectItem"
+        v-model:selected-keys="selectedKeys"
         showLine
         class="left-tree-container"
     >
@@ -14,17 +15,23 @@
 <script setup lang="ts">
 import { TreeProps } from 'ant-design-vue';
 
-import { getTreeOne_api, getTreeTwo_api } from '@/api/system/apiPage';
+import {
+    apiOperations_api,
+    getApiGranted_api,
+    getTreeOne_api,
+    getTreeTwo_api,
+} from '@/api/system/apiPage';
 import type { modeType, treeNodeTpye } from '../typing';
 
 const emits = defineEmits(['select']);
 const props = defineProps<{
     mode: modeType;
     hasHome?: boolean;
+    code?: string;
 }>();
 
 const treeData = ref<TreeProps['treeData']>([]);
-
+const selectedKeys = ref<string[]>([]);
 const getTreeData = () => {
     let tree: treeNodeTpye[] = [];
     getTreeOne_api().then((resp: any) => {
@@ -33,24 +40,40 @@ const getTreeData = () => {
             key: item.url,
         }));
         const allPromise = tree.map((item) => getTreeTwo_api(item.name));
+        // 若类型不为api，根据不同类型添加得到不同的过滤数组
+        if (props.mode === 'appManger') allPromise.push(apiOperations_api());
+        else if (props.mode === 'home')
+            allPromise.push(getApiGranted_api(props.code as string));
         Promise.all(allPromise).then((values) => {
             values.forEach((item: any, i) => {
-                tree[i].children = combData(item?.paths);
-                tree[i].schemas = item.components.schemas;
+                if (props.mode === 'api') {
+                    tree[i].schemas = item.components.schemas;
+                    tree[i].children = combData(item.paths);
+                } else if (i < values.length - 2) {
+                    const paths = filterPath(
+                        item.paths,
+                        values[values.length - 1].result as string[],
+                    );
+                    tree[i].children = combData(paths);
+                    tree[i].schemas = item.components.schemas;
+                }
             });
-            if (props.hasHome)
+            if (props.hasHome) {
                 tree.unshift({
                     key: 'home',
                     name: '首页',
                     schemas: {},
                     children: [],
                 });
+                selectedKeys.value = ['home'];
+            }
+
             treeData.value = tree;
         });
     });
 };
 const clickSelectItem: TreeProps['onSelect'] = (key: any[], node: any) => {
-    if (key[0] === 'home') return emits('select',node.node.dataRef, {});
+    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);
@@ -86,12 +109,36 @@ const combData = (dataSource: object) => {
                     },
                 ],
             };
+
             apiList.push(apiObj);
         }
     });
 
     return apiList;
 };
+/**
+ * 过滤能展示的接口  模式mode为api时不需要过滤
+ * @param path 源数据
+ * @param filterArr 过滤数组
+ */
+const filterPath = (path: object, filterArr: string[]) => {
+    for (const key in path) {
+        if (Object.prototype.hasOwnProperty.call(path, key)) {
+            const value = path[key];
+            for (const prop in value) {
+                if (Object.prototype.hasOwnProperty.call(value, prop)) {
+                    const item = value[prop];
+                    if (!filterArr.includes(item.operationId))
+                        delete value[prop];
+                }
+            }
+            if(Object.keys(value).length === 0) delete path[key]
+        }
+    }
+    console.log(path, filterArr);
+
+    return path;
+};
 </script>
 
 <style lang="less">
diff --git a/src/views/system/Platforms/Api/index.vue b/src/views/system/Platforms/Api/index.vue
index 15a06a0b..be81a8e2 100644
--- a/src/views/system/Platforms/Api/index.vue
+++ b/src/views/system/Platforms/Api/index.vue
@@ -3,13 +3,19 @@
         <div class="top">
             <slot name="top" />
         </div>
-        <a-row :gutter="24" style="background-color: #fff;padding: 20px;">
-            <a-col :span="24" v-if="props.showTitle">API文档</a-col>
+        <a-row :gutter="24" style="background-color: #fff; padding: 20px">
+            <a-col
+                :span="24"
+                v-if="props.showTitle"
+                style="font-size: 16px; margin-bottom: 48px"
+                >API文档</a-col
+            >
             <a-col :span="5">
                 <LeftTree
                     @select="treeSelect"
                     :mode="props.mode"
                     :has-home="props.hasHome"
+                    :filter-array="treeFilter"
                 />
             </a-col>
             <a-col :span="19">
@@ -70,14 +76,16 @@ const props = defineProps<{
     mode: modeType;
     showTitle?: boolean;
     hasHome?: boolean;
+    code?: string
 }>();
-const showHome = ref<boolean>(Boolean(props.hasHome))
+const showHome = ref<boolean>(Boolean(props.hasHome));
 const tableData = ref([]);
+const treeFilter = ref([]);
 const treeSelect = (node: treeNodeTpye, nodeSchemas: object = {}) => {
-    if (node.key === 'home') return showHome.value = true;
+    if (node.key === 'home') return (showHome.value = true);
     schemas.value = nodeSchemas;
     if (!node.apiList) return;
-    showHome.value = false
+    showHome.value = false;
     const apiList: apiObjType[] = node.apiList as apiObjType[];
     const table: any = [];
     // 将对象形式的数据转换为表格需要的形式

From d0b0cfa6ba1dec513ed5b5b28f6d60615e34ad34 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Tue, 28 Feb 2023 18:55:13 +0800
Subject: [PATCH 19/23] =?UTF-8?q?feat:=20=E5=9B=BD=E6=A0=87=E7=BA=A7?=
 =?UTF-8?q?=E8=81=94=E5=88=97=E8=A1=A8/=E7=A6=81=E7=94=A8/=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8/=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/media/cascade.ts                |   9 +-
 src/components/AIcon/index.tsx          |   2 +-
 src/views/media/Cascade/Save/index.less |  35 +++
 src/views/media/Cascade/Save/index.vue  | 377 ++++++++++++++++++++++++
 src/views/media/Cascade/index.vue       | 239 ++++++++++-----
 src/views/media/Cascade/typings.d.ts    |   2 +-
 src/views/media/Device/Save/index.vue   |   2 +-
 7 files changed, 595 insertions(+), 71 deletions(-)
 create mode 100644 src/views/media/Cascade/Save/index.less
 create mode 100644 src/views/media/Cascade/Save/index.vue

diff --git a/src/api/media/cascade.ts b/src/api/media/cascade.ts
index ec315392..be1b8215 100644
--- a/src/api/media/cascade.ts
+++ b/src/api/media/cascade.ts
@@ -1,10 +1,11 @@
 import server from '@/utils/request'
+import type { CascadeItem } from '@/views/media/Cascade/typings'
 
 export default {
     // 列表
-    list: (data: any, id: string) => server.post(`/media/gb28181-cascade/_query`, data),
+    list: (data: any) => server.post<any>(`/media/gb28181-cascade/_query`, data),
     // 列表字段通道数量, 来自下面接口的total
-    queryCount: (id: string) => server.post(`/media/gb28181-cascade/${id}/bindings/_query`),
+    queryCount: (id: string) => server.post<any>(`/media/gb28181-cascade/${id}/bindings/_query`),
     // 详情
     detail: (id: string): any => server.get(`/media/gb28181-cascade/${id}`),
     // 新增
@@ -13,4 +14,8 @@ export default {
     update: (id: string, data: any) => server.put(`/media/gb28181-cascade/${id}`, data),
     // 删除
     del: (id: string) => server.remove(`media/gb28181-cascade/${id}`),
+    // 禁用
+    disabled: (id: string) => server.post<any>(`/media/gb28181-cascade/${id}/_disabled`),
+    // 启用
+    enabled: (id: string) => server.post<any>(`/media/gb28181-cascade/${id}/_enabled`),
 }
\ No newline at end of file
diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx
index e239a887..6e1682a0 100644
--- a/src/components/AIcon/index.tsx
+++ b/src/components/AIcon/index.tsx
@@ -48,7 +48,7 @@ const iconKeys = [
     'ClockCircleOutlined',
     'PartitionOutlined',
     'ShareAltOutlined',
-    'playCircleOutlined',
+    'PlayCircleOutlined',
     'RightOutlined',
     'FileTextOutlined',
     'UploadOutlined',
diff --git a/src/views/media/Cascade/Save/index.less b/src/views/media/Cascade/Save/index.less
new file mode 100644
index 00000000..aafe5855
--- /dev/null
+++ b/src/views/media/Cascade/Save/index.less
@@ -0,0 +1,35 @@
+.doc {
+    height: 1050px;
+    padding: 24px;
+    overflow-y: auto;
+    color: rgba(#000, 0.8);
+    font-size: 14px;
+    background-color: #fafafa;
+
+    .url {
+        padding: 8px 16px;
+        color: #2f54eb;
+        background-color: rgba(#a7bdf7, 0.2);
+    }
+
+    h1 {
+        margin: 16px 0;
+        color: rgba(#000, 0.85);
+        font-weight: bold;
+        font-size: 14px;
+
+        &:first-child {
+            margin-top: 0;
+        }
+    }
+
+    h2 {
+        margin: 6px 0;
+        color: rgba(0, 0, 0, 0.8);
+        font-size: 14px;
+    }
+
+    .image {
+        margin: 16px 0;
+    }
+}
diff --git a/src/views/media/Cascade/Save/index.vue b/src/views/media/Cascade/Save/index.vue
new file mode 100644
index 00000000..84c9fc1e
--- /dev/null
+++ b/src/views/media/Cascade/Save/index.vue
@@ -0,0 +1,377 @@
+<!-- 国标级联新增/编辑 -->
+<template>
+    <page-container>
+        <a-card>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form layout="vertical">
+                        <a-form-item
+                            label="接入方式"
+                            v-bind="validateInfos.channel"
+                        >
+                            <RadioCard
+                                layout="horizontal"
+                                :options="PROVIDER_OPTIONS"
+                                :checkStyle="true"
+                                :disabled="!!route.query.id"
+                                v-model="formData.channel"
+                            />
+                        </a-form-item>
+                        <a-row :gutter="24">
+                            <a-col :span="8">
+                                <JUpload
+                                    v-model:modelValue="formData.photoUrl"
+                                    :bgImage="formData.photoUrl"
+                                />
+                            </a-col>
+                            <a-col :span="16">
+                                <a-form-item
+                                    label="ID"
+                                    v-bind="validateInfos.id"
+                                >
+                                    <a-input
+                                        v-model:value="formData.id"
+                                        placeholder="请输入"
+                                        :disabled="!!route.query.id"
+                                    />
+                                </a-form-item>
+                                <a-form-item
+                                    label="设备名称"
+                                    v-bind="validateInfos.name"
+                                >
+                                    <a-input
+                                        v-model:value="formData.name"
+                                        placeholder="请输入名称"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                        </a-row>
+                        <a-form-item
+                            label="所属产品"
+                            v-bind="validateInfos.productId"
+                        >
+                            <a-row :gutter="[0, 10]">
+                                <a-col :span="!!route.query.id ? 24 : 22">
+                                    <a-select
+                                        v-model:value="formData.productId"
+                                        placeholder="请选择所属产品"
+                                        :disabled="!!route.query.id"
+                                    >
+                                        <a-select-option
+                                            v-for="(item, index) in productList"
+                                            :key="index"
+                                            :value="item.id"
+                                        >
+                                            {{ item.name }}
+                                        </a-select-option>
+                                    </a-select>
+                                </a-col>
+                                <a-col :span="2" v-if="!route.query.id">
+                                    <a-button
+                                        type="link"
+                                        @click="saveProductVis = true"
+                                    >
+                                        <AIcon type="PlusOutlined" />
+                                    </a-button>
+                                </a-col>
+                            </a-row>
+                        </a-form-item>
+                        <a-form-item
+                            label="接入密码"
+                            v-bind="validateInfos['others.access_pwd']"
+                            v-if="formData.channel === 'gb28181-2016'"
+                        >
+                            <a-input-password
+                                v-model:value="formData.others.access_pwd"
+                                placeholder="请输入接入密码"
+                            />
+                        </a-form-item>
+                        <template v-if="!!route.query.id">
+                            <a-form-item
+                                label="流传输模式"
+                                v-bind="validateInfos.streamMode"
+                            >
+                                <a-radio-group
+                                    button-style="solid"
+                                    v-model:value="formData.streamMode"
+                                >
+                                    <a-radio-button value="UDP">
+                                        UDP
+                                    </a-radio-button>
+                                    <a-radio-button value="TCP_PASSIVE">
+                                        TCP被动
+                                    </a-radio-button>
+                                </a-radio-group>
+                            </a-form-item>
+                            <a-form-item label="设备厂商">
+                                <a-input
+                                    v-model:value="formData.manufacturer"
+                                    placeholder="请输入设备厂商"
+                                />
+                            </a-form-item>
+                            <a-form-item label="设备型号">
+                                <a-input
+                                    v-model:value="formData.model"
+                                    placeholder="请输入设备型号"
+                                />
+                            </a-form-item>
+                            <a-form-item label="固件版本">
+                                <a-input
+                                    v-model:value="formData.firmware"
+                                    placeholder="请输入固件版本"
+                                />
+                            </a-form-item>
+                        </template>
+
+                        <a-form-item label="说明">
+                            <a-textarea
+                                v-model:value="formData.description"
+                                show-count
+                                :maxlength="200"
+                                :rows="5"
+                                placeholder="请输入说明"
+                            />
+                        </a-form-item>
+                        <a-form-item>
+                            <a-button
+                                type="primary"
+                                @click="handleSubmit"
+                                :loading="btnLoading"
+                            >
+                                保存
+                            </a-button>
+                        </a-form-item>
+                    </a-form>
+                </a-col>
+                <a-col :span="12">
+                    <div class="doc">
+                        <h1>1.概述</h1>
+                        <div>
+                            配置国标级联，平台可以将已经接入到自身的摄像头共享给第三方调用播放。
+                        </div>
+                        <div>
+                            <a-alert
+                                message="注：该配置只用于将本平台向上级联至第三方平台，如需第三方平台向上级联至本平台，请在“视频设备”页面新增设备时选择“GB/T28181”接入方式。"
+                                type="info"
+                                show-icon
+                            />
+                        </div>
+                        <h1>2.配置说明</h1>
+                        <div>
+                            以下配置说明以将本平台数据级联到LiveGBS平台为例。
+                        </div>
+                        <h2>1、上级SIP ID</h2>
+                        <div>请填写第三方平台中配置的<b>SIP ID</b>。</div>
+                        <div class="image">
+                            <a-image
+                                width="100%"
+                                :src="getImage('/northbound/doc2.png')"
+                            />
+                        </div>
+                        <h2>2、上级SIP 域</h2>
+                        <div>请填写第三方平台中配置的<b>SIP ID域</b>。</div>
+                        <div class="image">
+                            <a-image
+                                width="100%"
+                                :src="getImage('/northbound/doc1.png')"
+                            />
+                        </div>
+                        <h2>3、上级SIP 地址</h2>
+                        <div>请填写第三方平台中配置的<b>SIP ID地址</b>。</div>
+                        <div class="image">
+                            <a-image
+                                width="100%"
+                                :src="getImage('/northbound/doc3.png')"
+                            />
+                        </div>
+                        <h2>4、本地SIP ID</h2>
+                        <div>
+                            请填写本地的<b>SIP ID地址</b>。
+                            地址由中心编码(8位)、行业编码(2位)、类型编码(3位)和序号(7位)四个码段共20位十
+                            进制数字字符构成。详细规则请参见《GB/T28181-2016》中附录D部分。
+                        </div>
+                        <h2>5、SIP本地地址</h2>
+                        <div>
+                            请选择<b>指定的网卡和端口</b>，如有疑问请联系系统运维人员。
+                        </div>
+                        <h2>6、用户</h2>
+                        <div>
+                            部分平台有基于用户和接入密码的特殊认证。通常情况下,请填写<b
+                                >本地SIP ID</b
+                            >值。
+                        </div>
+                        <h2>7、接入密码</h2>
+                        <div>
+                            需与上级平台设置的接入密码一致，用于身份认证。
+                        </div>
+                        <h2>8、厂商/型号/版本号</h2>
+                        <div>
+                            本平台将以“设备”的身份级联到上级平台，请设置本平台在上级平台中显示的厂商、型号、版本号。
+                        </div>
+                        <h2>9、心跳周期</h2>
+                        <div>
+                            需与上级平台设置的心跳周期保持一致，通常默认60秒。
+                        </div>
+                        <h2>10、注册间隔</h2>
+                        <div>
+                            若SIP代理通过注册方式校时,其注册间隔时间宜设置为小于
+                            SIP代理与 SIP服务器出现1s误 差所经过的运行时间。
+                        </div>
+                    </div>
+                </a-col>
+            </a-row>
+        </a-card>
+    </page-container>
+</template>
+
+<script setup lang="ts">
+import { getImage } from '@/utils/comm';
+import { Form } from 'ant-design-vue';
+import { message } from 'ant-design-vue';
+
+import DeviceApi from '@/api/media/device';
+
+import { PROVIDER_OPTIONS } from '@/views/media/Device/const';
+import type { ProductType } from '@/views/media/Device/typings';
+
+const router = useRouter();
+const route = useRoute();
+const useForm = Form.useForm;
+
+// 表单数据
+const formData = ref({
+    id: '',
+    name: '',
+    channel: 'gb28181-2016',
+    photoUrl: getImage('/device-media.png'),
+    productId: '',
+    others: {
+        access_pwd: '',
+    },
+    description: '',
+    // 编辑字段
+    streamMode: 'UDP',
+    manufacturer: '',
+    model: '',
+    firmware: '',
+});
+
+// 验证规则
+const formRules = ref({
+    id: [
+        {
+            required: true,
+            message: '请输入ID',
+        },
+        { max: 64, message: '最多输入64个字符' },
+        {
+            pattern: /^[a-zA-Z0-9_\-]+$/,
+            message: '请输入英文或者数字或者-或者_',
+        },
+    ],
+    name: [
+        { required: true, message: '请输入名称' },
+        { max: 64, message: '最多可输入64个字符' },
+    ],
+    productId: [{ required: true, message: '请选择所属产品' }],
+    channel: [{ required: true, message: '请选择接入方式' }],
+    'others.access_pwd': [{ required: true, message: '请输入接入密码' }],
+    description: [{ max: 200, message: '最多可输入200个字符' }],
+    streamMode: [{ required: true, message: '请选择流传输模式' }],
+});
+
+watch(
+    () => formData.value.channel,
+    (val) => {
+        formRules.value['id'][0].required = val === 'gb28181-2016';
+        formRules.value['others.access_pwd'][0].required =
+            val === 'gb28181-2016';
+        validate();
+        getProductList();
+    },
+);
+
+const { resetFields, validate, validateInfos, clearValidate } = useForm(
+    formData.value,
+    formRules.value,
+);
+
+const clearValid = () => {
+    setTimeout(() => {
+        clearValidate();
+    }, 200);
+};
+
+/**
+ * 获取所属产品
+ */
+const productList = ref<ProductType[]>([]);
+const getProductList = async () => {
+    // console.log('formData.productId: ', formData.value.productId);
+    const params = {
+        paging: false,
+        sorts: [{ name: 'createTime', order: 'desc' }],
+        terms: [
+            { column: 'accessProvider', value: formData.value.channel },
+            { column: 'state', value: 1 },
+        ],
+    };
+    const { result } = await DeviceApi.queryProductList(params);
+    productList.value = result;
+};
+getProductList();
+
+/**
+ * 新增产品
+ */
+const saveProductVis = ref(false);
+
+/**
+ * 获取详情
+ */
+const getDetail = async () => {
+    const res = await DeviceApi.detail(route.query.id as string);
+    // console.log('res: ', res);
+    // formData.value = res.result;
+    Object.assign(formData.value, res.result);
+    formData.value.channel = res.result.provider;
+
+    console.log('formData.value: ', formData.value);
+};
+
+onMounted(() => {
+    getDetail();
+});
+
+/**
+ * 表单提交
+ */
+const btnLoading = ref<boolean>(false);
+const handleSubmit = () => {
+    // console.log('formData.value: ', formData.value);
+    validate()
+        .then(async () => {
+            btnLoading.value = true;
+            let res;
+            if (!route.query.id) {
+                res = await DeviceApi.save(formData.value);
+            } else {
+                res = await DeviceApi.update(formData.value);
+            }
+            if (res?.success) {
+                message.success('保存成功');
+                router.back();
+            }
+        })
+        .catch((err) => {
+            console.log('err: ', err);
+        })
+        .finally(() => {
+            btnLoading.value = false;
+        });
+};
+</script>
+
+<style lang="less" scoped>
+@import './index.less';
+</style>
diff --git a/src/views/media/Cascade/index.vue b/src/views/media/Cascade/index.vue
index a5eb66c0..21ac2e94 100644
--- a/src/views/media/Cascade/index.vue
+++ b/src/views/media/Cascade/index.vue
@@ -2,17 +2,19 @@
     <page-container>
         <Search
             :columns="columns"
-            target="notice-config"
+            target="media-cascade"
             @search="handleSearch"
         />
+
         <JTable
             ref="listRef"
             :columns="columns"
-            :request="DeviceApi.list"
+            :request="(e:any) => lastValueFrom(e)"
             :defaultParams="{
                 sorts: [{ name: 'createTime', order: 'desc' }],
             }"
             :params="params"
+            :gridColumn="2"
         >
             <template #headerTitle>
                 <a-button type="primary" @click="handleAdd"> 新增 </a-button>
@@ -23,45 +25,37 @@
                     :actions="getActions(slotProps, 'card')"
                     v-bind="slotProps"
                     :showStatus="true"
-                    :status="
-                        slotProps.state.value === 'online' ? 'success' : 'error'
-                    "
-                    :statusText="slotProps.state.text"
-                    :statusNames="{ success: 'success', error: 'error' }"
+                    :status="slotProps.status?.value"
+                    :statusText="slotProps.status?.text"
+                    :statusNames="{
+                        enabled: 'success',
+                        disabled: 'error',
+                    }"
                 >
                     <template #img>
                         <slot name="img">
-                            <img :src="getImage('/device-media.png')" />
+                            <img
+                                :src="
+                                    getImage('/device/instance/device-card.png')
+                                "
+                            />
                         </slot>
                     </template>
                     <template #content>
                         <h3 class="card-item-content-title">
                             {{ slotProps.name }}
                         </h3>
-                        <a-row>
-                            <a-col :span="12">
-                                <div class="card-item-content-text">厂商</div>
-                                <div>{{ slotProps.manufacturer }}</div>
-                            </a-col>
-                            <a-col :span="12">
-                                <div class="card-item-content-text">
-                                    通道数量
-                                </div>
-                                <div>{{ slotProps.channelNumber }}</div>
-                            </a-col>
-                            <a-col :span="12">
-                                <div class="card-item-content-text">型号</div>
-                                <div>{{ slotProps.model }}</div>
-                            </a-col>
-                            <a-col :span="12">
-                                <div class="card-item-content-text">
-                                    接入方式
-                                </div>
-                                <!-- <div>
-                                    {{ providerType[slotProps.provider] }}
-                                </div> -->
-                            </a-col>
-                        </a-row>
+                        <p>通道数量：{{ slotProps.count }}</p>
+                        <Ellipsis>
+                            <a-badge
+                                :text="`sip:${slotProps.sipConfigs[0]?.sipId}@${slotProps.sipConfigs[0]?.hostAndPort}`"
+                                :status="
+                                    slotProps.status?.value === 'enabled'
+                                        ? 'success'
+                                        : 'error'
+                                "
+                            />
+                        </Ellipsis>
                     </template>
                     <template #actions="item">
                         <a-tooltip
@@ -73,9 +67,20 @@
                                 v-bind="item.popConfirm"
                                 :disabled="item.disabled"
                             >
-                                <a-button :disabled="item.disabled">
+                                <a-button
+                                    :disabled="item.disabled"
+                                    v-if="item.key === 'delete'"
+                                >
                                     <AIcon type="DeleteOutlined" />
                                 </a-button>
+                                <a-button
+                                    :disabled="item.disabled"
+                                    @click="item.onClick"
+                                    v-else
+                                >
+                                    <AIcon :type="item.icon" />
+                                    <span>{{ item.text }}</span>
+                                </a-button>
                             </a-popconfirm>
                             <template v-else>
                                 <a-button
@@ -87,9 +92,53 @@
                                 </a-button>
                             </template>
                         </a-tooltip>
+                        <!-- <PermissionButton
+                            :disabled="item.disabled"
+                            :popConfirm="item.popConfirm"
+                            :tooltip="{
+                                ...item.tooltip,
+                            }"
+                            @click="item.onClick"
+                            :hasPermission="`media/Cascade:${item.key}`"
+                        >
+                            <AIcon
+                                type="DeleteOutlined"
+                                v-if="item.key === 'delete'"
+                            />
+                            <template v-else>
+                                <AIcon :type="item.icon" />
+                                <span>{{ item?.text }}</span>
+                            </template>
+                        </PermissionButton> -->
                     </template>
                 </CardBox>
             </template>
+            <template #sipId="slotProps">
+                {{ slotProps.sipConfigs[0]?.sipId }}
+            </template>
+            <template #publicHost="slotProps">
+                {{ slotProps.sipConfigs[0]?.publicHost }}
+            </template>
+            <template #status="slotProps">
+                <a-badge
+                    :text="slotProps.status?.text"
+                    :status="
+                        slotProps.status?.value === 'enabled'
+                            ? 'success'
+                            : 'error'
+                    "
+                />
+            </template>
+            <template #onlineStatus="slotProps">
+                <a-badge
+                    :text="slotProps.onlineStatus?.text"
+                    :status="
+                        slotProps.onlineStatus?.value === 'online'
+                            ? 'success'
+                            : 'error'
+                    "
+                />
+            </template>
             <template #action="slotProps">
                 <a-space :size="16">
                     <a-tooltip
@@ -123,6 +172,24 @@
                             /></a-button>
                         </a-button>
                     </a-tooltip>
+                    <!-- <template
+                        v-for="i in getActions(slotProps, 'table')"
+                        :key="i.key"
+                    >
+                        <PermissionButton
+                            :disabled="i.disabled"
+                            :popConfirm="i.popConfirm"
+                            :tooltip="{
+                                ...i.tooltip,
+                            }"
+                            @click="i.onClick"
+                            type="link"
+                            style="padding: 0px"
+                            :hasPermission="`device/Instance:${i.key}`"
+                        >
+                            <template #icon><AIcon :type="i.icon" /></template>
+                        </PermissionButton>
+                    </template> -->
                 </a-space>
             </template>
         </JTable>
@@ -131,6 +198,7 @@
 
 <script setup lang="ts">
 import DeviceApi from '@/api/media/device';
+import CascadeApi from '@/api/media/cascade';
 import type { ActionsType } from '@/components/Table/index.vue';
 import { message } from 'ant-design-vue';
 import { getImage } from '@/utils/comm';
@@ -156,14 +224,14 @@ const columns = [
     },
     {
         title: '上级SIP ID',
-        dataIndex: 'sipConfigs',
-        key: 'sipConfigs',
+        dataIndex: 'sipId',
+        key: 'sipId',
         scopedSlots: true,
     },
     {
         title: '上级SIP 地址',
-        dataIndex: 'sipConfigs',
-        key: 'sipConfigs',
+        dataIndex: 'publicHost',
+        key: 'publicHost',
         scopedSlots: true,
     },
     {
@@ -217,17 +285,35 @@ const columns = [
  * @param params
  */
 const handleSearch = (e: any) => {
-    // console.log('handleSearch:', e);
     params.value = e;
 };
 
+/**
+ * 处理表格数据
+ * @param params
+ */
+const lastValueFrom = async (params: any) => {
+    const res = await CascadeApi.list(params);
+    res.result.data.forEach(async (item: any) => {
+        const resp = await queryBindChannel(item.id);
+        item.count = resp.result.total;
+    });
+    return res;
+};
+
+/**
+ * 查询通道数量
+ * @param id
+ */
+const queryBindChannel = async (id: string) => {
+    return await CascadeApi.queryCount(id);
+};
+
 /**
  * 新增
  */
 const handleAdd = () => {
-    menuStory.jumpPage('media/Device/Save', {
-        id: ':id',
-    });
+    menuStory.jumpPage('media/Cascade/Save');
 };
 
 const getActions = (
@@ -245,7 +331,7 @@ const getActions = (
             icon: 'EditOutlined',
             onClick: () => {
                 menuStory.jumpPage(
-                    'media/Device/Save',
+                    'media/Cascade/Save',
                     {},
                     {
                         id: data.id,
@@ -255,58 +341,79 @@ const getActions = (
         },
         {
             key: 'view',
-            text: '查看通道',
+            text: '选择通道',
             tooltip: {
-                title: '查看通道',
+                title: '选择通道',
             },
-            icon: 'PartitionOutlined',
+            icon: 'LinkOutlined',
             onClick: () => {
-                // router.push(
-                //     `/media/device/Channel?id=${data.id}&type=${data.provider}`,
-                // );
                 menuStory.jumpPage(
-                    'media/Device/Channel',
+                    'media/Cascade/Channel',
                     {},
                     {
                         id: data.id,
-                        type: data.provider,
                     },
                 );
             },
         },
         {
             key: 'debug',
-            text: '更新通道',
+            text: '推送',
             tooltip: {
                 title:
-                    data.provider === 'fixed-media'
-                        ? '固定地址无法更新通道'
-                        : data.state.value === 'offline'
-                        ? '设备已离线'
-                        : data.state.value === 'notActive'
-                        ? '设备已禁用'
-                        : '',
+                    data.status?.value === 'disabled'
+                        ? '禁用状态下不可推送'
+                        : '推送',
             },
-            disabled:
-                data.state.value === 'offline' ||
-                data.state.value === 'notActive' ||
-                data.provider === 'fixed-media',
-            icon: 'SyncOutlined',
+            disabled: data.status?.value === 'disabled',
+            icon: 'ShareAltOutlined',
             onClick: () => {
                 // updateChannel()
             },
         },
+        {
+            key: 'action',
+            text: data.status?.value === 'enabled' ? '禁用' : '启用',
+            tooltip: {
+                title: data.status?.value === 'enabled' ? '禁用' : '启用',
+            },
+            icon:
+                data.status?.value === 'enabled'
+                    ? 'StopOutlined'
+                    : 'PlayCircleOutlined',
+            popConfirm: {
+                title: `确认${
+                    data.status?.value === 'enabled' ? '禁用' : '启用'
+                }?`,
+                onConfirm: async () => {
+                    let res =
+                        data.status.value === 'enabled'
+                            ? await CascadeApi.disabled(data.id)
+                            : await CascadeApi.enabled(data.id);
+
+                    if (res.success) {
+                        message.success('操作成功！');
+                        listRef.value?.reload();
+                    } else {
+                        message.error('操作失败！');
+                    }
+                },
+            },
+        },
         {
             key: 'delete',
             text: '删除',
             tooltip: {
-                title: '在线设备无法删除',
+                title:
+                    data.status?.value === 'enabled'
+                        ? '请先禁用, 再删除'
+                        : '删除',
             },
-            disabled: data.state.value === 'online',
+            disabled: data.status?.value === 'enabled',
             popConfirm: {
                 title: '确认删除?',
                 onConfirm: async () => {
-                    const resp = await DeviceApi.del(data.id);
+                    const resp = await CascadeApi.del(data.id);
                     if (resp.status === 200) {
                         message.success('操作成功！');
                         listRef.value?.reload();
diff --git a/src/views/media/Cascade/typings.d.ts b/src/views/media/Cascade/typings.d.ts
index 531cab1d..7d2f6fb8 100644
--- a/src/views/media/Cascade/typings.d.ts
+++ b/src/views/media/Cascade/typings.d.ts
@@ -31,7 +31,7 @@ type SipConfig = {
     transport: string;
     user: string;
 };
-type CascadeItem = {
+export type CascadeItem = {
     mediaServerId: string;
     onlineStatus: State;
     proxyStream: boolean;
diff --git a/src/views/media/Device/Save/index.vue b/src/views/media/Device/Save/index.vue
index 5f5e3397..b7b52cec 100644
--- a/src/views/media/Device/Save/index.vue
+++ b/src/views/media/Device/Save/index.vue
@@ -1,4 +1,4 @@
-<!-- 通知模板详情 -->
+<!-- 视频设备新增/编辑 -->
 <template>
     <page-container>
         <a-card>

From e233e9f55ff2d897d2212cbcc65289824dd03242 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Tue, 28 Feb 2023 19:45:23 +0800
Subject: [PATCH 20/23] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8=E6=95=B0=E6=8D=AE=E7=9B=91=E5=90=AC=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/media/cascade.ts               |   7 +
 src/components/MonacoEditor/index.vue  |   2 +-
 src/views/media/Cascade/Save/index.vue | 528 +++++++++++++++++++------
 3 files changed, 419 insertions(+), 118 deletions(-)

diff --git a/src/api/media/cascade.ts b/src/api/media/cascade.ts
index be1b8215..58d27d52 100644
--- a/src/api/media/cascade.ts
+++ b/src/api/media/cascade.ts
@@ -18,4 +18,11 @@ export default {
     disabled: (id: string) => server.post<any>(`/media/gb28181-cascade/${id}/_disabled`),
     // 启用
     enabled: (id: string) => server.post<any>(`/media/gb28181-cascade/${id}/_enabled`),
+
+    // 新增/编辑 
+    // 获取集群节点
+    clusters: () => server.get(`/network/resources/alive/clusters`),
+    // SIP本地地址
+    all: () => server.get(`/network/resources/alive/_all`),
+
 }
\ No newline at end of file
diff --git a/src/components/MonacoEditor/index.vue b/src/components/MonacoEditor/index.vue
index 7d438221..21f8ba61 100644
--- a/src/components/MonacoEditor/index.vue
+++ b/src/components/MonacoEditor/index.vue
@@ -90,7 +90,7 @@ const insert = (val) => {
     ]);
 }
 
-watch(() => props.value,
+watch(() => props.modelValue,
     (val) => {
         instance.setValue(val)
     })
diff --git a/src/views/media/Cascade/Save/index.vue b/src/views/media/Cascade/Save/index.vue
index 84c9fc1e..c9081613 100644
--- a/src/views/media/Cascade/Save/index.vue
+++ b/src/views/media/Cascade/Save/index.vue
@@ -4,40 +4,23 @@
         <a-card>
             <a-row :gutter="24">
                 <a-col :span="12">
-                    <a-form layout="vertical">
-                        <a-form-item
-                            label="接入方式"
-                            v-bind="validateInfos.channel"
-                        >
-                            <RadioCard
-                                layout="horizontal"
-                                :options="PROVIDER_OPTIONS"
-                                :checkStyle="true"
-                                :disabled="!!route.query.id"
-                                v-model="formData.channel"
-                            />
-                        </a-form-item>
+                    <a-form layout="vertical" :model="formData">
                         <a-row :gutter="24">
-                            <a-col :span="8">
-                                <JUpload
-                                    v-model:modelValue="formData.photoUrl"
-                                    :bgImage="formData.photoUrl"
-                                />
-                            </a-col>
-                            <a-col :span="16">
+                            <TitleComponent data="基本信息" />
+                            <a-col :span="12">
                                 <a-form-item
-                                    label="ID"
-                                    v-bind="validateInfos.id"
-                                >
-                                    <a-input
-                                        v-model:value="formData.id"
-                                        placeholder="请输入"
-                                        :disabled="!!route.query.id"
-                                    />
-                                </a-form-item>
-                                <a-form-item
-                                    label="设备名称"
-                                    v-bind="validateInfos.name"
+                                    label="名称"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入名称',
+                                        },
+                                        {
+                                            max: 84,
+                                            message: '最多可输入84个字符',
+                                        },
+                                    ]"
                                 >
                                     <a-input
                                         v-model:value="formData.name"
@@ -45,93 +28,404 @@
                                     />
                                 </a-form-item>
                             </a-col>
-                        </a-row>
-                        <a-form-item
-                            label="所属产品"
-                            v-bind="validateInfos.productId"
-                        >
-                            <a-row :gutter="[0, 10]">
-                                <a-col :span="!!route.query.id ? 24 : 22">
-                                    <a-select
-                                        v-model:value="formData.productId"
-                                        placeholder="请选择所属产品"
-                                        :disabled="!!route.query.id"
-                                    >
-                                        <a-select-option
-                                            v-for="(item, index) in productList"
-                                            :key="index"
-                                            :value="item.id"
-                                        >
-                                            {{ item.name }}
-                                        </a-select-option>
-                                    </a-select>
-                                </a-col>
-                                <a-col :span="2" v-if="!route.query.id">
-                                    <a-button
-                                        type="link"
-                                        @click="saveProductVis = true"
-                                    >
-                                        <AIcon type="PlusOutlined" />
-                                    </a-button>
-                                </a-col>
-                            </a-row>
-                        </a-form-item>
-                        <a-form-item
-                            label="接入密码"
-                            v-bind="validateInfos['others.access_pwd']"
-                            v-if="formData.channel === 'gb28181-2016'"
-                        >
-                            <a-input-password
-                                v-model:value="formData.others.access_pwd"
-                                placeholder="请输入接入密码"
-                            />
-                        </a-form-item>
-                        <template v-if="!!route.query.id">
-                            <a-form-item
-                                label="流传输模式"
-                                v-bind="validateInfos.streamMode"
-                            >
-                                <a-radio-group
-                                    button-style="solid"
-                                    v-model:value="formData.streamMode"
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="代理视频流"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请选择代理视频流',
+                                        },
+                                    ]"
                                 >
-                                    <a-radio-button value="UDP">
-                                        UDP
-                                    </a-radio-button>
-                                    <a-radio-button value="TCP_PASSIVE">
-                                        TCP被动
-                                    </a-radio-button>
-                                </a-radio-group>
-                            </a-form-item>
-                            <a-form-item label="设备厂商">
-                                <a-input
-                                    v-model:value="formData.manufacturer"
-                                    placeholder="请输入设备厂商"
-                                />
-                            </a-form-item>
-                            <a-form-item label="设备型号">
-                                <a-input
-                                    v-model:value="formData.model"
-                                    placeholder="请输入设备型号"
-                                />
-                            </a-form-item>
-                            <a-form-item label="固件版本">
-                                <a-input
-                                    v-model:value="formData.firmware"
-                                    placeholder="请输入固件版本"
-                                />
-                            </a-form-item>
-                        </template>
+                                    <a-radio-group
+                                        button-style="solid"
+                                        v-model:value="formData.name"
+                                    >
+                                        <a-radio-button value="enabled">
+                                            启用
+                                        </a-radio-button>
+                                        <a-radio-button value="disabled">
+                                            禁用
+                                        </a-radio-button>
+                                    </a-radio-group>
+                                </a-form-item>
+                            </a-col>
+
+                            <TitleComponent data="信令服务配置" />
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="集群节点"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请选择集群节点',
+                                        },
+                                    ]"
+                                >
+                                    <a-input
+                                        v-model:value="formData.name"
+                                        placeholder="请选择集群节点"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="信令名称"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入信令名称',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-input
+                                        v-model:value="formData.name"
+                                        placeholder="请输入信令名称"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="24">
+                                <a-form-item
+                                    label="上级SIP ID"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入上级SIP ID',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-input
+                                        v-model:value="formData.name"
+                                        placeholder="请输入上级SIP ID"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="上级SIP域"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入上级平台SIP域',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-input
+                                        v-model:value="formData.name"
+                                        placeholder="请输入上级平台SIP域"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="上级SIP 地址"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入上级SIP 地址',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-row :gutter="10">
+                                        <a-col :span="14">
+                                            <a-input
+                                                v-model:value="formData.name"
+                                                placeholder="请输入IP地址"
+                                            />
+                                        </a-col>
+                                        <a-col :span="10">
+                                            <a-input
+                                                v-model:value="formData.name"
+                                                placeholder="请输入端口"
+                                            />
+                                        </a-col>
+                                    </a-row>
+                                </a-form-item>
+                            </a-col>
+
+                            <a-col :span="24">
+                                <a-form-item
+                                    label="本地SIP ID"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入网关侧的SIP ID',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-input
+                                        v-model:value="formData.name"
+                                        placeholder="网关侧的SIP ID"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="SIP本地地址"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入SIP本地地址',
+                                        },
+                                    ]"
+                                >
+                                    <a-row :gutter="10">
+                                        <a-col :span="14">
+                                            <a-select
+                                                v-model:value="formData.name"
+                                                placeholder="请选择IP地址"
+                                            >
+                                                <a-select-option value="1">
+                                                    1
+                                                </a-select-option>
+                                            </a-select>
+                                        </a-col>
+                                        <a-col :span="10">
+                                            <a-select
+                                                v-model:value="formData.name"
+                                                placeholder="请选择端口"
+                                            >
+                                                <a-select-option value="1">
+                                                    1
+                                                </a-select-option>
+                                            </a-select>
+                                        </a-col>
+                                    </a-row>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="SIP远程地址"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入SIP远程地址',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-row :gutter="10">
+                                        <a-col :span="14">
+                                            <a-input
+                                                v-model:value="formData.name"
+                                                placeholder="请输入IP地址"
+                                            />
+                                        </a-col>
+                                        <a-col :span="10">
+                                            <a-input
+                                                v-model:value="formData.name"
+                                                placeholder="请输入端口"
+                                            />
+                                        </a-col>
+                                    </a-row>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="24">
+                                <a-form-item
+                                    label="传输协议"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请选择传输协议',
+                                        },
+                                    ]"
+                                >
+                                    <a-radio-group
+                                        button-style="solid"
+                                        v-model:value="formData.name"
+                                    >
+                                        <a-radio-button value="UDP">
+                                            UDP
+                                        </a-radio-button>
+                                        <a-radio-button value="TCP_PASSIVE">
+                                            TCP
+                                        </a-radio-button>
+                                    </a-radio-group>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="用户"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入用户',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-input
+                                        v-model:value="formData.name"
+                                        placeholder="请输入用户"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="接入密码"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入接入密码',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-input
+                                        v-model:value="formData.name"
+                                        placeholder="请输入接入密码"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="厂商"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入厂商',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-input
+                                        v-model:value="formData.name"
+                                        placeholder="请输入厂商"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="型号"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入型号',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-input
+                                        v-model:value="formData.name"
+                                        placeholder="请输入型号"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="版本号"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入版本号',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-input
+                                        v-model:value="formData.name"
+                                        placeholder="请输入版本号"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="心跳周期（秒）"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入心跳周期（秒）',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-input-number
+                                        v-model:value="formData.name"
+                                        placeholder="请输入心跳周期（秒）"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item
+                                    label="注册间隔（秒）"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入注册间隔（秒）',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <a-input-number
+                                        v-model:value="formData.name"
+                                        placeholder="请输入注册间隔（秒）"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                        </a-row>
 
-                        <a-form-item label="说明">
-                            <a-textarea
-                                v-model:value="formData.description"
-                                show-count
-                                :maxlength="200"
-                                :rows="5"
-                                placeholder="请输入说明"
-                            />
-                        </a-form-item>
                         <a-form-item>
                             <a-button
                                 type="primary"

From 468bbd3eb3864e2185a6a5a9c2023fb21dd843e2 Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Tue, 28 Feb 2023 20:06:07 +0800
Subject: [PATCH 21/23] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=89=A9?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Metadata/ArrayParam/index.vue  | 16 +++----
 .../Metadata/BooleanParam/index.vue           |  2 +-
 src/components/Metadata/ConfigParam/index.vue |  2 +-
 src/components/Metadata/EnumParam/index.vue   | 27 ++++++-----
 src/components/Metadata/JsonParam/index.vue   | 48 ++++++++++---------
 .../Metadata/MetricsParam/index.vue           | 20 +++++---
 .../Metadata/VirtualRuleParam/index.vue       |  2 +-
 .../Edit/{PropertyForm.vue => BaseForm.vue}   | 15 ++++--
 .../Metadata/Base/Edit/CommonForm.vue         |  2 -
 .../Metadata/Base/Edit/ExpandsForm.vue        | 19 +-------
 .../Metadata/Base/Edit/ValueTypeForm.vue      | 10 ++--
 .../components/Metadata/Base/Edit/index.vue   |  7 ++-
 src/views/device/data.ts                      | 15 ++++++
 13 files changed, 102 insertions(+), 83 deletions(-)
 rename src/views/device/components/Metadata/Base/Edit/{PropertyForm.vue => BaseForm.vue} (87%)
 delete mode 100644 src/views/device/components/Metadata/Base/Edit/CommonForm.vue

diff --git a/src/components/Metadata/ArrayParam/index.vue b/src/components/Metadata/ArrayParam/index.vue
index f0b8bcd0..53410132 100644
--- a/src/components/Metadata/ArrayParam/index.vue
+++ b/src/components/Metadata/ArrayParam/index.vue
@@ -3,26 +3,26 @@
     <template #title>
       <div style="display: flex; justify-content: space-between; align-items: center;">
         <div style="width: 150px;">配置元素</div>
-        <AIcon type="CloseOutlined" @click="visible = false"/>
+        <AIcon type="CloseOutlined" @click="visible = false" />
       </div>
     </template>
     <template #content>
       <div style="max-width: 400px;">
-        <a-form layout="vertical" :model="_value">
-          <value-type-form v-model:value="_value" :name="[]" isSub key="sub"></value-type-form>
-          <a-form-item label="说明" name="description" :rules="[
+        <div class="ant-form-vertical">
+          <value-type-form v-model:value="_value" :name="name" isSub key="sub"></value-type-form>
+          <a-form-item label="说明" :name="name.concat(['description'])" :rules="[
             { max: 200, message: '最多可输入200个字符' },
           ]">
             <a-textarea v-model:value="_value.description" size="small"></a-textarea>
           </a-form-item>
-        </a-form>
+        </div>
       </div>
     </template>
     <a-button type="dashed" block @click="visible = true">
-      配置元素<AIcon type="EditOutlined" class="item-icon"/>
+      配置元素
+      <AIcon type="EditOutlined" class="item-icon" />
     </a-button>
   </a-popover>
-
 </template>
 <script setup lang="ts" name="ArrayParam">
 import ValueTypeForm from '@/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue';
@@ -36,7 +36,7 @@ const props = defineProps({
     default: () => ({ extends: {} })
   },
   name: {
-    type: Array as PropType<string[]>,
+    type: Array as PropType<(string | number)[]>,
     required: true
   }
 })
diff --git a/src/components/Metadata/BooleanParam/index.vue b/src/components/Metadata/BooleanParam/index.vue
index 4b93bf4d..a1e0a160 100644
--- a/src/components/Metadata/BooleanParam/index.vue
+++ b/src/components/Metadata/BooleanParam/index.vue
@@ -47,7 +47,7 @@ const props = defineProps({
     })
   },
   name: {
-    type: Array as PropType<string[]>,
+    type: Array as PropType<(string| number)[]>,
     required: true
   }
 })
diff --git a/src/components/Metadata/ConfigParam/index.vue b/src/components/Metadata/ConfigParam/index.vue
index 1f1247ed..9373fb63 100644
--- a/src/components/Metadata/ConfigParam/index.vue
+++ b/src/components/Metadata/ConfigParam/index.vue
@@ -30,7 +30,7 @@ const props = defineProps({
     default: () => ({})
   },
   name: {
-    type: Array as PropType<string[]>,
+    type: Array as PropType<(string| number)[]>,
     default: () => ([]),
     required: true
   },
diff --git a/src/components/Metadata/EnumParam/index.vue b/src/components/Metadata/EnumParam/index.vue
index f6398e14..f7d45ca3 100644
--- a/src/components/Metadata/EnumParam/index.vue
+++ b/src/components/Metadata/EnumParam/index.vue
@@ -13,18 +13,18 @@
             </div>
           </template>
           <template #content>
-            <a-form :model="_value[index]" layout="vertical">
-              <a-form-item label="Value" name="value" :rules="[
+            <div class="ant-form-vertical">
+              <a-form-item label="Value" :name="name.concat([index, 'value'])" :rules="[
                 { required: true, message: '请输入Value' },
               ]">
                 <a-input v-model:value="_value[index].value" size="small"></a-input>
               </a-form-item>
-              <a-form-item label="Text" name="text" :rules="[
+              <a-form-item label="Text" :name="name.concat([index, 'text'])" :rules="[
                 { required: true, message: '请输入Text' },
               ]">
                 <a-input v-model:value="_value[index].text" size="small"></a-input>
               </a-form-item>
-            </a-form>
+            </div>
           </template>
           <div class="item-edit" @click="handleEdit(index)">
             {{ item.text || '枚举项配置' }}
@@ -33,11 +33,13 @@
         </a-popover>
       </div>
       <div class="item-right">
-        <AIcon type="DeleteOutlined" @click="handleDelete(index)"/>
+        <AIcon type="DeleteOutlined" @click="handleDelete(index)" />
       </div>
     </div>
     <a-button type="dashed" block @click="handleAdd">
-      <template #icon><AIcon type="PlusOutlined" class="item-icon" /></template>
+      <template #icon>
+        <AIcon type="PlusOutlined" class="item-icon" />
+      </template>
       新增枚举型
     </a-button>
   </div>
@@ -57,20 +59,23 @@ const emit = defineEmits<Emits>()
 const props = defineProps({
   value: {
     type: Object as PropType<EnumType[]>,
+  },
+  name: {
+    type: Array as PropType<(string | number)[]>,
     default: () => ([])
   }
 })
 
 const _value = ref<EnumType[]>([])
 watchEffect(() => {
-  _value.value = props.value
+  _value.value = props.value || ([{}])
 })
 
 watch(_value,
-() => {
-  emit('update:value', _value.value)
-},
-{ deep: true })
+  () => {
+    emit('update:value', _value.value)
+  },
+  { deep: true, immediate: true })
 
 const editIndex = ref<number>(-1)
 const handleEdit = (index: number) => {
diff --git a/src/components/Metadata/JsonParam/index.vue b/src/components/Metadata/JsonParam/index.vue
index 6edc0742..8a47f380 100644
--- a/src/components/Metadata/JsonParam/index.vue
+++ b/src/components/Metadata/JsonParam/index.vue
@@ -13,27 +13,25 @@
             </div>
           </template>
           <template #content>
-            <div style="max-width: 400px;">
-              <a-form :model="_value[index]" layout="vertical">
-                <a-form-item label="标识" name="id" :rules="[
-                  { required: true, message: '请输入标识' },
-                  { max: 64, message: '最多可输入64个字符' },
-                  {
-                    pattern: /^[a-zA-Z0-9_\-]+$/,
-                    message: 'ID只能由数字、字母、下划线、中划线组成',
-                  },
-                ]">
-                  <a-input v-model:value="_value[index].id" size="small"></a-input>
-                </a-form-item>
-                <a-form-item label="名称" name="name" :rules="[
-                  { required: true, message: '请输入名称' },
-                  { max: 64, message: '最多可输入64个字符' },
-                ]">
-                  <a-input v-model:value="_value[index].name" size="small"></a-input>
-                </a-form-item>
-                <value-type-form v-model:value="_value[index].valueType" :name="['valueType']" isSub
-                  key="json_sub"></value-type-form>
-              </a-form>
+            <div style="max-width: 400px;" class="ant-form-vertical">
+              <a-form-item label="标识" :name="name.concat([index, 'id'])" :rules="[
+                { required: true, message: '请输入标识' },
+                { max: 64, message: '最多可输入64个字符' },
+                {
+                  pattern: /^[a-zA-Z0-9_\-]+$/,
+                  message: 'ID只能由数字、字母、下划线、中划线组成',
+                },
+              ]">
+                <a-input v-model:value="_value[index].id" size="small"></a-input>
+              </a-form-item>
+              <a-form-item label="名称" :name="name.concat([index, 'name'])" :rules="[
+                { required: true, message: '请输入名称' },
+                { max: 64, message: '最多可输入64个字符' },
+              ]">
+                <a-input v-model:value="_value[index].name" size="small"></a-input>
+              </a-form-item>
+              <value-type-form v-model:value="_value[index].valueType" :name="name.concat([index, 'valueType'])" isSub
+                key="json_sub"></value-type-form>
             </div>
           </template>
           <div class="item-edit" @click="handleEdit(index)">
@@ -47,7 +45,9 @@
       </div>
     </div>
     <a-button type="dashed" block @click="handleAdd">
-      <template #icon><AIcon type="PlusOutlined" class="item-icon" /></template>
+      <template #icon>
+        <AIcon type="PlusOutlined" class="item-icon" />
+      </template>
       添加参数
     </a-button>
   </div>
@@ -65,6 +65,10 @@ const emit = defineEmits<Emits>()
 const props = defineProps({
   value: {
     type: Object as PropType<JsonType[]>,
+  },
+  name: {
+    type: Array as PropType<(string | number)[]>,
+    default: () => ([])
   }
 })
 
diff --git a/src/components/Metadata/MetricsParam/index.vue b/src/components/Metadata/MetricsParam/index.vue
index 88e32a39..1adc8903 100644
--- a/src/components/Metadata/MetricsParam/index.vue
+++ b/src/components/Metadata/MetricsParam/index.vue
@@ -15,8 +15,8 @@
           </template>
           <template #content>
             <div>
-              <a-form :model="_value[index]" layout="vertical">
-                <a-form-item label="标识" name="id" :rules="[
+              <div class="ant-form-vertical">
+                <a-form-item label="标识" :name="name.concat([index, 'id'])" :rules="[
                   { required: true, message: '请输入标识' },
                   { max: 64, message: '最多可输入64个字符' },
                   {
@@ -26,19 +26,19 @@
                 ]">
                   <a-input v-model:value="_value[index].id" size="small"></a-input>
                 </a-form-item>
-                <a-form-item label="名称" name="name" :rules="[
+                <a-form-item label="名称" :name="name.concat([index, 'name'])" :rules="[
                   { required: true, message: '请输入名称' },
                   { max: 64, message: '最多可输入64个字符' },
                 ]">
                   <a-input v-model:value="_value[index].name" size="small"></a-input>
                 </a-form-item>
-                <a-form-item label="指标值" name="value" :rules="[
+                <a-form-item label="指标值" :name="name.concat([index, 'value'])" :rules="[
                   { required: true, message: '请输入指标值' },
                   { validator: () => validateIndicator(_value[index]), message: '请输入指标值' }
                 ]">
-                  <JIndicators v-model:value="_value[index]" :type="type" size="small" :enum="enum"/>
+                  <JIndicators v-model:value="_value[index]" :type="type" size="small" :enum="enum" />
                 </a-form-item>
-              </a-form>
+              </div>
             </div>
           </template>
           <div class="item-edit" @click="handleEdit(index)">
@@ -52,7 +52,9 @@
       </div>
     </div>
     <a-button type="dashed" block @click="handleAdd">
-      <template #icon><AIcon type="PlusOutlined" class="item-icon" /></template>
+      <template #icon>
+        <AIcon type="PlusOutlined" class="item-icon" />
+      </template>
       添加指标
     </a-button>
   </div>
@@ -77,6 +79,10 @@ const props = defineProps({
   enum: {
     type: Object,
     default: () => ({})
+  },
+  name: {
+    type: Array as PropType<(string | number)[]>,
+    default: () => ([])
   }
 })
 
diff --git a/src/components/Metadata/VirtualRuleParam/index.vue b/src/components/Metadata/VirtualRuleParam/index.vue
index c2dad4d5..21167fd0 100644
--- a/src/components/Metadata/VirtualRuleParam/index.vue
+++ b/src/components/Metadata/VirtualRuleParam/index.vue
@@ -44,7 +44,7 @@ const props = defineProps({
     })
   },
   name: {
-    type: Array as PropType<string[]>,
+    type: Array as PropType<(string| number)[]>,
     default: () => ([])
   },
   id: String,
diff --git a/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
similarity index 87%
rename from src/views/device/components/Metadata/Base/Edit/PropertyForm.vue
rename to src/views/device/components/Metadata/Base/Edit/BaseForm.vue
index a563a43d..679d89d4 100644
--- a/src/views/device/components/Metadata/Base/Edit/PropertyForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
@@ -18,7 +18,6 @@
   <template v-if="modelType === 'properties'">
     <value-type-form :name="['valueType']" v-model:value="value.valueType" key="property" title="数据类型"
       @change-type="changeValueType"></value-type-form>
-
     <expands-form :name="['expands']" v-model:value="value.expands" :type="type" :id="value.id" :config="config"
       :valueType="value.valueType"></expands-form>
   </template>
@@ -46,20 +45,28 @@
     </a-form-item>
     <value-type-form :name="['valueType']" v-model:value="value.valueType" key="function" title="输出参数"></value-type-form>
   </template>
+  <template v-if="modelType === 'tags'">
+    <value-type-form :name="['valueType']" v-model:value="value.valueType" key="property" title="数据类型"></value-type-form>
+    <a-form-item label="读写类型" :name="['expands', 'type']" :rules="[
+      { required: true, message: '请选择读写类型' },
+    ]">
+      <a-select v-model:value="value.expands.type" :options="ExpandsTypeList" mode="multiple" size="small"></a-select>
+    </a-form-item>
+  </template>
   <a-form-item label="说明" name="description" :rules="[
     { max: 200, message: '最多可输入200个字符' },
   ]">
     <a-textarea v-model:value="value.description" size="small"></a-textarea>
   </a-form-item>
 </template>
-<script setup lang="ts" name="PropertyForm">
+<script setup lang="ts" name="BaseForm">
 import { PropType } from 'vue';
 import ExpandsForm from './ExpandsForm.vue';
 import ValueTypeForm from './ValueTypeForm.vue'
 import { useProductStore } from '@/store/product';
 import { getMetadataConfig } from '@/api/device/product'
 import JsonParam from '@/components/Metadata/JsonParam/index.vue'
-import { EventLevel } from '@/views/device/data';
+import { EventLevel, ExpandsTypeList } from '@/views/device/data';
 
 const props = defineProps({
   type: {
@@ -76,7 +83,7 @@ const props = defineProps({
     default: ''
   }
 })
-if (props.modelType === 'events') {
+if (props.modelType === 'events' || props.modelType === 'tags') {
   if (!props.value.expands) {
     props.value.expands = {}
   }
diff --git a/src/views/device/components/Metadata/Base/Edit/CommonForm.vue b/src/views/device/components/Metadata/Base/Edit/CommonForm.vue
deleted file mode 100644
index 9d4e7f46..00000000
--- a/src/views/device/components/Metadata/Base/Edit/CommonForm.vue
+++ /dev/null
@@ -1,2 +0,0 @@
-<template></template>
-<script setup lang="ts" name="CommonForm"></script>
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
index cf6d62a3..d3376921 100644
--- a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
@@ -10,7 +10,7 @@
   <a-form-item label="读写类型" :name="name.concat(['type'])" :rules="[
     { required: true, message: '请选择读写类型' },
   ]">
-    <a-select v-model:value="_value.type" :options="options" mode="multiple" size="small"></a-select>
+    <a-select v-model:value="_value.type" :options="ExpandsTypeList" mode="multiple" size="small"></a-select>
   </a-form-item>
   <a-form-item label="其他配置" v-if="config.length > 0">
     <a-form-item v-for="(item, index) in config" :key="index">
@@ -24,7 +24,7 @@
 </template>
 <script setup lang="ts" name="ExpandsForm">
 import { useMetadataStore } from '@/store/metadata';
-import { PropertySource } from '@/views/device/data';
+import { ExpandsTypeList, PropertySource } from '@/views/device/data';
 import { PropType } from 'vue';
 import VirtualRuleParam from '@/components/Metadata/VirtualRuleParam/index.vue';
 import ConfigParam from '@/components/Metadata/ConfigParam/index.vue'
@@ -78,21 +78,6 @@ watch(_value,
   },
   { deep: true, immediate: true })
 
-const options = [
-  {
-    label: '读',
-    value: 'read',
-  },
-  {
-    label: '写',
-    value: 'write',
-  },
-  {
-    label: '上报',
-    value: 'report',
-  },
-]
-
 const metadataStore = useMetadataStore()
 
 onMounted(() => {
diff --git a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
index df7d1884..5911b0f5 100644
--- a/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue
@@ -1,6 +1,6 @@
 <template>
   <a-form-item :label="title" :name="name.concat(['type'])" :rules="[
-    metadataStore.model.type !== 'functions' ? { required: true, message: '请选择数据类型' } : {},
+    metadataStore.model.type !== 'functions' ? { required: true, message: `请选择${title}` } : {},
   ]">
     <a-select v-model:value="_value.type" :options="metadataStore.model.type === 'events' ? eventDataTypeList : _dataTypeList" size="small" @change="changeType"></a-select>
   </a-form-item>
@@ -17,7 +17,7 @@
   <a-form-item label="枚举项" :name="name.concat(['elements'])" v-if="['enum'].includes(_value.type)" :rules="[
     { required: true, message: '请配置枚举项' }
   ]">
-    <EnumParam v-model:value="_value.elements"></EnumParam>
+    <EnumParam v-model:value="_value.elements" :name="name.concat(['elements'])"></EnumParam>
   </a-form-item>
   <a-form-item :name="name.concat(['expands', 'maxLength'])" v-if="['string', 'password'].includes(_value.type)">
     <template #label>
@@ -34,8 +34,8 @@
   <a-form-item label="元素配置" :name="name.concat(['elementType'])" v-if="['array'].includes(_value.type)">
     <ArrayParam v-model:value="_value.elementType" :name="name.concat(['elementType'])"></ArrayParam>
   </a-form-item>
-  <a-form-item label="JSON对象" :name="name.concat(['properties'])" v-if="['object'].includes(_value.type)">
-    <JsonParam v-model:value="_value.jsonConfig" :name="name.concat(['properties'])"></JsonParam>
+  <a-form-item label="JSON对象" :name="name.concat(['properties'])" v-if="['object'].includes(_value.type)" :rules="[]">
+    <JsonParam v-model:value="_value.properties" :name="name.concat(['properties'])"></JsonParam>
   </a-form-item>
   <a-form-item label="文件类型" :name="name.concat(['fileType'])" v-if="['file'].includes(_value.type)" initialValue="url"
     :rules="[
@@ -68,7 +68,7 @@ const props = defineProps({
     default: false
   },
   name: {
-    type: Array as PropType<string[]>,
+    type: Array as PropType<(string | number)[]>,
     default: () => ([]),
     required: true
   },
diff --git a/src/views/device/components/Metadata/Base/Edit/index.vue b/src/views/device/components/Metadata/Base/Edit/index.vue
index 8a06d189..ede6b6e6 100644
--- a/src/views/device/components/Metadata/Base/Edit/index.vue
+++ b/src/views/device/components/Metadata/Base/Edit/index.vue
@@ -5,7 +5,7 @@
       <a-button :loading="save.loading" type="primary" @click="save.saveMetadata">保存</a-button>
     </template>
     <a-form ref="formRef" :model="form.model" layout="vertical">
-        <PropertyForm :model-type="metadataStore.model.type" :type="type" ref="propertyForm" v-model:value="form.model"></PropertyForm>
+        <BaseForm :model-type="metadataStore.model.type" :type="type" v-model:value="form.model"></BaseForm>
     </a-form>
   </a-drawer>
 </template>
@@ -20,7 +20,7 @@ import { updateMetadata, asyncUpdateMetadata } from '../../metadata'
 import { Store } from 'jetlinks-store';
 import { detail } from '@/api/device/instance';
 import { DeviceInstance } from '@/views/device/Instance/typings';
-import PropertyForm from './PropertyForm.vue';
+import BaseForm from './BaseForm.vue';
 import { PropType } from 'vue';
 
 const props = defineProps({
@@ -56,8 +56,6 @@ const close = () => {
 
 const title = computed(() => metadataStore.model.action === 'add' ? '新增' : '修改')
 
-const propertyForm = ref()
-
 const form = reactive({
   model: {} as any,
 })
@@ -128,6 +126,7 @@ const save = reactive({
       }
       save.loading = false
     })
+    save.loading = false
   },
   resetMetadata: async () => {
     const { id } = route.params
diff --git a/src/views/device/data.ts b/src/views/device/data.ts
index eb571cd0..264d0f6b 100644
--- a/src/views/device/data.ts
+++ b/src/views/device/data.ts
@@ -133,3 +133,18 @@ export const DateTypeList = [
   //   value: 'yyyy-MM-dd HH:mm:ss zzz',
   // },
 ];
+
+export const ExpandsTypeList = [
+  {
+    label: '读',
+    value: 'read',
+  },
+  {
+    label: '写',
+    value: 'write',
+  },
+  {
+    label: '上报',
+    value: 'report',
+  },
+]
\ No newline at end of file

From bee4050386dfd7f2f61830f2678d08d5557b5b3b Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Tue, 28 Feb 2023 20:44:33 +0800
Subject: [PATCH 22/23] =?UTF-8?q?fix:=20=E7=89=A9=E6=A8=A1=E5=9E=8BTSL?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/components/Metadata/Base/Edit/BaseForm.vue | 6 +++++-
 .../device/components/Metadata/Base/Edit/ExpandsForm.vue    | 2 +-
 src/views/device/components/Metadata/Cat/index.vue          | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
index 679d89d4..e780808e 100644
--- a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
@@ -7,7 +7,7 @@
       message: 'ID只能由数字、字母、下划线、中划线组成',
     },
   ]">
-    <a-input v-model:value="value.id" size="small" @change="asyncOtherConfig"></a-input>
+    <a-input v-model:value="value.id" size="small" @change="asyncOtherConfig" :disabled="metadataStore.model.action === 'edit'"></a-input>
   </a-form-item>
   <a-form-item label="名称" name="name" :rules="[
     { required: true, message: '请输入名称' },
@@ -67,6 +67,7 @@ import { useProductStore } from '@/store/product';
 import { getMetadataConfig } from '@/api/device/product'
 import JsonParam from '@/components/Metadata/JsonParam/index.vue'
 import { EventLevel, ExpandsTypeList } from '@/views/device/data';
+import { useMetadataStore } from '@/store/metadata';
 
 const props = defineProps({
   type: {
@@ -83,6 +84,9 @@ const props = defineProps({
     default: ''
   }
 })
+
+const metadataStore = useMetadataStore()
+
 if (props.modelType === 'events' || props.modelType === 'tags') {
   if (!props.value.expands) {
     props.value.expands = {}
diff --git a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
index d3376921..5fa96daa 100644
--- a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue
@@ -19,7 +19,7 @@
   </a-form-item>
   <a-form-item v-if="type === 'product' && ['int', 'float', 'double', 'long', 'date', 'string', 'boolean'].includes(valueType.type)"
     label="指标配置" :name="name.concat(['metrics'])">
-    <metrics-param v-model:value="_value.metrics" :type="valueType.type" :enum="valueType"></metrics-param>
+    <metrics-param v-model:value="_value.metrics" :type="valueType.type" :enum="valueType" :name="name.concat(['metrics'])"></metrics-param>
   </a-form-item>
 </template>
 <script setup lang="ts" name="ExpandsForm">
diff --git a/src/views/device/components/Metadata/Cat/index.vue b/src/views/device/components/Metadata/Cat/index.vue
index bde3f7fd..a9bafd58 100644
--- a/src/views/device/components/Metadata/Cat/index.vue
+++ b/src/views/device/components/Metadata/Cat/index.vue
@@ -122,7 +122,7 @@ watch(
 )
 
 watch(
-  [props.visible, props.type],
+  () => [props.visible, props.type],
   () => {
     if (props.visible) {
       loading.value = true
@@ -136,7 +136,7 @@ watch(
       } else {
         productDetail(id as string).then((resp) => {
           loading.value = false
-          // productStore.setCurrent(resp.result)
+          productStore.setCurrent(resp.result)
           value.value = resp.result.metadata
         });
       }

From fbff5146bdb1e5de728a6d83651bf43c850e2194 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Tue, 28 Feb 2023 21:13:10 +0800
Subject: [PATCH 23/23] =?UTF-8?q?feat:=20=E5=9B=BD=E6=A0=87=E7=BA=A7?=
 =?UTF-8?q?=E8=81=94=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/media/cascade.ts               |   7 +-
 src/views/media/Cascade/Save/index.vue | 373 ++++++++++++++-----------
 2 files changed, 216 insertions(+), 164 deletions(-)

diff --git a/src/api/media/cascade.ts b/src/api/media/cascade.ts
index 58d27d52..c0b71ded 100644
--- a/src/api/media/cascade.ts
+++ b/src/api/media/cascade.ts
@@ -11,7 +11,8 @@ export default {
     // 新增
     save: (data: any) => server.post(`/media/gb28181-cascade`, data),
     // 修改
-    update: (id: string, data: any) => server.put(`/media/gb28181-cascade/${id}`, data),
+    // update: (id: string, data: any) => server.put(`/media/gb28181-cascade/${id}`, data),
+    update: (data: any) => server.patch(`/media/gb28181-cascade`, data),
     // 删除
     del: (id: string) => server.remove(`media/gb28181-cascade/${id}`),
     // 禁用
@@ -21,8 +22,8 @@ export default {
 
     // 新增/编辑 
     // 获取集群节点
-    clusters: () => server.get(`/network/resources/alive/clusters`),
+    clusters: () => server.get<any>(`/network/resources/clusters`),
     // SIP本地地址
-    all: () => server.get(`/network/resources/alive/_all`),
+    all: () => server.get<any>(`/network/resources/alive/_all`),
 
 }
\ No newline at end of file
diff --git a/src/views/media/Cascade/Save/index.vue b/src/views/media/Cascade/Save/index.vue
index c9081613..231d0b19 100644
--- a/src/views/media/Cascade/Save/index.vue
+++ b/src/views/media/Cascade/Save/index.vue
@@ -4,13 +4,13 @@
         <a-card>
             <a-row :gutter="24">
                 <a-col :span="12">
-                    <a-form layout="vertical" :model="formData">
+                    <a-form ref="formRef" layout="vertical" :model="formData">
                         <a-row :gutter="24">
                             <TitleComponent data="基本信息" />
                             <a-col :span="12">
                                 <a-form-item
                                     label="名称"
-                                    name="name"
+                                    name="cascadeName"
                                     :rules="[
                                         {
                                             required: true,
@@ -23,7 +23,7 @@
                                     ]"
                                 >
                                     <a-input
-                                        v-model:value="formData.name"
+                                        v-model:value="formData.cascadeName"
                                         placeholder="请输入名称"
                                     />
                                 </a-form-item>
@@ -31,7 +31,7 @@
                             <a-col :span="12">
                                 <a-form-item
                                     label="代理视频流"
-                                    name="name"
+                                    name="proxyStream"
                                     :rules="[
                                         {
                                             required: true,
@@ -41,12 +41,12 @@
                                 >
                                     <a-radio-group
                                         button-style="solid"
-                                        v-model:value="formData.name"
+                                        v-model:value="formData.proxyStream"
                                     >
-                                        <a-radio-button value="enabled">
+                                        <a-radio-button :value="true">
                                             启用
                                         </a-radio-button>
-                                        <a-radio-button value="disabled">
+                                        <a-radio-button :value="false">
                                             禁用
                                         </a-radio-button>
                                     </a-radio-group>
@@ -56,8 +56,7 @@
                             <TitleComponent data="信令服务配置" />
                             <a-col :span="12">
                                 <a-form-item
-                                    label="集群节点"
-                                    name="name"
+                                    name="clusterNodeId"
                                     :rules="[
                                         {
                                             required: true,
@@ -65,9 +64,23 @@
                                         },
                                     ]"
                                 >
-                                    <a-input
-                                        v-model:value="formData.name"
+                                    <template #label>
+                                        <span>
+                                            集群节点
+                                            <a-tooltip
+                                                title="使用此集群节点级联到上级平台"
+                                            >
+                                                <AIcon
+                                                    type="QuestionCircleOutlined"
+                                                    style="margin-left: 2px"
+                                                />
+                                            </a-tooltip>
+                                        </span>
+                                    </template>
+                                    <a-select
+                                        v-model:value="formData.clusterNodeId"
                                         placeholder="请选择集群节点"
+                                        :options="clustersList"
                                     />
                                 </a-form-item>
                             </a-col>
@@ -95,7 +108,7 @@
                             <a-col :span="24">
                                 <a-form-item
                                     label="上级SIP ID"
-                                    name="name"
+                                    name="sipId"
                                     :rules="[
                                         {
                                             required: true,
@@ -108,7 +121,7 @@
                                     ]"
                                 >
                                     <a-input
-                                        v-model:value="formData.name"
+                                        v-model:value="formData.sipId"
                                         placeholder="请输入上级SIP ID"
                                     />
                                 </a-form-item>
@@ -116,7 +129,7 @@
                             <a-col :span="12">
                                 <a-form-item
                                     label="上级SIP域"
-                                    name="name"
+                                    name="domain"
                                     :rules="[
                                         {
                                             required: true,
@@ -129,7 +142,7 @@
                                     ]"
                                 >
                                     <a-input
-                                        v-model:value="formData.name"
+                                        v-model:value="formData.domain"
                                         placeholder="请输入上级平台SIP域"
                                     />
                                 </a-form-item>
@@ -137,7 +150,7 @@
                             <a-col :span="12">
                                 <a-form-item
                                     label="上级SIP 地址"
-                                    name="name"
+                                    name="remoteAddress"
                                     :rules="[
                                         {
                                             required: true,
@@ -152,14 +165,21 @@
                                     <a-row :gutter="10">
                                         <a-col :span="14">
                                             <a-input
-                                                v-model:value="formData.name"
+                                                v-model:value="
+                                                    formData.remoteAddress
+                                                "
                                                 placeholder="请输入IP地址"
                                             />
                                         </a-col>
                                         <a-col :span="10">
-                                            <a-input
-                                                v-model:value="formData.name"
+                                            <a-input-number
+                                                :min="1"
+                                                :max="65535"
+                                                v-model:value="
+                                                    formData.remotePort
+                                                "
                                                 placeholder="请输入端口"
+                                                style="width: 100%"
                                             />
                                         </a-col>
                                     </a-row>
@@ -169,7 +189,7 @@
                             <a-col :span="24">
                                 <a-form-item
                                     label="本地SIP ID"
-                                    name="name"
+                                    name="localSipId"
                                     :rules="[
                                         {
                                             required: true,
@@ -182,15 +202,14 @@
                                     ]"
                                 >
                                     <a-input
-                                        v-model:value="formData.name"
+                                        v-model:value="formData.localSipId"
                                         placeholder="网关侧的SIP ID"
                                     />
                                 </a-form-item>
                             </a-col>
                             <a-col :span="12">
                                 <a-form-item
-                                    label="SIP本地地址"
-                                    name="name"
+                                    name="host"
                                     :rules="[
                                         {
                                             required: true,
@@ -198,20 +217,30 @@
                                         },
                                     ]"
                                 >
+                                    <template #label>
+                                        <span>
+                                            SIP本地地址
+                                            <a-tooltip
+                                                title="使用指定的网卡和端口进行请求"
+                                            >
+                                                <AIcon
+                                                    type="QuestionCircleOutlined"
+                                                    style="margin-left: 2px"
+                                                />
+                                            </a-tooltip>
+                                        </span>
+                                    </template>
                                     <a-row :gutter="10">
                                         <a-col :span="14">
                                             <a-select
-                                                v-model:value="formData.name"
+                                                v-model:value="formData.host"
                                                 placeholder="请选择IP地址"
-                                            >
-                                                <a-select-option value="1">
-                                                    1
-                                                </a-select-option>
-                                            </a-select>
+                                                :options="allList"
+                                            />
                                         </a-col>
                                         <a-col :span="10">
                                             <a-select
-                                                v-model:value="formData.name"
+                                                v-model:value="formData.port"
                                                 placeholder="请选择端口"
                                             >
                                                 <a-select-option value="1">
@@ -225,7 +254,7 @@
                             <a-col :span="12">
                                 <a-form-item
                                     label="SIP远程地址"
-                                    name="name"
+                                    name="publicHost"
                                     :rules="[
                                         {
                                             required: true,
@@ -240,14 +269,21 @@
                                     <a-row :gutter="10">
                                         <a-col :span="14">
                                             <a-input
-                                                v-model:value="formData.name"
+                                                v-model:value="
+                                                    formData.publicHost
+                                                "
                                                 placeholder="请输入IP地址"
                                             />
                                         </a-col>
                                         <a-col :span="10">
-                                            <a-input
-                                                v-model:value="formData.name"
+                                            <a-input-number
+                                                :min="1"
+                                                :max="65535"
+                                                v-model:value="
+                                                    formData.publicPort
+                                                "
                                                 placeholder="请输入端口"
+                                                style="width: 100%"
                                             />
                                         </a-col>
                                     </a-row>
@@ -256,7 +292,7 @@
                             <a-col :span="24">
                                 <a-form-item
                                     label="传输协议"
-                                    name="name"
+                                    name="transport"
                                     :rules="[
                                         {
                                             required: true,
@@ -266,12 +302,12 @@
                                 >
                                     <a-radio-group
                                         button-style="solid"
-                                        v-model:value="formData.name"
+                                        v-model:value="formData.transport"
                                     >
                                         <a-radio-button value="UDP">
                                             UDP
                                         </a-radio-button>
-                                        <a-radio-button value="TCP_PASSIVE">
+                                        <a-radio-button value="TCP">
                                             TCP
                                         </a-radio-button>
                                     </a-radio-group>
@@ -280,7 +316,7 @@
                             <a-col :span="12">
                                 <a-form-item
                                     label="用户"
-                                    name="name"
+                                    name="user"
                                     :rules="[
                                         {
                                             required: true,
@@ -293,7 +329,7 @@
                                     ]"
                                 >
                                     <a-input
-                                        v-model:value="formData.name"
+                                        v-model:value="formData.user"
                                         placeholder="请输入用户"
                                     />
                                 </a-form-item>
@@ -301,7 +337,7 @@
                             <a-col :span="12">
                                 <a-form-item
                                     label="接入密码"
-                                    name="name"
+                                    name="password"
                                     :rules="[
                                         {
                                             required: true,
@@ -313,8 +349,8 @@
                                         },
                                     ]"
                                 >
-                                    <a-input
-                                        v-model:value="formData.name"
+                                    <a-input-password
+                                        v-model:value="formData.password"
                                         placeholder="请输入接入密码"
                                     />
                                 </a-form-item>
@@ -322,7 +358,7 @@
                             <a-col :span="12">
                                 <a-form-item
                                     label="厂商"
-                                    name="name"
+                                    name="manufacturer"
                                     :rules="[
                                         {
                                             required: true,
@@ -335,7 +371,7 @@
                                     ]"
                                 >
                                     <a-input
-                                        v-model:value="formData.name"
+                                        v-model:value="formData.manufacturer"
                                         placeholder="请输入厂商"
                                     />
                                 </a-form-item>
@@ -343,7 +379,7 @@
                             <a-col :span="12">
                                 <a-form-item
                                     label="型号"
-                                    name="name"
+                                    name="model"
                                     :rules="[
                                         {
                                             required: true,
@@ -356,7 +392,7 @@
                                     ]"
                                 >
                                     <a-input
-                                        v-model:value="formData.name"
+                                        v-model:value="formData.model"
                                         placeholder="请输入型号"
                                     />
                                 </a-form-item>
@@ -364,7 +400,7 @@
                             <a-col :span="12">
                                 <a-form-item
                                     label="版本号"
-                                    name="name"
+                                    name="firmware"
                                     :rules="[
                                         {
                                             required: true,
@@ -377,7 +413,7 @@
                                     ]"
                                 >
                                     <a-input
-                                        v-model:value="formData.name"
+                                        v-model:value="formData.firmware"
                                         placeholder="请输入版本号"
                                     />
                                 </a-form-item>
@@ -385,42 +421,44 @@
                             <a-col :span="12">
                                 <a-form-item
                                     label="心跳周期（秒）"
-                                    name="name"
+                                    name="keepaliveInterval"
                                     :rules="[
                                         {
                                             required: true,
-                                            message: '请输入心跳周期（秒）',
-                                        },
-                                        {
-                                            max: 64,
-                                            message: '最多可输入64个字符',
+                                            message: '请输入心跳周期',
                                         },
                                     ]"
                                 >
                                     <a-input-number
-                                        v-model:value="formData.name"
-                                        placeholder="请输入心跳周期（秒）"
+                                        :min="1"
+                                        :max="10000"
+                                        v-model:value="
+                                            formData.keepaliveInterval
+                                        "
+                                        placeholder="请输入心跳周期"
+                                        style="width: 100%"
                                     />
                                 </a-form-item>
                             </a-col>
                             <a-col :span="12">
                                 <a-form-item
                                     label="注册间隔（秒）"
-                                    name="name"
+                                    name="registerInterval"
                                     :rules="[
                                         {
                                             required: true,
-                                            message: '请输入注册间隔（秒）',
-                                        },
-                                        {
-                                            max: 64,
-                                            message: '最多可输入64个字符',
+                                            message: '请输入注册间隔',
                                         },
                                     ]"
                                 >
                                     <a-input-number
-                                        v-model:value="formData.name"
-                                        placeholder="请输入注册间隔（秒）"
+                                        :min="1"
+                                        :max="10000"
+                                        v-model:value="
+                                            formData.registerInterval
+                                        "
+                                        placeholder="请输入注册间隔"
+                                        style="width: 100%"
                                     />
                                 </a-form-item>
                             </a-col>
@@ -523,10 +561,7 @@ import { getImage } from '@/utils/comm';
 import { Form } from 'ant-design-vue';
 import { message } from 'ant-design-vue';
 
-import DeviceApi from '@/api/media/device';
-
-import { PROVIDER_OPTIONS } from '@/views/media/Device/const';
-import type { ProductType } from '@/views/media/Device/typings';
+import CascadeApi from '@/api/media/cascade';
 
 const router = useRouter();
 const route = useRoute();
@@ -534,101 +569,96 @@ const useForm = Form.useForm;
 
 // 表单数据
 const formData = ref({
-    id: '',
+    id: route.query.id || undefined,
+    // name: '',
+    cascadeName: '',
+    proxyStream: false,
+    // 以下字段, 提交时需提取到sipConfigs[{}]字段当中
+    clusterNodeId: '',
     name: '',
-    channel: 'gb28181-2016',
-    photoUrl: getImage('/device-media.png'),
-    productId: '',
-    others: {
-        access_pwd: '',
-    },
-    description: '',
-    // 编辑字段
-    streamMode: 'UDP',
+    sipId: '',
+    domain: '',
+    remoteAddress: '',
+    remotePort: undefined,
+    localSipId: '',
+    host: '',
+    port: undefined,
+    // remotePublic: {
+    //     host: '',
+    //     port: undefined,
+    // },
+    publicHost: '',
+    publicPort: undefined,
+    transport: 'UDP',
+    user: '',
+    password: '',
     manufacturer: '',
     model: '',
     firmware: '',
+    keepaliveInterval: '60',
+    registerInterval: '3600',
 });
 
-// 验证规则
-const formRules = ref({
-    id: [
-        {
-            required: true,
-            message: '请输入ID',
-        },
-        { max: 64, message: '最多输入64个字符' },
-        {
-            pattern: /^[a-zA-Z0-9_\-]+$/,
-            message: '请输入英文或者数字或者-或者_',
-        },
-    ],
-    name: [
-        { required: true, message: '请输入名称' },
-        { max: 64, message: '最多可输入64个字符' },
-    ],
-    productId: [{ required: true, message: '请选择所属产品' }],
-    channel: [{ required: true, message: '请选择接入方式' }],
-    'others.access_pwd': [{ required: true, message: '请输入接入密码' }],
-    description: [{ max: 200, message: '最多可输入200个字符' }],
-    streamMode: [{ required: true, message: '请选择流传输模式' }],
-});
-
-watch(
-    () => formData.value.channel,
-    (val) => {
-        formRules.value['id'][0].required = val === 'gb28181-2016';
-        formRules.value['others.access_pwd'][0].required =
-            val === 'gb28181-2016';
-        validate();
-        getProductList();
-    },
-);
-
-const { resetFields, validate, validateInfos, clearValidate } = useForm(
-    formData.value,
-    formRules.value,
-);
-
-const clearValid = () => {
-    setTimeout(() => {
-        clearValidate();
-    }, 200);
-};
-
 /**
- * 获取所属产品
+ * 获取集群节点
  */
-const productList = ref<ProductType[]>([]);
-const getProductList = async () => {
-    // console.log('formData.productId: ', formData.value.productId);
-    const params = {
-        paging: false,
-        sorts: [{ name: 'createTime', order: 'desc' }],
-        terms: [
-            { column: 'accessProvider', value: formData.value.channel },
-            { column: 'state', value: 1 },
-        ],
-    };
-    const { result } = await DeviceApi.queryProductList(params);
-    productList.value = result;
+const clustersList = ref([]);
+const getClustersList = async () => {
+    const { result } = await CascadeApi.clusters();
+    clustersList.value = result.map((m: any) => ({
+        label: m.name,
+        value: m.id,
+    }));
 };
-getProductList();
-
+getClustersList();
 /**
- * 新增产品
+ * SIP本地地址
  */
-const saveProductVis = ref(false);
+const allList = ref([]);
+const getAllList = async () => {
+    const { result } = await CascadeApi.all();
+    allList.value = result.map((m: any) => ({
+        label: m.host,
+        value: m.host,
+    }));
+};
+getAllList();
 
 /**
  * 获取详情
  */
 const getDetail = async () => {
-    const res = await DeviceApi.detail(route.query.id as string);
+    if (!route.query.id) return;
+    const res = await CascadeApi.detail(route.query.id as string);
     // console.log('res: ', res);
     // formData.value = res.result;
-    Object.assign(formData.value, res.result);
-    formData.value.channel = res.result.provider;
+    // Object.assign(formData.value, res.result);
+
+    const { id, name, proxyStream, sipConfigs } = res.result;
+    formData.value = {
+        id,
+        cascadeName: name,
+        proxyStream,
+        clusterNodeId: sipConfigs[0]?.clusterNodeId,
+        name: sipConfigs[0]?.name,
+        sipId: sipConfigs[0]?.sipId,
+        domain: sipConfigs[0]?.domain,
+        remoteAddress: sipConfigs[0]?.remoteAddress,
+        remotePort: sipConfigs[0]?.remotePort,
+        localSipId: sipConfigs[0]?.localSipId,
+        host: sipConfigs[0]?.host,
+        port: sipConfigs[0]?.port,
+        publicHost: sipConfigs[0]?.publicHost,
+        publicPort: sipConfigs[0]?.publicPort,
+        transport: sipConfigs[0]?.transport,
+        user: sipConfigs[0]?.user,
+        password: sipConfigs[0]?.password,
+        manufacturer: sipConfigs[0]?.manufacturer,
+        model: sipConfigs[0]?.model,
+        firmware: sipConfigs[0]?.firmware,
+        keepaliveInterval: sipConfigs[0]?.keepaliveInterval,
+        registerInterval: sipConfigs[0]?.registerInterval,
+    };
 
     console.log('formData.value: ', formData.value);
 };
@@ -640,28 +670,49 @@ onMounted(() => {
 /**
  * 表单提交
  */
+const formRef = ref();
 const btnLoading = ref<boolean>(false);
 const handleSubmit = () => {
     // console.log('formData.value: ', formData.value);
-    validate()
+    formRef.value
+        .validate()
         .then(async () => {
+            const {
+                id,
+                cascadeName,
+                proxyStream,
+                publicHost,
+                publicPort,
+                ...extraFormData
+            } = formData.value;
+            const params = {
+                id,
+                name: cascadeName,
+                proxyStream,
+                sipConfigs: [
+                    {
+                        ...extraFormData,
+                        remotePublic: {
+                            host: publicHost,
+                            port: publicPort,
+                        },
+                    },
+                ],
+            };
             btnLoading.value = true;
-            let res;
-            if (!route.query.id) {
-                res = await DeviceApi.save(formData.value);
-            } else {
-                res = await DeviceApi.update(formData.value);
-            }
-            if (res?.success) {
-                message.success('保存成功');
-                router.back();
-            }
-        })
-        .catch((err) => {
-            console.log('err: ', err);
-        })
-        .finally(() => {
+            const res = formData.value.id
+                ? await CascadeApi.update(params)
+                : await CascadeApi.save(params);
             btnLoading.value = false;
+            if (res.success) {
+                message.success('操作成功');
+                router.back();
+            } else {
+                message.error('操作失败');
+            }
+        })
+        .catch((err: any) => {
+            console.log('err: ', err);
         });
 };
 </script>