From 442ca04cf88d312bd5a591e0cb662c33ad581fea Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Fri, 24 Feb 2023 09:50:23 +0800
Subject: [PATCH 01/17] =?UTF-8?q?fix:=20=E6=83=A8=E5=B9=B3=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Product/index.vue            | 322 ++++++++++--------
 .../rule-engine/Alarm/Configuration/index.vue |   5 +
 2 files changed, 177 insertions(+), 150 deletions(-)

diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index 96ed930b..456eedbe 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -1,167 +1,180 @@
 <template>
     <page-container>
-            <Search
-                :columns="query.columns"
-                target="product-manage"
-                @search="handleSearch"
-            />
-            <JTable
-                :columns="columns"
-                :request="queryProductList"
-                ref="tableRef"
-                :defaultParams="{
-                    sorts: [{ name: 'createTime', order: 'desc' }],
-                }"
-                :params="params"
-            >
-                <template #headerTitle>
-                    <a-space>
-                        <a-button type="primary" @click="add"
-                            ><plus-outlined />新增</a-button
-                        >
-                        <a-upload
-                            name="file"
-                            accept=".json"
-                            :showUploadList="false"
-                            :before-upload="beforeUpload"
-                        >
-                            <a-button>导入</a-button>
-                        </a-upload>
-                    </a-space>
-                </template>
-                <template #deviceType="slotProps">
-                    <div>{{ slotProps.deviceType.text }}</div>
-                </template>
-                <template #card="slotProps">
-                    <CardBox
-                        :value="slotProps"
-                        @click="handleClick"
-                        :actions="getActions(slotProps, 'card')"
-                        v-bind="slotProps"
-                        :active="_selectedRowKeys.includes(slotProps.id)"
-                        :status="slotProps.state"
-                        :statusText="slotProps.state === 1 ? '正常' : '禁用'"
-                        :statusNames="{
-                            1: 'success',
-                            0: 'error',
-                        }"
+        <Search
+            :columns="query.columns"
+            target="product-manage"
+            @search="handleSearch"
+        />
+        <JTable
+            :columns="columns"
+            :request="queryProductList"
+            ref="tableRef"
+            :defaultParams="{
+                sorts: [{ name: 'createTime', order: 'desc' }],
+            }"
+            :params="params"
+        >
+            <template #headerTitle>
+                <a-space>
+                    <a-button type="primary" @click="add"
+                        ><plus-outlined />新增</a-button
                     >
-                        <template #img>
-                            <slot name="img">
-                                <img :src="getImage('/device-product.png')" />
-                            </slot>
-                        </template>
-                        <template #content>
-                            <h3
+                    <a-upload
+                        name="file"
+                        accept=".json"
+                        :showUploadList="false"
+                        :before-upload="beforeUpload"
+                    >
+                        <a-button>导入</a-button>
+                    </a-upload>
+                </a-space>
+            </template>
+            <template #deviceType="slotProps">
+                <div>{{ slotProps.deviceType.text }}</div>
+            </template>
+            <template #card="slotProps">
+                <CardBox
+                    :value="slotProps"
+                    @click="handleClick"
+                    :actions="getActions(slotProps, 'card')"
+                    v-bind="slotProps"
+                    :active="_selectedRowKeys.includes(slotProps.id)"
+                    :status="slotProps.state"
+                    :statusText="slotProps.state === 1 ? '正常' : '禁用'"
+                    :statusNames="{
+                        1: 'success',
+                        0: 'error',
+                    }"
+                >
+                    <template #img>
+                        <slot name="img">
+                            <img
+                                :src="
+                                    slotProps.photoUrl ||
+                                    getImage('/device-product.png')
+                                "
+                                class="productImg"
+                            />
+                        </slot>
+                    </template>
+                    <template #content>
+                        <Ellipsis
+                            ><span
                                 @click.stop="handleView(slotProps.id)"
-                                style="font-weight: 600"
+                                style="font-weight: 600; font-size: 16px"
                             >
                                 {{ slotProps.name }}
-                            </h3>
-                            <a-row>
-                                <a-col :span="12">
-                                    <div class="card-item-content-text">
-                                        设备类型
-                                    </div>
-                                    <div>直连设备</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"
-                                    okText="确定"
-                                    cancelText="取消"
+                            </span></Ellipsis
+                        >
+                        <a-row>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">
+                                    设备类型
+                                </div>
+                                <div>{{ slotProps?.deviceType?.text }}</div>
+                            </a-col>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">
+                                    接入方式
+                                </div>
+                                <Ellipsis
+                                    ><div>
+                                        {{ slotProps?.accessName }}
+                                    </div></Ellipsis
                                 >
-                                    <a-button :disabled="item.disabled">
-                                        <AIcon
-                                            type="DeleteOutlined"
-                                            v-if="item.key === 'delete'"
-                                        />
-                                        <template v-else>
-                                            <AIcon :type="item.icon" />
-                                            <span>{{ item?.text }}</span>
-                                        </template>
-                                    </a-button>
-                                </a-popconfirm>
-                                <template v-else>
-                                    <a-button
-                                        :disabled="item.disabled"
-                                        @click="item.onClick"
-                                    >
-                                        <AIcon
-                                            type="DeleteOutlined"
-                                            v-if="item.key === 'delete'"
-                                        />
-                                        <template v-else>
-                                            <AIcon :type="item.icon" />
-                                            <span>{{ item?.text }}</span>
-                                        </template>
-                                    </a-button>
-                                </template>
-                            </a-tooltip>
-                        </template>
-                    </CardBox>
-                </template>
-                <template #state="slotProps">
-                    <a-badge
-                        :text="slotProps.state === 1 ? '正常' : '禁用'"
-                        :status="statusMap.get(slotProps.state)"
-                    />
-                </template>
-                <template #id="slotProps">
-                    <a>{{ slotProps.id }}</a>
-                </template>
-                <template #action="slotProps">
-                    <a-space :size="16">
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <template #actions="item">
                         <a-tooltip
-                            v-for="i in getActions(slotProps)"
-                            :key="i.key"
-                            v-bind="i.tooltip"
+                            v-bind="item.tooltip"
+                            :title="item.disabled && item.tooltip.title"
                         >
                             <a-popconfirm
-                                v-if="i.popConfirm"
-                                v-bind="i.popConfirm"
+                                v-if="item.popConfirm"
+                                v-bind="item.popConfirm"
+                                :disabled="item.disabled"
                                 okText="确定"
                                 cancelText="取消"
                             >
-                                <a-button
-                                    :disabled="i.disabled"
-                                    style="padding: 0"
-                                    type="link"
-                                    ><AIcon :type="i.icon"
-                                /></a-button>
+                                <a-button :disabled="item.disabled">
+                                    <AIcon
+                                        type="DeleteOutlined"
+                                        v-if="item.key === 'delete'"
+                                    />
+                                    <template v-else>
+                                        <AIcon :type="item.icon" />
+                                        <span>{{ item?.text }}</span>
+                                    </template>
+                                </a-button>
                             </a-popconfirm>
+                            <template v-else>
+                                <a-button
+                                    :disabled="item.disabled"
+                                    @click="item.onClick"
+                                >
+                                    <AIcon
+                                        type="DeleteOutlined"
+                                        v-if="item.key === 'delete'"
+                                    />
+                                    <template v-else>
+                                        <AIcon :type="item.icon" />
+                                        <span>{{ item?.text }}</span>
+                                    </template>
+                                </a-button>
+                            </template>
+                        </a-tooltip>
+                    </template>
+                </CardBox>
+            </template>
+            <template #state="slotProps">
+                <a-badge
+                    :text="slotProps.state === 1 ? '正常' : '禁用'"
+                    :status="statusMap.get(slotProps.state)"
+                />
+            </template>
+            <template #id="slotProps">
+                <a>{{ slotProps.id }}</a>
+            </template>
+            <template #action="slotProps">
+                <a-space :size="16">
+                    <a-tooltip
+                        v-for="i in getActions(slotProps)"
+                        :key="i.key"
+                        v-bind="i.tooltip"
+                    >
+                        <a-popconfirm
+                            v-if="i.popConfirm"
+                            v-bind="i.popConfirm"
+                            okText="确定"
+                            cancelText="取消"
+                        >
                             <a-button
+                                :disabled="i.disabled"
                                 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>
-            <!-- 新增、编辑 -->
-            <Save
-                ref="saveRef"
-                :isAdd="isAdd"
-                :title="title"
-                @success="refresh"
-            />
+                                ><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>
+        <!-- 新增、编辑 -->
+        <Save ref="saveRef" :isAdd="isAdd" :title="title" @success="refresh" />
     </page-container>
 </template>
 
@@ -193,11 +206,11 @@ import { isNoCommunity, downloadObject } from '@/utils/utils';
 import { omit } from 'lodash-es';
 import { typeOptions } from '@/components/Search/util';
 import Save from './Save/index.vue';
-import { useMenuStore } from 'store/menu'
+import { useMenuStore } from 'store/menu';
 /**
  * 表格数据
  */
- const menuStory = useMenuStore()
+const menuStory = useMenuStore();
 const router = useRouter();
 const isAdd = ref<number>(0);
 const title = ref<string>('');
@@ -425,7 +438,7 @@ const beforeUpload = (file: any) => {
  * 查看
  */
 const handleView = (id: string) => {
-    menuStory.jumpPage('device/Product/Detail',{id})
+    menuStory.jumpPage('device/Product/Detail', { id });
 };
 
 /**
@@ -643,4 +656,13 @@ const handleSearch = (e: any) => {
     padding: 20px;
     background: #f0f2f5;
 }
+.productImg {
+    width: 88px;
+    height: 88px;
+}
+.productName {
+    white-space: nowrap; /*强制在同一行内显示所有文本，直到文本结束或者遭遇br标签对象才换行。*/
+    overflow: hidden; /*超出部分隐藏*/
+    text-overflow: ellipsis; /*隐藏部分以省略号代替*/
+}
 </style>
diff --git a/src/views/rule-engine/Alarm/Configuration/index.vue b/src/views/rule-engine/Alarm/Configuration/index.vue
index 61ecfd8f..d507c780 100644
--- a/src/views/rule-engine/Alarm/Configuration/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/index.vue
@@ -206,10 +206,12 @@ import { Store } from 'jetlinks-store';
 import type { ActionsType } from '@/components/Table/index.vue';
 import { message } from 'ant-design-vue';
 import { getImage } from '@/utils/comm';
+import { useMenuStore } from '@/store/menu';
 const params = ref<Record<string, any>>({});
 let isAdd = ref<number>(0);
 let title = ref<string>('');
 const tableRef = ref<Record<string, any>>({});
+const menuStory = useMenuStore();
 const columns = [
     {
         title: '名称',
@@ -421,6 +423,9 @@ const getActions = (
         return actions.filter((i: ActionsType) => i.key !== 'view');
     return actions;
 };
+const add = () =>{
+    // menuStory.jumpPage()
+}
 </script>
 <style lang="less" scoped>
 .content-des-title {

From bf8b5935732892406f8c309d779c72cc0c2873a8 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Fri, 24 Feb 2023 09:53:52 +0800
Subject: [PATCH 02/17] =?UTF-8?q?fix:=20=E8=A7=84=E5=88=99=E7=BC=96?=
 =?UTF-8?q?=E6=8E=92=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rule-engine/Instance/index.vue | 41 +++++++++++++++---------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/views/rule-engine/Instance/index.vue b/src/views/rule-engine/Instance/index.vue
index f96ef9f1..68fa99d0 100644
--- a/src/views/rule-engine/Instance/index.vue
+++ b/src/views/rule-engine/Instance/index.vue
@@ -1,7 +1,11 @@
 <template>
     <page-container>
         <div>
-            <Search :columns="query.columns" target="device-instance" @search="handleSearch"></Search>
+            <Search
+                :columns="query.columns"
+                target="device-instance"
+                @search="handleSearch"
+            ></Search>
             <JTable
                 :columns="columns"
                 :request="queryList"
@@ -14,7 +18,7 @@
                 <template #headerTitle>
                     <a-space>
                         <a-button type="primary" @click="add"
-                            ><plus-outlined/>新增</a-button
+                            ><plus-outlined />新增</a-button
                         >
                     </a-space>
                 </template>
@@ -36,14 +40,18 @@
                             </slot>
                         </template>
                         <template #content>
-                            <h3 style="font-weight: 600">
-                                {{ slotProps.name }}
-                            </h3>
+                            <Ellipsis>
+                                <span style="font-weight: 600; font-size: 16px">
+                                    {{ slotProps.name }}
+                                </span>
+                            </Ellipsis>
                             <a-row>
                                 <a-col :span="12">
-                                    <div class="rule-desc">
-                                        {{ slotProps.description }}
-                                    </div>
+                                    <Ellipsis>
+                                        <div>
+                                            {{ slotProps.description }}
+                                        </div>
+                                    </Ellipsis>
                                 </a-col>
                             </a-row>
                         </template>
@@ -154,7 +162,12 @@
 <script lang="ts" setup>
 import JTable from '@/components/Table';
 import type { InstanceItem } from './typings';
-import { queryList , startRule , stopRule , deleteRule} from '@/api/rule-engine/instance';
+import {
+    queryList,
+    startRule,
+    stopRule,
+    deleteRule,
+} from '@/api/rule-engine/instance';
 import type { ActionsType } from '@/components/Table/index.vue';
 import { getImage } from '@/utils/comm';
 import { message } from 'ant-design-vue';
@@ -266,7 +279,10 @@ const getActions = (
             tooltip: {
                 title: data.state?.value !== 'disable' ? '禁用' : '启用',
             },
-            icon: data.state?.value !== 'disable' ? 'StopOutlined' : 'CheckCircleOutlined',
+            icon:
+                data.state?.value !== 'disable'
+                    ? 'StopOutlined'
+                    : 'CheckCircleOutlined',
             popConfirm: {
                 title: `确认${data.state !== 'disable' ? '禁用' : '启用'}?`,
                 onConfirm: async () => {
@@ -332,9 +348,4 @@ const handleSearch = (e: any) => {
 };
 </script>
 <style scoped>
-.rule-desc {
-    white-space: nowrap; /*强制在同一行内显示所有文本，直到文本结束或者遭遇br标签对象才换行。*/
-    overflow: hidden; /*超出部分隐藏*/
-    text-overflow: ellipsis; /*隐藏部分以省略号代替*/
-}
 </style>
\ No newline at end of file

From b5e547831deb6653d469d4339acb5c1c8a0e5c3d Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 24 Feb 2023 10:19:47 +0800
Subject: [PATCH 03/17] fix: bug#10181

---
 src/views/notice/Config/Detail/index.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/notice/Config/Detail/index.vue b/src/views/notice/Config/Detail/index.vue
index 293cb17a..7a5a85b8 100644
--- a/src/views/notice/Config/Detail/index.vue
+++ b/src/views/notice/Config/Detail/index.vue
@@ -333,7 +333,7 @@ watch(
         msgType.value = MSG_TYPE[val];
 
         formData.value.provider =
-            formData.value.provider !== ':id'
+            route.params.id !== ':id'
                 ? formData.value.provider
                 : msgType.value[0].value;
 
@@ -344,14 +344,14 @@ watch(
     },
 );
 
-watch(
-    () => formData.value.provider,
-    (val) => {
-        // formData.value.configuration =
-        //     CONFIG_FIELD_MAP[formData.value.type][val];
-        // clearValid();
-    },
-);
+// watch(
+//     () => formData.value.provider,
+//     (val) => {
+//         // formData.value.configuration =
+//         //     CONFIG_FIELD_MAP[formData.value.type][val];
+//         // clearValid();
+//     },
+// );
 
 // 验证规则
 const formRules = ref({

From ad2bc406141c1c3c3e793a2e29857937447f583a Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 24 Feb 2023 11:15:27 +0800
Subject: [PATCH 04/17] fix: bug#10163

---
 src/views/notice/Template/Detail/index.vue | 40 ++++++++++++++++------
 src/views/notice/Template/types.d.ts       |  4 +++
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue
index 35c26200..ac3ce6cf 100644
--- a/src/views/notice/Template/Detail/index.vue
+++ b/src/views/notice/Template/Detail/index.vue
@@ -803,9 +803,6 @@ const formData = ref<TemplateFormData>({
  * 重置公用字段值
  */
 const resetPublicFiles = () => {
-    formData.value.template.message = '';
-    formData.value.configId = undefined;
-
     if (
         formData.value.provider === 'dingTalkMessage' ||
         formData.value.type === 'weixin'
@@ -819,7 +816,12 @@ const resetPublicFiles = () => {
     if (formData.value.type === 'email')
         formData.value.template.toParty = undefined;
     // formData.value.description = '';
+
+    formData.value.template.messageType = 'markdown';
+    formData.value.template.message = '';
+    formData.value.configId = undefined;
     formData.value.variableDefinitions = [];
+    handleMessageTypeChange();
 };
 
 // 根据通知方式展示对应的字段
@@ -992,16 +994,30 @@ const variableReg = (value: string) => {
  * 钉钉机器人 消息类型选择改变
  */
 const handleMessageTypeChange = () => {
+    delete formData.value.template.markdown;
+    delete formData.value.template.link;
+    delete formData.value.template.text;
+    if (formData.value.template.messageType === 'link') {
+        formData.value.template.link = {
+            title: '',
+            picUrl: '',
+            messageUrl: '',
+            text: formData.value.template.message as string,
+        };
+    }
+    if (formData.value.template.messageType === 'markdown') {
+        formData.value.template.markdown = {
+            title: '',
+            text: formData.value.template.message as string,
+        };
+    }
+    if (formData.value.template.messageType === 'text') {
+        formData.value.template.text = {
+            content: formData.value.template.message as string,
+        };
+    }
     formData.value.variableDefinitions = [];
     formData.value.template.message = '';
-    if (formData.value.template.link) {
-        formData.value.template.link.title = '';
-        formData.value.template.link.picUrl = '';
-        formData.value.template.link.messageUrl = '';
-    }
-    if (formData.value.template.markdown) {
-        formData.value.template.markdown.title = '';
-    }
 };
 
 /**
@@ -1047,6 +1063,8 @@ const handleTypeChange = () => {
 const handleProviderChange = () => {
     formData.value.template =
         TEMPLATE_FIELD_MAP[formData.value.type][formData.value.provider];
+    // console.log('formData.value: ', formData.value);
+    // console.log('formData.value.template: ', formData.value.template);
     getConfigList();
     resetPublicFiles();
 };
diff --git a/src/views/notice/Template/types.d.ts b/src/views/notice/Template/types.d.ts
index 54aad7ff..bae9e021 100644
--- a/src/views/notice/Template/types.d.ts
+++ b/src/views/notice/Template/types.d.ts
@@ -27,6 +27,9 @@ interface ILink {
     messageUrl: string;
     text: string;
 }
+interface IText {
+    content: string;
+}
 
 export type TemplateFormData = {
     template: {
@@ -37,6 +40,7 @@ export type TemplateFormData = {
         messageType?: string;
         markdown?: IMarkDown;
         link?: ILink;
+        text?: IText;
         // 微信
         // agentId?: string;
         // message?: string;

From 6af3a1a9982dbc6caac1fd0d719dfcf2d4a01a2c Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 24 Feb 2023 11:51:45 +0800
Subject: [PATCH 05/17] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=86=85=E5=AE=B9=E6=8F=90=E5=8F=96=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue
index ac3ce6cf..eb5ae295 100644
--- a/src/views/notice/Template/Detail/index.vue
+++ b/src/views/notice/Template/Detail/index.vue
@@ -919,7 +919,7 @@ watch(
     () => formData.value.template.markdown?.title,
     (val) => {
         if (!val) return;
-        variableReg(val);
+        variableReg();
     },
     { deep: true },
 );
@@ -928,7 +928,7 @@ watch(
     () => formData.value.template.link?.title,
     (val) => {
         if (!val) return;
-        variableReg(val);
+        variableReg();
     },
     { deep: true },
 );
@@ -937,7 +937,7 @@ watch(
     () => formData.value.template.subject,
     (val) => {
         if (!val) return;
-        variableReg(val);
+        variableReg();
     },
     { deep: true },
 );
@@ -947,7 +947,7 @@ watch(
     () => formData.value.template.message,
     (val) => {
         if (!val) return;
-        variableReg(val);
+        variableReg();
     },
     { deep: true },
 );
@@ -956,21 +956,42 @@ watch(
     () => formData.value.template.body,
     (val) => {
         if (!val) return;
-        variableReg(val);
+        variableReg();
     },
     { deep: true },
 );
 
+/**
+ * 将需要提取变量的字段值拼接为一个字符串, 用于统一提取变量
+ */
+const spliceStr = () => {
+    let variableFieldsStr = formData.value.template.message;
+    if (formData.value.provider === 'dingTalkRobotWebHook') {
+        if (formData.value.template.messageType === 'markdown')
+            variableFieldsStr += formData.value.template.markdown
+                ?.title as string;
+        if (formData.value.template.messageType === 'link')
+            variableFieldsStr += formData.value.template.link?.title as string;
+    }
+    if (formData.value.provider === 'embedded')
+        variableFieldsStr += formData.value.template.subject as string;
+    if (formData.value.provider === 'http')
+        variableFieldsStr += formData.value.template.body as string;
+    // console.log('variableFieldsStr: ', variableFieldsStr);
+    return variableFieldsStr || '';
+};
+
 /**
  * 根据字段输入内容, 提取变量
  * @param value
  */
-const variableReg = (value: string) => {
+const variableReg = () => {
+    const _val = spliceStr();
     // 已经存在的变量
     const oldKey = formData.value.variableDefinitions?.map((m) => m.id);
     // 正则提取${}里面的值
     const pattern = /(?<=\$\{).*?(?=\})/g;
-    const titleList = value.match(pattern)?.filter((f) => f);
+    const titleList = _val.match(pattern)?.filter((f) => f);
     const newKey = [...new Set(titleList)];
     const result = newKey?.map((m) =>
         oldKey.includes(m)
@@ -982,12 +1003,7 @@ const variableReg = (value: string) => {
                   format: '%s',
               },
     );
-    formData.value.variableDefinitions = [
-        ...new Set([
-            ...formData.value.variableDefinitions,
-            ...(result as IVariableDefinitions[]),
-        ]),
-    ];
+    formData.value.variableDefinitions = result as IVariableDefinitions[];
 };
 
 /**

From 15c31a449bcff964f1fc51d0edd5ddbf9ea4869e Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 24 Feb 2023 14:07:45 +0800
Subject: [PATCH 06/17] fix: bug#10199 #10201

---
 src/components/Table/index.tsx      | 2 +-
 src/views/notice/Config/index.vue   | 4 ++--
 src/views/notice/Template/index.vue | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx
index e3c69329..ecc04bf0 100644
--- a/src/components/Table/index.tsx
+++ b/src/components/Table/index.tsx
@@ -260,7 +260,7 @@ const JTable = defineComponent<JTableProps>({
         /**
          * 导出方法
          */
-        expose({ reload })
+        expose({ reload, _dataSource })
 
         return () => <Spin spinning={loading.value}>
             <div class={styles["jtable-body"]} style={{ ...props.bodyStyle }}>
diff --git a/src/views/notice/Config/index.vue b/src/views/notice/Config/index.vue
index ff935b45..cd89502e 100644
--- a/src/views/notice/Config/index.vue
+++ b/src/views/notice/Config/index.vue
@@ -29,7 +29,7 @@
                         <a-button>导入</a-button>
                     </a-upload>
                     <a-popconfirm
-                        title="确认导出当前页数据？"
+                        title="确认导出？"
                         ok-text="确定"
                         cancel-text="取消"
                         @confirm="handleExport"
@@ -308,7 +308,7 @@ const beforeUpload = (file: any) => {
  * 导出
  */
 const handleExport = () => {
-    downloadObject(configRef.value.dataSource, `通知配置`);
+    downloadObject(configRef.value._dataSource, `通知配置`);
 };
 
 const syncVis = ref(false);
diff --git a/src/views/notice/Template/index.vue b/src/views/notice/Template/index.vue
index 9db9dab6..f5ecbb08 100644
--- a/src/views/notice/Template/index.vue
+++ b/src/views/notice/Template/index.vue
@@ -29,7 +29,7 @@
                         <a-button>导入</a-button>
                     </a-upload>
                     <a-popconfirm
-                        title="确认导出当前页数据？"
+                        title="确认导出？"
                         ok-text="确定"
                         cancel-text="取消"
                         @confirm="handleExport"
@@ -314,7 +314,7 @@ const beforeUpload = (file: any) => {
  * 导出
  */
 const handleExport = () => {
-    downloadObject(configRef.value.dataSource, `通知配置`);
+    downloadObject(configRef.value._dataSource, `通知配置`);
 };
 
 const syncVis = ref(false);

From f3620e5e076638bc8e1d38a6fc90135101b8fdc4 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 24 Feb 2023 14:55:30 +0800
Subject: [PATCH 07/17] fix: bug#10198

---
 src/views/notice/Config/Detail/index.vue   | 65 ++++++++++------
 src/views/notice/Template/Detail/index.vue | 88 +++++++++++++---------
 src/views/notice/Template/types.d.ts       |  2 +
 src/views/notice/const.ts                  |  4 +-
 4 files changed, 101 insertions(+), 58 deletions(-)

diff --git a/src/views/notice/Config/Detail/index.vue b/src/views/notice/Config/Detail/index.vue
index 7a5a85b8..88a92a1e 100644
--- a/src/views/notice/Config/Detail/index.vue
+++ b/src/views/notice/Config/Detail/index.vue
@@ -336,23 +336,9 @@ watch(
             route.params.id !== ':id'
                 ? formData.value.provider
                 : msgType.value[0].value;
-
-        // formData.value.configuration =
-        //     CONFIG_FIELD_MAP[val][formData.value.provider];
-
-        // clearValid();
     },
 );
 
-// watch(
-//     () => formData.value.provider,
-//     (val) => {
-//         // formData.value.configuration =
-//         //     CONFIG_FIELD_MAP[formData.value.type][val];
-//         // clearValid();
-//     },
-// );
-
 // 验证规则
 const formRules = ref({
     type: [{ required: true, message: '请选择通知方式' }],
@@ -421,12 +407,6 @@ const { resetFields, validate, validateInfos, clearValidate } = useForm(
     formRules.value,
 );
 
-const clearValid = () => {
-    setTimeout(() => {
-        clearValidate();
-    }, 200);
-};
-
 const getDetail = async () => {
     if (route.params.id === ':id') return;
     const res = await configApi.detail(route.params.id as string);
@@ -444,7 +424,7 @@ const handleTypeChange = () => {
     setTimeout(() => {
         formData.value.configuration =
             CONFIG_FIELD_MAP[formData.value.type][formData.value.provider];
-        // resetPublicFiles();
+        resetPublicFiles();
     }, 0);
 };
 
@@ -454,7 +434,48 @@ const handleTypeChange = () => {
 const handleProviderChange = () => {
     formData.value.configuration =
         CONFIG_FIELD_MAP[formData.value.type][formData.value.provider];
-    // resetPublicFiles();
+    resetPublicFiles();
+};
+
+/**
+ * 重置字段值
+ */
+const resetPublicFiles = () => {
+    switch (formData.value.provider) {
+        case 'dingTalkMessage':
+            formData.value.configuration.appKey = '';
+            formData.value.configuration.appSecret = '';
+            break;
+        case 'dingTalkRobotWebHook':
+            formData.value.configuration.url = '';
+            break;
+        case 'corpMessage':
+            formData.value.configuration.corpId = '';
+            formData.value.configuration.corpSecret = '';
+            break;
+        case 'embedded':
+            formData.value.configuration.host = '';
+            formData.value.configuration.port = 25;
+            formData.value.configuration.ssl = false;
+            formData.value.configuration.sender = '';
+            formData.value.configuration.username = '';
+            formData.value.configuration.password = '';
+            break;
+        case 'aliyun':
+            formData.value.configuration.regionId = '';
+            formData.value.configuration.accessKeyId = '';
+            formData.value.configuration.secret = '';
+            break;
+        case 'aliyunSms':
+            formData.value.configuration.regionId = '';
+            formData.value.configuration.accessKeyId = '';
+            formData.value.configuration.secret = '';
+            break;
+        case 'http':
+            formData.value.configuration.url = undefined;
+            formData.value.configuration.headers = [];
+            break;
+    }
 };
 
 /**
diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue
index eb5ae295..d16395f3 100644
--- a/src/views/notice/Template/Detail/index.vue
+++ b/src/views/notice/Template/Detail/index.vue
@@ -106,7 +106,8 @@
                                         <a-form-item label="收信部门">
                                             <ToOrg
                                                 v-model:toParty="
-                                                    formData.template.toParty
+                                                    formData.template
+                                                        .departmentIdList
                                                 "
                                                 :type="formData.type"
                                                 :config-id="formData.configId"
@@ -132,7 +133,7 @@
                                             </template>
                                             <ToUser
                                                 v-model:toUser="
-                                                    formData.template.toUser
+                                                    formData.template.userIdList
                                                 "
                                                 :type="formData.type"
                                                 :config-id="formData.configId"
@@ -800,25 +801,56 @@ const formData = ref<TemplateFormData>({
 });
 
 /**
- * 重置公用字段值
+ * 重置字段值
  */
 const resetPublicFiles = () => {
-    if (
-        formData.value.provider === 'dingTalkMessage' ||
-        formData.value.type === 'weixin'
-    ) {
-        formData.value.template.toTag = undefined;
-        formData.value.template.toUser = undefined;
-        formData.value.template.agentId = undefined;
+    switch (formData.value.provider) {
+        case 'dingTalkMessage':
+            formData.value.template.agentId = '';
+            formData.value.template.message = '';
+            formData.value.template.departmentIdList = '';
+            formData.value.template.userIdList = '';
+            break;
+        case 'dingTalkRobotWebHook':
+            formData.value.template.message = '';
+            formData.value.template.messageType = 'markdown';
+            formData.value.template.markdown = { text: '', title: '' };
+            break;
+        case 'corpMessage':
+            formData.value.template.agentId = '';
+            formData.value.template.message = '';
+            formData.value.template.toParty = '';
+            formData.value.template.toUser = '';
+            formData.value.template.toTag = '';
+            break;
+        case 'embedded':
+            formData.value.template.subject = '';
+            formData.value.template.message = '';
+            formData.value.template.text = '';
+            formData.value.template.sendTo = [];
+            formData.value.template.attachments = [];
+            break;
+        case 'aliyun':
+            formData.value.template.templateType = 'tts';
+            formData.value.template.templateCode = '';
+            formData.value.template.ttsCode = '';
+            formData.value.template.message = '';
+            formData.value.template.playTimes = 1;
+            formData.value.template.calledShowNumbers = '';
+            formData.value.template.calledNumber = '';
+            break;
+        case 'aliyunSms':
+            formData.value.template.code = '';
+            formData.value.template.message = '';
+            formData.value.template.phoneNumber = '';
+            formData.value.template.signName = '';
+            break;
+        case 'http':
+            formData.value.template.contextAsBody = true;
+            formData.value.template.body = '';
+            break;
     }
-    if (formData.value.type === 'weixin')
-        formData.value.template.toParty = undefined;
-    if (formData.value.type === 'email')
-        formData.value.template.toParty = undefined;
-    // formData.value.description = '';
 
-    formData.value.template.messageType = 'markdown';
-    formData.value.template.message = '';
     formData.value.configId = undefined;
     formData.value.variableDefinitions = [];
     handleMessageTypeChange();
@@ -833,15 +865,8 @@ watch(
             route.params.id !== ':id'
                 ? formData.value.provider
                 : msgType.value[0].value;
-        // formData.value.provider = formData.value.provider || msgType.value[0].value;
-        // console.log('formData.value.template: ', formData.value.template);
-
-        // formData.value.template =
-        //     TEMPLATE_FIELD_MAP[val][formData.value.provider];
 
         if (val !== 'email') getConfigList();
-        // clearValid();
-        // console.log('formData.value: ', formData.value);
 
         if (val === 'sms') {
             getTemplateList();
@@ -850,15 +875,6 @@ watch(
     },
 );
 
-// watch(
-//     () => formData.value.provider,
-//     (val) => {
-//         formData.value.template = TEMPLATE_FIELD_MAP[formData.value.type][val];
-
-//         clearValid();
-//     },
-// );
-
 // 验证规则
 const formRules = ref({
     type: [{ required: true, message: '请选择通知方式' }],
@@ -1069,6 +1085,7 @@ 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);
 };
@@ -1146,8 +1163,9 @@ const handleSubmit = () => {
     setTimeout(() => {
         validate()
             .then(async () => {
-                formData.value.template.ttsCode =
-                    formData.value.template.templateCode;
+                if (formData.value.provider === 'ttsCode')
+                    formData.value.template.ttsCode =
+                        formData.value.template.templateCode;
                 btnLoading.value = true;
                 let res;
                 if (!formData.value.id) {
diff --git a/src/views/notice/Template/types.d.ts b/src/views/notice/Template/types.d.ts
index bae9e021..23e9ca57 100644
--- a/src/views/notice/Template/types.d.ts
+++ b/src/views/notice/Template/types.d.ts
@@ -36,6 +36,8 @@ export type TemplateFormData = {
         // 钉钉消息
         agentId?: string;
         message?: string;
+        departmentIdList?: string;
+        userIdList?: string;
         // 钉钉机器人
         messageType?: string;
         markdown?: IMarkDown;
diff --git a/src/views/notice/const.ts b/src/views/notice/const.ts
index 32116d21..39c36df7 100644
--- a/src/views/notice/const.ts
+++ b/src/views/notice/const.ts
@@ -147,10 +147,12 @@ export const TEMPLATE_FIELD_MAP = {
         dingTalkMessage: {
             agentId: '',
             message: '',
+            departmentIdList: '',
+            userIdList: ''
         },
         dingTalkRobotWebHook: {
             message: '',
-            messageType: '',
+            messageType: 'markdown',
             markdown: {
                 text: '',
                 title: '',

From 0dcdac0ee66a1bab583a470c14222c291a51c8f6 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 24 Feb 2023 16:50:45 +0800
Subject: [PATCH 08/17] fix: bug#10196

---
 src/api/notice/config.ts                   | 12 ++--
 src/views/notice/Config/SyncUser/index.vue | 73 +++++++++++++++-------
 2 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/src/api/notice/config.ts b/src/api/notice/config.ts
index bbb21c3d..467455d6 100644
--- a/src/api/notice/config.ts
+++ b/src/api/notice/config.ts
@@ -16,21 +16,21 @@ export default {
     debug: (data: any, configId: string, templateId: string) => post(`/notifier/${configId}/${templateId}/_send`, data),
     getHistory: (data: any, id: string) => post(`/notify/history/config/${id}/_query`, data),
     // 获取所有平台用户
-    getPlatformUsers: () => post<any>(`/user/_query/no-paging`, { paging: false }),
+    getPlatformUsers: (data: any) => post<any>(`/user/_query/no-paging`, data),
     // 钉钉部门
     dingTalkDept: (id: string) => get<any>(`/notifier/dingtalk/corp/${id}/departments/tree`),
     // 钉钉部门人员
-    getDingTalkUsers: (configId: string, deptId: string) => get(`/notifier/dingtalk/corp/${configId}/${deptId}/users`),
+    getDingTalkUsers: (configId: string, deptId: string) => get<any>(`/notifier/dingtalk/corp/${configId}/${deptId}/users`),
     // 钉钉已经绑定的人员
-    getDingTalkBindUsers: (id: string) => get(`/user/third-party/dingTalk_dingTalkMessage/${id}`),
+    getDingTalkBindUsers: (id: string) => get<any>(`/user/third-party/dingTalk_dingTalkMessage/${id}`),
     // 钉钉绑定用户
-    dingTalkBindUser: (data: any, id: string) => patch(`/user/third-party/dingTalk_dingTalkMessage/${id}`, data),
+    dingTalkBindUser: (data: { userId: string; providerName: string; thirdPartyUserId: string }[], id: string) => patch(`/user/third-party/dingTalk_dingTalkMessage/${id}`, data),
     // 微信部门
     weChatDept: (id: string) => get<any>(`/notifier/wechat/corp/${id}/departments`),
     // 微信部门人员
-    getWeChatUsers: (configId: string, deptId: string) => get(`/notifier/wechat/corp/${configId}/${deptId}/users`),
+    getWeChatUsers: (configId: string, deptId: string) => get<any>(`/notifier/wechat/corp/${configId}/${deptId}/users`),
     // 微信已经绑定的人员
-    getWeChatBindUsers: (id: string) => get(`/user/third-party/weixin_corpMessage/${id}`),
+    getWeChatBindUsers: (id: string) => get<any>(`/user/third-party/weixin_corpMessage/${id}`),
     // 微信绑定用户
     weChatBindUser: (data: any, id: string) => patch(`/user/third-party/weixin_corpMessage/${id}`, data),
     // 解绑
diff --git a/src/views/notice/Config/SyncUser/index.vue b/src/views/notice/Config/SyncUser/index.vue
index 1fc23686..2aa1a45f 100644
--- a/src/views/notice/Config/SyncUser/index.vue
+++ b/src/views/notice/Config/SyncUser/index.vue
@@ -7,7 +7,7 @@
             @cancel="_vis = false"
             width="80%"
         >
-            <a-row :gutter="10">
+            <a-row :gutter="10" class="model-body">
                 <a-col :span="4">
                     <a-input
                         v-model:value="deptName"
@@ -40,6 +40,7 @@
                         :dataSource="dataSource"
                         :loading="tableLoading"
                         model="table"
+                        noPagination
                     >
                         <template #headerTitle>
                             <a-button type="primary" @click="handleAutoBind">
@@ -273,14 +274,24 @@ const getActions = (
  * 自动绑定
  */
 const handleAutoBind = () => {
-    configApi.dingTalkBindUser([], props.data.id).then(() => {
+    const arr = dataSource.value
+        .filter((item: any) => item.userId && item.status.value === 'error')
+        .map((i: any) => {
+            return {
+                userId: i.userId,
+                providerName: i.userName,
+                thirdPartyUserId: i.thirdPartyUserId,
+            };
+        });
+    // console.log('arr: ', arr);
+    configApi.dingTalkBindUser(arr, props.data.id).then(() => {
         message.success('操作成功');
         getTableData();
     });
 };
 
 /**
- * 获取钉钉部门用户
+ * 获取钉钉/微信部门用户
  */
 const getDeptUsers = async () => {
     let res = null;
@@ -304,14 +315,24 @@ const getBindUsers = async () => {
     return res?.result;
 };
 /**
- * 获取所有用户
+ * 获取所有用户未绑定的用户
  */
 const allUserList = ref([]);
 const getAllUsers = async () => {
-    const { result } = await configApi.getPlatformUsers();
+    const params = {
+        paging: false,
+        terms: [
+            {
+                column: `id$user-third$${props.data.type}_${props.data.provider}$not`,
+                value: props.data.id,
+            },
+        ],
+    };
+    const { result } = await configApi.getPlatformUsers(params);
     allUserList.value = result.map((m: any) => ({
         label: m.name,
         value: m.id,
+        ...m,
     }));
     return result;
 };
@@ -326,31 +347,36 @@ const getTableData = () => {
     Promise.all<any>([getDeptUsers(), getBindUsers(), getAllUsers()]).then(
         (res) => {
             dataSource.value = [];
-            const [deptUsers, bindUsers, allUsers] = res;
-            (deptUsers || []).forEach((item: any) => {
+            const [deptUsers, bindUsers, unBindUsers] = res;
+            (deptUsers || []).forEach((deptUser: any) => {
+                // 未绑定的用户
+                let unBindUser = unBindUsers.find(
+                    (f: any) => f.name === deptUser?.name,
+                );
                 // 绑定的用户
                 const bindUser = bindUsers.find(
-                    (f: any) => f.thirdPartyUserId === item.id,
-                );
-                // 平台用户
-                const allUser = allUsers.find(
-                    (f: any) => f.id === bindUser?.userId,
+                    (f: any) => f.thirdPartyUserId === deptUser.id,
                 );
+                if (bindUser) {
+                    unBindUser = unBindUsers.find(
+                        (f: any) => f.id === bindUser.userId,
+                    );
+                }
                 dataSource.value.push({
-                    thirdPartyUserId: item.id,
-                    thirdPartyUserName: item.name,
-                    userId: bindUser?.userId,
-                    userName: allUser
-                        ? `${allUser.name}(${allUser.username})`
+                    thirdPartyUserId: deptUser.id,
+                    thirdPartyUserName: deptUser.name,
+                    bindId: bindUser?.userId,
+                    userId: unBindUser?.id,
+                    userName: unBindUser
+                        ? `${unBindUser.name}(${unBindUser.username})`
                         : '',
                     status: {
                         text: bindUser?.providerName ? '已绑定' : '未绑定',
                         value: bindUser?.providerName ? 'success' : 'error',
                     },
-                    bindId: bindUser?.id,
                 });
             });
-            console.log('dataSource.value: ', dataSource.value);
+            // console.log('dataSource.value: ', dataSource.value);
         },
     );
     tableLoading.value = false;
@@ -434,8 +460,13 @@ const handleBindSubmit = () => {
 };
 const handleCancel = () => {
     bindVis.value = false;
-    resetFields()
+    resetFields();
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.model-body {
+    height: 600px;
+    overflow-y: auto;
+}
+</style>

From 164cec5aa5e05c1fd4974f55c756b6a9697d211f Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 24 Feb 2023 17:06:13 +0800
Subject: [PATCH 09/17] fix: bug#10191

---
 src/views/notice/Config/SyncUser/index.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/notice/Config/SyncUser/index.vue b/src/views/notice/Config/SyncUser/index.vue
index 2aa1a45f..cd985723 100644
--- a/src/views/notice/Config/SyncUser/index.vue
+++ b/src/views/notice/Config/SyncUser/index.vue
@@ -395,7 +395,11 @@ watch(
  */
 const bindVis = ref(false);
 const confirmLoading = ref(false);
-const formData = ref({ userId: '' });
+const formData = ref({
+    userId: '',
+    thirdPartyUserId: '',
+    thirdPartyUserName: '',
+});
 const formRules = ref({
     userId: [{ required: true, message: '请选择用户', trigger: 'change' }],
 });
@@ -407,7 +411,8 @@ const { resetFields, validate, validateInfos, clearValidate } = useForm(
 
 const handleBind = (row: any) => {
     bindVis.value = true;
-    formData.value = row;
+    // formData.value = row;
+    Object.assign(formData.value, row);
     getAllUsers();
 };
 
@@ -428,8 +433,8 @@ const filterOption = (input: string, option: any) => {
 const handleBindSubmit = () => {
     validate().then(async () => {
         const params = {
-            // providerName: formData.value.thirdPartyUserName,
-            // thirdPartyUserId: formData.value.thirdPartyUserId,
+            providerName: formData.value.thirdPartyUserName,
+            thirdPartyUserId: formData.value.thirdPartyUserId,
             userId: formData.value.userId,
         };
         confirmLoading.value = true;

From 1003130a4c5f94f283c9e22e2698829669edf3da Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 24 Feb 2023 17:19:00 +0800
Subject: [PATCH 10/17] fix: bug#10174

---
 .../Template/Detail/components/Attachments.vue    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/notice/Template/Detail/components/Attachments.vue b/src/views/notice/Template/Detail/components/Attachments.vue
index 4ed8b4ec..e77d0e20 100644
--- a/src/views/notice/Template/Detail/components/Attachments.vue
+++ b/src/views/notice/Template/Detail/components/Attachments.vue
@@ -92,10 +92,7 @@ const handleChange = (info: UploadChangeParam, id: string | undefined) => {
         const targetFileIdx = fileList.value.findIndex((f) => f.id === id);
         fileList.value[targetFileIdx].name = info.file.name;
         fileList.value[targetFileIdx].location = info.file.response?.result;
-        emit(
-            'update:attachments',
-            fileList.value.map(({ name, location }) => ({ name, location })),
-        );
+        emitEvents();
     }
 };
 
@@ -107,6 +104,7 @@ const handleDelete = (id: string | undefined) => {
     const idx = fileList.value.findIndex((f) => f.id === id);
 
     fileList.value.splice(idx, 1);
+    emitEvents();
 };
 
 /**
@@ -118,6 +116,15 @@ const handleAdd = () => {
         name: '',
         location: '',
     });
+
+    emitEvents();
+};
+
+const emitEvents = () => {
+    emit(
+        'update:attachments',
+        fileList.value.map(({ name, location }) => ({ name, location })),
+    );
 };
 
 /**

From 6a275ee983f529856cdeb48b9ecc4e5aebb25e79 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Fri, 24 Feb 2023 17:23:36 +0800
Subject: [PATCH 11/17] =?UTF-8?q?feat:=20=E5=91=8A=E8=AD=A6=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E5=91=8A=E8=AD=A6=E9=85=8D=E7=BD=AE40%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/rule-engine/configuration.ts          |  18 +-
 src/api/rule-engine/scene.ts                  |   4 +-
 .../Alarm/Configuration/Save/Base/index.vue   | 203 ++++++++++++++++++
 .../Alarm/Configuration/Save/Scene/index.vue  |   9 +
 .../Alarm/Configuration/Save/index.vue        |  23 ++
 .../rule-engine/Alarm/Configuration/index.vue | 146 ++++++++-----
 src/views/rule-engine/Alarm/Log/index.vue     |   9 +
 7 files changed, 353 insertions(+), 59 deletions(-)
 create mode 100644 src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
 create mode 100644 src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
 create mode 100644 src/views/rule-engine/Alarm/Configuration/Save/index.vue
 create mode 100644 src/views/rule-engine/Alarm/Log/index.vue

diff --git a/src/api/rule-engine/configuration.ts b/src/api/rule-engine/configuration.ts
index 08017c2e..1d31bcef 100644
--- a/src/api/rule-engine/configuration.ts
+++ b/src/api/rule-engine/configuration.ts
@@ -18,4 +18,20 @@ export const remove = (id:string) => server.remove(`/alarm/config/${id}`);
 /**
  * 手动触发告警
  */
-export const _execute = (data:any) => server.post('/scene/batch/_execute',data)
\ No newline at end of file
+export const _execute = (data:any) => server.post('/scene/batch/_execute',data);
+/**
+ * 下拉框场景数据
+ */
+export const getScene = (params:Record<string,any>) => server.get('/scene/_query/no-paging?paging=false',params);
+/**
+ * 获取配置类型
+ */
+export const getTargetTypes = () => server.get('/alarm/config/target-type/supports');
+/**
+ * 保存基本设置
+ */
+export const save = (data:any) =>server.post('/alarm/config',data);
+/**
+ * 获取基础设置数据
+ */
+export const detail = (id:string) => server.get(`/alarm/config/${id}`);
\ No newline at end of file
diff --git a/src/api/rule-engine/scene.ts b/src/api/rule-engine/scene.ts
index 28cd4b71..0ae3e8dd 100644
--- a/src/api/rule-engine/scene.ts
+++ b/src/api/rule-engine/scene.ts
@@ -5,4 +5,6 @@ export const modify = (id: string, data: any) => server.put(`/scene/${id}`, data
 
 export const save = (data: any) => server.post(`/scene`, data)
 
-export const detail = (id: string) => server.get(`/scene/${id}`)
\ No newline at end of file
+export const detail = (id: string) => server.get(`/scene/${id}`)
+
+export const query = (data: any) => server.post('/scene/_query/',data);
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
new file mode 100644
index 00000000..81b622a3
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
@@ -0,0 +1,203 @@
+<template>
+    <div>
+        <a-form layout="vertical" :rules="rule" :model="form" ref="formRef">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="名称" name="name">
+                        <a-input
+                            placeholder="请输入名称"
+                            v-model:value="form.name"
+                        ></a-input> </a-form-item
+                ></a-col>
+                <a-col :span="12">
+                    <a-form-item label="类型" name="targetType">
+                        <a-select
+                            :options="options"
+                            v-model:value="form.targetType"
+                            :disabled="selectDisable"
+                        ></a-select>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-form-item label="级别" name="level">
+                <a-radio-group v-model:value="form.level">
+                    <a-radio-button
+                        v-for="(item, index) in levelOption"
+                        :key="index"
+                        :value="item.value"
+                    >
+                        <div
+                            style="
+                                text-align: center;
+                                margin-top: 10px;
+                                font-size: 15px;
+                                width: 90%;
+                            "
+                        >
+                            <img
+                                :src="getImage(`/alarm/alarm${index + 1}.png`)"
+                                style="height: 40px"
+                                alt=""
+                            />{{ item.label }}
+                        </div>
+                    </a-radio-button>
+                </a-radio-group>
+            </a-form-item>
+            <a-form-item label="说明" name="description">
+                <a-textarea v-model:value="form.description"></a-textarea>
+            </a-form-item>
+            <a-button type="primary" @click="handleSave" :loading="loading"
+                >保存</a-button
+            >
+        </a-form>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { getTargetTypes, save, detail } from '@/api/rule-engine/configuration';
+import { queryLevel } from '@/api/rule-engine/config';
+import { query } from '@/api/rule-engine/scene';
+import { getImage } from '@/utils/comm';
+import { message } from 'ant-design-vue';
+import { useMenuStore } from '@/store/menu';
+import { useRoute } from 'vue-router';
+import { Store } from 'jetlinks-store';
+const route = useRoute();
+const id = route.query?.id;
+let selectDisable = ref(false);
+const queryData = () => {
+    if (id) {
+        detail(id).then((res) => {
+            if (res.status === 200) {
+                form.level = res?.result?.level;
+                form.name = res?.result?.name;
+                form.targetType = res?.result?.targetType;
+                form.description = res?.result?.description;
+                Store.set('configuration-data', res.result);
+                query({
+                    terms: [
+                        {
+                            terms: [
+                                {
+                                    column: 'id',
+                                    termType: 'alarm-bind-rule',
+                                    value: id,
+                                },
+                            ],
+                            type: 'and',
+                        },
+                    ],
+                    sorts: [
+                        {
+                            name: 'createTime',
+                            order: 'desc',
+                        },
+                    ],
+                }).then((resq) => {
+                    if (resq.status === 200) {
+                        selectDisable.value = !!resq.result.data?.length;
+                    }
+                });
+            }
+        });
+    }
+};
+const rule = {
+    name: [
+        {
+            required: true,
+            message: '请输入名称',
+        },
+        {
+            max: 64,
+            message: '最多输入64个字符',
+        },
+    ],
+    targetType: [
+        {
+            required: true,
+            message: '请选择类型',
+        },
+    ],
+    level: [
+        {
+            required: true,
+            message: '请选择级别',
+        },
+    ],
+    description: [
+        {
+            max: 200,
+            message: '最多可输入200个字符',
+        },
+    ],
+};
+let form = reactive({
+    level: '',
+    targetType: '',
+    name: '',
+    description: '',
+});
+let options = ref();
+let levelOption = ref();
+let loading = ref(false);
+const formRef = ref();
+const menuStory = useMenuStore();
+const getSupports = async () => {
+    let res = await getTargetTypes();
+    if (res.status === 200) {
+        options.value = res.result.map(
+            (item: { id: string; name: string }) => ({
+                label: item.name,
+                value: item.id,
+            }),
+        );
+    }
+};
+getSupports();
+const getLevel = () => {
+    queryLevel().then((res) => {
+        if (res.status === 200) {
+            levelOption.value = res.result?.levels
+                ?.filter((i: any) => i?.level && i?.title)
+                .map((item: { level: number; title: string }) => ({
+                    label: item.title,
+                    value: item.level,
+                }));
+        }
+    });
+};
+getLevel();
+const handleSave = async () => {
+    loading.value = true;
+    formRef.value
+        .validate()
+        .then(async () => {
+            const res = await save(form);
+            loading.value = false;
+            if (res.status === 200) {
+                message.success('操作成功');
+                menuStory.jumpPage(
+                    'rule-engine/Alarm/Configuration/Save',
+                    {},
+                    { id: res.result?.id },
+                );
+                if (!id) {
+                    Store.set('configuration-data', res.result);
+                }
+            }
+        })
+        .catch((error) => {
+            loading.value = false;
+            console.log(error);
+        });
+};
+queryData();
+</script>
+<style lang="less" scoped>
+.ant-radio-button-wrapper {
+    margin: 10px 15px 0 0;
+    width: 125px;
+    height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
new file mode 100644
index 00000000..016a7a4c
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
@@ -0,0 +1,9 @@
+<template>
+  <div>123</div>
+</template>
+
+<script lang="ts" setup>
+
+</script>
+<style lang="less" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/index.vue
new file mode 100644
index 00000000..bafdcba7
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/index.vue
@@ -0,0 +1,23 @@
+<template>
+        <page-container>
+            <a-card>
+                <a-tabs v-model:activeKey="activeKey">
+                    <a-tab-pane key="1" tab="基础配置">
+                        <Base/>
+                    </a-tab-pane>
+                    <a-tab-pane key="2" tab="关联场景联动">
+                        <Scene></Scene>
+                    </a-tab-pane>
+                    <a-tab-pane key="3" tab="告警记录"></a-tab-pane>
+                </a-tabs>
+            </a-card>
+        </page-container>
+</template>
+
+<script lang="ts" setup>
+import Base from './Base/index.vue';
+import Scene from './Scene/index.vue'
+const activeKey = ref('2');
+</script>
+<style lang="less" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Configuration/index.vue b/src/views/rule-engine/Alarm/Configuration/index.vue
index d507c780..29ba5a12 100644
--- a/src/views/rule-engine/Alarm/Configuration/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/index.vue
@@ -2,7 +2,7 @@
     <page-container>
         <div>
             <Search
-                :columns="query.columns"
+                :columns="columns"
                 target="device-instance"
                 @search="handleSearch"
             ></Search>
@@ -13,6 +13,7 @@
                 :defaultParams="{
                     sorts: [{ name: 'createTime', order: 'desc' }],
                 }"
+                :params="params"
             >
                 <template #headerTitle>
                     <a-space>
@@ -41,23 +42,27 @@
                             </slot>
                         </template>
                         <template #content>
-                            <h3 style="font-weight: 600">
-                                {{ slotProps.name }}
-                            </h3>
+                            <Ellipsis>
+                                <span style="font-weight: 600; font-size: 16px">
+                                    {{ slotProps.name }}
+                                </span>
+                            </Ellipsis>
                             <a-row>
                                 <a-col :span="12">
                                     <div class="content-des-title">
                                         关联场景联动
                                     </div>
-                                    <div class="rule-desc">
-                                        {{ (slotProps?.scene || []).map((item: any) => item?.name).join(',') || '' }}
-                                    </div>
+                                    <Ellipsis
+                                        ><div>
+                                            {{ (slotProps?.scene || []).map((item: any) => item?.name).join(',') || '' }}
+                                        </div></Ellipsis
+                                    >
                                 </a-col>
                                 <a-col :span="12">
                                     <div class="content-des-title">
                                         告警级别
                                     </div>
-                                    <div class="rule-desc">
+                                    <div>
                                         {{ (Store.get('default-level') || []).find((item: any) => item?.level === slotProps.level)?.title ||
             slotProps.level }}
                                     </div>
@@ -200,6 +205,7 @@ import {
     _disable,
     remove,
     _execute,
+    getScene,
 } from '@/api/rule-engine/configuration';
 import { queryLevel } from '@/api/rule-engine/config';
 import { Store } from 'jetlinks-store';
@@ -207,6 +213,8 @@ import type { ActionsType } from '@/components/Table/index.vue';
 import { message } from 'ant-design-vue';
 import { getImage } from '@/utils/comm';
 import { useMenuStore } from '@/store/menu';
+import encodeQuery from '@/utils/encodeQuery';
+import { useStorage } from '@vueuse/core';
 const params = ref<Record<string, any>>({});
 let isAdd = ref<number>(0);
 let title = ref<string>('');
@@ -217,35 +225,104 @@ const columns = [
         title: '名称',
         dataIndex: 'name',
         key: 'name',
+        search: {
+            type: 'string',
+        },
     },
     {
         title: '类型',
         dataIndex: 'targetType',
         key: 'targetType',
         scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                {
+                    label: '产品',
+                    value: 'product',
+                },
+                {
+                    label: '设备',
+                    value: 'device',
+                },
+                {
+                    label: '组织',
+                    value: 'org',
+                },
+                {
+                    label: '其他',
+                    value: 'other',
+                },
+            ],
+        },
     },
     {
         title: '告警级别',
         dataIndex: 'level',
         key: 'level',
         scopedSlots: true,
+        search: {
+            type: 'select',
+            options: async () => {
+                const res = await queryLevel();
+                if (res.status === 200) {
+                    return (res?.result?.levels || [])
+                        .filter((i: any) => i?.level && i?.title)
+                        .map((item: any) => ({
+                            label: item.title,
+                            value: item.level,
+                        }));
+                }
+                return [];
+            },
+        },
     },
     {
         title: '关联场景联动',
         dataIndex: 'sceneId',
         wdith: 250,
         scopedSlots: true,
+        search: {
+            type: 'select',
+            options: async () => {
+                const res = await getScene(
+                    encodeQuery({
+                        sorts: { createTime: 'desc' },
+                    }),
+                );
+                if(res.status === 200){
+                    return res.result.map((item:any) => ({label:item.name, value:item.id}))
+                }
+                return [];
+            },
+        },
     },
     {
         title: '状态',
         dataIndex: 'state',
         key: 'state',
         scopedSlots: true,
+        search: {
+                type: 'select',
+                options: [
+                    {
+                        label: '正常',
+                        value: 'enabled',
+                    },
+                    {
+                        label: '禁用',
+                        value: 'disabled',
+                    },
+                ],
+            },
     },
     {
         title: '说明',
         dataIndex: 'description',
         key: 'description',
+        search:{
+            type:'string',
+        }
     },
     {
         title: '操作',
@@ -261,44 +338,6 @@ const map = {
     org: '组织',
     other: '其他',
 };
-const query = {
-    columns: [
-        {
-            title: '名称',
-            dataIndex: 'name',
-            key: 'name',
-            search: {
-                type: 'string',
-            },
-        },
-        {
-            title: '状态',
-            dataIndex: 'state',
-            key: 'state',
-            search: {
-                type: 'select',
-                options: [
-                    {
-                        label: '正常',
-                        value: 'enabled',
-                    },
-                    {
-                        label: '禁用',
-                        value: 'disabled',
-                    },
-                ],
-            },
-        },
-        {
-            title: '说明',
-            key: 'description',
-            dataIndex: 'description',
-            search: {
-                type: 'string',
-            },
-        },
-    ],
-};
 const handleSearch = (e: any) => {
     params.value = e;
 };
@@ -357,9 +396,7 @@ const getActions = (
 
             icon: 'EditOutlined',
             onClick: () => {
-                title.value = '编辑';
-                isAdd.value = 2;
-                nextTick(() => {});
+                menuStory.jumpPage('rule-engine/Alarm/Configuration/Save',{},{id:data.id});
             },
         },
         {
@@ -423,17 +460,12 @@ const getActions = (
         return actions.filter((i: ActionsType) => i.key !== 'view');
     return actions;
 };
-const add = () =>{
-    // menuStory.jumpPage()
-}
+const add = () => {
+    menuStory.jumpPage('rule-engine/Alarm/Configuration/Save');
+};
 </script>
 <style lang="less" scoped>
 .content-des-title {
     font-size: 12px;
 }
-.rule-desc {
-    white-space: nowrap; /*强制在同一行内显示所有文本，直到文本结束或者遭遇br标签对象才换行。*/
-    overflow: hidden; /*超出部分隐藏*/
-    text-overflow: ellipsis; /*隐藏部分以省略号代替*/
-}
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Log/index.vue b/src/views/rule-engine/Alarm/Log/index.vue
new file mode 100644
index 00000000..d9e0a826
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Log/index.vue
@@ -0,0 +1,9 @@
+<template>
+  <div></div>
+</template>
+
+<script lang="ts" setup>
+
+</script>
+<style lang="less" scoped>
+</style>
\ No newline at end of file

From 8b842883ec2cafc78082fbe33b80c9bdf88e3d50 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 24 Feb 2023 17:46:14 +0800
Subject: [PATCH 12/17] =?UTF-8?q?feat:=20=E8=A7=86=E9=A2=91=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/media/Device/Save/index.vue | 10 ++++++----
 src/views/media/Device/index.vue      | 22 +++++++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/views/media/Device/Save/index.vue b/src/views/media/Device/Save/index.vue
index 760a4216..5f5e3397 100644
--- a/src/views/media/Device/Save/index.vue
+++ b/src/views/media/Device/Save/index.vue
@@ -51,7 +51,7 @@
                             v-bind="validateInfos.productId"
                         >
                             <a-row :gutter="[0, 10]">
-                                <a-col :span="22">
+                                <a-col :span="!!route.query.id ? 24 : 22">
                                     <a-select
                                         v-model:value="formData.productId"
                                         placeholder="请选择所属产品"
@@ -66,7 +66,7 @@
                                         </a-select-option>
                                     </a-select>
                                 </a-col>
-                                <a-col :span="2">
+                                <a-col :span="2" v-if="!route.query.id">
                                     <a-button
                                         type="link"
                                         @click="saveProductVis = true"
@@ -132,12 +132,11 @@
                                 placeholder="请输入说明"
                             />
                         </a-form-item>
-                        <a-form-item :wrapper-col="{ offset: 0, span: 3 }">
+                        <a-form-item>
                             <a-button
                                 type="primary"
                                 @click="handleSubmit"
                                 :loading="btnLoading"
-                                style="width: 100%"
                             >
                                 保存
                             </a-button>
@@ -356,6 +355,8 @@ const getDetail = async () => {
     // formData.value = res.result;
     Object.assign(formData.value, res.result);
     formData.value.channel = res.result.provider;
+
+    console.log('formData.value: ', formData.value);
 };
 
 onMounted(() => {
@@ -367,6 +368,7 @@ onMounted(() => {
  */
 const btnLoading = ref<boolean>(false);
 const handleSubmit = () => {
+    // console.log('formData.value: ', formData.value);
     validate()
         .then(async () => {
             btnLoading.value = true;
diff --git a/src/views/media/Device/index.vue b/src/views/media/Device/index.vue
index 39ad6b8c..bfdb016a 100644
--- a/src/views/media/Device/index.vue
+++ b/src/views/media/Device/index.vue
@@ -261,9 +261,13 @@ const getActions = (
             },
             icon: 'EditOutlined',
             onClick: () => {
-                menuStory.jumpPage('media/Device/Save', {
-                    id: data.id,
-                });
+                menuStory.jumpPage(
+                    'media/Device/Save',
+                    {},
+                    {
+                        id: data.id,
+                    },
+                );
             },
         },
         {
@@ -277,10 +281,14 @@ const getActions = (
                 // router.push(
                 //     `/media/device/Channel?id=${data.id}&type=${data.provider}`,
                 // );
-                menuStory.jumpPage('media/Device/Channel', {
-                    id: data.id,
-                    type: data.provider,
-                });
+                menuStory.jumpPage(
+                    'media/Device/Channel',
+                    {},
+                    {
+                        id: data.id,
+                        type: data.provider,
+                    },
+                );
             },
         },
         {

From 86ee86d11926cc72bb5b89797f896ca1e0e288b8 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Fri, 24 Feb 2023 17:58:44 +0800
Subject: [PATCH 13/17] =?UTF-8?q?update:=20=E5=BA=94=E7=94=A8=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/api/system/apply.ts                       |    5 +
 .../system/Apply/Save/components/EditForm.vue | 1265 +++++++++++++++++
 .../Apply/Save/components/FormLabel.vue       |   10 +-
 .../Apply/Save/components/RequestTable.vue    |  121 ++
 src/views/system/Apply/Save/index.vue         |  496 +------
 src/views/system/Apply/Save/typing.d.ts       |   87 +-
 6 files changed, 1479 insertions(+), 505 deletions(-)
 create mode 100644 src/views/system/Apply/Save/components/EditForm.vue
 create mode 100644 src/views/system/Apply/Save/components/RequestTable.vue

diff --git a/src/api/system/apply.ts b/src/api/system/apply.ts
index f1e30331..8318a97c 100644
--- a/src/api/system/apply.ts
+++ b/src/api/system/apply.ts
@@ -7,3 +7,8 @@ export const getApplyList_api = (data: any) => server.post(`/application/_query/
 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 getDepartmentList_api = () => server.get(`/organization/_all/tree`);
\ 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
new file mode 100644
index 00000000..9bc64a81
--- /dev/null
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -0,0 +1,1265 @@
+<template>
+    <div class="edit-form-container">
+        <a-form ref="formRef" :model="form.data" layout="vertical" class="form">
+            <a-form-item
+                label="名称"
+                name="name"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请输入名称',
+                    },
+                ]"
+            >
+                <a-input
+                    v-model:value="form.data.name"
+                    placeholder="请输入名称"
+                />
+            </a-form-item>
+            <a-form-item
+                label="应用"
+                name="provider"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请选择应用',
+                    },
+                ]"
+            >
+                <a-radio-group
+                    v-model:value="form.data.provider"
+                    class="radio-container"
+                    @change="form.data.integrationModes = []"
+                >
+                    <a-radio-button value="internal-standalone">
+                        <div>
+                            <a-image
+                                :preview="false"
+                                :src="getImage('/apply/provider1.png')"
+                                width="64px"
+                                height="64px"
+                            />
+                            <p>内部独立应用</p>
+                        </div>
+                    </a-radio-button>
+                    <a-radio-button value="internal-integrated">
+                        <div>
+                            <a-image
+                                :preview="false"
+                                :src="getImage('/apply/provider2.png')"
+                            />
+                            <p>内部集成应用</p>
+                        </div>
+                    </a-radio-button>
+                    <a-radio-button value="wechat-webapp">
+                        <div>
+                            <a-image
+                                :preview="false"
+                                :src="getImage('/apply/provider3.png')"
+                            />
+                            <p>微信网站应用</p>
+                        </div>
+                    </a-radio-button>
+                    <a-radio-button value="dingtalk-ent-app">
+                        <div>
+                            <a-image
+                                :preview="false"
+                                :src="getImage('/apply/provider4.png')"
+                            />
+                            <p>钉钉企业内部应用</p>
+                        </div>
+                    </a-radio-button>
+                    <a-radio-button value="third-party">
+                        <div>
+                            <a-image
+                                :preview="false"
+                                :src="getImage('/apply/provider5.png')"
+                            />
+                            <p>第三方应用</p>
+                        </div>
+                    </a-radio-button>
+                </a-radio-group>
+            </a-form-item>
+            <a-form-item
+                label="接入方式"
+                name="integrationModes"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请选择接入方式',
+                    },
+                ]"
+            >
+                <a-checkbox-group
+                    v-model:value="form.data.integrationModes"
+                    :options="joinOptions"
+                />
+            </a-form-item>
+
+            <a-collapse v-model:activeKey="form.integrationModesISO">
+                <!-- 页面集成 -->
+                <a-collapse-panel
+                    key="page"
+                    v-if="form.data.integrationModes.includes('page')"
+                    header="页面集成"
+                >
+                    <a-form-item
+                        :name="['page', 'baseUrl']"
+                        class="resetLabel"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请输入接入地址',
+                            },
+                        ]"
+                    >
+                        <template #label>
+                            <FormLabel
+                                text="接入地址"
+                                required
+                                tooltip="填写访问其它平台的地址"
+                            />
+                        </template>
+                        <a-input
+                            v-model:value="form.data.page.baseUrl"
+                            placeholder="请输入接入地址"
+                        />
+                    </a-form-item>
+                    <a-form-item
+                        label="路由方式"
+                        :name="['page', 'routeType']"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请选择路由方式',
+                            },
+                        ]"
+                    >
+                        <a-select v-model:value="form.data.page.routeType">
+                            <a-select-option value="hash">hash</a-select-option>
+                            <a-select-option value="history"
+                                >history</a-select-option
+                            >
+                        </a-select>
+                    </a-form-item>
+
+                    <a-form-item v-if="form.data.provider === 'third-party'">
+                        <template #label>
+                            <FormLabel
+                                text="参数"
+                                tooltip="自定义参数,格式${name}"
+                            />
+                        </template>
+
+                        <RequestTable
+                            v-model:value="form.data.page.parameters"
+                        />
+                    </a-form-item>
+                </a-collapse-panel>
+                <!-- API客户端 -->
+                <a-collapse-panel
+                    key="apiClient"
+                    v-if="form.data.integrationModes.includes('apiClient')"
+                    header="API客户端"
+                >
+                    <a-form-item
+                        class="resetLabel"
+                        :name="['apiClient', 'baseUrl']"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请输入接口地址',
+                            },
+                        ]"
+                    >
+                        <template #label>
+                            <FormLabel
+                                text="接口地址"
+                                required
+                                tooltip="访问Api服务的地址"
+                            />
+                        </template>
+                        <a-input
+                            v-model:value="form.data.apiClient.baseUrl"
+                            placeholder="请输入接口地址"
+                        />
+                    </a-form-item>
+                    <div v-if="form.data.provider === 'internal-standalone'">
+                        <a-form-item
+                            class="resetLabel"
+                            :name="[
+                                'apiClient',
+                                'authConfig',
+                                'oauth2',
+                                'authorizationUrl',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入授权地址',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="授权地址"
+                                    required
+                                    tooltip="认证授权地址"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.apiClient.authConfig.oauth2
+                                        .authorizationUrl
+                                "
+                                placeholder="请输入授权地址"
+                            />
+                        </a-form-item>
+                        <a-form-item
+                            class="resetLabel"
+                            :name="[
+                                'apiClient',
+                                'authConfig',
+                                'oauth2',
+                                'tokenUrl',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入token地址',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="token地址"
+                                    required
+                                    tooltip="设置token令牌的地址"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.apiClient.authConfig.oauth2
+                                        .tokenUrl
+                                "
+                                placeholder="请输入token地址"
+                            />
+                        </a-form-item>
+                        <a-form-item>
+                            <template #label>
+                                <FormLabel
+                                    text="回调地址"
+                                    tooltip="授权完成后跳转到具体页面的回调地址"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.apiClient.authConfig.oauth2
+                                        .redirectUri
+                                "
+                                placeholder="请输入回调地址"
+                            />
+                        </a-form-item>
+                        <a-form-item
+                            class="resetLabel"
+                            :name="[
+                                'apiClient',
+                                'authConfig',
+                                'oauth2',
+                                'clientId',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入appId',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="appId"
+                                    required
+                                    tooltip="第三方应用唯一标识"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.apiClient.authConfig.oauth2
+                                        .clientId
+                                "
+                                placeholder="请输入appId"
+                            />
+                        </a-form-item>
+                        <a-form-item
+                            class="resetLabel"
+                            :name="[
+                                'apiClient',
+                                'authConfig',
+                                'oauth2',
+                                'clientSecret',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入appKey',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="appKey"
+                                    required
+                                    tooltip="第三方应用唯一标识的密钥"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.apiClient.authConfig.oauth2
+                                        .clientSecret
+                                "
+                                placeholder="请输入appKey"
+                            />
+                        </a-form-item>
+                    </div>
+                    <div v-else-if="form.data.provider === 'third-party'">
+                        <a-form-item
+                            label="认证方式"
+                            :name="['apiClient', 'authConfig', 'type']"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请选择认证方式',
+                                },
+                            ]"
+                        >
+                            <a-select
+                                v-model:value="
+                                    form.data.apiClient.authConfig.type
+                                "
+                            >
+                                <a-select-option value="oauth2">
+                                    OAuth2
+                                </a-select-option>
+                                <a-select-option value="basic">
+                                    基本认证
+                                </a-select-option>
+                                <a-select-option value="bearer">
+                                    bearer认证
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                        <div
+                            v-if="
+                                form.data.apiClient.authConfig.type === 'oauth2'
+                            "
+                        >
+                            <a-form-item
+                                class="resetLabel"
+                                :name="[
+                                    'apiClient',
+                                    'authConfig',
+                                    'oauth2',
+                                    'authorizationUrl',
+                                ]"
+                                :rules="[
+                                    {
+                                        required: true,
+                                        message: '请输入授权地址',
+                                    },
+                                ]"
+                            >
+                                <template #label>
+                                    <FormLabel
+                                        text="授权地址"
+                                        required
+                                        tooltip="认证授权地址"
+                                    />
+                                </template>
+                                <a-input
+                                    v-model:value="
+                                        form.data.apiClient.authConfig.oauth2
+                                            .authorizationUrl
+                                    "
+                                    placeholder="请输入授权地址"
+                                />
+                            </a-form-item>
+
+                            <a-form-item
+                                label="请求方式"
+                                :name="[
+                                    'apiClient',
+                                    'authConfig',
+                                    'oauth2',
+                                    'tokenRequestType',
+                                ]"
+                                :rules="[
+                                    {
+                                        required: true,
+                                        message: '请选择认证方式',
+                                    },
+                                ]"
+                            >
+                                <a-select
+                                    v-model:value="
+                                        form.data.apiClient.authConfig.oauth2
+                                            .tokenRequestType
+                                    "
+                                >
+                                    <a-select-option value="POST_BODY">
+                                        请求体
+                                    </a-select-option>
+                                    <a-select-option value="POST_URI">
+                                        请求头
+                                    </a-select-option>
+                                </a-select>
+                            </a-form-item>
+
+                            <a-form-item
+                                class="resetLabel"
+                                :name="[
+                                    'apiClient',
+                                    'authConfig',
+                                    'oauth2',
+                                    'clientId',
+                                ]"
+                                :rules="[
+                                    {
+                                        required: true,
+                                        message: '请输入client_id',
+                                    },
+                                ]"
+                            >
+                                <template #label>
+                                    <FormLabel
+                                        text="client_id"
+                                        required
+                                        tooltip="应用唯一标识"
+                                    />
+                                </template>
+                                <a-input
+                                    v-model:value="
+                                        form.data.apiClient.authConfig.oauth2
+                                            .clientId
+                                    "
+                                    placeholder="请输入client_id"
+                                />
+                            </a-form-item>
+                            <a-form-item
+                                class="resetLabel"
+                                :name="[
+                                    'apiClient',
+                                    'authConfig',
+                                    'oauth2',
+                                    'clientSecret',
+                                ]"
+                                :rules="[
+                                    {
+                                        required: true,
+                                        message: '请输入client_secret',
+                                    },
+                                ]"
+                            >
+                                <template #label>
+                                    <FormLabel
+                                        text="client_secret"
+                                        required
+                                        tooltip="应用唯一标识的秘钥"
+                                    />
+                                </template>
+                                <a-input
+                                    v-model:value="
+                                        form.data.apiClient.authConfig.oauth2
+                                            .clientSecret
+                                    "
+                                    placeholder="请输入client_secret"
+                                />
+                            </a-form-item>
+                        </div>
+                        <div
+                            v-else-if="
+                                form.data.apiClient.authConfig.type === 'basic'
+                            "
+                        >
+                            <a-form-item
+                                label="用户名"
+                                :name="[
+                                    'apiClient',
+                                    'authConfig',
+                                    'basic',
+                                    'username',
+                                ]"
+                                :rules="[
+                                    {
+                                        required: true,
+                                        message: '请输入用户名',
+                                    },
+                                ]"
+                            >
+                                <a-input
+                                    v-model:value="
+                                        form.data.apiClient.authConfig.basic
+                                            .username
+                                    "
+                                    placeholder="请输入用户名"
+                                />
+                            </a-form-item>
+                            <a-form-item
+                                label="密码"
+                                :name="[
+                                    'apiClient',
+                                    'authConfig',
+                                    'basic',
+                                    'password',
+                                ]"
+                                :rules="[
+                                    {
+                                        required: true,
+                                        message: '请输入密码',
+                                    },
+                                ]"
+                            >
+                                <a-input
+                                    v-model:value="
+                                        form.data.apiClient.authConfig.basic
+                                            .password
+                                    "
+                                    placeholder="请输入密码"
+                                />
+                            </a-form-item>
+                        </div>
+                        <div
+                            v-else-if="
+                                form.data.apiClient.authConfig.type === 'bearer'
+                            "
+                        >
+                            <a-form-item
+                                label="token"
+                                :name="[
+                                    'apiClient',
+                                    'authConfig',
+                                    'oauth2',
+                                    'tokenUrl',
+                                ]"
+                                :rules="[
+                                    {
+                                        required: true,
+                                        message: '请输入token',
+                                    },
+                                ]"
+                            >
+                                <a-input
+                                    v-model:value="
+                                        form.data.apiClient.authConfig.oauth2
+                                            .tokenUrl
+                                    "
+                                    placeholder="请输入token"
+                                />
+                            </a-form-item>
+                        </div>
+                    </div>
+
+                    <div
+                        v-if="
+                            form.data.provider === 'internal-standalone' ||
+                            form.data.provider === 'third-party'
+                        "
+                    >
+                        <a-form-item>
+                            <template #label>
+                                <FormLabel
+                                    text="请求头"
+                                    tooltip="根据不同应用的调用规范，自定义请求头内容"
+                                />
+                            </template>
+
+                            <RequestTable
+                                v-model:value="form.data.apiClient.headers"
+                            />
+                        </a-form-item>
+                        <a-form-item label="参数">
+                            <RequestTable
+                                v-model:value="form.data.apiClient.parameters"
+                            />
+                        </a-form-item>
+                    </div>
+                </a-collapse-panel>
+                <!-- API服务 -->
+                <a-collapse-panel
+                    key="apiServer"
+                    v-if="form.data.integrationModes.includes('apiServer')"
+                    header="API服务"
+                >
+                    <a-form-item
+                        class="resetLabel"
+                        v-if="!form.data.integrationModes.includes('apiClient')"
+                        :name="['apiServer', 'appId']"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请输入appId',
+                            },
+                        ]"
+                    >
+                        <template #label>
+                            <FormLabel
+                                text="appId"
+                                required
+                                tooltip="第三方应用唯一标识"
+                            />
+                        </template>
+                        <a-input
+                            v-model:value="
+                                form.data.apiClient.authConfig.oauth2.clientId
+                            "
+                            disabled
+                            placeholder="请输入appId"
+                        />
+                    </a-form-item>
+
+                    <a-form-item
+                        class="resetLabel"
+                        :name="['apiServer', 'secureKey']"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请输入secureKey',
+                            },
+                        ]"
+                    >
+                        <template #label>
+                            <FormLabel
+                                text="secureKey"
+                                required
+                                tooltip="第三方应用唯一标识匹配的秘钥"
+                            />
+                        </template>
+                        <a-input
+                            v-model:value="form.data.apiServer.secureKey"
+                            placeholder="请输入secureKey"
+                        />
+                    </a-form-item>
+                    <a-form-item
+                        class="resetLabel"
+                        v-if="form.data.provider === 'internal-standalone'"
+                    >
+                        <template #label>
+                            <FormLabel
+                                text="回调地址"
+                                tooltip="授权完成后跳转到具体页面的回调地址"
+                            />
+                        </template>
+                        <a-input
+                            v-model:value="form.data.apiServer.redirectUri"
+                            placeholder="请输入redirectUri"
+                        />
+                    </a-form-item>
+                    <a-form-item
+                        class="resetLabel"
+                        :name="['apiServer', 'roleIdList']"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请选中角色',
+                            },
+                        ]"
+                    >
+                        <template #label>
+                            <FormLabel
+                                text="角色"
+                                required
+                                tooltip="为应用用户分配角色，根据绑定的角色，进行系统菜单赋权"
+                            />
+                        </template>
+                        <a-select
+                            v-model:value="form.data.apiServer.roleIdList"
+                            :options="form.roleIdList"
+                            placeholder="请选中角色"
+                        ></a-select>
+                        <PermissionButton
+                            :uhasPermission="`${rolePermission}:update`"
+                            type="link"
+                            @click="clickAddItem('roleIdList', 'Role')"
+                            class="add-item"
+                        >
+                            <AIcon type="PlusOutlined" />
+                        </PermissionButton>
+                    </a-form-item>
+                    <a-form-item>
+                        <template #label>
+                            <FormLabel
+                                text="组织"
+                                tooltip="为应用用户分配所属组织，根据绑定的组织，进行数据隔离"
+                            />
+                        </template>
+                        <a-tree-select
+                            v-model:value="form.data.apiServer.orgIdList"
+                            show-search
+                            style="width: 100%"
+                            :dropdown-style="{
+                                maxHeight: '400px',
+                                overflow: 'auto',
+                            }"
+                            :fieldNames="{
+                                label: 'name',
+                                value: 'id',
+                            }"
+                            multiple
+                            :tree-data="form.orgIdList"
+                            placeholder="请选择组织"
+                        >
+                            <template #title="{ name }">
+                                {{ name }}
+                            </template>
+                        </a-tree-select>
+                        <PermissionButton
+                            :uhasPermission="`${deptPermission}:update`"
+                            type="link"
+                            @click="clickAddItem('roleIdList', 'Role')"
+                            class="add-item"
+                        >
+                            <AIcon type="PlusOutlined" />
+                        </PermissionButton>
+                    </a-form-item>
+
+                    <div v-if="form.data.provider === 'third-party'">
+                        <a-form-item>
+                            <template #label>
+                                <FormLabel
+                                    text="redirectUrl"
+                                    tooltip="授权后自动跳转的页面地址"
+                                />
+                            </template>
+                            <a-input v-model:value="form.data.apiServer.redirectUri" placeholder="请输入redirectUrl" />
+                        </a-form-item>
+                        <a-form-item label="IP白名单">
+                            <a-textarea
+                                v-model:value="form.data.apiServer.ipWhiteList"
+                                placeholder="请输入IP白名单，多个地址回车分隔，不填默认均可访问"
+                                :rows="3"
+                                style="width: 100%"
+                            />
+                        </a-form-item>
+                    </div>
+                </a-collapse-panel>
+                <!-- 单点登录 -->
+                <a-collapse-panel
+                    key="ssoClient"
+                    v-if="form.data.integrationModes.includes('ssoClient')"
+                    header="单点登录"
+                >
+                    <a-form-item
+                        class="resetLabel"
+                        :name="[
+                            'apiClient',
+                            'authConfig',
+                            'oauth2',
+                            'authorizationUrl',
+                        ]"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请输入授权地址',
+                            },
+                        ]"
+                    >
+                        <template #label>
+                            <FormLabel
+                                text="授权地址"
+                                required
+                                tooltip="认证授权地址"
+                            />
+                        </template>
+                        <a-input
+                            v-model:value="
+                                form.data.apiClient.authConfig.oauth2
+                                    .authorizationUrl
+                            "
+                            placeholder="请输入授权地址"
+                        />
+                    </a-form-item>
+                    <a-form-item>
+                        <template #label>
+                            <FormLabel
+                                text="回调地址"
+                                tooltip="授权完成后跳转到具体页面的回调地址"
+                            />
+                        </template>
+                        <a-input
+                            v-model:value="
+                                form.data.apiClient.authConfig.oauth2
+                                    .redirectUri
+                            "
+                            placeholder="请输入回调地址"
+                        />
+                    </a-form-item>
+                    <a-form-item
+                        class="resetLabel"
+                        :name="[
+                            'apiClient',
+                            'authConfig',
+                            'oauth2',
+                            'clientId',
+                        ]"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请输入appId',
+                            },
+                        ]"
+                    >
+                        <template #label>
+                            <FormLabel
+                                text="appId"
+                                required
+                                tooltip="第三方应用唯一标识"
+                            />
+                        </template>
+                        <a-input
+                            v-model:value="
+                                form.data.apiClient.authConfig.oauth2.clientId
+                            "
+                            disabled
+                            placeholder="请输入appId"
+                        />
+                    </a-form-item>
+                    <a-form-item
+                        class="resetLabel"
+                        :name="[
+                            'apiClient',
+                            'authConfig',
+                            'oauth2',
+                            'clientSecret',
+                        ]"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请输入appKey',
+                            },
+                        ]"
+                    >
+                        <template #label>
+                            <FormLabel
+                                text="appKey"
+                                required
+                                tooltip="第三方应用唯一标识的密钥"
+                            />
+                        </template>
+                        <a-input
+                            v-model:value="
+                                form.data.apiClient.authConfig.oauth2
+                                    .clientSecret
+                            "
+                            placeholder="请输入appKey"
+                        />
+                    </a-form-item>
+
+                    <a-form-item class="resetLabel">
+                        <template #label>
+                            <FormLabel
+                                text="自动创建用户"
+                                required
+                                tooltip="开启后，第三方用户第一次授权登录系统时，无需进入授权绑定页面。系统默认创建一个新用户与之绑定。"
+                            />
+                        </template>
+                        <a-switch
+                            v-model:checked="
+                                form.data.apiClient.authConfig.oauth2
+                                    .clientSecret
+                            "
+                        />
+                    </a-form-item>
+                    <a-form-item
+                        label="用户名前缀"
+                        :name="[
+                            'apiClient',
+                            'authConfig',
+                            'oauth2',
+                            'clientSecret',
+                        ]"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请输入用户名前缀',
+                            },
+                        ]"
+                    >
+                        <a-input
+                            v-model:value="
+                                form.data.apiClient.authConfig.oauth2
+                                    .clientSecret
+                            "
+                            placeholder="请输入用户名前缀"
+                        />
+                    </a-form-item>
+                    <a-form-item
+                        label="默认密码"
+                        :name="[
+                            'apiClient',
+                            'authConfig',
+                            'oauth2',
+                            'clientSecret',
+                        ]"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请输入默认密码',
+                            },
+                        ]"
+                    >
+                        <a-input
+                            v-model:value="
+                                form.data.apiClient.authConfig.oauth2
+                                    .clientSecret
+                            "
+                            placeholder="请输入默认密码"
+                        />
+                    </a-form-item>
+
+                    <a-form-item label="角色">
+                        <a-select
+                            v-model:value="form.data.apiServer.roleIdList"
+                            :options="form.roleIdList"
+                            placeholder="请选中角色"
+                        ></a-select>
+                        <PermissionButton
+                            :uhasPermission="`${rolePermission}:update`"
+                            type="link"
+                            @click="clickAddItem('roleIdList', 'Role')"
+                            class="add-item"
+                        >
+                            <AIcon type="PlusOutlined" />
+                        </PermissionButton>
+                    </a-form-item>
+                    <a-form-item label="组织">
+                        <a-tree-select
+                            v-model:value="form.data.apiServer.orgIdList"
+                            show-search
+                            style="width: 100%"
+                            :dropdown-style="{
+                                maxHeight: '400px',
+                                overflow: 'auto',
+                            }"
+                            :fieldNames="{
+                                label: 'name',
+                                value: 'id',
+                            }"
+                            multiple
+                            :tree-data="form.orgIdList"
+                            placeholder="请选择组织"
+                        >
+                            <template #title="{ name }">
+                                {{ name }}
+                            </template>
+                        </a-tree-select>
+                        <PermissionButton
+                            :uhasPermission="`${deptPermission}:update`"
+                            type="link"
+                            @click="clickAddItem('roleIdList', 'Role')"
+                            class="add-item"
+                        >
+                            <AIcon type="PlusOutlined" />
+                        </PermissionButton>
+                    </a-form-item>
+                </a-collapse-panel>
+            </a-collapse>
+
+            <a-form-item label="说明" name="description">
+                <a-textarea
+                    v-model:value="form.data.description"
+                    placeholder="请输入说明"
+                    showCount
+                    :maxlength="200"
+                    :rows="3"
+                    style="width: 100%"
+                />
+            </a-form-item>
+        </a-form>
+
+        <a-button v-if="!routeQuery.view" @click="clickSave">
+            {{ routeQuery.view }}保存
+        </a-button>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { getDepartmentList_api } from '@/api/system/apply';
+import FormLabel from './FormLabel.vue';
+import RequestTable from './RequestTable.vue';
+import { getImage } from '@/utils/comm';
+import type { formType, dictType, optionsType } from '../typing';
+import { getRoleList_api } from '@/api/system/user';
+import { FormInstance } from 'ant-design-vue';
+
+const emit = defineEmits(['changeApplyType']);
+const routeQuery = useRoute().query;
+
+const deptPermission = 'system/Department';
+const rolePermission = 'system/Role';
+
+const initForm: formType = {
+    name: '',
+    provider: 'internal-standalone',
+    integrationModes: [],
+    config: '',
+    description: '',
+    page: {
+        // 页面集成
+        baseUrl: '',
+        routeType: 'hash',
+        parameters: [{ label: '', value: '' }],
+    },
+    apiClient: {
+        // API客户端
+        baseUrl: '',
+        headers: [{ label: '', value: '' }], // 请求头
+        parameters: [{ label: '', value: '' }], // 请求参数
+        authConfig: {
+            // API客户端
+            type: 'oauth2', // 类型, 可选值：none, bearer, oauth2, basic, other
+            bearer: { token: '' }, // 授权信息
+            basic: { username: '', password: '' }, // 基本信息
+            oauth2: {
+                // OAuth2信息
+                authorizationUrl: '', // 授权地址
+                tokenUrl: '', // token地址
+                redirectUri: '', // 重定向地址
+                clientId: '', // 客户端ID
+                clientSecret: '', // 客户端密钥
+                grantType: '', // 类型
+                accessTokenProperty: '', // token属性名
+                tokenRequestType: '', // token请求方式, 可选值：POST_URI，POST_BODY
+            },
+        },
+    },
+    apiServer: {
+        // API服务
+        appId: '',
+        secureKey: '', // 密钥
+        redirectUri: '', // 重定向URL
+        roleIdList: [], // 角色列表
+        orgIdList: [], // 部门列表
+        ipWhiteList: '', // IP白名单
+        signature: '', // 签名方式, 可选值：MD5，SHA256
+        enableOAuth2: false, // 是否启用OAuth2
+    },
+    sso: {
+        // 统一单点登陆集成
+        configuration: {
+            // 配置
+            oauth2: {
+                // Oauth2单点登录配置
+                authorizationUrl: '', // 授权地址
+                redirectUri: '', // 重定向地址
+                clientId: '', // 客户端ID
+                clientSecret: '', // 客户端密钥
+                userInfoUrl: '', // 用户信息接口
+                scope: '', // scope
+                userProperty: {
+                    // 用户属性字段信息
+                    userId: '', // 用户ID
+                    username: '', // 用户名
+                    name: '', // 名称
+                    avatar: '', // 头像
+                    email: '', // 邮箱
+                    telephone: '', // 电话
+                    description: '', // 说明
+                },
+                grantType: '', // 类型
+                tokenUrl: '', // token地址
+                accessTokenProperty: '', // token属性名
+                tokenRequestType: '', // token请求方式
+            },
+            appId: '', // 微信单点登录配置
+            appKey: '', // 钉钉单点登录配置
+            appSecret: '', // 钉钉、微信单点登录配置
+        },
+        autoCreateUser: false, // 是否自动创建平台用户
+        usernamePrefix: '', // 用户ID前缀
+        roleIdList: [], // 自动创建平台用户时角色列表
+        orgIdList: [], // 自动创建平台用户时部门列表
+        defaultPasswd: '', // 默认密码
+    },
+};
+const formRef = ref<FormInstance>();
+const form = reactive({
+    data: { ...initForm },
+    integrationModesISO: [] as string[],
+    roleIdList: [] as optionsType,
+    orgIdList: [] as dictType,
+});
+// 接入方式的选项
+const joinOptions = computed(() => {
+    if (form.data.provider === 'internal-standalone')
+        return [
+            {
+                label: '页面集成',
+                value: 'page',
+            },
+            {
+                label: 'API客户端',
+                value: 'apiClient',
+            },
+            {
+                label: 'API服务',
+                value: 'apiServer',
+            },
+            {
+                label: '单点登录',
+                value: 'ssoClient',
+            },
+        ];
+    else if (form.data.provider === 'internal-integrated')
+        return [
+            {
+                label: '页面集成',
+                value: 'page',
+            },
+            {
+                label: 'API客户端',
+                value: 'apiClient',
+            },
+        ];
+    else if (form.data.provider === 'wechat-webapp')
+        return [
+            {
+                label: '单点登录',
+                value: 'ssoClient',
+            },
+        ];
+    else if (form.data.provider === 'dingtalk-ent-app')
+        return [
+            {
+                label: '单点登录',
+                value: 'ssoClient',
+            },
+        ];
+    else if (form.data.provider === 'third-party')
+        return [
+            {
+                label: '页面集成',
+                value: 'page',
+            },
+            {
+                label: 'API客户端',
+                value: 'apiClient',
+            },
+            {
+                label: 'API服务',
+                value: 'apiServer',
+            },
+            {
+                label: '单点登录',
+                value: 'ssoClient',
+            },
+        ];
+});
+
+init();
+
+function init() {
+    getRoleIdList();
+    getOrgIdList();
+
+    watch(
+        () => form.data.provider,
+        (n) => {
+            emit('changeApplyType', n);
+        },
+        { immediate: true },
+    );
+}
+
+// 获取角色列表
+function getRoleIdList() {
+    getRoleList_api().then((resp) => {
+        if (resp.status === 200) {
+            const result = resp.result as dictType;
+            form.roleIdList = result.map((item) => ({
+                label: item.name,
+                value: item.id,
+            }));
+        }
+    });
+}
+// 获取组织列表
+function getOrgIdList() {
+    getDepartmentList_api().then((resp) => {
+        if (resp.status === 200) {
+            form.orgIdList = resp.result as dictType;
+        }
+    });
+}
+// 添加角色/组织
+function clickAddItem(prop: 'roleIdList' | 'orgIdList', target: string) {
+    const tab: any = window.open(`${origin}/#/system/${target}?save=true`);
+    tab.onSaveSuccess = (value: string) => {
+        form.data.apiServer[prop] = [
+            ...(form.data.apiServer[prop] || []),
+            value,
+        ];
+        if (prop === 'roleIdList') getRoleIdList();
+        else getOrgIdList();
+    };
+}
+// 保存
+function clickSave() {
+    formRef.value?.validate().then((resp) => {
+        console.log('save');
+    });
+}
+
+function test(...args: any[]) {
+    console.log('test:', args);
+}
+</script>
+
+<style lang="less" scoped>
+.edit-form-container {
+    .form {
+        .ant-form-item {
+            &.resetLabel {
+                :deep(.ant-form-item-required) {
+                    &::before {
+                        display: none;
+                    }
+                }
+            }
+
+            :deep(.ant-form-item-control) {
+                .ant-form-item-control-input-content {
+                    display: flex;
+                }
+            }
+        }
+        .radio-container {
+            .ant-radio-button-wrapper {
+                height: 120px;
+                width: 120px;
+                padding: 0 15px;
+                box-sizing: content-box;
+                margin-right: 20px;
+
+                > :last-child {
+                    width: 100%;
+                    height: 100%;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+
+                    > div {
+                        width: 100%;
+                        text-align: center;
+                    }
+                    :deep(.ant-image) {
+                        width: 64px;
+                        height: 64px;
+                    }
+                    p {
+                        margin: 0;
+                    }
+                }
+            }
+        }
+    }
+}
+</style>
diff --git a/src/views/system/Apply/Save/components/FormLabel.vue b/src/views/system/Apply/Save/components/FormLabel.vue
index 814de405..4be698bd 100644
--- a/src/views/system/Apply/Save/components/FormLabel.vue
+++ b/src/views/system/Apply/Save/components/FormLabel.vue
@@ -1,10 +1,10 @@
 <template>
     <div class="form-label-container">
         <span class="text">{{ props.text }}</span>
-        <span class="required">*</span>
+        <span class="required" v-show="props.required">*</span>
         <a-tooltip>
             <template #title>{{ props.tooltip }}</template>
-            <AIcon type="QuestionCircleOutlined" style="color: #00000073;cursor: inherit;" />
+            <AIcon type="QuestionCircleOutlined" class="icon" />
         </a-tooltip>
     </div>
 </template>
@@ -24,11 +24,15 @@ const props = defineProps<{
 
     .required {
         display: inline-block;
-        margin-right: 4px;
         color: #ff4d4f;
         font-size: 14px;
         font-family: SimSun, sans-serif;
         line-height: 1;
     }
+    .icon {
+        color: #00000073;
+        cursor: inherit;
+        margin-left: 4px;
+    }
 }
 </style>
diff --git a/src/views/system/Apply/Save/components/RequestTable.vue b/src/views/system/Apply/Save/components/RequestTable.vue
new file mode 100644
index 00000000..f5e1c55d
--- /dev/null
+++ b/src/views/system/Apply/Save/components/RequestTable.vue
@@ -0,0 +1,121 @@
+<template>
+    <div class="request-table-container">
+        <a-table
+            :columns="columns"
+            :data-source="tableData"
+            :pagination="false"
+            size="small"
+            bordered
+        >
+            <template #bodyCell="{ column, record, index }">
+                <template v-if="column.dataIndex === 'key'">
+                    <a-input v-model:value="record.label" />
+                </template>
+                <template v-else-if="column.dataIndex === 'value'">
+                    <a-input v-model:value="record.value" />
+                </template>
+                <template v-else-if="column.dataIndex === 'action'">
+                    <a-button
+                        type="link"
+                        @click="removeRow((current - 1) * 10 + index)"
+                    >
+                        <AIcon type="DeleteOutlined" />
+                    </a-button>
+                </template>
+            </template>
+        </a-table>
+        <a-pagination
+            v-show="props.value.length > 10"
+            v-model:current="current"
+            :page-size="10"
+            :total="props.value.length"
+            show-less-items
+        />
+        <a-button type="dashed" @click="addRow" class="add-btn">
+            <AIcon type="PlusOutlined" />新增
+        </a-button>
+    </div>
+</template>
+
+<script setup lang="ts">
+import type { optionsType } from '../typing';
+
+const emits = defineEmits(['update:value']);
+const props = defineProps<{
+    value: optionsType;
+}>();
+const columns = [
+    {
+        title: 'KEY',
+        dataIndex: 'key',
+    },
+    {
+        title: 'VALUE',
+        dataIndex: 'value',
+    },
+    {
+        title: ' ',
+        dataIndex: 'action',
+    },
+];
+
+const current = ref<number>(1);
+
+const tableData = computed(() => {
+    return props.value.slice((current.value - 1) * 10, current.value * 10);
+});
+
+watch(
+    () => props.value,
+    (n, o) => {
+        if (!o || n.length === o.length) return;
+        // 如果是新增行操作
+        else if (n.length > o.length) {
+            // 若新增后会出现新一页，则跳转到最新的一页
+            if (o.length % 10 === 0 && n.length > 10)
+                current.value = current.value + 1;
+        } else {
+            // 如果是删除行操作
+            // 若删除的行是本页的最后一行，且本页不是第一页，则跳转到上一页
+            if (o.length % 10 === 1 && o.length > 10)
+                current.value = current.value - 1;
+        }
+    },
+    {
+        immediate: true,
+    },
+);
+
+function removeRow(index: number) {
+    const left = props.value.slice(0, index++);
+    const right = props.value.slice(index, props.value.length);
+    emits('update:value', [...left, ...right]);
+}
+function addRow() {
+    const newRow = {
+        label: '',
+        value: '',
+    };
+    console.log(111);
+
+    emits('update:value', [...props.value, newRow]);
+}
+</script>
+
+<style lang="less" scoped>
+.request-table-container {
+    width: 100%;
+    :deep(.ant-btn-link) {
+        color: #000000d9;
+
+        &:hover {
+            color: #1d39c4;
+        }
+    }
+    .add-btn {
+        width: 100%;
+        display: block;
+        margin-top: 10px;
+    }
+}
+</style>
diff --git a/src/views/system/Apply/Save/index.vue b/src/views/system/Apply/Save/index.vue
index 8689f773..b18dfb58 100644
--- a/src/views/system/Apply/Save/index.vue
+++ b/src/views/system/Apply/Save/index.vue
@@ -3,351 +3,9 @@
         <a-card class="save-container">
             <a-row :gutter="24">
                 <a-col :span="14">
-                    <a-form
-                        ref="formRef"
-                        :model="form.data"
-                        layout="vertical"
-                        class="form"
-                    >
-                        <a-form-item label="名称" name="name">
-                            <a-input
-                                v-model:value="form.data.name"
-                                placeholder="请输入名称"
-                            />
-                        </a-form-item>
-                        <a-form-item label="应用" name="provider">
-                            <a-radio-group
-                                v-model:value="form.data.provider"
-                                class="radio-container"
-                                @change="form.data.integrationModes = []"
-                            >
-                                <a-radio-button value="internal-standalone">
-                                    <div>
-                                        <a-image
-                                            :preview="false"
-                                            :src="
-                                                getImage('/apply/provider1.png')
-                                            "
-                                            width="64px"
-                                            height="64px"
-                                        />
-                                        <p>内部独立应用</p>
-                                    </div>
-                                </a-radio-button>
-                                <a-radio-button value="internal-integrated">
-                                    <div>
-                                        <a-image
-                                            :preview="false"
-                                            :src="
-                                                getImage('/apply/provider2.png')
-                                            "
-                                        />
-                                        <p>内部集成应用</p>
-                                    </div>
-                                </a-radio-button>
-                                <a-radio-button value="wechat-webapp">
-                                    <div>
-                                        <a-image
-                                            :preview="false"
-                                            :src="
-                                                getImage('/apply/provider3.png')
-                                            "
-                                        />
-                                        <p>微信网站应用</p>
-                                    </div>
-                                </a-radio-button>
-                                <a-radio-button value="dingtalk-ent-app">
-                                    <div>
-                                        <a-image
-                                            :preview="false"
-                                            :src="
-                                                getImage('/apply/provider4.png')
-                                            "
-                                        />
-                                        <p>钉钉企业内部应用</p>
-                                    </div>
-                                </a-radio-button>
-                                <a-radio-button value="third-party">
-                                    <div>
-                                        <a-image
-                                            :preview="false"
-                                            :src="
-                                                getImage('/apply/provider5.png')
-                                            "
-                                        />
-                                        <p>第三方应用</p>
-                                    </div>
-                                </a-radio-button>
-                            </a-radio-group>
-                        </a-form-item>
-                        <a-form-item label="接入方式" name="integrationModes">
-                            <a-checkbox-group
-                                v-model:value="form.data.integrationModes"
-                                :options="joinOptions"
-                            />
-                        </a-form-item>
-                        <a-collapse
-                            v-model:activeKey="form.integrationModesISO"
-                        >
-                            <a-collapse-panel
-                                key="page"
-                                v-show="
-                                    form.data.integrationModes.includes('page')
-                                "
-                                header="页面集成"
-                            >
-                                <a-form-item
-                                    :name="['page', 'baseUrl']"
-                                    class="resetLabel"
-                                    :rules="[
-                                        {
-                                            required: true,
-                                        },
-                                    ]"
-                                >
-                                    <template #label>
-                                        <FormLabel
-                                            text="接入地址"
-                                            required
-                                            tooltip="填写访问其它平台的地址"
-                                        />
-                                    </template>
-                                    <a-input
-                                        v-model:value="form.data.page.baseUrl"
-                                        placeholder="请输入接入地址"
-                                    />
-                                </a-form-item>
-                                <a-form-item
-                                    label="路由方式"
-                                    :name="['page', 'routeType']"
-                                    :rules="[
-                                        {
-                                            required: true,
-                                        },
-                                    ]"
-                                >
-                                    <a-select
-                                        v-model:value="form.data.page.routeType"
-                                        style="width: 120px"
-                                    >
-                                        <a-select-option value="hash"
-                                            >hash</a-select-option
-                                        >
-                                        <a-select-option value="history"
-                                            >history</a-select-option
-                                        >
-                                    </a-select>
-                                </a-form-item>
-                            </a-collapse-panel>
-                            <a-collapse-panel
-                                key="apiClient"
-                                v-show="
-                                    form.data.integrationModes.includes(
-                                        'apiClient',
-                                    )
-                                "
-                                header="API客户端"
-                            >
-                                <a-form-item
-                                    class="resetLabel"
-                                    :name="['apiClient', 'baseUrl']"
-                                    :rules="[
-                                        {
-                                            required: true,
-                                        },
-                                    ]"
-                                >
-                                    <template #label>
-                                        <FormLabel
-                                            text="接口地址"
-                                            required
-                                            tooltip="访问Api服务的地址"
-                                        />
-                                    </template>
-                                    <a-input
-                                        v-model:value="
-                                            form.data.apiClient.baseUrl
-                                        "
-                                        placeholder="请输入接入地址"
-                                    />
-                                </a-form-item>
-                                <a-form-item
-                                    class="resetLabel"
-                                    :name="[
-                                        'apiClient',
-                                        'authConfig',
-                                        'oauth2',
-                                        'authorizationUrl',
-                                    ]"
-                                    :rules="[
-                                        {
-                                            required: true,
-                                        },
-                                    ]"
-                                >
-                                    <template #label>
-                                        <FormLabel
-                                            text="授权地址"
-                                            required
-                                            tooltip="认证授权地址"
-                                        />
-                                    </template>
-                                    <a-input
-                                        v-model:value="
-                                            form.data.apiClient.authConfig
-                                                .oauth2.authorizationUrl
-                                        "
-                                        placeholder="请输入授权地址"
-                                    />
-                                </a-form-item>
-                                <a-form-item
-                                    class="resetLabel"
-                                    :name="[
-                                        'apiClient',
-                                        'authConfig',
-                                        'oauth2',
-                                        'tokenUrl',
-                                    ]"
-                                    :rules="[
-                                        {
-                                            required: true,
-                                        },
-                                    ]"
-                                >
-                                    <template #label>
-                                        <FormLabel
-                                            text="token地址"
-                                            required
-                                            tooltip="设置token令牌的地址"
-                                        />
-                                    </template>
-                                    <a-input
-                                        v-model:value="
-                                            form.data.apiClient.authConfig
-                                                .oauth2.tokenUrl
-                                        "
-                                        placeholder="请输入token地址"
-                                    />
-                                </a-form-item>
-                                <a-form-item
-                                    label="回调地址"
-                                    :name="[
-                                        'apiClient',
-                                        'authConfig',
-                                        'oauth2',
-                                        'redirectUri',
-                                    ]"
-                                >
-                                    <template #label>
-                                        <FormLabel
-                                            text="回调地址"
-                                            tooltip="授权完成后跳转到具体页面的回调地址"
-                                        />
-                                    </template>
-                                    <a-input
-                                        v-model:value="
-                                            form.data.apiClient.authConfig
-                                                .oauth2.redirectUri
-                                        "
-                                        placeholder="请输入回调地址"
-                                    />
-                                </a-form-item>
-                                <a-form-item
-                                    class="resetLabel"
-                                    :name="[
-                                        'apiClient',
-                                        'authConfig',
-                                        'oauth2',
-                                        'clientId',
-                                    ]"
-                                    :rules="[
-                                        {
-                                            required: true,
-                                        },
-                                    ]"
-                                >
-                                    <template #label>
-                                        <FormLabel
-                                            text="appId"
-                                            required
-                                            tooltip="第三方应用唯一标识"
-                                        />
-                                    </template>
-                                    <a-input
-                                        v-model:value="
-                                            form.data.apiClient.authConfig
-                                                .oauth2.clientId
-                                        "
-                                        placeholder="请输入appId"
-                                    />
-                                </a-form-item>
-                                <a-form-item
-                                    class="resetLabel"
-                                    :name="[
-                                        'apiClient',
-                                        'authConfig',
-                                        'oauth2',
-                                        'clientSecret',
-                                    ]"
-                                    :rules="[
-                                        {
-                                            required: true,
-                                        },
-                                    ]"
-                                >
-                                    <template #label>
-                                        <FormLabel
-                                            text="appKey"
-                                            required
-                                            tooltip="第三方应用唯一标识的密钥"
-                                        />
-                                    </template>
-                                    <a-input
-                                        v-model:value="
-                                            form.data.apiClient.authConfig
-                                                .oauth2.clientSecret
-                                        "
-                                        placeholder="请输入appKey"
-                                    />
-                                </a-form-item>
-
-                                <a-form-item label="请求头"> </a-form-item>
-                                <a-form-item label="参数"> </a-form-item>
-                            </a-collapse-panel>
-                            <a-collapse-panel
-                                key="apiServer"
-                                v-show="
-                                    form.data.integrationModes.includes(
-                                        'apiServer',
-                                    )
-                                "
-                                header="API服务"
-                            >
-                            </a-collapse-panel>
-                            <a-collapse-panel
-                                key="ssoClient"
-                                v-show="
-                                    form.data.integrationModes.includes(
-                                        'ssoClient',
-                                    )
-                                "
-                                header="单点登录"
-                            >
-                            </a-collapse-panel>
-                        </a-collapse>
-                        <a-form-item label="说明" name="description">
-                            <a-textarea
-                                v-model:value="form.data.description"
-                                placeholder="请输入说明"
-                                showCount
-                                :maxlength="200"
-                                :rows="5"
-                            />
-                        </a-form-item>
-                    </a-form>
-                    <a-button v-if="!routeQuery.view">保存</a-button>
+                    <EditForm @change-apply-type="chengeType" />
                 </a-col>
-                <a-col :span="10"><Does :type="form.data.provider" /></a-col>
+                <a-col :span="10"><Does :type="rightType" /></a-col>
             </a-row>
         </a-card>
     </page-container>
@@ -355,151 +13,11 @@
 
 <script setup lang="ts">
 import Does from './components/Does.vue';
-import FormLabel from './components/FormLabel.vue';
-import { getImage } from '@/utils/comm';
-import type { applyType, formType } from './typing';
-const routeQuery = useRoute().query;
+import EditForm from './components/EditForm.vue';
+import type { applyType } from './typing';
 
-const initForm: formType = {
-    name: '',
-    provider: 'internal-standalone',
-    integrationModes: [],
-    config: '',
-    description: '',
-    page: {
-        baseUrl: '',
-        routeType: 'hash',
-    },
-    apiClient: {
-        baseUrl: '',
-        authConfig: {
-            type: '',
-            oauth2: {
-                authorizationUrl: '',
-                tokenUrl: '',
-                redirectUri: '',
-                clientId: '',
-                clientSecret: '',
-            },
-        },
-    },
+const rightType = ref<applyType>('internal-standalone');
+const chengeType = (newType: applyType) => {
+    rightType.value = newType;
 };
-const form = reactive({
-    data: { ...initForm },
-    integrationModesISO: [] as string[],
-});
-const joinOptions = computed(() => {
-    if (form.data.provider === 'internal-standalone')
-        return [
-            {
-                label: '页面集成',
-                value: 'page',
-            },
-            {
-                label: 'API客户端',
-                value: 'apiClient',
-            },
-            {
-                label: 'API服务',
-                value: 'apiServer',
-            },
-            {
-                label: '单点登录',
-                value: 'ssoClient',
-            },
-        ];
-    else if (form.data.provider === 'internal-integrated')
-        return [
-            {
-                label: '页面集成',
-                value: 'page',
-            },
-            {
-                label: 'API客户端',
-                value: 'apiClient',
-            },
-        ];
-    else if (form.data.provider === 'wechat-webapp')
-        return [
-            {
-                label: '单点登录',
-                value: 'ssoClient',
-            },
-        ];
-    else if (form.data.provider === 'dingtalk-ent-app')
-        return [
-            {
-                label: '单点登录',
-                value: 'ssoClient',
-            },
-        ];
-    else if (form.data.provider === 'third-party')
-        return [
-            {
-                label: '页面集成',
-                value: 'page',
-            },
-            {
-                label: 'API客户端',
-                value: 'apiClient',
-            },
-            {
-                label: 'API服务',
-                value: 'apiServer',
-            },
-            {
-                label: '单点登录',
-                value: 'ssoClient',
-            },
-        ];
-});
 </script>
-
-<style lang="less" scoped>
-.save-container {
-    .form {
-        .ant-form-item {
-            &.resetLabel {
-                :deep(.ant-form-item-required) {
-                    &::before {
-                        display: none;
-                    }
-                }
-            }
-
-            .ant-select {
-                width: 100% !important;
-            }
-        }
-        .radio-container {
-            .ant-radio-button-wrapper {
-                height: 120px;
-                width: 120px;
-                padding: 0 15px;
-                box-sizing: content-box;
-                margin-right: 20px;
-
-                > :last-child {
-                    width: 100%;
-                    height: 100%;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-
-                    > div {
-                        width: 100%;
-                        text-align: center;
-                    }
-                    :deep(.ant-image) {
-                        width: 64px;
-                        height: 64px;
-                    }
-                    p {
-                        margin: 0;
-                    }
-                }
-            }
-        }
-    }
-}
-</style>
diff --git a/src/views/system/Apply/Save/typing.d.ts b/src/views/system/Apply/Save/typing.d.ts
index ae70211b..1f49c6e1 100644
--- a/src/views/system/Apply/Save/typing.d.ts
+++ b/src/views/system/Apply/Save/typing.d.ts
@@ -3,28 +3,89 @@ export type applyType = 'internal-standalone'
     | 'internal-integrated'
     | 'dingtalk-ent-app'
     | 'third-party'
+export type dictType = {
+    id: string;
+    name: string;
+    children?: dictType
+}[];
 
+export type optionsType = {
+    label: string,
+    value: string;
+    disabled?: boolean
+}[]
 export type formType = {
     name: string;
     provider: applyType;
     integrationModes: string[];
     config: string;
     description: string;
-    page: {
-        baseUrl:string,
-        routeType:'hash' | 'history'
-    },
-    apiClient: {
+    page: { // 页面集成
         baseUrl: string,
-        authConfig: {
-            type:string,
-            oauth2 :{
-                authorizationUrl:string,
-                tokenUrl: string,
-                redirectUri:string,
-                clientId:string,
-                clientSecret:string
+        routeType: 'hash' | 'history',
+        parameters: optionsType
+    },
+    apiClient: { // API客户端
+        baseUrl: string, // 接口地址	
+        headers: optionsType, // 请求头	
+        parameters: optionsType, // 请求参数	
+        authConfig: { // 认证配置	
+            type: 'none' | 'bearer' | 'oauth2' | 'basic' | 'other', // 类型, 可选值：none, bearer, oauth2, basic, other
+            bearer: { token: string }, // 授权信息	
+            basic: { username: string, password: string }, // 基本信息	
+            oauth2: { // OAuth2信息
+                authorizationUrl: string, // 授权地址	
+                tokenUrl: string, // token地址	
+                redirectUri: string, // 重定向地址	
+                clientId: string, // 客户端ID	
+                clientSecret: string, // 客户端密钥
+                grantType: 'authorization_code' | 'client_credentials' | '', // 类型
+                accessTokenProperty: string, // token属性名	
+                tokenRequestType: 'POST_URI' | 'POST_BODY' | '' // token请求方式, 可选值：POST_URI，POST_BODY
             }
         }
+    },
+    apiServer: { // API服务
+        appId: string,
+        secureKey: string, // 密钥
+        redirectUri: string, // 重定向URL	
+        roleIdList: string[], // 角色列表	
+        orgIdList: string[], // 部门列表	
+        ipWhiteList: string, // IP白名单	
+        signature: 'MD5' | 'SHA256' | '', // 签名方式, 可选值：MD5，SHA256
+        enableOAuth2: boolean, // 是否启用OAuth2	
+    },
+    sso: { // 统一单点登陆集成
+        configuration: { // 配置
+            oauth2: { // Oauth2单点登录配置
+                authorizationUrl: string, // 授权地址	
+                redirectUri: string, // 重定向地址	
+                clientId: string, // 客户端ID	
+                clientSecret: string, // 客户端密钥	
+                userInfoUrl: string, // 用户信息接口	
+                scope: string, // scope
+                userProperty: { // 用户属性字段信息	
+                    userId: string, // 用户ID	
+                    username: string, // 用户名	
+                    name: string, // 名称
+                    avatar: string, // 头像	
+                    email: string, // 邮箱	
+                    telephone: string, // 电话
+                    description: string, // 说明
+                },
+                grantType: 'authorization_code' | 'client_credentials' | '', // 类型	
+                tokenUrl: string, // token地址	
+                accessTokenProperty: string, // token属性名	
+                tokenRequestType: 'POST_URI' | 'POST_BODY' | '', // token请求方式	
+            },
+            appId: string, // 微信单点登录配置
+            appKey: string, // 钉钉单点登录配置
+            appSecret: string, // 钉钉、微信单点登录配置
+        },
+        autoCreateUser: boolean, // 是否自动创建平台用户
+        usernamePrefix: string, // 用户ID前缀
+        roleIdList: string[], // 自动创建平台用户时角色列表	
+        orgIdList: string[], // 自动创建平台用户时部门列表	
+        defaultPasswd: string, // 默认密码
     }
 }
\ No newline at end of file

From 55a0a2adb5ba0bd261cd8842f1d9f94068512313 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Fri, 24 Feb 2023 18:00:53 +0800
Subject: [PATCH 14/17] =?UTF-8?q?feat:=20=E8=A7=86=E9=A2=91=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E9=80=9A=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/media/Device/Channel/index.vue    | 174 ++++++++++++++++++++
 src/views/media/Device/Channel/typings.d.ts | 114 +++++++++++++
 2 files changed, 288 insertions(+)
 create mode 100644 src/views/media/Device/Channel/index.vue
 create mode 100644 src/views/media/Device/Channel/typings.d.ts

diff --git a/src/views/media/Device/Channel/index.vue b/src/views/media/Device/Channel/index.vue
new file mode 100644
index 00000000..4ef66e6d
--- /dev/null
+++ b/src/views/media/Device/Channel/index.vue
@@ -0,0 +1,174 @@
+<template>
+    <page-container>
+        <Search
+            type="simple"
+            :columns="columns"
+            target="product"
+            @search="handleSearch"
+        />
+
+        <JTable
+            ref="instanceRef"
+            :columns="columns"
+            :request="(e:any) => templateApi.getHistory(e, data.id)"
+            :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>
+            <template #state="slotProps">
+                <a-space>
+                    <a-badge
+                        :status="slotProps.state.value"
+                        :text="slotProps.state.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)"
+                />
+            </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';
+
+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 columns = [
+    {
+        title: 'ID',
+        dataIndex: 'id',
+        key: 'id',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '发送时间',
+        dataIndex: 'notifyTime',
+        key: 'notifyTime',
+        scopedSlots: true,
+        search: {
+            type: 'date',
+            handleValue: (v: any) => {
+                return v;
+            },
+        },
+    },
+    {
+        title: '状态',
+        dataIndex: 'state',
+        key: 'state',
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: '成功', value: 'success' },
+                { label: '失败', value: 'error' },
+            ],
+            handleValue: (v: any) => {
+                return v;
+            },
+        },
+    },
+    {
+        title: '操作',
+        key: 'action',
+        scopedSlots: true,
+    },
+];
+
+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 handleError = (e: any) => {
+    Modal.info({
+        title: '错误信息',
+        content: h(
+            'p',
+            {
+                style: {
+                    maxHeight: '300px',
+                    overflowY: 'auto',
+                },
+            },
+            JSON.stringify(e),
+        ),
+    });
+};
+/**
+ * 查看详情
+ */
+const handleDetail = (e: any) => {
+    Modal.info({
+        title: '详情信息',
+        content: h(
+            'p',
+            {
+                style: {
+                    maxHeight: '300px',
+                    overflowY: 'auto',
+                },
+            },
+            JSON.stringify(e),
+        ),
+    });
+};
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/media/Device/Channel/typings.d.ts b/src/views/media/Device/Channel/typings.d.ts
new file mode 100644
index 00000000..09d659aa
--- /dev/null
+++ b/src/views/media/Device/Channel/typings.d.ts
@@ -0,0 +1,114 @@
+export type CatalogItemType = {
+    district?: string;
+    device?: string;
+    platform?: string;
+    user?: string;
+    platform_outer?: string;
+    ext?: string;
+};
+
+export interface CatalogItem {
+    id: string;
+    channelId: string;
+    deviceId: string;
+    name: string;
+    type: CatalogItemType;
+    createTime: number;
+    modifyTime: number;
+    children?: CatalogItem[];
+}
+
+export type ChannelStatusType =
+    | 'online'
+    | 'lost'
+    | 'defect'
+    | 'add'
+    | 'delete'
+    | 'update'
+    | 'offline';
+
+export type PtzType = 'unknown' | 'ball' | 'hemisphere' | 'fixed' | 'remoteControl';
+
+export type CatalogType = keyof CatalogItemType;
+
+export type ChannelType =
+    | 'dv_no_storage'
+    | 'dv_has_storage'
+    | 'dv_decoder'
+    | 'networking_monitor_server'
+    | 'media_proxy'
+    | 'web_access_server'
+    | 'video_management_server'
+    | 'network_matrix'
+    | 'network_controller'
+    | 'network_alarm_machine'
+    | 'dvr'
+    | 'video_server'
+    | 'encoder'
+    | 'decoder'
+    | 'video_switching_matrix'
+    | 'audio_switching_matrix'
+    | 'alarm_controller'
+    | 'nvr'
+    | 'hvr'
+    | 'camera'
+    | 'ipc'
+    | 'display'
+    | 'alarm_input'
+    | 'alarm_output'
+    | 'audio_input'
+    | 'audio_output'
+    | 'mobile_trans'
+    | 'other_outer'
+    | 'center_server'
+    | 'web_server'
+    | 'media_dispatcher'
+    | 'proxy_server'
+    | 'secure_server'
+    | 'alarm_server'
+    | 'database_server'
+    | 'gis_server'
+    | 'management_server'
+    | 'gateway_server'
+    | 'media_storage_server'
+    | 'signaling_secure_gateway'
+    | 'business_group'
+    | 'virtual_group'
+    | 'center_user'
+    | 'end_user'
+    | 'media_iap'
+    | 'media_ops'
+    | 'district'
+    | 'other';
+
+export interface ChannelItem {
+    id: string;
+    deviceId: string;
+    deviceName: string;
+    channelId: string;
+    name: string;
+    manufacturer: string;
+    model: string;
+    address: string;
+    provider: string;
+    status: {
+        value: string;
+        text: string;
+    };
+    others: object;
+    description: string;
+    parentChannelId: string;
+    subCount: integer;
+    civilCode: string;
+    ptzType: PtzType;
+    catalogType: CatalogType;
+    channelType: ChannelType;
+    catalogCode: string;
+    longitude: number;
+    latitude: number;
+    createTime: number;
+    modifyTime: number;
+    parentId: string;
+    gb28181ProxyStream: boolean;
+    gb28181ChannelId: string;
+}

From 25ee85681c14dfc10266b18ce4043fa0187eb585 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Fri, 24 Feb 2023 18:07:41 +0800
Subject: [PATCH 15/17] =?UTF-8?q?fix:=20=E8=BF=90=E8=A1=8C=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |    1 +
 src/api/device/instance.ts                    |   18 +-
 src/store/menu.ts                             |    3 +
 .../Diagnose/Status/ManualInspection.tsx      |   14 +-
 .../Instance/Detail/Diagnose/Status/index.tsx |  284 +--
 .../Instance/Detail/Running/Event/index.vue   |   63 +-
 .../Detail/Running/Property/Detail/AMap.vue   |   55 +-
 .../Detail/Running/Property/Detail/Chart.vue  |   43 +
 .../Detail/Running/Property/Detail/Charts.vue |  219 ++-
 .../Running/Property/Detail/PropertyAMap.vue  |   74 +
 .../Detail/Running/Property/Detail/Table.vue  |   71 +-
 .../Detail/Running/Property/Detail/index.vue  |   10 +-
 .../Detail/Running/Property/PropertyCard.vue  |   62 +-
 .../Detail/Running/Property/ValueDetail.vue   |   18 +-
 .../Detail/Running/Property/ValueRender.vue   |    9 +-
 .../Detail/Running/Property/index.vue         |   56 +-
 src/views/device/Instance/Detail/index.vue    |    2 +-
 src/views/device/Instance/index.vue           |   17 +-
 yarn.lock                                     | 1555 ++++++++---------
 19 files changed, 1466 insertions(+), 1108 deletions(-)
 create mode 100644 src/views/device/Instance/Detail/Running/Property/Detail/Chart.vue
 create mode 100644 src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue

diff --git a/package.json b/package.json
index 7174015a..78feb7a7 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "unplugin-vue-components": "^0.22.12",
     "vite-plugin-monaco-editor": "^1.1.0",
     "vue": "^3.2.45",
+    "vue-json-viewer": "^3.0.4",
     "vue-router": "^4.1.6",
     "vue3-markdown-it": "^1.0.10",
     "vue3-ts-jsoneditor": "^2.7.1"
diff --git a/src/api/device/instance.ts b/src/api/device/instance.ts
index 2ea8aef8..5148bca8 100644
--- a/src/api/device/instance.ts
+++ b/src/api/device/instance.ts
@@ -466,4 +466,20 @@ export const saveEdgeMap = (deviceId: string, data?: any) => server.post(`/edge/
  * @param params 
  * @returns 
  */
-export const getPropertyData = (deviceId: string, params: Record<string, unknown>) => server.get(`/device-instance/${deviceId}/properties/_query`, params)
\ No newline at end of file
+export const getPropertyData = (deviceId: string, params: Record<string, unknown>) => server.get(`/device-instance/${deviceId}/properties/_query`, params)
+
+/**
+ * 聚合查询设备属性
+ * @param deviceId 
+ * @param data 
+ * @returns 
+ */
+export const getPropertiesInfo = (deviceId: string, data: Record<string, unknown>) => server.post(`/device-instance/${deviceId}/agg/_query`, data)
+
+/**
+ * 聚合查询设备属性
+ * @param deviceId 
+ * @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
diff --git a/src/store/menu.ts b/src/store/menu.ts
index 44c0d9fe..49445fb8 100644
--- a/src/store/menu.ts
+++ b/src/store/menu.ts
@@ -4,6 +4,8 @@ import { filterAsnycRouter, MenuItem } from '@/utils/menu'
 import { isArray } from 'lodash-es'
 import { usePermissionStore } from './permission'
 import router from '@/router'
+import { message } from 'ant-design-vue'
+import { onlyMessage } from '@/utils/comm'
 
 const defaultOwnParams = [
   {
@@ -77,6 +79,7 @@ export const useMenuStore = defineStore({
           name, params, query
         })
       } else {
+        onlyMessage('暂无权限，请联系管理员', 'error')
         console.warn(`没有找到对应的页面: ${name}`)
       }
     },
diff --git a/src/views/device/Instance/Detail/Diagnose/Status/ManualInspection.tsx b/src/views/device/Instance/Detail/Diagnose/Status/ManualInspection.tsx
index 5482befe..6bec31e0 100644
--- a/src/views/device/Instance/Detail/Diagnose/Status/ManualInspection.tsx
+++ b/src/views/device/Instance/Detail/Diagnose/Status/ManualInspection.tsx
@@ -1,4 +1,6 @@
 import AIcon from "@/components/AIcon";
+import { useInstanceStore } from "@/store/instance";
+import { useMenuStore } from "@/store/menu";
 import { Button, Descriptions, Modal } from "ant-design-vue"
 import styles from './index.module.less'
 
@@ -14,6 +16,10 @@ const ManualInspection = defineComponent({
 
         const { data } = props
 
+        const instanceStore = useInstanceStore();
+
+        const menuStory = useMenuStore();
+
         const dataRender = () => {
             if (data.type === 'device' || data.type === 'product') {
                 return (
@@ -207,7 +213,13 @@ const ManualInspection = defineComponent({
                 emit('save', data)
             }}
             onCancel={() => {
-                // TODO 跳转设备和产品
+                if (data.type === 'device') {
+                    instanceStore.tabActiveKey = 'Info'
+                } else if (data.type === 'product') {
+                    menuStory.jumpPage('device/Product/Detail', { id: data.productId, tab: 'access' });
+                } else {
+                    menuStory.jumpPage('link/AccessConfig/Detail', { id: data.configuration?.id });
+                }
             }}>
             <div style={{ display: 'flex' }}>{dataRender()}</div>
         </Modal>
diff --git a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
index f075aea9..3dbc27d2 100644
--- a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
+++ b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
@@ -11,6 +11,8 @@ import _ from "lodash"
 import DiagnosticAdvice from './DiagnosticAdvice'
 import ManualInspection from './ManualInspection'
 import { deployDevice } from "@/api/initHome"
+import PermissionButton from '@/components/PermissionButton/index.vue'
+import { useMenuStore } from "@/store/menu"
 
 type TypeProps = 'network' | 'child-device' | 'media' | 'cloud' | 'channel'
 
@@ -41,6 +43,7 @@ const Status = defineComponent({
         const diagnoseData = ref<Partial<Record<string, any>>>()
 
         const bindParentVisible = ref<boolean>(false)
+        const menuStory = useMenuStore();
 
         const configuration = reactive<{
             product: Record<string, any>,
@@ -57,19 +60,8 @@ const Status = defineComponent({
             artificialData.value = params
         }
 
-        // TODO
         const jumpAccessConfig = () => {
-            // const purl = getMenuPathByCode(MENUS_CODE['device/Product/Detail']);
-            // if (purl) {
-            //   history.push(
-            //     `${getMenuPathByParams(MENUS_CODE['device/Product/Detail'], device.productId)}`,
-            //     {
-            //       tab: 'access',
-            //     },
-            //   );
-            // } else {
-            //   message.error('规则可能有加密处理，请联系管理员');
-            // }
+            menuStory.jumpPage('device/Product/Detail', { id: unref(device).productId, tab: 'access' });
         };
 
         const jumpDeviceConfig = () => {
@@ -123,34 +115,40 @@ const Status = defineComponent({
                                             <Badge
                                                 status="default"
                                                 text={
-                                                    <span>网络组件已禁用，请先<Popconfirm
-                                                        title="确认启用"
-                                                        onConfirm={async () => {
-                                                            const res = await startNetwork(
-                                                                unref(gateway)?.channelId,
-                                                            );
-                                                            if (res.status === 200) {
-                                                                message.success('操作成功！');
-                                                                list.value = modifyArrayList(
-                                                                    list.value,
-                                                                    {
-                                                                        key: 'network',
-                                                                        name: '网络组件',
-                                                                        desc: '诊断网络组件配置是否正确，配置错误将导致设备连接失败',
-                                                                        status: 'success',
-                                                                        text: '正常',
-                                                                        info: null,
-                                                                    },
-                                                                );
-                                                            }
-                                                        }}
-                                                    >
-                                                        <Button type="link" style="padding: 0">启用</Button>
-                                                    </Popconfirm></span>
+                                                    <span>网络组件已禁用，请先
+                                                        <PermissionButton
+                                                            type="link"
+                                                            hasPermission="link/Type:action"
+                                                            popConfirm={{
+                                                                title: '确认启用',
+                                                                onConfirm: async () => {
+                                                                    const res = await startNetwork(
+                                                                        unref(gateway)?.channelId,
+                                                                    );
+                                                                    if (res.status === 200) {
+                                                                        message.success('操作成功！');
+                                                                        list.value = modifyArrayList(
+                                                                            list.value,
+                                                                            {
+                                                                                key: 'network',
+                                                                                name: '网络组件',
+                                                                                desc: '诊断网络组件配置是否正确，配置错误将导致设备连接失败',
+                                                                                status: 'success',
+                                                                                text: '正常',
+                                                                                info: null,
+                                                                            },
+                                                                        );
+                                                                    }
+                                                                }
+                                                            }}
+                                                        >
+                                                            启用
+                                                        </PermissionButton>
+                                                    </span>
                                                 }
                                             />
                                         </div>
-                                    </div>
+                                    </div >
                                 ) : (
                                     <div>
                                         <div class={styles.infoItem}>
@@ -287,28 +285,31 @@ const Status = defineComponent({
                                                 <Badge
                                                     status="default"
                                                     text={<span>设备接入网关已禁用，请先
-                                                        <Popconfirm
-                                                            title="确认启用"
-                                                            onConfirm={async () => {
-                                                                const resp = await startGateway(unref(device).accessId || '');
-                                                                if (resp.status === 200) {
-                                                                    message.success('操作成功！');
-                                                                    list.value = modifyArrayList(
-                                                                        list.value,
-                                                                        {
-                                                                            key: 'gateway',
-                                                                            name: '设备接入网关',
-                                                                            desc: desc,
-                                                                            status: 'success',
-                                                                            text: '正常',
-                                                                            info: null,
-                                                                        },
-                                                                    );
+                                                        <PermissionButton
+                                                            hasPermission="link/Type:action"
+                                                            popConfirm={{
+                                                                title: '确认启用',
+                                                                onConfirm: async () => {
+                                                                    const resp = await startGateway(unref(device).accessId || '');
+                                                                    if (resp.status === 200) {
+                                                                        message.success('操作成功！');
+                                                                        list.value = modifyArrayList(
+                                                                            list.value,
+                                                                            {
+                                                                                key: 'gateway',
+                                                                                name: '设备接入网关',
+                                                                                desc: desc,
+                                                                                status: 'success',
+                                                                                text: '正常',
+                                                                                info: null,
+                                                                            },
+                                                                        );
+                                                                    }
                                                                 }
                                                             }}
                                                         >
-                                                            <Button type="link" style="padding: 0">启用</Button>
-                                                        </Popconfirm>
+                                                            启用
+                                                        </PermissionButton>
                                                     </span>}
                                                 />
                                             </div>
@@ -411,28 +412,32 @@ const Status = defineComponent({
                                             status="default"
                                             text={
                                                 <span>
-                                                    设备接入网关已禁用，请先<Popconfirm
-                                                        title="确认启用"
-                                                        onConfirm={async () => {
-                                                            const resp = await startGateway(unref(device).accessId || '');
-                                                            if (resp.status === 200) {
-                                                                message.success('操作成功！');
-                                                                list.value = modifyArrayList(
-                                                                    list.value,
-                                                                    {
-                                                                        key: 'gateway',
-                                                                        name: '设备接入网关',
-                                                                        desc: desc,
-                                                                        status: 'success',
-                                                                        text: '正常',
-                                                                        info: null,
-                                                                    },
-                                                                );
+                                                    设备接入网关已禁用，请先
+                                                    <PermissionButton
+                                                        hasPermission="link/AccessConfig:action"
+                                                        popConfirm={{
+                                                            title: '确认启用',
+                                                            onConfirm: async () => {
+                                                                const resp = await startGateway(unref(device).accessId || '');
+                                                                if (resp.status === 200) {
+                                                                    message.success('操作成功！');
+                                                                    list.value = modifyArrayList(
+                                                                        list.value,
+                                                                        {
+                                                                            key: 'gateway',
+                                                                            name: '设备接入网关',
+                                                                            desc: desc,
+                                                                            status: 'success',
+                                                                            text: '正常',
+                                                                            info: null,
+                                                                        },
+                                                                    );
+                                                                }
                                                             }
                                                         }}
                                                     >
-                                                        <Button type="link" style="padding: 0">启用</Button>
-                                                    </Popconfirm>
+                                                        启用
+                                                    </PermissionButton>
                                                 </span>
                                             }
                                         />
@@ -519,28 +524,32 @@ const Status = defineComponent({
                                                 status="default"
                                                 text={
                                                     <span>
-                                                        网关父设备已禁用，请先<Popconfirm
-                                                            title="确认启用"
-                                                            onConfirm={async () => {
-                                                                const resp = await _deploy(response?.result?.id || '');
-                                                                if (resp.status === 200) {
-                                                                    message.success('操作成功！');
-                                                                    list.value = modifyArrayList(
-                                                                        list.value,
-                                                                        {
-                                                                            key: 'parent-device',
-                                                                            name: '网关父设备',
-                                                                            desc: '诊断网关父设备状态是否正常，禁用或离线将导致连接失败',
-                                                                            status: 'success',
-                                                                            text: '正常',
-                                                                            info: null,
-                                                                        },
-                                                                    );
+                                                        网关父设备已禁用，请先
+                                                        <PermissionButton
+                                                            hasPermission="device/Product:action"
+                                                            popConfirm={{
+                                                                title: '确认启用',
+                                                                onConfirm: async () => {
+                                                                    const resp = await _deploy(response?.result?.id || '');
+                                                                    if (resp.status === 200) {
+                                                                        message.success('操作成功！');
+                                                                        list.value = modifyArrayList(
+                                                                            list.value,
+                                                                            {
+                                                                                key: 'parent-device',
+                                                                                name: '网关父设备',
+                                                                                desc: '诊断网关父设备状态是否正常，禁用或离线将导致连接失败',
+                                                                                status: 'success',
+                                                                                text: '正常',
+                                                                                info: null,
+                                                                            },
+                                                                        );
+                                                                    }
                                                                 }
                                                             }}
                                                         >
-                                                            <Button type="link" style="padding: 0">启用</Button>
-                                                        </Popconfirm>
+                                                            启用
+                                                        </PermissionButton>
                                                     </span>
                                                 }
                                             />
@@ -623,28 +632,32 @@ const Status = defineComponent({
                                                 status="default"
                                                 text={
                                                     <span>
-                                                        产品已禁用，请<Popconfirm
-                                                            title="确认启用"
-                                                            onConfirm={async () => {
-                                                                const resp = await _deployProduct(unref(device).productId || '');
-                                                                if (resp.status === 200) {
-                                                                    message.success('操作成功！');
-                                                                    list.value = modifyArrayList(
-                                                                        list.value,
-                                                                        {
-                                                                            key: 'product',
-                                                                            name: '产品状态',
-                                                                            desc: '诊断产品状态是否正常，禁用状态将导致设备连接失败',
-                                                                            status: 'success',
-                                                                            text: '正常',
-                                                                            info: null,
-                                                                        },
-                                                                    );
+                                                        产品已禁用，请
+                                                        <PermissionButton
+                                                            hasPermission="device/Product:action"
+                                                            popConfirm={{
+                                                                title: '确认启用',
+                                                                onConfirm: async () => {
+                                                                    const resp = await _deployProduct(unref(device).productId || '');
+                                                                    if (resp.status === 200) {
+                                                                        message.success('操作成功！');
+                                                                        list.value = modifyArrayList(
+                                                                            list.value,
+                                                                            {
+                                                                                key: 'product',
+                                                                                name: '产品状态',
+                                                                                desc: '诊断产品状态是否正常，禁用状态将导致设备连接失败',
+                                                                                status: 'success',
+                                                                                text: '正常',
+                                                                                info: null,
+                                                                            },
+                                                                        );
+                                                                    }
                                                                 }
                                                             }}
                                                         >
-                                                            <Button type="link" style="padding: 0">启用</Button>
-                                                        </Popconfirm>
+                                                            启用
+                                                        </PermissionButton>
                                                         产品
                                                     </span>
                                                 }
@@ -695,29 +708,34 @@ const Status = defineComponent({
                                         status="default"
                                         text={
                                             <span>
-                                                设备已禁用，请<Popconfirm
-                                                    title="确认启用"
-                                                    onConfirm={async () => {
-                                                        const resp = await _deploy(unref(device)?.id || '');
-                                                        if (resp.status === 200) {
-                                                            instanceStore.current.state = { value: 'offline', text: '离线' }
-                                                            message.success('操作成功！');
-                                                            list.value = modifyArrayList(
-                                                                list.value,
-                                                                {
-                                                                    key: 'device',
-                                                                    name: '设备状态',
-                                                                    desc: '诊断设备状态是否正常，禁用状态将导致设备连接失败',
-                                                                    status: 'success',
-                                                                    text: '正常',
-                                                                    info: null,
-                                                                },
-                                                            );
+                                                设备已禁用，请
+                                                <PermissionButton
+                                                    hasPermission="device/Instance:action"
+                                                    popConfirm={{
+                                                        title: '确认启用',
+                                                        onConfirm: async () => {
+                                                            const resp = await _deploy(unref(device)?.id || '');
+                                                            if (resp.status === 200) {
+                                                                instanceStore.current.state = { value: 'offline', text: '离线' }
+                                                                message.success('操作成功！');
+                                                                list.value = modifyArrayList(
+                                                                    list.value,
+                                                                    {
+                                                                        key: 'device',
+                                                                        name: '设备状态',
+                                                                        desc: '诊断设备状态是否正常，禁用状态将导致设备连接失败',
+                                                                        status: 'success',
+                                                                        text: '正常',
+                                                                        info: null,
+                                                                    },
+                                                                );
+                                                            }
                                                         }
                                                     }}
                                                 >
-                                                    <Button type="link" style="padding: 0">启用</Button>
-                                                </Popconfirm>设备
+                                                    启用
+                                                </PermissionButton>
+                                                设备
                                             </span>
                                         }
                                     />
diff --git a/src/views/device/Instance/Detail/Running/Event/index.vue b/src/views/device/Instance/Detail/Running/Event/index.vue
index ec35af49..a9e169ad 100644
--- a/src/views/device/Instance/Detail/Running/Event/index.vue
+++ b/src/views/device/Instance/Detail/Running/Event/index.vue
@@ -5,7 +5,7 @@
         :columns="columns"
         :request="_getEventList"
         model="TABLE"
-        :bodyStyle="{padding: '0 24px'}"
+        :bodyStyle="{ padding: '0 24px' }"
     >
         <template #timestamp="slotProps">
             {{ moment(slotProps.timestamp).format('YYYY-MM-DD HH:mm:ss') }}
@@ -19,18 +19,18 @@
 </template>
 
 <script lang="ts" setup>
-import moment from 'moment'
-import { getEventList } from '@/api/device/instance'
-import { useInstanceStore } from '@/store/instance'
-import { Modal } from 'ant-design-vue'
+import moment from 'moment';
+import { getEventList } from '@/api/device/instance';
+import { useInstanceStore } from '@/store/instance';
+import { Modal } from 'ant-design-vue';
 
 const events = defineProps({
     data: {
         type: Object,
-        default: () => {}
-    }
-})
-const instanceStore = useInstanceStore()
+        default: () => {},
+    },
+});
+const instanceStore = useInstanceStore();
 
 const columns = ref<Record<string, any>>([
     {
@@ -38,43 +38,52 @@ const columns = ref<Record<string, any>>([
         dataIndex: 'timestamp',
         key: 'timestamp',
         scopedSlots: true,
+        search: {
+            type: 'date',
+        },
     },
     {
         title: '操作',
         dataIndex: 'action',
         key: 'action',
         scopedSlots: true,
-    }
-])
-const params = ref<Record<string, any>>({})
+    },
+]);
+const params = ref<Record<string, any>>({});
 
-const _getEventList = () => getEventList(instanceStore.current.id || '', events.data.id || '', params.value)
+const _getEventList = () =>
+    getEventList(
+        instanceStore.current.id || '',
+        events.data.id || '',
+        params.value,
+    );
 
 watchEffect(() => {
-    if(events.data?.valueType?.type === 'object'){
+    if (events.data?.valueType?.type === 'object') {
         (events.data.valueType?.properties || []).map((i: any) => {
             columns.value.splice(0, 0, {
-              key: i.id,
-              title: i.name,
-              dataIndex: `${i.id}_format`
-            })
-        })
+                key: i.id,
+                title: i.name,
+                dataIndex: `${i.id}_format`,
+                search: {
+                    type: 'string',
+                },
+            });
+        });
     } else {
         columns.value.splice(0, 0, {
             title: '数据',
             dataIndex: 'value',
-        })
+        });
     }
-})
+});
 
 const detail = () => {
     Modal.info({
         title: () => '详情',
         width: 850,
-        content: () => h('div', {}, [
-          h('p', '暂未开发'),
-        ]),
-        okText: '关闭'
-      });
-}
+        content: () => h('div', {}, [h('p', '暂未开发')]),
+        okText: '关闭',
+    });
+};
 </script>
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/AMap.vue b/src/views/device/Instance/Detail/Running/Property/Detail/AMap.vue
index db5458d2..e0656cec 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/AMap.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/AMap.vue
@@ -1,3 +1,54 @@
+<!-- 坐标点拾取组件 -->
 <template>
-    <div>AMap</div>
-</template>
\ No newline at end of file
+    <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/Chart.vue b/src/views/device/Instance/Detail/Running/Property/Detail/Chart.vue
new file mode 100644
index 00000000..9c5a4031
--- /dev/null
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/Chart.vue
@@ -0,0 +1,43 @@
+<template>
+    <div class="chart" ref="chart"></div>
+</template>
+
+<script setup lang="ts">
+import * as echarts from 'echarts';
+
+const { proxy } = <any>getCurrentInstance();
+
+const props = defineProps({
+    // 图表数据
+    options:{
+        type:Object,
+        default:()=>{}
+    }
+});
+
+/**
+ * 绘制图表
+ */
+const createChart = () => {
+    nextTick(() => {
+        const myChart = echarts.init(proxy.$refs.chart);
+        myChart.setOption(props.options);
+        window.addEventListener('resize', function () {
+            myChart.resize();
+        });
+    });
+};
+
+watch(
+    () => props.options,
+    () => createChart(),
+    { immediate: true, deep: true },
+);
+</script>
+
+<style scoped lang="less">
+.chart {
+    width: 100%;
+    height: 100%;
+}
+</style>
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue b/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue
index f54b82c5..57c25647 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue
@@ -1,3 +1,218 @@
 <template>
-    <div>Charts</div>
-</template>
\ No newline at end of file
+    <a-spin :spinning="loading">
+        <div>
+            <a-space>
+                <div>
+                    统计周期：
+                    <a-select v-model:value="cycle" style="width: 120px">
+                        <a-select-option value="*" v-if="_type"
+                            >实际值</a-select-option
+                        >
+                        <a-select-option value="1m">按分钟统计</a-select-option>
+                        <a-select-option value="1h">按小时统计</a-select-option>
+                        <a-select-option value="1d">按天统计</a-select-option>
+                        <a-select-option value="1w">按周统计</a-select-option>
+                        <a-select-option value="1M">按月统计</a-select-option>
+                    </a-select>
+                </div>
+                <div v-if="cycle !== '*' && _type">
+                    统计规则：
+                    <a-select v-model:value="agg" style="width: 120px">
+                        <a-select-option value="AVG">平均值</a-select-option>
+                        <a-select-option value="MAX">最大值</a-select-option>
+                        <a-select-option value="MIN">最小值</a-select-option>
+                        <a-select-option value="COUNT">总数</a-select-option>
+                    </a-select>
+                </div>
+            </a-space>
+        </div>
+        <div style="width: 100%; height: 500px">
+            <Chart :options="options" v-if="chartsList.length" />
+            <JEmpty v-else />
+        </div>
+    </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { getPropertiesInfo, getPropertiesList } from '@/api/device/instance';
+import { useInstanceStore } from '@/store/instance';
+import Chart from './Chart.vue';
+import * as echarts from 'echarts';
+
+const list = ['int', 'float', 'double', 'long'];
+
+const prop = defineProps({
+    data: {
+        type: Object,
+        default: () => {},
+    },
+    time: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const cycle = ref<string>('*');
+const agg = ref<string>('AVG');
+const loading = ref<boolean>(false);
+const chartsList = ref<any[]>([]);
+const instanceStore = useInstanceStore();
+const options = ref({});
+
+const _type = computed(() => {
+    const flag = list.includes(prop.data?.valueType?.type || '')
+    cycle.value =  flag ? '*' : '1m'
+    return flag
+});
+
+const queryChartsAggList = async () => {
+    loading.value = true;
+    const resp = await getPropertiesInfo(instanceStore.current.id, {
+        columns: [
+            {
+                property: prop.data.id,
+                alias: prop.data.id,
+                agg: agg.value,
+            },
+        ],
+        query: {
+            interval: cycle.value,
+            format: 'yyyy-MM-dd HH:mm:ss',
+            from: prop.time[0],
+            to: prop.time[1],
+        },
+    });
+    loading.value = false;
+    if (resp.status === 200) {
+        const dataList: any[] = [
+            {
+                year: prop.time[1],
+                value: undefined,
+                type: prop.data?.name || '',
+            },
+        ];
+        (resp.result as any[]).forEach((i: any) => {
+            dataList.push({
+                ...i,
+                year: i.time,
+                value: Number(i[prop.data.id || '']),
+                type: prop.data?.name || '',
+            });
+        });
+        dataList.push({
+            year: prop.time[0],
+            value: undefined,
+            type: prop.data?.name || '',
+        });
+        chartsList.value = (dataList || []).reverse();
+    }
+};
+
+const queryChartsList = async () => {
+    loading.value = true;
+    const resp = await getPropertiesList(
+        instanceStore.current.id,
+        prop.data.id,
+        {
+            paging: false,
+            terms: [
+                {
+                    column: 'timestamp$BTW',
+                    value:
+                        prop.time[0] && prop.time[1]
+                            ? [prop.time[0], prop.time[1]]
+                            : [],
+                    type: 'and',
+                },
+            ],
+            sorts: [{ name: 'timestamp', order: 'asc' }],
+        },
+    );
+    loading.value = false;
+    if (resp.status === 200) {
+        const dataList: any[] = [
+            {
+                year: prop.time[0],
+                value: undefined,
+                type: prop.data?.name || '',
+            },
+        ];
+        (resp.result as any)?.data?.forEach((i: any) => {
+            dataList.push({
+                ...i,
+                year: i.timestamp,
+                value: i.value,
+                type: prop.data?.name || '',
+            });
+        });
+        dataList.push({
+            year: prop.time[1],
+            value: undefined,
+            type: prop.data?.name || '',
+        });
+        chartsList.value = dataList || [];
+    }
+};
+
+const getOptions = (arr: any[]) => {
+    options.value = {
+        xAxis: {
+            type: 'category',
+            data: arr.map((item) => {
+                return echarts.format.formatTime(
+                    'yyyy-MM-dd\nhh:mm:ss',
+                    item.year,
+                    false,
+                );
+            }),
+            name: '时间',
+        },
+        yAxis: {
+            type: 'value',
+            name: arr[0]?.type,
+        },
+        dataZoom: [
+            {
+                type: 'inside',
+                start: 0,
+                end: 10,
+            },
+            {
+                start: 0,
+                end: 10,
+            },
+        ],
+        tooltip: {
+            trigger: 'axis',
+            position: function (pt: any) {
+                return [pt[0], '10%'];
+            },
+        },
+        series: [
+            {
+                data: arr.map((i: any) => i.value),
+                type: 'line',
+                areaStyle: {},
+            },
+        ],
+    };
+};
+
+watch(
+    () => [cycle, agg],
+    ([newCycle, newAgg]) => {
+        if (newCycle.value === '*' && _type.value) {
+            queryChartsList();
+        } else {
+            queryChartsAggList();
+        }
+    },
+    { deep: true, immediate: true },
+);
+
+watchEffect(() => {
+    if (chartsList.value.length) {
+        getOptions(chartsList.value);
+    }
+});
+</script>
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue b/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue
new file mode 100644
index 00000000..b7860f91
--- /dev/null
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue
@@ -0,0 +1,74 @@
+<template>
+    <a-spin :spinning="loading">
+        <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-space>
+            </div>
+        </div>
+        <AMap :points="geoList" />
+    </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { getPropertyData } from '@/api/device/instance';
+import { useInstanceStore } from '@/store/instance';
+import encodeQuery from '@/utils/encodeQuery';
+import AMap from './AMap.vue';
+
+const instanceStore = useInstanceStore();
+
+const prop = defineProps({
+    data: {
+        type: Object,
+        default: () => {},
+    },
+    time: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const geoList = ref<any[]>([]);
+const loading = ref<boolean>(false);
+
+const query = async () => {
+    loading.value = true;
+    const resp = await getPropertyData(
+        instanceStore.current.id,
+        encodeQuery({
+            paging: false,
+            terms: {
+                property: prop.data.id,
+                timestamp$BTW: prop.time[0] && prop.time[1] ? prop.time : [],
+            },
+            sorts: { timestamp: 'asc' },
+        }),
+    );
+    loading.value = false;
+    if (resp.status === 200) {
+        const list: any[] = [];
+        ((resp.result as any)?.data || []).forEach((item: any) => {
+            list.push([item.value.lon, item.value.lat]);
+        });
+        geoList.value = list
+    }
+};
+
+watch(
+    () => [prop.data.id, prop.time],
+    ([newVal]) => {
+        if (newVal) {
+            query();
+        }
+    },
+    {
+        deep: true, immediate: true
+    }
+);
+</script>
+
+<style lang="less" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue b/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue
index bc945471..83bba809 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue
@@ -18,6 +18,13 @@
                 <template v-if="column.key === 'timestamp'">
                     {{ moment(record.timestamp).format('YYYY-MM-DD HH:mm:ss') }}
                 </template>
+                <template v-if="column.key === 'value'">
+                    <ValueRender
+                        type="table"
+                        :data="_props.data"
+                        :value="{ formatValue: record.value }"
+                    />
+                </template>
                 <template v-else-if="column.key === 'action'">
                     <a-space>
                         <a-button
@@ -30,7 +37,7 @@
                             @click="_download(record)"
                             ><AIcon type="DownloadOutlined"
                         /></a-button>
-                        <a-button type="link"
+                        <a-button type="link" @click="showDetail(record)"
                             ><AIcon type="SearchOutlined"
                         /></a-button>
                     </a-space>
@@ -38,6 +45,28 @@
             </template>
         </a-table>
     </div>
+    <a-modal
+        title="详情"
+        :visible="visible"
+        @ok="visible = false"
+        @cancel="visible = false"
+    >
+        <div>自定义属性</div>
+        <JsonViewer
+            v-if="
+                data?.valueType?.type === 'object' ||
+                data?.valueType?.type === 'array'
+            "
+            :expand-depth="5"
+            :value="current.formatValue"
+        />
+        <a-textarea
+            v-else-if="data?.valueType?.type === 'file'"
+            :value="current.formatValue"
+            :row="3"
+        />
+        <a-input v-else disabled :value="current.formatValue" />
+    </a-modal>
 </template>
 
 <script lang="ts" setup>
@@ -46,6 +75,8 @@ import { useInstanceStore } from '@/store/instance';
 import encodeQuery from '@/utils/encodeQuery';
 import moment from 'moment';
 import { getType } from '../index';
+import ValueRender from '../ValueRender.vue';
+import JsonViewer from 'vue-json-viewer';
 
 const _props = defineProps({
     data: {
@@ -57,8 +88,11 @@ const _props = defineProps({
         default: () => [],
     },
 });
+
 const instanceStore = useInstanceStore();
 const dataSource = ref({});
+const current = ref<any>({});
+const visible = ref<boolean>(false);
 
 const columns = computed(() => {
     const arr: any[] = [
@@ -92,6 +126,11 @@ const showLoad = computed(() => {
     );
 });
 
+const showDetail = (item: any) => {
+    visible.value = true;
+    current.value = item;
+};
+
 const queryPropertyData = async (params: any) => {
     const resp = await getPropertyData(
         instanceStore.current.id,
@@ -99,7 +138,7 @@ const queryPropertyData = async (params: any) => {
             ...params,
             terms: {
                 property: _props.data.id,
-                timestamp$BTW: _props.time?.length ? _props.time : [],
+                timestamp$BTW: _props.time,
             },
             sorts: { timestamp: 'desc' },
         }),
@@ -109,14 +148,20 @@ const queryPropertyData = async (params: any) => {
     }
 };
 
-watchEffect(() => {
-    if (_props.data.id) {
-        queryPropertyData({
-            pageSize: _props.data.valueType?.type === 'file' ? 5 : 10,
-            pageIndex: 0,
-        });
+watch(
+    () => [_props.data.id, _props.time],
+    ([newVal]) => {
+        if (newVal) {
+            queryPropertyData({
+                pageSize: _props.data.valueType?.type === 'file' ? 5 : 10,
+                pageIndex: 0,
+            });
+        }
+    },
+    {
+        deep: true, immediate: true
     }
-});
+);
 
 const onChange = (page: any) => {
     queryPropertyData({
@@ -140,4 +185,10 @@ const _download = (record: any) => {
     //移除
     document.body.removeChild(downNode);
 };
-</script>
\ No newline at end of file
+</script>
+
+<style lang="less" scoped>
+:deep(.ant-pagination-item) {
+    display: none !important;
+}
+</style>
\ No newline at end of file
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 6ba7173e..6bdb9c4b 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/index.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/index.vue
@@ -2,15 +2,15 @@
     <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">
+            <a-tabs 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>
                 <a-tab-pane key="charts" tab="图表">
-                    <Charts />
+                    <Charts :data="props.data" :time="_getTimes" />
                 </a-tab-pane>
-                <a-tab-pane key="geo" tab="轨迹">
-                    <AMap />
+                <a-tab-pane key="geo" tab="轨迹" v-if="data?.valueType?.type === 'geoPoint'">
+                    <PropertyAMap :data="props.data" :time="_getTimes" />
                 </a-tab-pane>
             </a-tabs>
         </div>
@@ -21,7 +21,7 @@
 import type { Dayjs } from 'dayjs';
 import TimeComponent from './TimeComponent.vue'
 import Charts from './Charts.vue'
-import AMap from './AMap.vue'
+import PropertyAMap from './PropertyAMap.vue'
 import Table from './Table.vue'
 
 const props = defineProps({
diff --git a/src/views/device/Instance/Detail/Running/Property/PropertyCard.vue b/src/views/device/Instance/Detail/Running/Property/PropertyCard.vue
index 220765b2..8ad0c5ef 100644
--- a/src/views/device/Instance/Detail/Running/Property/PropertyCard.vue
+++ b/src/views/device/Instance/Detail/Running/Property/PropertyCard.vue
@@ -1,15 +1,15 @@
 <template>
     <a-card :hoverable="true" class="card-box">
         <!-- <a-spin :spinning="loading"> -->
-            <div class="card-container">
-                <div class="header">
-                    <div class="title">{{ _props.data.name }}</div>
-                    <div class="extra">
-                        <a-space :size="16">
+        <div class="card-container">
+            <div class="header">
+                <div class="title">{{ _props.data.name }}</div>
+                <div class="extra">
+                    <a-space :size="16">
+                        <template v-for="i in actions" :key="i.key">
                             <a-tooltip
-                                v-for="i in actions"
-                                :key="i.key"
                                 v-bind="i.tooltip"
+                                v-if="i.key !== 'edit'"
                             >
                                 <a-button
                                     style="padding: 0; margin: 0"
@@ -17,26 +17,48 @@
                                     :disabled="i.disabled"
                                     @click="i.onClick && i.onClick(data)"
                                 >
-                                    <AIcon :type="i.icon" style="color: #323130; font-size: 12px" />
+                                    <AIcon
+                                        :type="i.icon"
+                                        style="color: #323130; font-size: 12px"
+                                    />
                                 </a-button>
                             </a-tooltip>
-                        </a-space>
-                    </div>
-                </div>
-                <div class="value">
-                    <ValueRender :data="data" :value="_props.data" type="card" />
-                </div>
-                <div class="bottom">
-                    <div style="color: rgba(0, 0, 0, .65); font-size: 12px">更新时间</div>
-                    <div class="time-value">{{_props?.data?.timeString || '--'}}</div>
+                            <PermissionButton
+                                :disabled="i.disabled"
+                                v-else
+                                :popConfirm="i.popConfirm"
+                                :tooltip="i.tooltip"
+                                @click="i.onClick && i.onClick(slotProps)"
+                                type="link"
+                                style="padding: 0px"
+                                :hasPermission="'device/Instance:update'"
+                            >
+                                <template #icon
+                                    ><AIcon :type="i.icon" style="color: #323130; font-size: 12px"
+                                /></template>
+                            </PermissionButton>
+                        </template>
+                    </a-space>
                 </div>
             </div>
+            <div class="value">
+                <ValueRender :data="data" :value="_props.data" type="card" />
+            </div>
+            <div class="bottom">
+                <div style="color: rgba(0, 0, 0, 0.65); font-size: 12px">
+                    更新时间
+                </div>
+                <div class="time-value">
+                    {{ _props?.data?.timeString || '--' }}
+                </div>
+            </div>
+        </div>
         <!-- </a-spin> -->
     </a-card>
 </template>
 
 <script lang="ts" setup>
-import ValueRender from './ValueRender.vue'
+import ValueRender from './ValueRender.vue';
 const _props = defineProps({
     data: {
         type: Object,
@@ -44,7 +66,7 @@ const _props = defineProps({
     },
     actions: {
         type: Array,
-        default: () => []
+        default: () => [],
     },
 });
 // const loading = ref<boolean>(true);
@@ -101,6 +123,6 @@ const _props = defineProps({
                 color: #000;
             }
         }
-    }   
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue b/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue
index d6fbb976..279505a7 100644
--- a/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue
+++ b/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue
@@ -13,23 +13,18 @@
             <a-image :src="value?.formatValue" />
         </template>
         <template v-else-if="['.flv', '.m3u8', '.mp4'].includes(type)">
-            <!-- TODO 视频组件缺失 -->
         </template>
         <template v-else>
-            <!-- <json-viewer
-                :value="{
-                    'id': '123'
-                }"
-                copyable
-                boxed
-                sort
-            ></json-viewer> -->
+            <JsonViewer
+                :expand-depth="5"
+                :value="value?.formatValue"
+            />
         </template>
     </a-modal>
 </template>
 
 <script lang="ts" setup>
-// import JsonViewer from 'vue3-json-viewer';
+import JsonViewer from 'vue-json-viewer';
 
 const _data = defineProps({
     type: {
@@ -46,9 +41,6 @@ const handleCancel = () => {
     _emit('close');
 };
 
-// watchEffect(() => {
-//     console.log(_data.value?.formatValue)
-// })
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/device/Instance/Detail/Running/Property/ValueRender.vue b/src/views/device/Instance/Detail/Running/Property/ValueRender.vue
index 10080cd0..60045917 100644
--- a/src/views/device/Instance/Detail/Running/Property/ValueRender.vue
+++ b/src/views/device/Instance/Detail/Running/Property/ValueRender.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="value">
         <div v-if="value?.formatValue !== 0 && !value?.formatValue" :class="valueClass">--</div>
-        <div v-else-if="data?.valueType?.type === 'file'">
+        <div v-else-if="_data.data?.valueType?.type === 'file'">
           <template v-if="data?.valueType?.fileType === 'base64'">
             <div :class="valueClass" v-if="!!getType(value?.formatValue)">
               <img :src="imgMap.get(_type)" @error="onError" />
@@ -36,10 +36,10 @@
             </template>
           </template>
         </div>
-        <div v-else-if="data?.valueType?.type === 'object'" @click="getDetail('obj')" :class="valueClass">
+        <div v-else-if="_data.data?.valueType?.type === 'object'" @click="getDetail('obj')" :class="valueClass">
           <img :src="imgMap.get('obj')" />
         </div>
-        <div v-else-if="data?.valueType?.type === 'geoPoint' || data?.valueType?.type === 'array'" :class="valueClass">
+        <div v-else-if="_data.data?.valueType?.type === 'geoPoint' || _data.data?.valueType?.type === 'array'" :class="valueClass">
           {{JSON.stringify(value?.formatValue)}}
         </div>
         <div v-else :class="valueClass">
@@ -53,7 +53,7 @@
 import { getImage } from "@/utils/comm";
 import { message } from "ant-design-vue";
 import ValueDetail from './ValueDetail.vue'
-import {getType, imgMap} from './index'
+import {getType, imgMap, imgList, videoList, fileList} from './index'
 
 const _data = defineProps({
     data: {
@@ -115,7 +115,6 @@ const getDetail = (_type: string) => {
   _types.value = flag
   visible.value = true
 }
-
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/device/Instance/Detail/Running/Property/index.vue b/src/views/device/Instance/Detail/Running/Property/index.vue
index 5cc3466b..27b2fc7a 100644
--- a/src/views/device/Instance/Detail/Running/Property/index.vue
+++ b/src/views/device/Instance/Detail/Running/Property/index.vue
@@ -32,20 +32,30 @@
             </template>
             <template #action="slotProps">
                 <a-space :size="16">
-                    <a-tooltip
-                        v-for="i in getActions(slotProps)"
-                        :key="i.key"
-                        v-bind="i.tooltip"
-                    >
-                        <a-button
-                            style="padding: 0"
-                            type="link"
+                    <template v-for="i in getActions(slotProps)" :key="i.key">
+                        <a-tooltip v-bind="i.tooltip" v-if="i.key !== 'edit'">
+                            <a-button
+                                style="padding: 0"
+                                type="link"
+                                :disabled="i.disabled"
+                                @click="i.onClick && i.onClick(slotProps)"
+                            >
+                                <AIcon :type="i.icon" />
+                            </a-button>
+                        </a-tooltip>
+                        <PermissionButton
                             :disabled="i.disabled"
+                            v-else
+                            :popConfirm="i.popConfirm"
+                            :tooltip="i.tooltip"
                             @click="i.onClick && i.onClick(slotProps)"
+                            type="link"
+                            style="padding: 0px"
+                            :hasPermission="'device/Instance:update'"
                         >
-                            <AIcon :type="i.icon" />
-                        </a-button>
-                    </a-tooltip>
+                            <template #icon><AIcon :type="i.icon" /></template>
+                        </PermissionButton>
+                    </template>
                 </a-space>
             </template>
             <template #paginationRender>
@@ -76,7 +86,11 @@
         @close="indicatorVisible = false"
         :data="currentInfo"
     />
-    <Detail v-if="detailVisible" :data="currentInfo" @close="detailVisible = false" />
+    <Detail
+        v-if="detailVisible"
+        :data="currentInfo"
+        @close="detailVisible = false"
+    />
 </template>
 
 <script lang="ts" setup>
@@ -240,11 +254,15 @@ const subscribeProperty = () => {
         ?.pipe(map((res: any) => res.payload))
         .subscribe((payload) => {
             list.value = [...list.value, payload];
-            unref(list).sort((a: any, b: any) => a.timestamp - b.timestamp)
-            .forEach((item: any) => {
-                const { value } = item;
-                propertyValue.value[value?.property] = { ...item, ...value };
-            });
+            unref(list)
+                .sort((a: any, b: any) => a.timestamp - b.timestamp)
+                .forEach((item: any) => {
+                    const { value } = item;
+                    propertyValue.value[value?.property] = {
+                        ...item,
+                        ...value,
+                    };
+                });
             // list.value = [...list.value, payload];
             // throttle(valueChange(list.value), 500);
         });
@@ -337,8 +355,8 @@ const onSearch = () => {
 };
 
 onUnmounted(() => {
-    subRef.value && subRef.value?.unsubscribe()
-})
+    subRef.value && subRef.value?.unsubscribe();
+});
 </script>
 
 <style scoped lang="less">
diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue
index 9401c2b3..f775e847 100644
--- a/src/views/device/Instance/Detail/index.vue
+++ b/src/views/device/Instance/Detail/index.vue
@@ -2,7 +2,7 @@
     <page-container
         :tabList="list"
         @back="onBack"
-        :tabActiveKey="instanceStore.active"
+        :tabActiveKey="instanceStore.tabActiveKey"
         @tabChange="onTabChange"
     >
         <template #title>
diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue
index 7049e76b..bf1e1393 100644
--- a/src/views/device/Instance/index.vue
+++ b/src/views/device/Instance/index.vue
@@ -155,13 +155,12 @@
                         />
                     </template>
                     <template #content>
-                        <h3
-                            class="card-item-content-title"
-                            @click.stop="handleView(slotProps.id)"
-                        >
-                            {{ slotProps.name }}
-                        </h3>
-                        <a-row>
+                        <Ellipsis style="width: calc(100% - 100px)">
+                            <span style="font-size: 16px; font-weight: 600"  @click.stop="handleView(slotProps.id)">
+                                {{ slotProps.name }}
+                            </span>
+                        </Ellipsis>
+                        <a-row style="margin-top: 20px">
                             <a-col :span="12">
                                 <div class="card-item-content-text">
                                     设备类型
@@ -172,7 +171,9 @@
                                 <div class="card-item-content-text">
                                     产品名称
                                 </div>
-                                <div>{{ slotProps.productName }}</div>
+                                <Ellipsis style="width: 100%">
+                                    {{ slotProps.productName }}
+                                </Ellipsis>
                             </a-col>
                         </a-row>
                     </template>
diff --git a/yarn.lock b/yarn.lock
index f8378c67..aeb96768 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -616,12 +616,12 @@
   resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.12.tgz"
   integrity sha512-iPYKN78t3op2+erv2frW568j1q0RpqX6JOLZ7oPPaAV1VaF7dDstOrNw37PVOYoTWE11pV4A1XUitpdEFNIsPg==
 
-"@gar/promisify@^1.1.3":
+"@gar/promisify@^1.0.1":
   version "1.1.3"
   resolved "https://registry.jetlinks.cn/@gar%2fpromisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@isaacs/string-locale-compare@*", "@isaacs/string-locale-compare@^1.1.0":
+"@isaacs/string-locale-compare@^1.0.1", "@isaacs/string-locale-compare@^1.1.0":
   version "1.1.0"
   resolved "https://registry.jetlinks.cn/@isaacs%2fstring-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
   integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
@@ -703,177 +703,157 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/arborist@*", "@npmcli/arborist@^6.2.3":
-  version "6.2.3"
-  resolved "https://registry.jetlinks.cn/@npmcli%2farborist/-/arborist-6.2.3.tgz#31f8aed2588341864d3811151d929c01308f8e71"
-  integrity sha512-lpGOC2ilSJXcc2zfW9QtukcCTcMbl3fVI0z4wvFB2AFIl0C+Q6Wv7ccrpdrQa8rvJ1ZVuc6qkX7HVTyKlzGqKA==
+"@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.5.0", "@npmcli/arborist@^2.9.0":
+  version "2.10.0"
+  resolved "https://registry.jetlinks.cn/@npmcli%2farborist/-/arborist-2.10.0.tgz#424c2d73a7ae59c960b0cc7f74fed043e4316c2c"
+  integrity sha512-CLnD+zXG9oijEEzViimz8fbOoFVb7hoypiaf7p6giJhvYtrxLAyY3cZAMPIFQvsG731+02eMDp3LqVBNo7BaZA==
   dependencies:
-    "@isaacs/string-locale-compare" "^1.1.0"
-    "@npmcli/fs" "^3.1.0"
-    "@npmcli/installed-package-contents" "^2.0.0"
-    "@npmcli/map-workspaces" "^3.0.2"
-    "@npmcli/metavuln-calculator" "^5.0.0"
-    "@npmcli/name-from-folder" "^2.0.0"
-    "@npmcli/node-gyp" "^3.0.0"
-    "@npmcli/package-json" "^3.0.0"
-    "@npmcli/query" "^3.0.0"
-    "@npmcli/run-script" "^6.0.0"
-    bin-links "^4.0.1"
-    cacache "^17.0.4"
+    "@isaacs/string-locale-compare" "^1.0.1"
+    "@npmcli/installed-package-contents" "^1.0.7"
+    "@npmcli/map-workspaces" "^1.0.2"
+    "@npmcli/metavuln-calculator" "^1.1.0"
+    "@npmcli/move-file" "^1.1.0"
+    "@npmcli/name-from-folder" "^1.0.1"
+    "@npmcli/node-gyp" "^1.0.1"
+    "@npmcli/package-json" "^1.0.1"
+    "@npmcli/run-script" "^1.8.2"
+    bin-links "^2.2.1"
+    cacache "^15.0.3"
     common-ancestor-path "^1.0.1"
-    hosted-git-info "^6.1.1"
-    json-parse-even-better-errors "^3.0.0"
+    json-parse-even-better-errors "^2.3.1"
     json-stringify-nice "^1.1.4"
-    minimatch "^6.1.6"
-    nopt "^7.0.0"
-    npm-install-checks "^6.0.0"
-    npm-package-arg "^10.1.0"
-    npm-pick-manifest "^8.0.1"
-    npm-registry-fetch "^14.0.3"
-    npmlog "^7.0.1"
-    pacote "^15.0.8"
-    parse-conflict-json "^3.0.0"
-    proc-log "^3.0.0"
+    mkdirp "^1.0.4"
+    mkdirp-infer-owner "^2.0.0"
+    npm-install-checks "^4.0.0"
+    npm-package-arg "^8.1.5"
+    npm-pick-manifest "^6.1.0"
+    npm-registry-fetch "^11.0.0"
+    pacote "^11.3.5"
+    parse-conflict-json "^1.1.1"
+    proc-log "^1.0.0"
     promise-all-reject-late "^1.0.0"
     promise-call-limit "^1.0.1"
-    read-package-json-fast "^3.0.2"
-    semver "^7.3.7"
-    ssri "^10.0.1"
-    treeverse "^3.0.0"
-    walk-up-path "^1.0.0"
-
-"@npmcli/ci-detect@*":
-  version "3.0.2"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fci-detect/-/ci-detect-3.0.2.tgz#facf5e48f553dd876cc9f5a749b269186ed7f7e6"
-  integrity sha512-P7nZG0skRVa9lH0OQmFG62CrzOySUiuPbKopjVAj3sXP0m1om9XfIvTp46h+NvlpTyd121JekiXFZj+1pnbm9g==
-
-"@npmcli/config@*":
-  version "6.1.3"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fconfig/-/config-6.1.3.tgz#8f513bf1a5dfa76f98d93d3cb6fb06b5f8960bd9"
-  integrity sha512-c8uOXPbRq1K8YeyUszj6MBWIdB6bx6x3K/UbGmc5GF7qpv1mB893Y5SuyrH/J7Kcw24Im4ASrsztk38ZBWFS2Q==
-  dependencies:
-    "@npmcli/map-workspaces" "^3.0.2"
-    ini "^3.0.0"
-    nopt "^7.0.0"
-    proc-log "^3.0.0"
-    read-package-json-fast "^3.0.2"
+    read-package-json-fast "^2.0.2"
+    readdir-scoped-modules "^1.1.0"
+    rimraf "^3.0.2"
     semver "^7.3.5"
+    ssri "^8.0.1"
+    treeverse "^1.0.4"
     walk-up-path "^1.0.0"
 
-"@npmcli/disparity-colors@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fdisparity-colors/-/disparity-colors-3.0.0.tgz#60ea8c6eb5ba9de2d1950e15b06205b2c3ab7833"
-  integrity sha512-5R/z157/f20Fi0Ou4ZttL51V0xz0EdPEOauFtPCEYOLInDBRCj1/TxOJ5aGTrtShxEshN2d+hXb9ZKSi5RLBcg==
+"@npmcli/ci-detect@^1.2.0", "@npmcli/ci-detect@^1.3.0":
+  version "1.4.0"
+  resolved "https://registry.jetlinks.cn/@npmcli%2fci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
+  integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==
+
+"@npmcli/config@^2.3.0":
+  version "2.4.0"
+  resolved "https://registry.jetlinks.cn/@npmcli%2fconfig/-/config-2.4.0.tgz#1447b0274f9502871dabd3ab1d8302472d515b1f"
+  integrity sha512-fwxu/zaZnvBJohXM3igzqa3P1IVYWi5N343XcKvKkJbAx+rTqegS5tAul4NLiMPQh6WoS5a4er6oo/ieUx1f4g==
+  dependencies:
+    ini "^2.0.0"
+    mkdirp-infer-owner "^2.0.0"
+    nopt "^5.0.0"
+    semver "^7.3.4"
+    walk-up-path "^1.0.0"
+
+"@npmcli/disparity-colors@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.jetlinks.cn/@npmcli%2fdisparity-colors/-/disparity-colors-1.0.1.tgz#b23c864c9658f9f0318d5aa6d17986619989535c"
+  integrity sha512-kQ1aCTTU45mPXN+pdAaRxlxr3OunkyztjbbxDY/aIcPS5CnCUrx+1+NvA6pTcYR7wmLZe37+Mi5v3nfbwPxq3A==
   dependencies:
     ansi-styles "^4.3.0"
 
-"@npmcli/fs@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.jetlinks.cn/@npmcli%2ffs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
+"@npmcli/fs@^1.0.0":
+  version "1.1.1"
+  resolved "https://registry.jetlinks.cn/@npmcli%2ffs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
+  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
   dependencies:
-    "@gar/promisify" "^1.1.3"
+    "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/fs@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.jetlinks.cn/@npmcli%2ffs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e"
-  integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==
+"@npmcli/git@^2.0.7", "@npmcli/git@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.jetlinks.cn/@npmcli%2fgit/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
+  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
   dependencies:
-    semver "^7.3.5"
-
-"@npmcli/git@^4.0.0", "@npmcli/git@^4.0.1":
-  version "4.0.3"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fgit/-/git-4.0.3.tgz#354db5fe1f29696303638e191d8538ee9b01b4bb"
-  integrity sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==
-  dependencies:
-    "@npmcli/promise-spawn" "^6.0.0"
-    lru-cache "^7.4.4"
+    "@npmcli/promise-spawn" "^1.3.2"
+    lru-cache "^6.0.0"
     mkdirp "^1.0.4"
-    npm-pick-manifest "^8.0.0"
-    proc-log "^3.0.0"
+    npm-pick-manifest "^6.1.1"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
-    which "^3.0.0"
+    which "^2.0.2"
 
-"@npmcli/installed-package-contents@^2.0.0", "@npmcli/installed-package-contents@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.jetlinks.cn/@npmcli%2finstalled-package-contents/-/installed-package-contents-2.0.1.tgz#3cad3141c95613426820128757a3549bef1b346b"
-  integrity sha512-GIykAFdOVK31Q1/zAtT5MbxqQL2vyl9mvFJv+OGu01zxbhL3p0xc8gJjdNGX1mWmUT43aEKVO2L6V/2j4TOsAA==
+"@npmcli/installed-package-contents@^1.0.6", "@npmcli/installed-package-contents@^1.0.7":
+  version "1.0.7"
+  resolved "https://registry.jetlinks.cn/@npmcli%2finstalled-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
+  integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
   dependencies:
-    npm-bundled "^3.0.0"
-    npm-normalize-package-bin "^3.0.0"
+    npm-bundled "^1.1.1"
+    npm-normalize-package-bin "^1.0.1"
 
-"@npmcli/map-workspaces@*", "@npmcli/map-workspaces@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fmap-workspaces/-/map-workspaces-3.0.2.tgz#aa3f9ebccb213073d6d6bf743047272108c29f06"
-  integrity sha512-bCEC4PG7HbadtAYkW/TTUVNEOSr5Dhfmv6yGLgByJgCvdCqq7teq09cjvJ1LhzJU/euWjvYMcQxsfj7yDD2ikg==
+"@npmcli/map-workspaces@^1.0.2", "@npmcli/map-workspaces@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.jetlinks.cn/@npmcli%2fmap-workspaces/-/map-workspaces-1.0.4.tgz#915708b55afa25e20bc2c14a766c124c2c5d4cab"
+  integrity sha512-wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q==
   dependencies:
-    "@npmcli/name-from-folder" "^2.0.0"
-    glob "^8.0.1"
-    minimatch "^6.1.6"
-    read-package-json-fast "^3.0.0"
+    "@npmcli/name-from-folder" "^1.0.1"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+    read-package-json-fast "^2.0.1"
 
-"@npmcli/metavuln-calculator@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fmetavuln-calculator/-/metavuln-calculator-5.0.0.tgz#917c3be49ebed0b424b07f38060b929127e4c499"
-  integrity sha512-BBFQx4M12wiEuVwCgtX/Depx0B/+NHMwDWOlXT41/Pdy5W/1Fenk+hibUlMSrFWwASbX+fY90UbILAEIYH02/A==
+"@npmcli/metavuln-calculator@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.jetlinks.cn/@npmcli%2fmetavuln-calculator/-/metavuln-calculator-1.1.1.tgz#2f95ff3c6d88b366dd70de1c3f304267c631b458"
+  integrity sha512-9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ==
   dependencies:
-    cacache "^17.0.0"
-    json-parse-even-better-errors "^3.0.0"
-    pacote "^15.0.0"
-    semver "^7.3.5"
+    cacache "^15.0.5"
+    pacote "^11.1.11"
+    semver "^7.3.2"
 
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fmove-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
+"@npmcli/move-file@^1.0.1", "@npmcli/move-file@^1.1.0":
+  version "1.1.2"
+  resolved "https://registry.jetlinks.cn/@npmcli%2fmove-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
+  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
   dependencies:
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@npmcli/name-from-folder@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fname-from-folder/-/name-from-folder-2.0.0.tgz#c44d3a7c6d5c184bb6036f4d5995eee298945815"
-  integrity sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==
+"@npmcli/name-from-folder@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.jetlinks.cn/@npmcli%2fname-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
+  integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
 
-"@npmcli/node-gyp@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fnode-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a"
-  integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==
+"@npmcli/node-gyp@^1.0.1", "@npmcli/node-gyp@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.jetlinks.cn/@npmcli%2fnode-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
+  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
 
-"@npmcli/package-json@*", "@npmcli/package-json@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fpackage-json/-/package-json-3.0.0.tgz#c9219a197e1be8dbf43c4ef8767a72277c0533b6"
-  integrity sha512-NnuPuM97xfiCpbTEJYtEuKz6CFbpUHtaT0+5via5pQeI25omvQDFbp1GcGJ/c4zvL/WX0qbde6YiLgfZbWFgvg==
+"@npmcli/package-json@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.jetlinks.cn/@npmcli%2fpackage-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89"
+  integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg==
   dependencies:
-    json-parse-even-better-errors "^3.0.0"
+    json-parse-even-better-errors "^2.3.1"
 
-"@npmcli/promise-spawn@^6.0.0", "@npmcli/promise-spawn@^6.0.1":
-  version "6.0.2"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fpromise-spawn/-/promise-spawn-6.0.2.tgz#c8bc4fa2bd0f01cb979d8798ba038f314cfa70f2"
-  integrity sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==
+"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.jetlinks.cn/@npmcli%2fpromise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
+  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
   dependencies:
-    which "^3.0.0"
+    infer-owner "^1.0.4"
 
-"@npmcli/query@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fquery/-/query-3.0.0.tgz#51a0dfb85811e04f244171f164b6bc83b36113a7"
-  integrity sha512-MFNDSJNgsLZIEBVZ0Q9w9K7o07j5N4o4yjtdz2uEpuCZlXGMuPENiRaFYk0vRqAA64qVuUQwC05g27fRtfUgnA==
+"@npmcli/run-script@^1.8.2", "@npmcli/run-script@^1.8.3", "@npmcli/run-script@^1.8.4", "@npmcli/run-script@^1.8.6":
+  version "1.8.6"
+  resolved "https://registry.jetlinks.cn/@npmcli%2frun-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
+  integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
   dependencies:
-    postcss-selector-parser "^6.0.10"
-
-"@npmcli/run-script@*", "@npmcli/run-script@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.jetlinks.cn/@npmcli%2frun-script/-/run-script-6.0.0.tgz#f89e322c729e26ae29db6cc8cc76559074aac208"
-  integrity sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==
-  dependencies:
-    "@npmcli/node-gyp" "^3.0.0"
-    "@npmcli/promise-spawn" "^6.0.0"
-    node-gyp "^9.0.0"
-    read-package-json-fast "^3.0.0"
-    which "^3.0.0"
+    "@npmcli/node-gyp" "^1.0.2"
+    "@npmcli/promise-spawn" "^1.3.2"
+    node-gyp "^7.1.0"
+    read-package-json-fast "^2.0.1"
 
 "@rollup/pluginutils@^4.1.2", "@rollup/pluginutils@^4.2.0":
   version "4.2.1"
@@ -912,10 +892,10 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.jetlinks.cn/@tootallnate%2fonce/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+"@tootallnate/once@1":
+  version "1.1.2"
+  resolved "https://registry.jetlinks.cn/@tootallnate%2fonce/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"
@@ -1235,23 +1215,11 @@ JSONStream@^1.0.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@*, abbrev@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.jetlinks.cn/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
-  integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
-
-abbrev@^1.0.0:
+abbrev@1, abbrev@~1.1.1:
   version "1.1.1"
   resolved "https://registry.jetlinks.cn/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-abort-controller@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
-  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
-  dependencies:
-    event-target-shim "^5.0.0"
-
 acorn-walk@^8.1.1:
   version "8.2.0"
   resolved "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-8.2.0.tgz"
@@ -1269,7 +1237,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.2.1:
+agentkeepalive@^4.1.3:
   version "4.2.1"
   resolved "https://registry.jetlinks.cn/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
   integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@@ -1376,12 +1344,12 @@ ansi-styles@^6.0.0:
   resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-6.2.1.tgz"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
 
-ansicolors@*:
+ansicolors@~0.3.2:
   version "0.3.2"
   resolved "https://registry.jetlinks.cn/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
   integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==
 
-ansistyles@*:
+ansistyles@~0.1.3:
   version "0.1.3"
   resolved "https://registry.jetlinks.cn/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
   integrity sha512-6QWEyvMgIXX0eO972y7YPBLSBsq7UWKFAoNNTLGaOJ9bstcEL9sCbcjf96dVfNDdUsRoGOK82vWFJlKApXds7g==
@@ -1417,31 +1385,36 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+aproba@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.jetlinks.cn/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
 "aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.jetlinks.cn/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-archy@*:
+archy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.jetlinks.cn/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
 
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.jetlinks.cn/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.jetlinks.cn/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
-are-we-there-yet@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.jetlinks.cn/are-we-there-yet/-/are-we-there-yet-4.0.0.tgz#3ff397dc14f08b52dd8b2a64d3cee154ab8760d2"
-  integrity sha512-nSXlV+u3vtVjRgihdTzbfWYzxPWGo424zPgQbHD0ZqIla3jqYAewDcvee0Ua2hjS5IfTAmjGlx1Jf0PKwjZDEw==
+are-we-there-yet@~1.1.2:
+  version "1.1.7"
+  resolved "https://registry.jetlinks.cn/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
+  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
   dependencies:
     delegates "^1.0.0"
-    readable-stream "^4.1.0"
+    readable-stream "^2.0.6"
 
 arg@^4.1.0:
   version "4.1.3"
@@ -1555,11 +1528,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.jetlinks.cn/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.jetlinks.cn/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
@@ -1567,15 +1535,17 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bin-links@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.jetlinks.cn/bin-links/-/bin-links-4.0.1.tgz#afeb0549e642f61ff889b58ea2f8dca78fb9d8d3"
-  integrity sha512-bmFEM39CyX336ZGGRsGPlc6jZHriIoHacOQcTt72MktIjpPhZoP4te2jOyUXF3BLILmJ8aNLncoPVeIIFlrDeA==
+bin-links@^2.2.1:
+  version "2.3.0"
+  resolved "https://registry.jetlinks.cn/bin-links/-/bin-links-2.3.0.tgz#1ff241c86d2c29b24ae52f49544db5d78a4eb967"
+  integrity sha512-JzrOLHLwX2zMqKdyYZjkDgQGT+kHDkIhv2/IK2lJ00qLxV4TmFoHi8drDBb6H5Zrz1YfgHkai4e2MGPqnoUhqA==
   dependencies:
-    cmd-shim "^6.0.0"
-    npm-normalize-package-bin "^3.0.0"
-    read-cmd-shim "^4.0.0"
-    write-file-atomic "^5.0.0"
+    cmd-shim "^4.0.1"
+    mkdirp-infer-owner "^2.0.0"
+    npm-normalize-package-bin "^1.0.0"
+    read-cmd-shim "^2.0.0"
+    rimraf "^3.0.0"
+    write-file-atomic "^3.0.3"
 
 binary-extensions@^2.0.0, binary-extensions@^2.2.0:
   version "2.2.0"
@@ -1651,68 +1621,34 @@ buffer-from@^1.0.0:
   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.jetlinks.cn/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
-  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.2.1"
-
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmmirror.com/builtins/-/builtins-1.0.3.tgz"
   integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
 
-builtins@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.jetlinks.cn/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
-  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
+cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
+  version "15.3.0"
+  resolved "https://registry.jetlinks.cn/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
+  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
   dependencies:
-    semver "^7.0.0"
-
-cacache@*, cacache@^17.0.0, cacache@^17.0.4:
-  version "17.0.4"
-  resolved "https://registry.jetlinks.cn/cacache/-/cacache-17.0.4.tgz#5023ed892ba8843e3b7361c26d0ada37e146290c"
-  integrity sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==
-  dependencies:
-    "@npmcli/fs" "^3.1.0"
-    fs-minipass "^3.0.0"
-    glob "^8.0.1"
-    lru-cache "^7.7.1"
-    minipass "^4.0.0"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    ssri "^10.0.0"
-    tar "^6.1.11"
-    unique-filename "^3.0.0"
-
-cacache@^16.1.0:
-  version "16.1.3"
-  resolved "https://registry.jetlinks.cn/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
-  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
+    "@npmcli/fs" "^1.0.0"
+    "@npmcli/move-file" "^1.0.1"
     chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
+    fs-minipass "^2.0.0"
+    glob "^7.1.4"
     infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
+    lru-cache "^6.0.0"
+    minipass "^3.1.1"
     minipass-collect "^1.0.2"
     minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
+    minipass-pipeline "^1.2.2"
+    mkdirp "^1.0.3"
     p-map "^4.0.0"
     promise-inflight "^1.0.1"
     rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^2.0.0"
+    ssri "^8.0.1"
+    tar "^6.0.2"
+    unique-filename "^1.1.1"
 
 cacheable-request@^6.0.0:
   version "6.1.0"
@@ -1793,11 +1729,6 @@ caseless@~0.12.0:
   resolved "https://registry.jetlinks.cn/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
-chalk@*:
-  version "5.2.0"
-  resolved "https://registry.jetlinks.cn/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3"
-  integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==
-
 chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz"
@@ -1826,9 +1757,9 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  resolved "https://registry.jetlinks.cn/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
@@ -1872,7 +1803,7 @@ chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@*, chownr@^2.0.0:
+chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.jetlinks.cn/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
@@ -1887,17 +1818,12 @@ ci-info@^2.0.0:
   resolved "https://registry.npmmirror.com/ci-info/-/ci-info-2.0.0.tgz"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
-ci-info@^3.6.1, ci-info@^3.7.1:
-  version "3.8.0"
-  resolved "https://registry.jetlinks.cn/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
-  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
-
-cidr-regex@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.jetlinks.cn/cidr-regex/-/cidr-regex-4.0.2.tgz#ca8216d1761eed0bd9c4f5e8740f2d7363dd05bb"
-  integrity sha512-xvqVyyE8emYjipWVxsA+Vcsbt8TbJJsTHbOeMMA5qsmXUu5VZJzNBGwI4rr1IZ0FQI2z7bfry4NNACP5Cf67CA==
+cidr-regex@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.jetlinks.cn/cidr-regex/-/cidr-regex-3.1.1.tgz#ba1972c57c66f61875f18fd7dd487469770b571d"
+  integrity sha512-RBqYd32aDwbCMFJRL6wHOlDNYJsPNTt8vC82ErHF5vKt8QQzxm1FrkW8s/R5pVrXMf17sba09Uoy91PKiddAsw==
   dependencies:
-    ip-regex "^5.0.0"
+    ip-regex "^4.1.0"
 
 clean-css@^5.2.2:
   version "5.3.1"
@@ -1921,13 +1847,13 @@ cli-boxes@^2.2.0:
   resolved "https://registry.npmmirror.com/cli-boxes/-/cli-boxes-2.2.1.tgz"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
 
-cli-columns@*:
-  version "4.0.0"
-  resolved "https://registry.jetlinks.cn/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
-  integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==
+cli-columns@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.jetlinks.cn/cli-columns/-/cli-columns-3.1.2.tgz#6732d972979efc2ae444a1f08e08fa139c96a18e"
+  integrity sha512-iQYpDgpPPmCjn534ikQOhi+ydP6uMar+DtJ6a0In4aGL/PKqWfao75s6eF81quQQaz7isGz+goNECLARRZswdg==
   dependencies:
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.1"
 
 cli-cursor@^3.1.0:
   version "3.1.0"
@@ -1936,7 +1862,7 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@*:
+cli-table3@^0.6.0:
   version "0.6.3"
   resolved "https://registry.jetlinks.cn/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
   integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
@@ -1966,6 +1892,15 @@ cli-width@^3.0.0:
   resolved "https://registry.npmmirror.com/cli-width/-/cli-width-3.0.0.tgz"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
+clipboard@^2.0.4:
+  version "2.0.11"
+  resolved "https://registry.jetlinks.cn/clipboard/-/clipboard-2.0.11.tgz#62180360b97dd668b6b3a84ec226975762a70be5"
+  integrity sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==
+  dependencies:
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.0.0"
+
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmmirror.com/cliui/-/cliui-5.0.0.tgz"
@@ -1996,10 +1931,17 @@ clone@^1.0.2:
   resolved "https://registry.jetlinks.cn/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-cmd-shim@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.jetlinks.cn/cmd-shim/-/cmd-shim-6.0.1.tgz#a65878080548e1dca760b3aea1e21ed05194da9d"
-  integrity sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==
+cmd-shim@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.jetlinks.cn/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd"
+  integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==
+  dependencies:
+    mkdirp-infer-owner "^2.0.0"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.jetlinks.cn/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
 
 color-convert@^1.9.0:
   version "1.9.3"
@@ -2033,7 +1975,7 @@ color-string@^1.9.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.3:
+color-support@^1.1.2:
   version "1.1.3"
   resolved "https://registry.jetlinks.cn/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -2051,12 +1993,12 @@ colorette@^2.0.16, colorette@^2.0.19:
   resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz"
   integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
 
-columnify@*:
-  version "1.6.0"
-  resolved "https://registry.jetlinks.cn/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
-  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
+columnify@~1.5.4:
+  version "1.5.4"
+  resolved "https://registry.jetlinks.cn/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  integrity sha512-rFl+iXVT1nhLQPfGDw+3WcS8rmm7XsLKUmhsGE3ihzzpIikeGrTaZPIRKYWeLsLBypsHzjXIvYEltVUZS84XxQ==
   dependencies:
-    strip-ansi "^6.0.1"
+    strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
 combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
@@ -2156,7 +2098,7 @@ consola@^2.15.3:
   resolved "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz"
   integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
 
-console-control-strings@^1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.jetlinks.cn/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
@@ -2226,9 +2168,9 @@ core-util-is@1.0.2:
   resolved "https://registry.jetlinks.cn/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
 
-core-util-is@^1.0.2:
+core-util-is@^1.0.2, core-util-is@~1.0.0:
   version "1.0.3"
-  resolved "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz"
+  resolved "https://registry.jetlinks.cn/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 cosmiconfig-typescript-loader@^4.0.0:
@@ -2302,11 +2244,6 @@ css-what@^6.0.1:
   resolved "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
-cssesc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-
 cssfilter@0.0.10:
   version "0.0.10"
   resolved "https://registry.npmmirror.com/cssfilter/-/cssfilter-0.0.10.tgz"
@@ -2405,6 +2342,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
+delegate@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.jetlinks.cn/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
+  integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.jetlinks.cn/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -2433,7 +2375,7 @@ diff@^4.0.1:
   resolved "https://registry.npmmirror.com/diff/-/diff-4.0.2.tgz"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-diff@^5.1.0:
+diff@^5.0.0:
   version "5.1.0"
   resolved "https://registry.jetlinks.cn/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
   integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
@@ -2588,7 +2530,7 @@ emoji-regex@^9.2.2:
   resolved "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-9.2.2.tgz"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-encoding@^0.1.13:
+encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.jetlinks.cn/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -2709,16 +2651,6 @@ event-source-polyfill@^1.0.31:
   resolved "https://registry.npmmirror.com/event-source-polyfill/-/event-source-polyfill-1.0.31.tgz"
   integrity sha512-4IJSItgS/41IxN5UVAVuAyczwZF7ZIEsM1XAoUzIHA6A+xzusEZUutdXz2Nr+MQPLxfTiCvqE79/C8HT8fKFvA==
 
-event-target-shim@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.jetlinks.cn/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
-  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
-
-events@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.jetlinks.cn/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.npmmirror.com/execa/-/execa-0.7.0.tgz"
@@ -2814,7 +2746,7 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fastest-levenshtein@*:
+fastest-levenshtein@^1.0.12:
   version "1.0.16"
   resolved "https://registry.jetlinks.cn/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
   integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
@@ -2942,13 +2874,6 @@ fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   dependencies:
     minipass "^3.0.0"
 
-fs-minipass@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.jetlinks.cn/fs-minipass/-/fs-minipass-3.0.1.tgz#853809af15b6d03e27638d1ab6432e6b378b085d"
-  integrity sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==
-  dependencies:
-    minipass "^4.0.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
@@ -2964,33 +2889,34 @@ function-bind@^1.1.1:
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.jetlinks.cn/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.jetlinks.cn/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
+  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
   dependencies:
     aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
+    color-support "^1.1.2"
+    console-control-strings "^1.0.0"
     has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
+    object-assign "^4.1.1"
+    signal-exit "^3.0.0"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
+    wide-align "^1.1.2"
 
-gauge@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.jetlinks.cn/gauge/-/gauge-5.0.0.tgz#e270ca9d97dae84abf64e5277ef1ebddc7dd1e2f"
-  integrity sha512-0s5T5eciEG7Q3ugkxAkFtaDhrrhXsCRivA5y8C9WMHWuI8UlMOJg7+Iwf7Mccii+Dfs3H5jHepU0joPVyQU0Lw==
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.jetlinks.cn/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==
   dependencies:
-    aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
-    has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -3068,18 +2994,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob@*, glob@^8.0.1:
-  version "8.1.0"
-  resolved "https://registry.jetlinks.cn/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
-  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
-glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
   version "7.2.3"
   resolved "https://registry.jetlinks.cn/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -3118,6 +3033,13 @@ globals@^11.1.0:
   resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+good-listener@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.jetlinks.cn/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
+  integrity sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==
+  dependencies:
+    delegate "^3.1.2"
+
 got@^6.7.1:
   version "6.7.1"
   resolved "https://registry.npmmirror.com/got/-/got-6.7.1.tgz"
@@ -3152,7 +3074,7 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@*, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.8:
   version "4.2.10"
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -3197,7 +3119,7 @@ has-own-prop@^2.0.0:
   resolved "https://registry.npmmirror.com/has-own-prop/-/has-own-prop-2.0.0.tgz"
   integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==
 
-has-unicode@^2.0.1:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.jetlinks.cn/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
@@ -3239,21 +3161,14 @@ homedir-polyfill@^1.0.0:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@*, hosted-git-info@^6.0.0, hosted-git-info@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.jetlinks.cn/hosted-git-info/-/hosted-git-info-6.1.1.tgz#629442c7889a69c05de604d52996b74fe6f26d58"
-  integrity sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==
-  dependencies:
-    lru-cache "^7.5.1"
-
 hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
   version "2.8.9"
   resolved "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
-hosted-git-info@^4.0.1:
+hosted-git-info@^4.0.1, hosted-git-info@^4.0.2:
   version "4.1.0"
-  resolved "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"
+  resolved "https://registry.jetlinks.cn/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
   integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
   dependencies:
     lru-cache "^6.0.0"
@@ -3281,17 +3196,17 @@ http-cache-semantics@^4.0.0:
   resolved "https://registry.npmmirror.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
 
-http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1:
+http-cache-semantics@^4.1.0:
   version "4.1.1"
   resolved "https://registry.jetlinks.cn/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.jetlinks.cn/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+http-proxy-agent@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.jetlinks.cn/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
   dependencies:
-    "@tootallnate/once" "2"
+    "@tootallnate/once" "1"
     agent-base "6"
     debug "4"
 
@@ -3353,17 +3268,12 @@ iconv-lite@^0.6.2, iconv-lite@^0.6.3:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
-ieee754@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.jetlinks.cn/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-ignore-walk@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.jetlinks.cn/ignore-walk/-/ignore-walk-6.0.1.tgz#f05e232992ebf25fef13613668fea99857e7e8cf"
-  integrity sha512-/c8MxUAqpRccq+LyDOecwF+9KqajueJHh8fz7g3YqjMZt+NSfJzx05zrKiXwa2sKwFCzaiZ5qUVfRj0pmxixEA==
+ignore-walk@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.jetlinks.cn/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
   dependencies:
-    minimatch "^6.1.6"
+    minimatch "^3.0.4"
 
 image-size@~0.5.0:
   version "0.5.5"
@@ -3406,16 +3316,11 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3:
+inherits@2, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@*, ini@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.jetlinks.cn/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
-  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
-
 ini@1.3.7:
   version "1.3.7"
   resolved "https://registry.npmmirror.com/ini/-/ini-1.3.7.tgz"
@@ -3426,18 +3331,23 @@ ini@^1.1.0, ini@^1.3.4, ini@~1.3.0:
   resolved "https://registry.jetlinks.cn/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-init-package-json@*:
-  version "5.0.0"
-  resolved "https://registry.jetlinks.cn/init-package-json/-/init-package-json-5.0.0.tgz#030cf0ea9c84cfc1b0dc2e898b45d171393e4b40"
-  integrity sha512-kBhlSheBfYmq3e0L1ii+VKe3zBTLL5lDCDWR+f9dLmEGSB3MqLlMlsolubSsyI88Bg6EA+BIMlomAnQ1SwgQBw==
+ini@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.jetlinks.cn/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
+
+init-package-json@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.jetlinks.cn/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646"
+  integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==
   dependencies:
-    npm-package-arg "^10.0.0"
-    promzard "^1.0.0"
-    read "^2.0.0"
-    read-package-json "^6.0.0"
+    npm-package-arg "^8.1.5"
+    promzard "^0.3.0"
+    read "~1.0.1"
+    read-package-json "^4.1.1"
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
-    validate-npm-package-name "^5.0.0"
+    validate-npm-package-name "^3.0.0"
 
 inquirer@^7.0.4:
   version "7.3.3"
@@ -3458,10 +3368,10 @@ inquirer@^7.0.4:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-ip-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.jetlinks.cn/ip-regex/-/ip-regex-5.0.0.tgz#cd313b2ae9c80c07bd3851e12bf4fa4dc5480632"
-  integrity sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==
+ip-regex@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.jetlinks.cn/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5"
+  integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
 
 ip@^2.0.0:
   version "2.0.0"
@@ -3499,14 +3409,14 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-cidr@*:
-  version "5.0.2"
-  resolved "https://registry.jetlinks.cn/is-cidr/-/is-cidr-5.0.2.tgz#8805dce4ac503dcb3270aa7e8987fcc6f400fa58"
-  integrity sha512-cCaw4czL00EUoO+mbOt2cUSFq8DQ/3rfWw6foy48TI52+j/tKTtlUet14UnWryHfY9bNbpHLqXkd/jnF600PPQ==
+is-cidr@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.jetlinks.cn/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814"
+  integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==
   dependencies:
-    cidr-regex "4.0.2"
+    cidr-regex "^3.1.1"
 
-is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
+is-core-module@^2.5.0, is-core-module@^2.9.0:
   version "2.11.0"
   resolved "https://registry.jetlinks.cn/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
   integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
@@ -3533,6 +3443,13 @@ is-extglob@^2.1.1:
   resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.jetlinks.cn/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
+  dependencies:
+    number-is-nan "^1.0.0"
+
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
@@ -3677,6 +3594,11 @@ is-yarn-global@^0.3.0:
   resolved "https://registry.npmmirror.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"
   integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
 
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.jetlinks.cn/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz"
@@ -3739,14 +3661,9 @@ json-buffer@3.0.0:
   resolved "https://registry.npmmirror.com/json-buffer/-/json-buffer-3.0.0.tgz"
   integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
 
-json-parse-even-better-errors@*, json-parse-even-better-errors@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz#2cb2ee33069a78870a0c7e3da560026b89669cf7"
-  integrity sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==
-
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
+  resolved "https://registry.jetlinks.cn/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
 json-schema-traverse@^0.4.1:
@@ -3815,15 +3732,15 @@ jsprim@^1.2.2:
     json-schema "0.4.0"
     verror "1.10.0"
 
-just-diff-apply@^5.2.0:
-  version "5.5.0"
-  resolved "https://registry.jetlinks.cn/just-diff-apply/-/just-diff-apply-5.5.0.tgz#771c2ca9fa69f3d2b54e7c3f5c1dfcbcc47f9f0f"
-  integrity sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==
+just-diff-apply@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.jetlinks.cn/just-diff-apply/-/just-diff-apply-3.1.2.tgz#710d8cda00c65dc4e692df50dbe9bac5581c2193"
+  integrity sha512-TCa7ZdxCeq6q3Rgms2JCRHTCfWAETPZ8SzYUbkYF6KR3I03sN29DaOIC+xyWboIcMvjAsD5iG2u/RWzHD8XpgQ==
 
-just-diff@^5.0.1:
-  version "5.2.0"
-  resolved "https://registry.jetlinks.cn/just-diff/-/just-diff-5.2.0.tgz#60dca55891cf24cd4a094e33504660692348a241"
-  integrity sha512-6ufhP9SHjb7jibNFrNxyFZ6od3g+An6Ai9mhGRvcYe8UJlH0prseN64M+6ZBBUoKYHZsitDP42gAJ8+eVWr3lw==
+just-diff@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.jetlinks.cn/just-diff/-/just-diff-3.1.1.tgz#d50c597c6fd4776495308c63bdee1b6839082647"
+  integrity sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ==
 
 keyv@^3.0.0:
   version "3.1.0"
@@ -3885,118 +3802,115 @@ less@^4.1.3:
     needle "^3.1.0"
     source-map "~0.6.0"
 
-libnpmaccess@*:
-  version "7.0.2"
-  resolved "https://registry.jetlinks.cn/libnpmaccess/-/libnpmaccess-7.0.2.tgz#7f056c8c933dd9c8ba771fa6493556b53c5aac52"
-  integrity sha512-vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw==
+libnpmaccess@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.jetlinks.cn/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"
+  integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==
   dependencies:
-    npm-package-arg "^10.1.0"
-    npm-registry-fetch "^14.0.3"
+    aproba "^2.0.0"
+    minipass "^3.1.1"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
 
-libnpmdiff@*:
-  version "5.0.11"
-  resolved "https://registry.jetlinks.cn/libnpmdiff/-/libnpmdiff-5.0.11.tgz#a8d3b9ff61e55f5cb377efc4ef06c7987236f5a1"
-  integrity sha512-oF+BCE8LwfSZaUkmIEKmfX4WmvE6puZhYKnRayynHrh6f1qMRqoutqIXlPS6wCF8IRV6sgAhXYOsBUYC6PTPCA==
+libnpmdiff@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.jetlinks.cn/libnpmdiff/-/libnpmdiff-2.0.4.tgz#bb1687992b1a97a8ea4a32f58ad7c7f92de53b74"
+  integrity sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ==
   dependencies:
-    "@npmcli/arborist" "^6.2.3"
-    "@npmcli/disparity-colors" "^3.0.0"
-    "@npmcli/installed-package-contents" "^2.0.0"
+    "@npmcli/disparity-colors" "^1.0.1"
+    "@npmcli/installed-package-contents" "^1.0.7"
     binary-extensions "^2.2.0"
-    diff "^5.1.0"
-    minimatch "^6.1.6"
-    npm-package-arg "^10.1.0"
-    pacote "^15.0.8"
-    tar "^6.1.13"
+    diff "^5.0.0"
+    minimatch "^3.0.4"
+    npm-package-arg "^8.1.1"
+    pacote "^11.3.0"
+    tar "^6.1.0"
 
-libnpmexec@*:
-  version "5.0.11"
-  resolved "https://registry.jetlinks.cn/libnpmexec/-/libnpmexec-5.0.11.tgz#ac579b6ac1bd20c0ea191386129ba5cc5051ef61"
-  integrity sha512-4Ec55gMBgGiJmaFjSVNc8s9iu6xBuqGJubtrWrK+5uCHbSoQd8Fng/cLE63hyZQTwyj0LTvHn0j/UEr0bTPTvw==
+libnpmexec@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.jetlinks.cn/libnpmexec/-/libnpmexec-2.0.1.tgz#729ae3e15a3ba225964ccf248117a75d311eeb73"
+  integrity sha512-4SqBB7eJvJWmUKNF42Q5qTOn20DRjEE4TgvEh2yneKlAiRlwlhuS9MNR45juWwmoURJlf2K43bozlVt7OZiIOw==
   dependencies:
-    "@npmcli/arborist" "^6.2.3"
-    "@npmcli/run-script" "^6.0.0"
+    "@npmcli/arborist" "^2.3.0"
+    "@npmcli/ci-detect" "^1.3.0"
+    "@npmcli/run-script" "^1.8.4"
     chalk "^4.1.0"
-    ci-info "^3.7.1"
-    npm-package-arg "^10.1.0"
-    npmlog "^7.0.1"
-    pacote "^15.0.8"
-    proc-log "^3.0.0"
-    read "^2.0.0"
-    read-package-json-fast "^3.0.2"
-    semver "^7.3.7"
+    mkdirp-infer-owner "^2.0.0"
+    npm-package-arg "^8.1.2"
+    pacote "^11.3.1"
+    proc-log "^1.0.0"
+    read "^1.0.7"
+    read-package-json-fast "^2.0.2"
     walk-up-path "^1.0.0"
 
-libnpmfund@*:
-  version "4.0.11"
-  resolved "https://registry.jetlinks.cn/libnpmfund/-/libnpmfund-4.0.11.tgz#201aa162af6062387b3e505a732e0de101e2846e"
-  integrity sha512-tDJqNcTAEQURma4UXBVIpyw1CrL5RPla0rnx5dBK2jt+zPa6i62RwcYLNa9vHUYdGBoN993fZtl77ddEFj72xQ==
+libnpmfund@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.jetlinks.cn/libnpmfund/-/libnpmfund-1.1.0.tgz#ee91313905b3194b900530efa339bc3f9fc4e5c4"
+  integrity sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ==
   dependencies:
-    "@npmcli/arborist" "^6.2.3"
+    "@npmcli/arborist" "^2.5.0"
 
-libnpmhook@*:
-  version "9.0.3"
-  resolved "https://registry.jetlinks.cn/libnpmhook/-/libnpmhook-9.0.3.tgz#5dbd6a146feb7e11993d36a26f750ae2347bb1d9"
-  integrity sha512-wMZe58sI7KLhg0+nUWZW5KdMfjNNcOIIbkoP19BDHYoUF9El7eeUWkGNxUGzpHkPKiGoQ1z/v6CYin4deebeuw==
+libnpmhook@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.jetlinks.cn/libnpmhook/-/libnpmhook-6.0.3.tgz#1d7f0d7e6a7932fbf7ce0881fdb0ed8bf8748a30"
+  integrity sha512-3fmkZJibIybzmAvxJ65PeV3NzRc0m4xmYt6scui5msocThbEp4sKFT80FhgrCERYDjlUuFahU6zFNbJDHbQ++g==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^14.0.3"
+    npm-registry-fetch "^11.0.0"
 
-libnpmorg@*:
-  version "5.0.3"
-  resolved "https://registry.jetlinks.cn/libnpmorg/-/libnpmorg-5.0.3.tgz#bd0a11d7a84b5f5c14689fb1e244fbb540700d63"
-  integrity sha512-QCLLB2oKCCwdiedQRcsj5eHAyYXM7vICM5f0gB9aRQzyVzx57S3anBIzhEUOhJxq6cWKtXRfkR5GsCxHEJ0CxA==
+libnpmorg@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.jetlinks.cn/libnpmorg/-/libnpmorg-2.0.3.tgz#4e605d4113dfa16792d75343824a0625c76703bc"
+  integrity sha512-JSGl3HFeiRFUZOUlGdiNcUZOsUqkSYrg6KMzvPZ1WVZ478i47OnKSS0vkPmX45Pai5mTKuwIqBMcGWG7O8HfdA==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^14.0.3"
+    npm-registry-fetch "^11.0.0"
 
-libnpmpack@*:
-  version "5.0.11"
-  resolved "https://registry.jetlinks.cn/libnpmpack/-/libnpmpack-5.0.11.tgz#b054a62e0c553b5685b02266a4a5036d9828ebdf"
-  integrity sha512-Ke2URk4d96SkxTEEUdW7TOWb0DLFrDWAdBEc1SPF/JrhebhS3/Rm1kazWOZ6JhK6PQBIsVPGmBq5MwboAtSR4w==
+libnpmpack@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.jetlinks.cn/libnpmpack/-/libnpmpack-2.0.1.tgz#d3eac25cc8612f4e7cdeed4730eee339ba51c643"
+  integrity sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ==
   dependencies:
-    "@npmcli/arborist" "^6.2.3"
-    "@npmcli/run-script" "^6.0.0"
-    npm-package-arg "^10.1.0"
-    pacote "^15.0.8"
+    "@npmcli/run-script" "^1.8.3"
+    npm-package-arg "^8.1.0"
+    pacote "^11.2.6"
 
-libnpmpublish@*:
-  version "7.1.0"
-  resolved "https://registry.jetlinks.cn/libnpmpublish/-/libnpmpublish-7.1.0.tgz#b178419b8f3968c7bba32c405ca29c6afe5b4aa4"
-  integrity sha512-AAw/84u6aLo6IzXFhf3s+VCg5/eqICRZFJgRfBpnbCjubRY33WXJh57aWYP0WPlqnFI3E2M1adIqQDbYVyRwgA==
-  dependencies:
-    ci-info "^3.6.1"
-    normalize-package-data "^5.0.0"
-    npm-package-arg "^10.1.0"
-    npm-registry-fetch "^14.0.3"
-    semver "^7.3.7"
-    sigstore "^1.0.0"
-    ssri "^10.0.1"
-
-libnpmsearch@*:
-  version "6.0.2"
-  resolved "https://registry.jetlinks.cn/libnpmsearch/-/libnpmsearch-6.0.2.tgz#b6a531a312855dd3bf84dd273b1033dd09b4cbec"
-  integrity sha512-p+5BF19AvnVg8mcIQhy6yWhI6jHQRVMYaIaKeITEfYAffWsqbottA/WZdMtHL76hViC6SFM1WdclM1w5eAIa1g==
-  dependencies:
-    npm-registry-fetch "^14.0.3"
-
-libnpmteam@*:
-  version "5.0.3"
-  resolved "https://registry.jetlinks.cn/libnpmteam/-/libnpmteam-5.0.3.tgz#196657e9d87c0cc914c44fee588ad2b838074a3c"
-  integrity sha512-7XOGhi45s+ml6TyrhJUTyrErcoDMKGKfEtiTEco4ofU7BGGAUOalVztKMVLLJgJOOXdIAIlzCHqkTXEuSiyCiA==
-  dependencies:
-    aproba "^2.0.0"
-    npm-registry-fetch "^14.0.3"
-
-libnpmversion@*:
+libnpmpublish@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.jetlinks.cn/libnpmversion/-/libnpmversion-4.0.2.tgz#cad9cd1b287fcf9576a64edfe71491b49a65d06f"
-  integrity sha512-n1X70mFHv8Piy4yos+MFWUARSkTbyV5cdsHScaIkuwYvRAF/s2VtYScDzWB4Oe8uNEuGNdjiRR1E/Dh1tMvv6g==
+  resolved "https://registry.jetlinks.cn/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794"
+  integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==
   dependencies:
-    "@npmcli/git" "^4.0.1"
-    "@npmcli/run-script" "^6.0.0"
-    json-parse-even-better-errors "^3.0.0"
-    proc-log "^3.0.0"
-    semver "^7.3.7"
+    normalize-package-data "^3.0.2"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
+    semver "^7.1.3"
+    ssri "^8.0.1"
+
+libnpmsearch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.jetlinks.cn/libnpmsearch/-/libnpmsearch-3.1.2.tgz#aee81b9e4768750d842b627a3051abc89fdc15f3"
+  integrity sha512-BaQHBjMNnsPYk3Bl6AiOeVuFgp72jviShNBw5aHaHNKWqZxNi38iVNoXbo6bG/Ccc/m1To8s0GtMdtn6xZ1HAw==
+  dependencies:
+    npm-registry-fetch "^11.0.0"
+
+libnpmteam@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.jetlinks.cn/libnpmteam/-/libnpmteam-2.0.4.tgz#9dbe2e18ae3cb97551ec07d2a2daf9944f3edc4c"
+  integrity sha512-FPrVJWv820FZFXaflAEVTLRWZrerCvfe7ZHSMzJ/62EBlho2KFlYKjyNEsPW3JiV7TLSXi3vo8u0gMwIkXSMTw==
+  dependencies:
+    aproba "^2.0.0"
+    npm-registry-fetch "^11.0.0"
+
+libnpmversion@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.jetlinks.cn/libnpmversion/-/libnpmversion-1.2.1.tgz#689aa7fe0159939b3cbbf323741d34976f4289e9"
+  integrity sha512-AA7x5CFgBFN+L4/JWobnY5t4OAHjQuPbAwUYJ7/NtHuyLut5meb+ne/aj0n7PWNiTGCJcRw/W6Zd2LoLT7EZuQ==
+  dependencies:
+    "@npmcli/git" "^2.0.7"
+    "@npmcli/run-script" "^1.8.4"
+    json-parse-even-better-errors "^2.3.1"
+    semver "^7.3.5"
+    stringify-package "^1.0.1"
 
 libnpx@^10.2.4:
   version "10.2.4"
@@ -4220,11 +4134,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
-  version "7.17.0"
-  resolved "https://registry.jetlinks.cn/lru-cache/-/lru-cache-7.17.0.tgz#00c7ba5919e5ea7c69ff94ddabbf32cb09ab805c"
-  integrity sha512-zSxlVVwOabhVyTi6E8gYv2cr6bXK+8ifYz5/uyJb9feXX6NACVDwY4p5Ut3WC3Ivo/QhpARHU3iujx2xGAYHbQ==
-
 magic-string@^0.25.7:
   version "0.25.9"
   resolved "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz"
@@ -4266,48 +4175,27 @@ make-error@^1.1.1:
   resolved "https://registry.npmmirror.com/make-error/-/make-error-1.3.6.tgz"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@*, make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1:
-  version "11.0.3"
-  resolved "https://registry.jetlinks.cn/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz#ed83dd3685b97f75607156d2721848f6eca561b9"
-  integrity sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==
+make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.jetlinks.cn/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
+  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
   dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^17.0.0"
-    http-cache-semantics "^4.1.1"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^4.0.0"
-    minipass-fetch "^3.0.0"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^10.0.0"
-
-make-fetch-happen@^10.0.3:
-  version "10.2.1"
-  resolved "https://registry.jetlinks.cn/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
-  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
+    agentkeepalive "^4.1.3"
+    cacache "^15.2.0"
     http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
+    http-proxy-agent "^4.0.1"
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
+    lru-cache "^6.0.0"
+    minipass "^3.1.3"
     minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
+    minipass-fetch "^1.3.2"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
+    negotiator "^0.6.2"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^9.0.0"
+    socks-proxy-agent "^6.0.0"
+    ssri "^8.0.0"
 
 map-obj@^1.0.0:
   version "1.0.1"
@@ -4510,13 +4398,6 @@ minimatch@^5.0.1, minimatch@^5.1.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^6.1.0, minimatch@^6.1.6:
-  version "6.2.0"
-  resolved "https://registry.jetlinks.cn/minimatch/-/minimatch-6.2.0.tgz#2b70fd13294178c69c04dfc05aebdb97a4e79e42"
-  integrity sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.npmmirror.com/minimist-options/-/minimist-options-4.1.0.tgz"
@@ -4538,27 +4419,16 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.jetlinks.cn/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
-  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
+minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
+  version "1.4.1"
+  resolved "https://registry.jetlinks.cn/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
+  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
   dependencies:
-    minipass "^3.1.6"
+    minipass "^3.1.0"
     minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
+    minizlib "^2.0.0"
   optionalDependencies:
-    encoding "^0.1.13"
-
-minipass-fetch@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.jetlinks.cn/minipass-fetch/-/minipass-fetch-3.0.1.tgz#bae3789f668d82ffae3ea47edc6b78b8283b3656"
-  integrity sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==
-  dependencies:
-    minipass "^4.0.0"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
+    encoding "^0.1.12"
 
 minipass-flush@^1.0.5:
   version "1.0.5"
@@ -4575,7 +4445,7 @@ minipass-json-stream@^1.0.1:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
 
-minipass-pipeline@*, minipass-pipeline@^1.2.4:
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.jetlinks.cn/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -4589,19 +4459,19 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@*, minipass@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.jetlinks.cn/minipass/-/minipass-4.2.0.tgz#4bf124d8c87c14e99846f9a27c3219d956998c0e"
-  integrity sha512-ExlilAIS7zJ2EWUMaVXi14H+FnZ18kr17kFkGemMqBx6jW0m8P6XfqwYVPEG53ENlgsED+alVP9ZxC3JzkK23Q==
-
-minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   version "3.3.6"
   resolved "https://registry.jetlinks.cn/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
   integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.1.1, minizlib@^2.1.2:
+minipass@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.jetlinks.cn/minipass/-/minipass-4.2.0.tgz#4bf124d8c87c14e99846f9a27c3219d956998c0e"
+  integrity sha512-ExlilAIS7zJ2EWUMaVXi14H+FnZ18kr17kFkGemMqBx6jW0m8P6XfqwYVPEG53ENlgsED+alVP9ZxC3JzkK23Q==
+
+minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.jetlinks.cn/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -4609,7 +4479,7 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp-infer-owner@*:
+mkdirp-infer-owner@^2.0.0:
   version "2.0.0"
   resolved "https://registry.jetlinks.cn/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
   integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
@@ -4618,11 +4488,6 @@ mkdirp-infer-owner@*:
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
-mkdirp@*:
-  version "2.1.3"
-  resolved "https://registry.jetlinks.cn/mkdirp/-/mkdirp-2.1.3.tgz#b083ff37be046fd3d6552468c1f0ff44c1545d1f"
-  integrity sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==
-
 mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.jetlinks.cn/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
@@ -4697,31 +4562,26 @@ mrm@^4.1.13:
     user-meta "^1.0.0"
     which "^2.0.2"
 
-ms@*, ms@^2.0.0, ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 muggle-string@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/muggle-string/-/muggle-string-0.1.0.tgz"
   integrity sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg==
 
-mute-stream@0.0.8:
+mute-stream@0.0.8, mute-stream@~0.0.4:
   version "0.0.8"
-  resolved "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.8.tgz"
+  resolved "https://registry.jetlinks.cn/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-mute-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.jetlinks.cn/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
-  integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
-
 nanoid@^3.3.4:
   version "3.3.4"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"
@@ -4741,7 +4601,7 @@ needle@^3.1.0:
     iconv-lite "^0.6.3"
     sax "^1.2.4"
 
-negotiator@^0.6.3:
+negotiator@^0.6.2:
   version "0.6.3"
   resolved "https://registry.jetlinks.cn/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -4754,20 +4614,20 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-gyp@*, node-gyp@^9.0.0:
-  version "9.3.1"
-  resolved "https://registry.jetlinks.cn/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4"
-  integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==
+node-gyp@^7.1.0, node-gyp@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.jetlinks.cn/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
+  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
-    nopt "^6.0.0"
-    npmlog "^6.0.0"
+    graceful-fs "^4.2.3"
+    nopt "^5.0.0"
+    npmlog "^4.1.2"
+    request "^2.88.2"
     rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
+    semver "^7.3.2"
+    tar "^6.0.2"
     which "^2.0.2"
 
 node-html-parser@^5.3.3:
@@ -4783,19 +4643,12 @@ node-releases@^2.0.6:
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz"
   integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==
 
-nopt@*, nopt@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.jetlinks.cn/nopt/-/nopt-7.0.0.tgz#09220f930c072109c98ef8aaf39e1d5f0ff9b0d4"
-  integrity sha512-e6Qw1rcrGoSxEH0hQ4GBSdUjkMOtXGhGFXdNT/3ZR0S37eR9DMj5za3dEDWE6o1T3/DP8ZOsPP4MIiky0c3QeA==
+nopt@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.jetlinks.cn/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
   dependencies:
-    abbrev "^2.0.0"
-
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.jetlinks.cn/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
+    abbrev "1"
 
 normalize-package-data@^2.5.0:
   version "2.5.0"
@@ -4807,7 +4660,7 @@ normalize-package-data@^2.5.0:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@^3.0.0:
+normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
   version "3.0.3"
   resolved "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz"
   integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
@@ -4817,16 +4670,6 @@ normalize-package-data@^3.0.0:
     semver "^7.3.4"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.jetlinks.cn/normalize-package-data/-/normalize-package-data-5.0.0.tgz#abcb8d7e724c40d88462b84982f7cbf6859b4588"
-  integrity sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==
-  dependencies:
-    hosted-git-info "^6.0.0"
-    is-core-module "^2.8.1"
-    semver "^7.3.5"
-    validate-npm-package-license "^3.0.4"
-
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
@@ -4842,41 +4685,31 @@ normalize-url@^4.1.0:
   resolved "https://registry.npmmirror.com/normalize-url/-/normalize-url-4.5.1.tgz"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
-npm-audit-report@*:
-  version "4.0.0"
-  resolved "https://registry.jetlinks.cn/npm-audit-report/-/npm-audit-report-4.0.0.tgz#dfffdb6464a7799d3d30e067ae1943982cf45f69"
-  integrity sha512-k2o5476sLrp94b6Gl819YzlS7LAdb8lgE6yQCysBEji5E3WoUdRve6tiVMLKAPPdLfItU4kOSUycWS5HFTrbug==
+npm-audit-report@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.jetlinks.cn/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5"
+  integrity sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==
   dependencies:
     chalk "^4.0.0"
 
-npm-bundled@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/npm-bundled/-/npm-bundled-3.0.0.tgz#7e8e2f8bb26b794265028491be60321a25a39db7"
-  integrity sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==
+npm-bundled@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.jetlinks.cn/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
+  integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
-    npm-normalize-package-bin "^3.0.0"
+    npm-normalize-package-bin "^1.0.1"
 
-npm-install-checks@*, npm-install-checks@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.jetlinks.cn/npm-install-checks/-/npm-install-checks-6.0.0.tgz#9a021d8e8b3956d61fd265c2eda4735bcd3d9b83"
-  integrity sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==
+npm-install-checks@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.jetlinks.cn/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
+  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
   dependencies:
     semver "^7.1.1"
 
-npm-normalize-package-bin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz#6097436adb4ef09e2628b59a7882576fe53ce485"
-  integrity sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==
-
-npm-package-arg@*, npm-package-arg@^10.0.0, npm-package-arg@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.jetlinks.cn/npm-package-arg/-/npm-package-arg-10.1.0.tgz#827d1260a683806685d17193073cc152d3c7e9b1"
-  integrity sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==
-  dependencies:
-    hosted-git-info "^6.0.0"
-    proc-log "^3.0.0"
-    semver "^7.3.5"
-    validate-npm-package-name "^5.0.0"
+npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.jetlinks.cn/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
 npm-package-arg@^6.0.0:
   version "6.1.1"
@@ -4888,43 +4721,53 @@ npm-package-arg@^6.0.0:
     semver "^5.6.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^7.0.0:
-  version "7.0.4"
-  resolved "https://registry.jetlinks.cn/npm-packlist/-/npm-packlist-7.0.4.tgz#033bf74110eb74daf2910dc75144411999c5ff32"
-  integrity sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==
+npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
+  version "8.1.5"
+  resolved "https://registry.jetlinks.cn/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
+  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
   dependencies:
-    ignore-walk "^6.0.0"
+    hosted-git-info "^4.0.1"
+    semver "^7.3.4"
+    validate-npm-package-name "^3.0.0"
 
-npm-pick-manifest@*, npm-pick-manifest@^8.0.0, npm-pick-manifest@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.jetlinks.cn/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz#c6acd97d1ad4c5dbb80eac7b386b03ffeb289e5f"
-  integrity sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==
+npm-packlist@^2.1.4:
+  version "2.2.2"
+  resolved "https://registry.jetlinks.cn/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
+  integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
   dependencies:
-    npm-install-checks "^6.0.0"
-    npm-normalize-package-bin "^3.0.0"
-    npm-package-arg "^10.0.0"
-    semver "^7.3.5"
+    glob "^7.1.6"
+    ignore-walk "^3.0.3"
+    npm-bundled "^1.1.1"
+    npm-normalize-package-bin "^1.0.1"
 
-npm-profile@*:
-  version "7.0.1"
-  resolved "https://registry.jetlinks.cn/npm-profile/-/npm-profile-7.0.1.tgz#a37dae08b22e662ece2c6e08946f9fcd9fdef663"
-  integrity sha512-VReArOY/fCx5dWL66cbJ2OMogTQAVVQA//8jjmjkarboki3V7UJ0XbGFW+khRwiAJFQjuH0Bqr/yF7Y5RZdkMQ==
+npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.jetlinks.cn/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
+  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
   dependencies:
-    npm-registry-fetch "^14.0.0"
-    proc-log "^3.0.0"
+    npm-install-checks "^4.0.0"
+    npm-normalize-package-bin "^1.0.1"
+    npm-package-arg "^8.1.2"
+    semver "^7.3.4"
 
-npm-registry-fetch@*, npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3:
-  version "14.0.3"
-  resolved "https://registry.jetlinks.cn/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz#8545e321c2b36d2c6fe6e009e77e9f0e527f547b"
-  integrity sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==
+npm-profile@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.jetlinks.cn/npm-profile/-/npm-profile-5.0.4.tgz#73e5bd1d808edc2c382d7139049cc367ac43161b"
+  integrity sha512-OKtU7yoAEBOnc8zJ+/uo5E4ugPp09sopo+6y1njPp+W99P8DvQon3BJYmpvyK2Bf1+3YV5LN1bvgXRoZ1LUJBA==
   dependencies:
-    make-fetch-happen "^11.0.0"
-    minipass "^4.0.0"
-    minipass-fetch "^3.0.0"
+    npm-registry-fetch "^11.0.0"
+
+npm-registry-fetch@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.jetlinks.cn/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
+  integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
+  dependencies:
+    make-fetch-happen "^9.0.1"
+    minipass "^3.1.3"
+    minipass-fetch "^1.3.0"
     minipass-json-stream "^1.0.1"
-    minizlib "^2.1.2"
-    npm-package-arg "^10.0.0"
-    proc-log "^3.0.0"
+    minizlib "^2.0.0"
+    npm-package-arg "^8.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -4947,10 +4790,10 @@ npm-run-path@^5.1.0:
   dependencies:
     path-key "^4.0.0"
 
-npm-user-validate@*:
-  version "2.0.0"
-  resolved "https://registry.jetlinks.cn/npm-user-validate/-/npm-user-validate-2.0.0.tgz#7b69bbbff6f7992a1d9a8968d52fd6b6db5431b6"
-  integrity sha512-sSWeqAYJ2dUPStJB+AEj0DyLRltr/f6YNcvCA7phkB8/RMLMnVsQ41GMwHo/ERZLYNDsyB2wPm7pZo1mqPOl7Q==
+npm-user-validate@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.jetlinks.cn/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
+  integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
 
 npm@<8.0.0:
   version "7.24.2"
@@ -5028,24 +4871,24 @@ npm@<8.0.0:
     which "^2.0.2"
     write-file-atomic "^3.0.3"
 
-npmlog@*, npmlog@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.jetlinks.cn/npmlog/-/npmlog-7.0.1.tgz#7372151a01ccb095c47d8bf1d0771a4ff1f53ac8"
-  integrity sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==
+npmlog@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.jetlinks.cn/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
-    are-we-there-yet "^4.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^5.0.0"
-    set-blocking "^2.0.0"
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
 
-npmlog@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.jetlinks.cn/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+npmlog@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.jetlinks.cn/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
+  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
   dependencies:
-    are-we-there-yet "^3.0.0"
+    are-we-there-yet "^2.0.0"
     console-control-strings "^1.1.0"
-    gauge "^4.0.3"
+    gauge "^3.0.0"
     set-blocking "^2.0.0"
 
 nrm@^1.2.5:
@@ -5070,11 +4913,21 @@ nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.jetlinks.cn/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
+
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.jetlinks.cn/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
+object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.jetlinks.cn/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
+
 object-inspect@^1.12.2:
   version "1.12.2"
   resolved "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.2.tgz"
@@ -5115,7 +4968,7 @@ open@>=6.0.0:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-opener@*:
+opener@^1.5.2:
   version "1.5.2"
   resolved "https://registry.jetlinks.cn/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
@@ -5215,29 +5068,30 @@ package-json@^6.3.0:
     registry-url "^5.0.0"
     semver "^6.2.0"
 
-pacote@*, pacote@^15.0.0, pacote@^15.0.8:
-  version "15.1.1"
-  resolved "https://registry.jetlinks.cn/pacote/-/pacote-15.1.1.tgz#94d8c6e0605e04d427610b3aacb0357073978348"
-  integrity sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ==
+pacote@^11.1.11, pacote@^11.2.6, pacote@^11.3.0, pacote@^11.3.1, pacote@^11.3.5:
+  version "11.3.5"
+  resolved "https://registry.jetlinks.cn/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
+  integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
   dependencies:
-    "@npmcli/git" "^4.0.0"
-    "@npmcli/installed-package-contents" "^2.0.1"
-    "@npmcli/promise-spawn" "^6.0.1"
-    "@npmcli/run-script" "^6.0.0"
-    cacache "^17.0.0"
-    fs-minipass "^3.0.0"
-    minipass "^4.0.0"
-    npm-package-arg "^10.0.0"
-    npm-packlist "^7.0.0"
-    npm-pick-manifest "^8.0.0"
-    npm-registry-fetch "^14.0.0"
-    proc-log "^3.0.0"
+    "@npmcli/git" "^2.1.0"
+    "@npmcli/installed-package-contents" "^1.0.6"
+    "@npmcli/promise-spawn" "^1.2.0"
+    "@npmcli/run-script" "^1.8.2"
+    cacache "^15.0.5"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    infer-owner "^1.0.4"
+    minipass "^3.1.3"
+    mkdirp "^1.0.3"
+    npm-package-arg "^8.0.1"
+    npm-packlist "^2.1.4"
+    npm-pick-manifest "^6.0.0"
+    npm-registry-fetch "^11.0.0"
     promise-retry "^2.0.1"
-    read-package-json "^6.0.0"
-    read-package-json-fast "^3.0.0"
-    sigstore "^1.0.0"
-    ssri "^10.0.0"
-    tar "^6.1.11"
+    read-package-json-fast "^2.0.1"
+    rimraf "^3.0.2"
+    ssri "^8.0.1"
+    tar "^6.1.0"
 
 param-case@^3.0.4:
   version "3.0.4"
@@ -5254,14 +5108,14 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-conflict-json@*, parse-conflict-json@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/parse-conflict-json/-/parse-conflict-json-3.0.0.tgz#eb266cbeeb66e73c3e92806da4d4ace3b798acff"
-  integrity sha512-ipcKLCmZbAj7n+h9qQREvdvsBUMPetGk9mM4ljCvs5inZznAlkHPk5XPc7ROtknUKw7kO6Jnz10Y3Eec7tky/A==
+parse-conflict-json@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.jetlinks.cn/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz#54ec175bde0f2d70abf6be79e0e042290b86701b"
+  integrity sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw==
   dependencies:
-    json-parse-even-better-errors "^3.0.0"
-    just-diff "^5.0.1"
-    just-diff-apply "^5.2.0"
+    json-parse-even-better-errors "^2.3.0"
+    just-diff "^3.0.1"
+    just-diff-apply "^3.0.0"
 
 parse-git-config@^1.1.1:
   version "1.1.1"
@@ -5416,14 +5270,6 @@ pkg-types@^1.0.0, pkg-types@^1.0.1:
     mlly "^1.0.0"
     pathe "^1.0.0"
 
-postcss-selector-parser@^6.0.10:
-  version "6.0.11"
-  resolved "https://registry.jetlinks.cn/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
-  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
 postcss-value-parser@^4.2.0:
   version "4.2.0"
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
@@ -5453,10 +5299,15 @@ prettier@^2.8.1:
   resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz"
   integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==
 
-proc-log@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
-  integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==
+proc-log@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.jetlinks.cn/proc-log/-/proc-log-1.0.0.tgz#0d927307401f69ed79341e83a0b2c9a13395eb77"
+  integrity sha512-aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg==
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.jetlinks.cn/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 process@^0.11.10:
   version "0.11.10"
@@ -5486,12 +5337,12 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-promzard@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.jetlinks.cn/promzard/-/promzard-1.0.0.tgz#3246f8e6c9895a77c0549cefb65828ac0f6c006b"
-  integrity sha512-KQVDEubSUHGSt5xLakaToDFrSoZhStB8dXLzk2xvwR67gJktrHFvpR63oZgHyK19WKbHFLXJqCPXdVR3aBP8Ig==
+promzard@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.jetlinks.cn/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+  integrity sha512-JZeYqd7UAcHCwI+sTOeUDYkvEU+1bQ7iE0UT1MgB/tERkAPkesW46MrpIySzODi+owTjZtiF8Ay5j9m60KmMBw==
   dependencies:
-    read "^2.0.0"
+    read "1"
 
 prop-ini@^0.0.2:
   version "0.0.2"
@@ -5550,7 +5401,7 @@ q@^1.5.1:
   resolved "https://registry.npmmirror.com/q/-/q-1.5.1.tgz"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
-qrcode-terminal@*:
+qrcode-terminal@^0.12.0:
   version "0.12.0"
   resolved "https://registry.jetlinks.cn/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
   integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
@@ -5580,28 +5431,28 @@ rc@1.2.8, rc@^1.0.1, rc@^1.1.6, rc@^1.2.1, rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-read-cmd-shim@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.jetlinks.cn/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz#640a08b473a49043e394ae0c7a34dd822c73b9bb"
-  integrity sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==
+read-cmd-shim@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.jetlinks.cn/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
+  integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
 
-read-package-json-fast@*, read-package-json-fast@^3.0.0, read-package-json-fast@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.jetlinks.cn/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049"
-  integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
+read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.jetlinks.cn/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
+  integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
   dependencies:
-    json-parse-even-better-errors "^3.0.0"
-    npm-normalize-package-bin "^3.0.0"
+    json-parse-even-better-errors "^2.3.0"
+    npm-normalize-package-bin "^1.0.1"
 
-read-package-json@*, read-package-json@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.jetlinks.cn/read-package-json/-/read-package-json-6.0.0.tgz#6a741841ad72a40e77a82b9c3c8c10e865bbc519"
-  integrity sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==
+read-package-json@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.jetlinks.cn/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703"
+  integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==
   dependencies:
-    glob "^8.0.1"
-    json-parse-even-better-errors "^3.0.0"
-    normalize-package-data "^5.0.0"
-    npm-normalize-package-bin "^3.0.0"
+    glob "^7.1.1"
+    json-parse-even-better-errors "^2.3.0"
+    normalize-package-data "^3.0.0"
+    npm-normalize-package-bin "^1.0.0"
 
 read-pkg-up@^7.0.1:
   version "7.0.1"
@@ -5622,12 +5473,12 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-read@*, read@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.jetlinks.cn/read/-/read-2.0.0.tgz#1d469a7321088e53b86ca77bf60a609e02f4eed8"
-  integrity sha512-88JMmpeeRYzW9gvIpYyXlYadWanW4vB2CYtDDVBfbRpbSogUNjTWEBXxJXMIVFSLjWVdCcdcIjI3+VV3Z2e9mw==
+read@1, read@^1.0.7, read@~1.0.1, read@~1.0.7:
+  version "1.0.7"
+  resolved "https://registry.jetlinks.cn/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+  integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
-    mute-stream "~1.0.0"
+    mute-stream "~0.0.4"
 
 readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.6.0:
   version "3.6.0"
@@ -5638,17 +5489,20 @@ readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.jetlinks.cn/readable-stream/-/readable-stream-4.3.0.tgz#0914d0c72db03b316c9733bb3461d64a3cc50cba"
-  integrity sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ==
+readable-stream@^2.0.6:
+  version "2.3.8"
+  resolved "https://registry.jetlinks.cn/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
   dependencies:
-    abort-controller "^3.0.0"
-    buffer "^6.0.3"
-    events "^3.3.0"
-    process "^0.11.10"
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
 
-readdir-scoped-modules@*:
+readdir-scoped-modules@^1.1.0:
   version "1.1.0"
   resolved "https://registry.jetlinks.cn/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -5731,7 +5585,7 @@ repeat-string@^1.6.1:
   resolved "https://registry.npmmirror.com/repeat-string/-/repeat-string-1.6.1.tgz"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
-request@^2.72.0:
+request@^2.72.0, request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.jetlinks.cn/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -5833,11 +5687,6 @@ rfdc@^1.3.0:
   resolved "https://registry.npmmirror.com/rfdc/-/rfdc-1.3.0.tgz"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
-rimraf@*:
-  version "4.1.2"
-  resolved "https://registry.jetlinks.cn/rimraf/-/rimraf-4.1.2.tgz#20dfbc98083bdfaa28b01183162885ef213dbf7c"
-  integrity sha512-BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ==
-
 rimraf@^2.6.2:
   version "2.7.1"
   resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
@@ -5845,7 +5694,7 @@ rimraf@^2.6.2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.2:
+rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.jetlinks.cn/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -5890,6 +5739,11 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   resolved "https://registry.jetlinks.cn/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.jetlinks.cn/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
@@ -5912,6 +5766,11 @@ scule@^1.0.0:
   resolved "https://registry.npmjs.org/scule/-/scule-1.0.0.tgz"
   integrity sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ==
 
+select@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.jetlinks.cn/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
+  integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==
+
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmmirror.com/semver-diff/-/semver-diff-2.1.0.tgz"
@@ -5931,18 +5790,18 @@ semver-utils@^1.1.4:
   resolved "https://registry.npmmirror.com/semver-utils/-/semver-utils-1.1.4.tgz"
   integrity sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==
 
-semver@*, semver@7.3.8, semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@7.3.8, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.8"
   resolved "https://registry.jetlinks.cn/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
 semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz"
@@ -5957,7 +5816,7 @@ sentence-case@^3.0.4:
     tslib "^2.0.3"
     upper-case-first "^2.0.2"
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
@@ -6001,14 +5860,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   resolved "https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-sigstore@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.jetlinks.cn/sigstore/-/sigstore-1.0.0.tgz#3c7a8bbacf99d0f978276bd29bd94911006b72c7"
-  integrity sha512-e+qfbn/zf1+rCza/BhIA//Awmf0v1pa5HQS8Xk8iXrn9bgytytVLqYD0P7NSqZ6IELTgq+tcDvLPkQjNHyWLNg==
-  dependencies:
-    make-fetch-happen "^11.0.1"
-    tuf-js "^1.0.0"
-
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"
@@ -6062,10 +5913,10 @@ snake-case@^3.0.4:
     dot-case "^3.0.4"
     tslib "^2.0.3"
 
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.jetlinks.cn/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+socks-proxy-agent@^6.0.0:
+  version "6.2.1"
+  resolved "https://registry.jetlinks.cn/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
+  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
   dependencies:
     agent-base "^6.0.2"
     debug "^4.3.3"
@@ -6155,17 +6006,10 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@*, ssri@^10.0.0, ssri@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.jetlinks.cn/ssri/-/ssri-10.0.1.tgz#c61f85894bbc6929fc3746f05e31cf5b44c030d5"
-  integrity sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==
-  dependencies:
-    minipass "^4.0.0"
-
-ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.jetlinks.cn/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
+ssri@^8.0.0, ssri@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.jetlinks.cn/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
   dependencies:
     minipass "^3.1.1"
 
@@ -6174,6 +6018,15 @@ string-argv@^0.3.1:
   resolved "https://registry.npmmirror.com/string-argv/-/string-argv-0.3.1.tgz"
   integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
 
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.jetlinks.cn/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz"
@@ -6216,7 +6069,19 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-strip-ansi@^3.0.0:
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.jetlinks.cn/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+stringify-package@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.jetlinks.cn/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
+  integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz"
   integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
@@ -6319,7 +6184,7 @@ svg-tags@^1.0.0:
   resolved "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz"
   integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
 
-tar@*, tar@^6.1.11, tar@^6.1.13, tar@^6.1.2:
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.11:
   version "6.1.13"
   resolved "https://registry.jetlinks.cn/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
   integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
@@ -6358,7 +6223,7 @@ text-extensions@^1.0.0:
   resolved "https://registry.npmmirror.com/text-extensions/-/text-extensions-1.9.0.tgz"
   integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
-text-table@*:
+text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.jetlinks.cn/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
@@ -6385,7 +6250,12 @@ timed-out@^4.0.0:
   resolved "https://registry.npmmirror.com/timed-out/-/timed-out-4.0.1.tgz"
   integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==
 
-tiny-relative-date@*:
+tiny-emitter@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.jetlinks.cn/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
+  integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
+
+tiny-relative-date@^1.3.0:
   version "1.3.0"
   resolved "https://registry.jetlinks.cn/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
@@ -6422,10 +6292,10 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-treeverse@*, treeverse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/treeverse/-/treeverse-3.0.0.tgz#dd82de9eb602115c6ebd77a574aae67003cb48c8"
-  integrity sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==
+treeverse@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.jetlinks.cn/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
+  integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
 
 trim-newlines@^3.0.0:
   version "3.0.1"
@@ -6466,14 +6336,6 @@ tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0:
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
-tuf-js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.jetlinks.cn/tuf-js/-/tuf-js-1.0.0.tgz#c89daaf69b348081a86e9f766151dfd7ce0f5078"
-  integrity sha512-1dxsQwESDzACJjTdYHQ4wJ1f/of7jALWKfJEHSBWUQB/5UTJUx9SW6GHXp4mZ1KvdBRJCpGjssoPFGi4hvw8/A==
-  dependencies:
-    make-fetch-happen "^11.0.1"
-    minimatch "^6.1.0"
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.jetlinks.cn/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -6545,19 +6407,12 @@ unimport@^1.0.2:
     strip-literal "^1.0.0"
     unplugin "^1.0.1"
 
-unique-filename@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.jetlinks.cn/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
-  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.jetlinks.cn/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
   dependencies:
-    unique-slug "^3.0.0"
-
-unique-filename@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
-  integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
-  dependencies:
-    unique-slug "^4.0.0"
+    unique-slug "^2.0.0"
 
 unique-random-array@1.0.0:
   version "1.0.0"
@@ -6571,17 +6426,10 @@ unique-random@^1.0.0:
   resolved "https://registry.npmmirror.com/unique-random/-/unique-random-1.0.0.tgz"
   integrity sha512-K1sUkPf9EXCZFNIlMCoX4icAqcvkR4FMPH4Z61HbyiWhQl1ZGo0zYeV2bJmocK8Cp6tnKYrCnpkeKGebXZoRTQ==
 
-unique-slug@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
-  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-unique-slug@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.jetlinks.cn/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
-  integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.jetlinks.cn/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
   dependencies:
     imurmurhash "^0.1.4"
 
@@ -6751,7 +6599,7 @@ user-meta@^1.0.0:
   dependencies:
     rc "^1.2.1"
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
@@ -6774,14 +6622,7 @@ validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validate-npm-package-name@*, validate-npm-package-name@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.jetlinks.cn/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz#f16afd48318e6f90a1ec101377fa0384cfc8c713"
-  integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==
-  dependencies:
-    builtins "^5.0.0"
-
-validate-npm-package-name@^3.0.0:
+validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
   version "3.0.0"
   resolved "https://registry.npmmirror.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"
   integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
@@ -6863,6 +6704,13 @@ vue-demi@*:
   resolved "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz"
   integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
 
+vue-json-viewer@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.jetlinks.cn/vue-json-viewer/-/vue-json-viewer-3.0.4.tgz#c1d65515e57d4036defbbc18fa942d7fd5fb9a8b"
+  integrity sha512-pnC080rTub6YjccthVSNQod2z9Sl5IUUq46srXtn6rxwhW8QM4rlYn+CTSLFKXWfw+N3xv77Cioxw7B4XUKIbQ==
+  dependencies:
+    clipboard "^2.0.4"
+
 vue-router@^4.1.6:
   version "4.1.6"
   resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.1.6.tgz"
@@ -6972,13 +6820,6 @@ which-module@^2.0.0:
   resolved "https://registry.npmmirror.com/which-module/-/which-module-2.0.0.tgz"
   integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
-which@*, which@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.jetlinks.cn/which/-/which-3.0.0.tgz#a9efd016db59728758a390d23f1687b6e8f59f8e"
-  integrity sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==
-  dependencies:
-    isexe "^2.0.0"
-
 which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.npmmirror.com/which/-/which-1.3.1.tgz"
@@ -6993,7 +6834,7 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.5:
+wide-align@^1.1.0, wide-align@^1.1.2:
   version "1.1.5"
   resolved "https://registry.jetlinks.cn/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -7046,14 +6887,6 @@ wrappy@1:
   resolved "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@*, write-file-atomic@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.jetlinks.cn/write-file-atomic/-/write-file-atomic-5.0.0.tgz#54303f117e109bf3d540261125c8ea5a7320fab0"
-  integrity sha512-R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
 write-file-atomic@^2.0.0:
   version "2.4.3"
   resolved "https://registry.npmmirror.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz"
@@ -7063,9 +6896,9 @@ write-file-atomic@^2.0.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@^3.0.0:
+write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.npmmirror.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"
+  resolved "https://registry.jetlinks.cn/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
   dependencies:
     imurmurhash "^0.1.4"

From be501e77fe021b2d28ea3fa475ee45d501b7bb9a Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Fri, 24 Feb 2023 18:21:44 +0800
Subject: [PATCH 16/17] =?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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Search/Search.vue              |   7 +-
 src/components/Table/index.tsx                |   6 +-
 src/store/scene.ts                            |  66 +------
 src/utils/regular.ts                          |  10 +-
 .../Scene/Save/Device/AddModal.vue            |  74 ++++---
 .../Scene/Save/Device/DeviceList.vue          | 187 ++++++++++++++++++
 .../Scene/Save/Device/DeviceSelect.vue        |  83 ++++++++
 .../rule-engine/Scene/Save/Device/OrgList.vue | 130 ++++++++++++
 .../rule-engine/Scene/Save/Device/Product.vue |  54 +++--
 .../rule-engine/Scene/Save/Device/Type.vue    | 100 ++++++++++
 .../rule-engine/Scene/Save/Device/index.vue   |   3 +-
 .../rule-engine/Scene/Save/Device/util.ts     |  69 +++++++
 .../Scene/Save/components/Timer.vue           | 138 +++++++++++++
 .../Scene/Save/components/TopCard.vue         | 167 ++++++++++++++++
 src/views/rule-engine/Scene/typings.ts        |  11 ++
 15 files changed, 996 insertions(+), 109 deletions(-)
 create mode 100644 src/views/rule-engine/Scene/Save/Device/DeviceList.vue
 create mode 100644 src/views/rule-engine/Scene/Save/Device/DeviceSelect.vue
 create mode 100644 src/views/rule-engine/Scene/Save/Device/OrgList.vue
 create mode 100644 src/views/rule-engine/Scene/Save/Device/Type.vue
 create mode 100644 src/views/rule-engine/Scene/Save/Device/util.ts
 create mode 100644 src/views/rule-engine/Scene/Save/components/Timer.vue
 create mode 100644 src/views/rule-engine/Scene/Save/components/TopCard.vue

diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index b0b2bf94..14d4af0f 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -98,7 +98,11 @@ const props = defineProps({
   class: {
     type: String,
     default: ''
-  }
+  },
+  // defaultTerms: {
+  //   type: Object,
+  //   default: () => ({})
+  // }
 })
 
 const searchRef = ref(null)
@@ -223,6 +227,7 @@ const handleParamsFormat = () => {
  */
 const searchSubmit = () => {
   emit('search', handleParamsFormat())
+  console.log('searchSubmit')
   if (props.type === 'advanced') {
     addUrlParams()
   }
diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx
index e3c69329..1239c9f6 100644
--- a/src/components/Table/index.tsx
+++ b/src/components/Table/index.tsx
@@ -144,6 +144,10 @@ const JTable = defineComponent<JTableProps>({
                     pageSize: 12
                 }
             }
+        },
+        scroll: {
+            type: Object,
+            default: () => { x: 1366 }
         }
     } as any,
     setup(props: JTableProps, { slots, emit, expose }) {
@@ -331,7 +335,7 @@ const JTable = defineComponent<JTableProps>({
                                         pagination={false}
                                         rowKey="id"
                                         rowSelection={props.rowSelection}
-                                        scroll={{ x: 1366 }}
+                                        scroll={props.scroll}
                                         v-slots={{
                                             bodyCell: (dt: Record<string, any>) => {
                                                 const { column, record } = dt;
diff --git a/src/store/scene.ts b/src/store/scene.ts
index b5c9dc5f..c25514b2 100644
--- a/src/store/scene.ts
+++ b/src/store/scene.ts
@@ -68,7 +68,7 @@ const defaultOptions = {
 };
 
 export const useSceneStore = defineStore('scene', () => {
-  const data = reactive<FormModelType | any>({
+  const data = reactive<FormModelType>({
     trigger: { type: ''},
     options: defaultOptions,
     branches: defaultBranches,
@@ -116,67 +116,3 @@ export const useSceneStore = defineStore('scene', () => {
     getDetail
   }
 })
-//
-// export const useSceneStore = defineStore({
-//   id: 'scene',
-//   state: (): DataType => {
-//     return {
-//       data: {
-//         trigger: { type: ''},
-//         options: defaultOptions,
-//         branches: defaultBranches,
-//         description: ''
-//       },
-//       productCache: {}
-//     }
-//   },
-//   actions: {
-//     /**
-//      * 初始化数据
-//      */
-//     initData() {
-//
-//     },
-//     /**
-//      * 获取详情
-//      * @param id
-//      */
-//     async getDetail(id: string) {
-//       const resp = await detail(id)
-//       if (resp.success) {
-//         const result = resp.result as SceneItem
-//         const triggerType = result.triggerType
-//         let branches: any[] = result.branches
-//
-//         if (!branches) {
-//           branches = cloneDeep(defaultBranches)
-//           if (triggerType === 'device') {
-//             branches.push(null)
-//           }
-//         } else {
-//           const branchesLength = branches.length;
-//           if (
-//             triggerType === 'device' &&
-//             ((branchesLength === 1 && !!branches[0]?.when?.length) || // 有一组数据并且when有值
-//               (branchesLength > 1 && !branches[branchesLength - 1]?.when?.length)) // 有多组否则数据，并且最后一组when有值
-//           ) {
-//             branches.push(null);
-//           }
-//         }
-//
-//         this.data = {
-//           ...result,
-//           trigger: result.trigger || {},
-//           branches: cloneDeep(assignmentKey(branches)),
-//           options: {...defaultOptions, ...result.options },
-//         }
-//       }
-//     },
-//     getProduct() {
-//
-//     }
-//   },
-//   getters: {
-//
-//   }
-// })
\ No newline at end of file
diff --git a/src/utils/regular.ts b/src/utils/regular.ts
index 7e7fa9cc..c98f5d64 100644
--- a/src/utils/regular.ts
+++ b/src/utils/regular.ts
@@ -7,4 +7,12 @@ export const isUrl = (path: string): boolean => urlReg.test(path)
 
 export const inputReg = /^[a-zA-Z0-9_\-]+$/
 
-export const isInput = (value: string) => inputReg.test(value)
\ No newline at end of file
+export const isInput = (value: string) => inputReg.test(value)
+
+// cron 表达式
+
+export const CronRegEx = new RegExp(
+  '^\\s*($|#|\\w+\\s*=|(\\?|\\*|(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?(?:,(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?)*)\\s+(\\?|\\*|(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?(?:,(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?)*)\\s+(\\?|\\*|(?:[01]?\\d|2[0-3])(?:(?:-|\\/|\\,)(?:[01]?\\d|2[0-3]))?(?:,(?:[01]?\\d|2[0-3])(?:(?:-|\\/|\\,)(?:[01]?\\d|2[0-3]))?)*)\\s+(\\?|\\*|(?:0?[1-9]|[12]\\d|3[01])(?:(?:-|\\/|\\,)(?:0?[1-9]|[12]\\d|3[01]))?(?:,(?:0?[1-9]|[12]\\d|3[01])(?:(?:-|\\/|\\,)(?:0?[1-9]|[12]\\d|3[01]))?)*)\\s+(\\?|\\*|(?:[1-9]|1[012])(?:(?:-|\\/|\\,)(?:[1-9]|1[012]))?(?:L|W)?(?:,(?:[1-9]|1[012])(?:(?:-|\\/|\\,)(?:[1-9]|1[012]))?(?:L|W)?)*|\\?|\\*|(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)(?:(?:-)(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC))?(?:,(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)(?:(?:-)(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC))?)*)\\s+(\\?|\\*|(?:[0-6])(?:(?:-|\\/|\\,|#)(?:[0-6]))?(?:L)?(?:,(?:[0-6])(?:(?:-|\\/|\\,|#)(?:[0-6]))?(?:L)?)*|\\?|\\*|(?:MON|TUE|WED|THU|FRI|SAT|SUN)(?:(?:-)(?:MON|TUE|WED|THU|FRI|SAT|SUN))?(?:,(?:MON|TUE|WED|THU|FRI|SAT|SUN)(?:(?:-)(?:MON|TUE|WED|THU|FRI|SAT|SUN))?)*)(|\\s)+(\\?|\\*|(?:|\\d{4})(?:(?:-|\\/|\\,)(?:|\\d{4}))?(?:,(?:|\\d{4})(?:(?:-|\\/|\\,)(?:|\\d{4}))?)*))$',
+);
+
+export const isCron = (value: string) => CronRegEx.test(value)
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Device/AddModal.vue b/src/views/rule-engine/Scene/Save/Device/AddModal.vue
index 6aa25bc2..5bae6dc3 100644
--- a/src/views/rule-engine/Scene/Save/Device/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Device/AddModal.vue
@@ -6,7 +6,7 @@
     @click='save'
     @cancel='cancel'
   >
-    <a-steps :current='addModel.stepNumber'>
+    <a-steps :current='addModel.stepNumber' @change='stepChange'>
       <a-step>
         <template #title>选择产品</template>
       </a-step>
@@ -17,19 +17,28 @@
         <template #title>触发类型</template>
       </a-step>
     </a-steps>
+    <a-divider style='margin-bottom: 0px' />
     <div class='steps-content'>
-      <Product :rowKey='addModel.productId' />
+      <Product v-if='addModel.stepNumber === 0' v-model:rowKey='addModel.productId' v-model:detail='addModel.productDetail' />
+      <DeviceSelect
+        v-else-if='addModel.stepNumber === 1'
+        :productId='addModel.productId'
+        v-model:deviceKeys='addModel.deviceKeys'
+        v-model:orgId='addModel.orgId'
+        v-model:selector='addModel.selector'
+        v-model:selectorValues='addModel.selectorValues'
+      />
+      <Type
+        v-else-if='addModel.stepNumber === 2'
+        :metadata='addModel.metadata'
+      />
     </div>
     <template #footer>
       <div class='steps-action'>
-        <template>
-          <a-button v-if='addModel.stepNumber === 0' @click='cancel'>取消</a-button>
-          <a-button v-else>上一步</a-button>
-        </template>
-        <template>
-          <a-button type='primary' v-if='addModel.stepNumber < 2'>下一步</a-button>
-          <a-button type='primary' v-else>确定</a-button>
-        </template>
+        <a-button v-if='addModel.stepNumber === 0' @click='cancel'>取消</a-button>
+        <a-button v-else @click='prev'>上一步</a-button>
+        <a-button type='primary' v-if='addModel.stepNumber < 2' @click='saveClick'>下一步</a-button>
+        <a-button type='primary' v-else @click='saveClick'>确定</a-button>
       </div>
     </template>
   </a-modal>
@@ -37,10 +46,12 @@
 
 <script setup lang='ts' name='AddModel'>
 import type { PropType } from 'vue'
-import { TriggerDevice } from '@/views/rule-engine/Scene/typings'
+import type { metadataType, TriggerDevice } from '@/views/rule-engine/Scene/typings'
 import { onlyMessage } from '@/utils/comm'
 import { detail as deviceDetail  } from '@/api/device/instance'
 import Product from './Product.vue'
+import DeviceSelect from './DeviceSelect.vue'
+import Type from './Type.vue'
 
 type Emit = {
   (e: 'cancel'): void
@@ -54,11 +65,7 @@ interface AddModelType extends Omit<TriggerDevice, 'selectorValues'> {
   orgId: Array<{ label: string, value: string }>
   productDetail: any
   selectorValues: Array<{ label: string, value: string }>
-  metadata: {
-    properties?: any[]
-    functions?: any[]
-    events?: any[]
-  }
+  metadata: metadataType
 }
 
 const emit = defineEmits<Emit>()
@@ -97,39 +104,56 @@ const handleOptions = () => {
 
 }
 
+const prev = () => {
+  addModel.stepNumber = addModel.stepNumber - 1
+}
+
 const cancel = () => {
   emit("cancel")
 }
 
-const handleMetadata = (metadata: string) => {
+const handleMetadata = (metadata?: string) => {
   try {
-    addModel.metadata = JSON.parse(metadata)
+    addModel.metadata = JSON.parse(metadata || "{}")
   } catch (e) {
     console.warn('handleMetadata: ' + e)
   }
 }
 
-const save = async () => {
-  if (addModel.stepNumber === 0) {
+const save = async (step?: number) => {
+  let _step = step !== undefined ? step : addModel.stepNumber
+  if (_step === 0) {
     addModel.productId ? addModel.stepNumber = 1 : onlyMessage('请选择产品', 'error')
-  } else if (addModel.stepNumber === 1) {
+  } else if (_step === 1) {
     const isFixed = addModel.selector === 'fixed' // 是否选择方式为设备
-    if ((['fixed', 'org'].includes(addModel.selector) ) && addModel.selectorValues?.length) {
+    if ((['fixed', 'org'].includes(addModel.selector) ) && !addModel.selectorValues?.length) {
       return onlyMessage(isFixed ? '请选择设备' : '请选择部门', 'error')
     }
     // 选择方式为设备且仅选中一个设备时，物模型取该设备
     if (isFixed && addModel.selectorValues?.length === 1) {
       const resp = await deviceDetail(addModel.selectorValues[0].value)
-      addModel.metadata
+      handleMetadata(resp.result.metadata)
     } else {
-
+      handleMetadata(addModel.productDetail?.metadata)
     }
-    //
+    addModel.stepNumber = 2
+  } else {
+
   }
   // handleOptions()
   // emit('update:value', {})
 }
 
+const saveClick = () => save()
+
+const stepChange = (step: number) => {
+  if (step !== 0) {
+    save(step - 1)
+  } else {
+    addModel.stepNumber = 0
+  }
+}
+
 </script>
 
 <style scoped>
diff --git a/src/views/rule-engine/Scene/Save/Device/DeviceList.vue b/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
new file mode 100644
index 00000000..cdb3dcfd
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
@@ -0,0 +1,187 @@
+<template>
+  <Search
+    :columns="columns"
+    type='simple'
+    @search="handleSearch"
+    class='search'
+    target="scene-triggrt-device-device"
+  />
+  <a-divider style='margin: 0' />
+  <j-table
+    ref='actionRef'
+    model='CARD'
+    :columns='columns'
+    :request='deviceQuery'
+    :gridColumn='2'
+    :params='params'
+    :bodyStyle='{
+      paddingRight: 0,
+      paddingLeft: 0
+    }'
+  >
+    <template #card="slotProps">
+      <CardBox
+        :value='slotProps'
+        :active="deviceRowKeys.includes(slotProps.id)"
+        :status="slotProps.state?.value"
+        :statusText="slotProps.state?.text"
+        :statusNames="{
+                        online: 'success',
+                        offline: 'error',
+                        notActive: 'warning',
+                    }"
+        @click="handleClick"
+      >
+        <template #img>
+          <slot name="img">
+            <img width='88' height='88' :src="slotProps.photoUrl || getImage('/device/instance/device-card.png')" />
+          </slot>
+        </template>
+        <template #content>
+          <Ellipsis style='width: calc(100% - 100px)'>
+              <span style="font-size: 16px;font-weight: 600" >
+                {{ slotProps.name }}
+              </span>
+          </Ellipsis>
+          <a-row>
+            <a-col :span="12">
+              <div class="card-item-content-text">
+                设备类型
+              </div>
+              <div>{{ slotProps.deviceType?.text }}</div>
+            </a-col>
+            <a-col :span="12">
+              <div class="card-item-content-text">
+                产品名称
+              </div>
+              <div>{{ slotProps.productName }}</div>
+            </a-col>
+          </a-row>
+        </template>
+      </CardBox>
+    </template>
+  </j-table>
+</template>
+
+<script setup lang='ts' name='DeviceSelectList'>
+import type { PropType } from 'vue'
+import { getImage } from '@/utils/comm'
+import { query } from '@/api/device/instance'
+import { cloneDeep } from 'lodash-es'
+
+type Emit = {
+  (e: 'update', data: Array<{ name: string, value: string}>): void
+}
+
+const actionRef = ref()
+const params = ref({})
+const context = inject('SceneDeviceAddModel')
+const props = defineProps({
+  rowKeys: {
+    type: Array as PropType<Array<{ name: string, value: string}>>,
+    default: () => ([])
+  },
+  productId: {
+    type: String,
+    default: ''
+  }
+})
+
+const emit = defineEmits<Emit>()
+
+const deviceRowKeys = computed(() => {
+  return props.rowKeys.map(item => item.value)
+})
+
+const columns = [
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    width: 300,
+    ellipsis: true,
+    fixed: 'left',
+    search: {
+      type: 'string'
+    }
+  },
+  {
+    title: '设备名称',
+    dataIndex: 'name',
+    width: 200,
+    ellipsis: true,
+    search: {
+      type: 'string',
+      first: true
+    }
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 200,
+    search: {
+      type: 'date'
+    }
+  },
+  {
+    title: '状态',
+    dataIndex: 'state',
+    width: 90,
+    search: {
+      type: 'select',
+      options: [
+        { label: '禁用', value: 'notActive' },
+        { label: '离线', value: 'offline' },
+        { label: '在线', value: 'online' },
+      ]
+    }
+  },
+
+]
+
+const handleSearch = (p: any) => {
+  params.value = p
+}
+
+const deviceQuery = (p: any) => {
+  const sorts: any = [];
+
+  if (props.rowKeys) {
+    props.rowKeys.forEach(rowKey => {
+      sorts.push({
+        name: 'id',
+        value: rowKey,
+      });
+    })
+  }
+  sorts.push({ name: 'createTime', order: 'desc' });
+  const terms = [
+    ...p.terms,
+    { terms: [{ column: "productId", value: props.productId }]}
+  ]
+  return query({ ...p, terms, sorts })
+}
+
+const handleClick = (detail: any) => {
+  const cloneRowKeys = cloneDeep(props.rowKeys)
+  const indexOf = cloneRowKeys.findIndex(item => item.value === detail.id)
+  if (indexOf !== -1) {
+    cloneRowKeys.splice(indexOf, 1)
+  } else {
+    cloneRowKeys.push({
+      name: detail.name,
+      value: detail.id
+    })
+  }
+  console.log('cloneRowKeys', cloneRowKeys)
+  emit('update', cloneRowKeys)
+}
+
+</script>
+
+<style scoped>
+.search {
+  margin-bottom: 0;
+  padding-right: 0px;
+  padding-left: 0px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Device/DeviceSelect.vue b/src/views/rule-engine/Scene/Save/Device/DeviceSelect.vue
new file mode 100644
index 00000000..b3aa34d6
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Device/DeviceSelect.vue
@@ -0,0 +1,83 @@
+<template>
+  <div class='device-select'>
+    <TopCard :options='typeList' v-model:value='selectorModel' @select='select' />
+    <DeviceList v-if='selectorModel === "fixed"' :productId='productId' :row-keys='devices' @update='updateDevice' />
+    <OrgList v-else-if='selectorModel === "org"' :productId='productId' :row-keys='orgIds' @update='updateOrg' />
+  </div>
+</template>
+
+<script setup lang='ts'>
+import TopCard from '@/views/rule-engine/Scene/Save/components/TopCard.vue'
+import DeviceList from './DeviceList.vue'
+import OrgList from './OrgList.vue'
+import { getImage } from '@/utils/comm'
+import type { PropType } from 'vue'
+
+type ItemType = {
+  name: string,
+  value: string
+}
+
+type Emit = {
+  (e: 'update:selector', data: string): void
+  (e: 'update:selectorValues', data: ItemType[]): void
+  (e: 'update:deviceKeys', data: ItemType[]): void
+  (e: 'update:orgId', data: ItemType[]): void
+}
+
+const emit = defineEmits<Emit>()
+
+const props = defineProps({
+  productId: {
+    type: String,
+    default: ''
+  },
+  selector: {
+    type: String,
+    default: ''
+  },
+  device: {
+    type: Array as PropType<ItemType[]>,
+    default: () => []
+  },
+  orgId: {
+    type: Array as PropType<ItemType[]>,
+    default: () => []
+  }
+})
+
+const selectorModel = ref(props.selector)
+const devices = ref(props.device)
+const orgIds = ref(props.orgId)
+
+const typeList = [
+  { label: '自定义', value: 'fixed', tip: '自定义选择当前产品下的任意设备', img: getImage('/scene/device-custom.png')},
+  { label: '全部', value: 'all', tip: '产品下的所有设备', img: getImage('/scene/trigger-device-all.png')},
+  { label: '按组织', value: 'org', tip: '选择产品下归属于具体组织的设备', img: getImage('/scene/trigger-device-org.png')},
+]
+
+const select = (s: string) => {
+  selectorModel.value = s
+  emit('update:selector', s)
+  emit('update:selectorValues', [])
+}
+
+const updateDevice = (d: any[]) => {
+  devices.value = d
+  emit('update:deviceKeys', d)
+  emit('update:selectorValues', d)
+}
+
+const updateOrg = (d: any[]) => {
+  orgIds.value = d
+  emit('update:orgId', d)
+  emit('update:selectorValues', d)
+}
+
+</script>
+
+<style scoped lang='less'>
+.device-select{
+  margin-top: 24px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Device/OrgList.vue b/src/views/rule-engine/Scene/Save/Device/OrgList.vue
new file mode 100644
index 00000000..1374b005
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Device/OrgList.vue
@@ -0,0 +1,130 @@
+<template>
+  <Search
+    :columns="columns"
+    type='simple'
+    @search="handleSearch"
+    class='search'
+    target="scene-triggrt-device-category"
+  />
+  <a-divider style='margin: 0' />
+  <JTable
+    ref="instanceRef"
+    model='TABLE'
+    type='TREE'
+    :columns="columns"
+    :request="query"
+    :scroll="{
+        y: 350
+    }"
+    :expandable='{
+      expandedRowKeys: openKeys,
+      onExpandedRowsChange: expandedRowChange,
+    }'
+    :rowSelection='{
+      type: "radio",
+      selectedRowKeys: orgRowKeys,
+      onChange: selectedRowChange
+    }'
+    :onChange='tableChange'
+  >
+
+  </JTable>
+
+</template>
+
+<script setup lang='ts' name='OrgList'>
+import type { PropType } from 'vue'
+import { getExpandedRowById } from './util'
+import { getTreeData_api } from '@/api/system/department'
+
+type Emit = {
+  (e: 'update', data: Array<{ name: string, value: string}>): void
+}
+
+const props = defineProps({
+  rowKeys: {
+    type: Array as PropType<Array<{ name: string, value: string}>>,
+    default: () => ([])
+  },
+  productId: {
+    type: String,
+    default: ''
+  }
+})
+const emit = defineEmits<Emit>()
+
+const params = ref()
+const openKeys = ref<string[]>([])
+const selectedRowKeys = ref(props.rowKeys.map(item => item.value))
+const sortParam = ref<{ name:string, order: string }>({ name: 'sortIndex', order: 'asc' })
+const iniPage = ref(true)
+
+const orgRowKeys = computed(() => {
+  return props.rowKeys.map(item => item.value)
+})
+
+const columns = [
+  {
+    title: '名称',
+    width: 300,
+    ellipsis: true,
+    dataIndex: 'name',
+  },
+  {
+    title: '排序',
+    dataIndex: 'sortIndex',
+    sorter: true,
+  },
+]
+
+const handleSearch = (p: any) => {
+  params.value = p
+}
+
+const tableChange = (_: any, f: any, sorter: any) => {
+  if (sorter.order) {
+    sortParam.value = { name: sorter.columnKey, order: (sorter.order as string).replace('end', ''), }
+  } else {
+    sortParam.value = { name: 'sortIndex', order: 'asc' }
+  }
+}
+
+const query = async (p: any) => {
+  const _params: any = {
+    paging: false,
+    sorts: [sortParam.value],
+  }
+
+  if (p.terms && p.terms.length) {
+    _params.terms = p.terms
+  }
+
+  const resp = await getTreeData_api(_params)
+
+  if (iniPage.value && props.rowKeys.length) {
+    iniPage.value = false
+    openKeys.value = getExpandedRowById(props.rowKeys[0]?.value, resp.result as any[])
+  }
+
+  return resp
+}
+
+const selectedRowChange = (_: any, selectedRows: any[]) => {
+  const item = selectedRows[0]
+  console.log(selectedRows)
+  emit('update', item ? [{ name: item.name, value: item.id }] : [])
+}
+
+const expandedRowChange = (keys: string[]) => {
+  openKeys.value = keys
+}
+
+</script>
+
+<style scoped>
+.search {
+  margin-bottom: 0;
+  padding-right: 0px;
+  padding-left: 0px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Device/Product.vue b/src/views/rule-engine/Scene/Save/Device/Product.vue
index d9d778ac..705d4b9e 100644
--- a/src/views/rule-engine/Scene/Save/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Product.vue
@@ -4,18 +4,25 @@
     type='simple'
     @search="handleSearch"
     class='search'
+    target="scene-triggrt-device-device"
   />
+  <a-divider style='margin: 0' />
   <j-table
-    :columns='columns'
     ref='actionRef'
+    model='CARD'
+    :columns='columns'
+    :params='params'
     :request='productQuery'
     :gridColumn='2'
-    model='CARD'
+    :bodyStyle='{
+      paddingRight: 0,
+      paddingLeft: 0
+    }'
   >
     <template #card="slotProps">
       <CardBox
         :value='slotProps'
-        :active="selectedRowKeys.includes(slotProps.id)"
+        :active="rowKey === slotProps.id"
         :status="slotProps.state"
         :statusText="slotProps.state === 1 ? '正常' : '禁用'"
         :statusNames="{ 1: 'success', 0: 'error',  }"
@@ -23,13 +30,17 @@
       >
         <template #img>
           <slot name="img">
-            <img :src="getImage('/device-product.png')" />
+            <img width='88' height='88' :src="slotProps.photoUrl || getImage('/device-product.png')" />
           </slot>
         </template>
         <template #content>
-          <h3 style="font-weight: 600" >
-            {{ slotProps.name }}
-          </h3>
+          <div style='width: calc(100% - 100px)'>
+            <Ellipsis>
+              <span style="font-size: 16px;font-weight: 600" >
+                {{ slotProps.name }}
+              </span>
+            </Ellipsis>
+          </div>
           <a-row>
             <a-col :span="12">
               <div class="card-item-content-text">
@@ -51,16 +62,25 @@ import { getTreeData_api } from '@/api/system/department'
 import { isNoCommunity } from '@/utils/utils'
 import { getImage } from '@/utils/comm'
 
+type Emit = {
+  (e: 'update:rowKey', data: string): void
+  (e: 'update:detail', data: string): void
+}
+
 const actionRef = ref()
 const params = ref({})
 const props = defineProps({
   rowKey: {
     type: String,
     default: ''
+  },
+  detail: {
+    type: Object,
+    default: () => ({})
   }
 })
 
-const selectedRowKeys = ref(props.rowKey)
+const emit = defineEmits<Emit>()
 
 const columns = [
   {
@@ -69,12 +89,19 @@ const columns = [
     width: 300,
     ellipsis: true,
     fixed: 'left',
+    search: {
+      type: 'string',
+    },
   },
   {
     title: '名称',
     dataIndex: 'name',
     width: 200,
     ellipsis: true,
+    search: {
+      type: 'string',
+      first: true
+    }
   },
   {
     title: '网关类型',
@@ -199,7 +226,6 @@ const columns = [
 
 const handleSearch = (p: any) => {
   params.value = p
-  actionRef.value.required()
 }
 
 const productQuery = (p: any) => {
@@ -217,12 +243,8 @@ const productQuery = (p: any) => {
 }
 
 const handleClick = (detail: any) => {
-  const _selected = new Set(selectedRowKeys.value)
-  if (_selected.has(detail.id)) {
-    _selected.delete(detail.id)
-  } else {
-    _selected.add(detail.id)
-  }
+  emit('update:rowKey', detail.id)
+  emit('update:detail', detail)
 }
 
 </script>
@@ -230,5 +252,7 @@ const handleClick = (detail: any) => {
 <style scoped lang='less'>
 .search {
   margin-bottom: 0;
+  padding-right: 0px;
+  padding-left: 0px;
 }
 </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
new file mode 100644
index 00000000..7d1e0c23
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Device/Type.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class='type'>
+    <a-form ref='typeForm' :model='formModel' layout='vertical' :colon='false'>
+      <a-form-item
+        required
+        label='触发类型'
+      >
+        <TopCard
+          :label-bottom='true'
+          :options='options'
+          v-model:value='formModel.operator'
+        />
+      </a-form-item>
+      <Timer v-if='showTimer' />
+    </a-form>
+  </div>
+</template>
+
+<script setup lang='ts'>
+
+import TopCard from '@/views/rule-engine/Scene/Save/components/TopCard.vue'
+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'
+
+const props = defineProps({
+  metadata: {
+    type: Object as PropType<metadataType>,
+    default: () => ({})
+  }
+})
+
+const formModel = reactive({
+  operator: 'online',
+})
+
+const readProperties = ref<any[]>([])
+const writeProperties = ref<any[]>([])
+
+const options = computed(() => {
+  const baseOptions = [
+    {
+      label: '设备上线',
+      value: 'online',
+      img: getImage('/scene/online.png'),
+    },
+    {
+      label: '设备离线',
+      value: 'offline',
+      img: getImage('/scene/offline.png'),
+    },
+  ]
+
+  if (props.metadata.events?.length) {
+    baseOptions.push(TypeEnum.reportEvent)
+  }
+
+  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'))
+
+    if (readProperties.value.length) {
+      baseOptions.push(TypeEnum.readProperty)
+    }
+
+    if (writeProperties.value.length) {
+      baseOptions.push(TypeEnum.writeProperty)
+    }
+
+    if (reportProperties.length) {
+      baseOptions.push(TypeEnum.reportProperty)
+    }
+
+  }
+
+  if (props.metadata.functions?.length) {
+    baseOptions.push(TypeEnum.invokeFunction)
+  }
+
+  return baseOptions
+})
+
+const showTimer = computed(() => {
+  return ['readProperty', 'writeProperty', 'invokeFunction'].includes(formModel.operator)
+})
+
+</script>
+
+<style scoped lang='less'>
+.type {
+  max-height: calc(100vh - 350px);
+  overflow-x: hidden;
+  overflow-y: auto;
+  margin-top: 24px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Device/index.vue b/src/views/rule-engine/Scene/Save/Device/index.vue
index 99f19a1e..96413d17 100644
--- a/src/views/rule-engine/Scene/Save/Device/index.vue
+++ b/src/views/rule-engine/Scene/Save/Device/index.vue
@@ -26,7 +26,8 @@ import AddButton from '../components/AddButton.vue'
 import Title from '../components/Title.vue'
 
 const sceneStore = useSceneStore()
-const { data } = storeToRefs(sceneStore)
+const { data } = storeToRefs<any>(sceneStore)
+
 const visible = ref(false)
 
 const rules = [{
diff --git a/src/views/rule-engine/Scene/Save/Device/util.ts b/src/views/rule-engine/Scene/Save/Device/util.ts
new file mode 100644
index 00000000..06cee863
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Device/util.ts
@@ -0,0 +1,69 @@
+import { getImage } from '@/utils/comm'
+
+export const TypeName = {
+  online: '设备上线',
+  offline: '设备离线',
+  reportEvent: '事件上报',
+  reportProperty: '属性上报',
+  readProperty: '读取属性',
+  writeProperty: '修改属性',
+  invokeFunction: '功能调用',
+};
+
+export const TypeEnum = {
+  reportProperty: {
+    label: '属性上报',
+    value: 'reportProperty',
+    img: getImage('/scene/reportProperty.png'),
+  },
+  reportEvent: {
+    label: '事件上报',
+    value: 'reportEvent',
+    img: getImage('/scene/reportProperty.png'),
+  },
+  readProperty: {
+    label: '读取属性',
+    value: 'readProperty',
+    img: getImage('/scene/readProperty.png'),
+  },
+  writeProperty: {
+    label: '修改属性',
+    value: 'writeProperty',
+    img: getImage('/scene/writeProperty.png'),
+  },
+  invokeFunction: {
+    label: '功能调用',
+    value: 'invokeFunction',
+    img: getImage('/scene/invokeFunction.png'),
+  },
+};
+
+export const getExpandedRowById = (id: string, data: any[]): string[] => {
+  const expandedKeys:string[] = []
+  const dataMap = new Map()
+
+  const flatMapData = (flatData: any[]) => {
+    flatData.forEach(item => {
+      dataMap.set(item.id, { pid: item.parentId })
+      if (item.children && item.children.length) {
+        flatMapData(item.children)
+      }
+    })
+  }
+
+  const getExp = (_id: string) => {
+    const item = dataMap.get(_id)
+    if (item) {
+      expandedKeys.push(_id)
+      if (dataMap.has(dataMap)) {
+        getExp(item.pid)
+      }
+    }
+  }
+
+  flatMapData(data)
+
+  getExp(id)
+
+  return expandedKeys
+}
\ 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.vue
new file mode 100644
index 00000000..5f4977f6
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/components/Timer.vue
@@ -0,0 +1,138 @@
+<template>
+  <a-form
+    ref='timerForm'
+    :model='formModel'
+    layout='vertical'
+    :colon='false'
+  >
+    <a-form-item name='trigger'>
+      <a-radio-group
+        v-model:value='formModel.trigger'
+        :options='[
+          { label: "按周", value: "week" },
+          { label: "按月", value: "month" },
+          { label: "cron表达式", value: "cron" },
+        ]'
+        option-type='button'
+        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>
+    <template v-else>
+      <a-form-item name='when'>
+
+      </a-form-item>
+      <a-form-item name='mod'>
+        <a-radio-group
+          v-model:value='formModel.mod'
+          :options='[
+          { label: "周期执行", value: "period" },
+          { label: "执行一次", value: "once" },
+        ]'
+          option-type='button'
+          button-style='solid'
+        />
+      </a-form-item>
+    </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-form-item>
+      <a-form-item> 执行一次 </a-form-item>
+    </a-space>
+    <a-space v-if='showPeriod' style='display: flex;gap: 24px'>
+      <a-form-item>
+        <a-time-range-picker
+          valueFormat='HH:mm:ss'
+          :value='[
+            formModel.period.from,
+            formModel.period.to,
+           ]'
+          @change='(v) => {
+                  formModel.period.from = v[0]
+                  formModel.period.to = v[1]
+              }'
+        />
+      </a-form-item>
+      <a-form-item>每</a-form-item>
+      <a-form-item
+        :name='["period", "every"]'
+        :rules='[{ required: true, message: "请输入时间" }]'
+      >
+        <a-input-number
+          placeholder='请输入时间'
+          style='max-width: 170px'
+          :precision='0'
+          :min='1'
+          :max='59'
+          v-model:value='formModel.period.every'
+        >
+          <template #addonAfter>
+            <a-select
+              v-model:value='formModel.period.unit'
+              :options='[
+                { label: "秒", value: "seconds" },
+                { label: "分", value: "minutes" },
+                { label: "小时", value: "hours" },
+              ]'
+            />
+          </template>
+        </a-input-number>
+      </a-form-item>
+      <a-form-item>执行一次</a-form-item>
+    </a-space>
+  </a-form>
+</template>
+
+<script setup lang='ts' name='Timer'>
+import type { PropType } from 'vue'
+import moment from 'moment'
+
+type NameType = string[] | string
+
+const props = defineProps({
+  name: {
+    type: [String, Array] as PropType<NameType>,
+    default: ''
+  },
+  value: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const formModel = reactive({
+  trigger: 'week',
+  when: [],
+  mod: 'period',
+  cron: undefined,
+  once: {
+    time: ''
+  },
+  period: {
+    from: moment(new Date()).startOf('day').format('HH:mm:ss'),
+    to: moment(new Date()).endOf('day').format('HH:mm:ss'),
+    every: 1,
+    unit: 'seconds'
+  }
+})
+
+const showCron = computed(() => {
+  return formModel.trigger === 'cron'
+})
+
+const showOnce = computed(() => {
+  return formModel.trigger !== 'cron' && formModel.mod === 'once'
+})
+
+const showPeriod = computed(() => {
+  return formModel.trigger !== 'cron' && formModel.mod === 'period'
+})
+
+</script>
+
+<style scoped lang='less'>
+
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/TopCard.vue b/src/views/rule-engine/Scene/Save/components/TopCard.vue
new file mode 100644
index 00000000..94d70415
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/components/TopCard.vue
@@ -0,0 +1,167 @@
+<template>
+  <div :class='classNames'>
+    <div
+      v-for='item in options'
+      :key='item.value'
+      :class='[
+        "trigger-way-item",
+        value === item.value ? "active" : "",
+        labelBottom ? "label-bottom" : ""
+        ]'
+      @click='() => click(item.value)'
+    >
+      <div class='way-item-title'>
+        <span class='label'>{{ item.label }}</span>
+        <a-popover v-if='item.tip' :content='item.tip'>
+          <AIcon type='QuestionCircleOutlined' class='icon' />
+        </a-popover>
+      </div>
+      <div class='way-item-image'>
+        <img
+          width='48'
+          v-bind='item.imgProps'
+          :src='item.img'
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang='ts' name='TopCard'>
+
+import type { PropType } from 'vue'
+
+type optionsType = {
+  label: string
+  value: string
+  img?: string
+  tip?: string
+  imgProps: Record<string, any>
+}
+
+type Emit = {
+  (e: 'update:value', data: string): void
+  (e: 'select', data: string): void
+}
+
+const props = defineProps({
+  options: {
+    type: Array as PropType<optionsType[]>,
+    default: () => ([])
+  },
+  value: {
+    type: String,
+    default: ''
+  },
+  class: {
+    type: String,
+    default: ''
+  },
+  disabled: {
+    type: Boolean,
+    default: false
+  },
+  labelBottom: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const classNames = computed(() => {
+  return [
+    props.class,
+    'trigger-way-warp',
+    props.disabled ? 'disabled' : ''
+  ]
+})
+
+const emit = defineEmits<Emit>()
+
+const click = (value: string) => {
+  emit('update:value', value)
+  emit('select', value)
+}
+
+</script>
+
+<style scoped lang='less'>
+.trigger-way-warp {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px 24px;
+  width: 100%;
+
+  .trigger-way-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 237px;
+    //width: 100%;
+    padding: 12px 16px;
+    border: 1px solid #e0e4e8;
+    border-radius: 2px;
+    cursor: pointer;
+    transition: all 0.3s;
+
+    .way-item-title {
+      span {
+        font-size: 16px;
+      }
+      .label {
+        padding-right: 6px;
+        color: rgba(#000, 0.64);
+      }
+
+      .icon {
+        color: rgba(#000, 0.5);
+      }
+    }
+
+    .way-item-image {
+      margin: 0 !important;
+      opacity: 0.6;
+    }
+
+    &:hover {
+      //color: @primary-color-hover;
+      .way-item-image {
+        opacity: 0.8;
+      }
+    }
+
+    &.active {
+      border-color: @primary-color-active;
+      .way-item-image {
+        opacity: 1;
+      }
+    }
+
+    &.label-bottom {
+      flex-direction: column-reverse;
+      grid-gap: 16px;
+      gap: 0;
+      align-items: center;
+      width: auto;
+      padding: 8px 16px;
+      p {
+        margin: 0;
+      }
+    }
+  }
+
+  &.disabled {
+    .trigger-way-item {
+      cursor: not-allowed;
+
+      &:hover {
+        color: initial;
+        opacity: 0.6;
+      }
+
+      &.active {
+        opacity: 1;
+      }
+    }
+  }
+}
+</style>
\ 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 f20a9a06..f1cfdcc9 100644
--- a/src/views/rule-engine/Scene/typings.ts
+++ b/src/views/rule-engine/Scene/typings.ts
@@ -9,6 +9,11 @@ type State = {
   text: string;
 };
 
+export type optionItem = {
+  label: string
+  value: string
+}
+
 type Action = {
   executor: string;
   configuration: Record<string, unknown>;
@@ -311,3 +316,9 @@ export interface FormModelType {
   options?: Record<string, any>;
   description?: string;
 }
+
+export type metadataType = {
+  properties?: any[]
+  functions?: any[]
+  events?: any[]
+}

From c24be85601d3585e6d30b751cebb2a6a17d6bc40 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Sun, 26 Feb 2023 18:03:51 +0800
Subject: [PATCH 17/17] =?UTF-8?q?update:=20=E5=BA=94=E7=94=A8=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/api/system/apply.ts                       |    8 +-
 .../system/Apply/Save/components/EditForm.vue | 1019 +++++++++++++----
 .../Apply/Save/components/MenuDialog.vue      |   49 +
 .../Apply/Save/components/RequestTable.vue    |   31 +-
 src/views/system/Apply/Save/typing.d.ts       |    4 +
 5 files changed, 863 insertions(+), 248 deletions(-)
 create mode 100644 src/views/system/Apply/Save/components/MenuDialog.vue

diff --git a/src/api/system/apply.ts b/src/api/system/apply.ts
index 8318a97c..9bf97443 100644
--- a/src/api/system/apply.ts
+++ b/src/api/system/apply.ts
@@ -11,4 +11,10 @@ export const delApply_api = (id:string) => server.remove(`/application/${id}`)
 
 
 // 获取组织列表
-export const getDepartmentList_api = () => server.get(`/organization/_all/tree`);
\ No newline at end of file
+export const getDepartmentList_api = () => server.get(`/organization/_all/tree`);
+// 获取组织列表
+export const getAppInfo_api = (id:string) => server.get(`/application/${id}`);
+// 新增应用
+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
diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index 9bc64a81..7ba9c83b 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -1,6 +1,12 @@
 <template>
     <div class="edit-form-container">
-        <a-form ref="formRef" :model="form.data" layout="vertical" class="form">
+        <a-form
+            ref="formRef"
+            :model="form.data"
+            layout="vertical"
+            class="form"
+            @validate="getErrorNum"
+        >
             <a-form-item
                 label="名称"
                 name="name"
@@ -9,6 +15,10 @@
                         required: true,
                         message: '请输入名称',
                     },
+                    {
+                        max: 64,
+                        message: '最多可输入64个字符',
+                    },
                 ]"
             >
                 <a-input
@@ -29,7 +39,7 @@
                 <a-radio-group
                     v-model:value="form.data.provider"
                     class="radio-container"
-                    @change="form.data.integrationModes = []"
+                    :disabled="!!routeQuery.id"
                 >
                     <a-radio-button value="internal-standalone">
                         <div>
@@ -93,6 +103,11 @@
                 <a-checkbox-group
                     v-model:value="form.data.integrationModes"
                     :options="joinOptions"
+                    @change="
+                        form.integrationModesISO = [
+                            ...form.data.integrationModes,
+                        ]
+                    "
                 />
             </a-form-item>
 
@@ -101,8 +116,18 @@
                 <a-collapse-panel
                     key="page"
                     v-if="form.data.integrationModes.includes('page')"
-                    header="页面集成"
                 >
+                    <template #header>
+                        <span>
+                            页面集成
+                            <span
+                                v-show="form.errorNumInfo.page.size"
+                                class="error-info"
+                            >
+                                {{ form.errorNumInfo.page.size }}
+                            </span>
+                        </span>
+                    </template>
                     <a-form-item
                         :name="['page', 'baseUrl']"
                         class="resetLabel"
@@ -153,6 +178,12 @@
 
                         <RequestTable
                             v-model:value="form.data.page.parameters"
+                            value-type="select"
+                            :value-options="[
+                                { label: '用户ID', value: '用户ID' },
+                                { label: '用户名', value: '用户名' },
+                                { label: 'token', value: 'token' },
+                            ]"
                         />
                     </a-form-item>
                 </a-collapse-panel>
@@ -160,8 +191,18 @@
                 <a-collapse-panel
                     key="apiClient"
                     v-if="form.data.integrationModes.includes('apiClient')"
-                    header="API客户端"
                 >
+                    <template #header>
+                        <span>
+                            API客户端
+                            <span
+                                v-show="form.errorNumInfo.apiClient.size"
+                                class="error-info"
+                            >
+                                {{ form.errorNumInfo.apiClient.size }}
+                            </span>
+                        </span>
+                    </template>
                     <a-form-item
                         class="resetLabel"
                         :name="['apiClient', 'baseUrl']"
@@ -273,6 +314,10 @@
                                     required: true,
                                     message: '请输入appId',
                                 },
+                                {
+                                    max: 64,
+                                    message: '最多可输入64个字符',
+                                },
                             ]"
                         >
                             <template #label>
@@ -303,6 +348,10 @@
                                     required: true,
                                     message: '请输入appKey',
                                 },
+                                {
+                                    max: 64,
+                                    message: '最多可输入64个字符',
+                                },
                             ]"
                         >
                             <template #label>
@@ -325,12 +374,7 @@
                         <a-form-item
                             label="认证方式"
                             :name="['apiClient', 'authConfig', 'type']"
-                            :rules="[
-                                {
-                                    required: true,
-                                    message: '请选择认证方式',
-                                },
-                            ]"
+                            :rules="[{ required: true }]"
                         >
                             <a-select
                                 v-model:value="
@@ -364,7 +408,7 @@
                                 :rules="[
                                     {
                                         required: true,
-                                        message: '请输入授权地址',
+                                        message: '该字段是必填字段',
                                     },
                                 ]"
                             >
@@ -425,7 +469,7 @@
                                 :rules="[
                                     {
                                         required: true,
-                                        message: '请输入client_id',
+                                        message: '该字段是必填字段',
                                     },
                                 ]"
                             >
@@ -455,7 +499,7 @@
                                 :rules="[
                                     {
                                         required: true,
-                                        message: '请输入client_secret',
+                                        message: '该字段是必填字段',
                                     },
                                 ]"
                             >
@@ -491,7 +535,7 @@
                                 :rules="[
                                     {
                                         required: true,
-                                        message: '请输入用户名',
+                                        message: '该字段是必填字段',
                                     },
                                 ]"
                             >
@@ -514,7 +558,7 @@
                                 :rules="[
                                     {
                                         required: true,
-                                        message: '请输入密码',
+                                        message: '该字段是必填字段',
                                     },
                                 ]"
                             >
@@ -527,43 +571,29 @@
                                 />
                             </a-form-item>
                         </div>
-                        <div
+                        <a-form-item
                             v-else-if="
                                 form.data.apiClient.authConfig.type === 'bearer'
                             "
+                            label="token"
+                            :name="['apiClient', 'authConfig', 'token']"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入token',
+                                },
+                            ]"
                         >
-                            <a-form-item
-                                label="token"
-                                :name="[
-                                    'apiClient',
-                                    'authConfig',
-                                    'oauth2',
-                                    'tokenUrl',
-                                ]"
-                                :rules="[
-                                    {
-                                        required: true,
-                                        message: '请输入token',
-                                    },
-                                ]"
-                            >
-                                <a-input
-                                    v-model:value="
-                                        form.data.apiClient.authConfig.oauth2
-                                            .tokenUrl
-                                    "
-                                    placeholder="请输入token"
-                                />
-                            </a-form-item>
-                        </div>
+                            <a-input
+                                v-model:value="
+                                    form.data.apiClient.authConfig.token
+                                "
+                                placeholder="请输入token"
+                            />
+                        </a-form-item>
                     </div>
 
-                    <div
-                        v-if="
-                            form.data.provider === 'internal-standalone' ||
-                            form.data.provider === 'third-party'
-                        "
-                    >
+                    <div v-if="form.data.provider !== 'internal-integrated'">
                         <a-form-item>
                             <template #label>
                                 <FormLabel
@@ -587,18 +617,23 @@
                 <a-collapse-panel
                     key="apiServer"
                     v-if="form.data.integrationModes.includes('apiServer')"
-                    header="API服务"
                 >
+                    <template #header>
+                        <span>
+                            API服务
+                            <span
+                                v-show="form.errorNumInfo.apiServer.size"
+                                class="error-info"
+                            >
+                                {{ form.errorNumInfo.apiServer.size }}
+                            </span>
+                        </span>
+                    </template>
                     <a-form-item
                         class="resetLabel"
                         v-if="!form.data.integrationModes.includes('apiClient')"
                         :name="['apiServer', 'appId']"
-                        :rules="[
-                            {
-                                required: true,
-                                message: '请输入appId',
-                            },
-                        ]"
+                        :rules="[{ required: true }]"
                     >
                         <template #label>
                             <FormLabel
@@ -608,9 +643,7 @@
                             />
                         </template>
                         <a-input
-                            v-model:value="
-                                form.data.apiClient.authConfig.oauth2.clientId
-                            "
+                            v-model:value="form.data.apiServer.appId"
                             disabled
                             placeholder="请输入appId"
                         />
@@ -624,6 +657,10 @@
                                 required: true,
                                 message: '请输入secureKey',
                             },
+                            {
+                                max: 64,
+                                message: '最多可输入64个字符',
+                            },
                         ]"
                     >
                         <template #label>
@@ -640,7 +677,7 @@
                     </a-form-item>
                     <a-form-item
                         class="resetLabel"
-                        v-if="form.data.provider === 'internal-standalone'"
+                        v-show="form.data.provider === 'internal-standalone'"
                     >
                         <template #label>
                             <FormLabel
@@ -678,7 +715,12 @@
                         <PermissionButton
                             :uhasPermission="`${rolePermission}:update`"
                             type="link"
-                            @click="clickAddItem('roleIdList', 'Role')"
+                            @click="
+                                clickAddItem(
+                                    form.data.apiServer.roleIdList,
+                                    'Role',
+                                )
+                            "
                             class="add-item"
                         >
                             <AIcon type="PlusOutlined" />
@@ -714,7 +756,12 @@
                         <PermissionButton
                             :uhasPermission="`${deptPermission}:update`"
                             type="link"
-                            @click="clickAddItem('roleIdList', 'Role')"
+                            @click="
+                                clickAddItem(
+                                    form.data.apiServer.orgIdList,
+                                    'Role',
+                                )
+                            "
                             class="add-item"
                         >
                             <AIcon type="PlusOutlined" />
@@ -729,7 +776,10 @@
                                     tooltip="授权后自动跳转的页面地址"
                                 />
                             </template>
-                            <a-input v-model:value="form.data.apiServer.redirectUri" placeholder="请输入redirectUrl" />
+                            <a-input
+                                v-model:value="form.data.apiServer.redirectUri"
+                                placeholder="请输入redirectUrl"
+                            />
                         </a-form-item>
                         <a-form-item label="IP白名单">
                             <a-textarea
@@ -745,20 +795,159 @@
                 <a-collapse-panel
                     key="ssoClient"
                     v-if="form.data.integrationModes.includes('ssoClient')"
-                    header="单点登录"
                 >
+                    <template #header>
+                        <span>
+                            单点登录
+                            <span
+                                v-show="form.errorNumInfo.ssoClient.size"
+                                class="error-info"
+                                :style="
+                                    form.errorNumInfo.ssoClient.size > 9
+                                        ? { padding: '0 8px' }
+                                        : {}
+                                "
+                            >
+                                {{ form.errorNumInfo.ssoClient.size }}
+                            </span>
+                        </span>
+                    </template>
+                    <!-- 第三方应用 -->
+                    <div v-if="form.data.provider === 'third-party'">
+                        <a-form-item
+                            label="认证方式"
+                            :name="['sso', 'configuration', 'oauth2', 'type']"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '该字段是必填字段',
+                                },
+                            ]"
+                        >
+                            <a-select
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2.type
+                                "
+                                placeholder="请选择认证方式"
+                                :options="[
+                                    { label: 'oauth2', value: 'oauth2' },
+                                ]"
+                            />
+                        </a-form-item>
+
+                        <a-form-item
+                            class="resetLabel"
+                            :name="['sso', 'configuration', 'oauth2', 'scope']"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入scope',
+                                },
+                                {
+                                    max: 64,
+                                    message: '最多可输入64个字符',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="scope"
+                                    required
+                                    tooltip="限制用户访问应用程序的权限"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2.scope
+                                "
+                                placeholder="请输入scope"
+                            />
+                        </a-form-item>
+                        <a-form-item
+                            class="resetLabel"
+                            :name="[
+                                'sso',
+                                'configuration',
+                                'oauth2',
+                                'client_id',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入client_id',
+                                },
+                                {
+                                    max: 64,
+                                    message: '最多可输入64个字符',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="client_id"
+                                    required
+                                    tooltip="应用唯一标识"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2.clientId
+                                "
+                                placeholder="请输入client_id"
+                            />
+                        </a-form-item>
+                        <a-form-item
+                            class="resetLabel"
+                            :name="[
+                                'sso',
+                                'configuration',
+                                'oauth2',
+                                'clientSecret',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入client_secret',
+                                },
+                                {
+                                    max: 64,
+                                    message: '最多可输入64个字符',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="client_secret"
+                                    required
+                                    tooltip="应用唯一标识的秘钥"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2
+                                        .clientSecret
+                                "
+                                placeholder="请输入client_secret"
+                            />
+                        </a-form-item>
+                    </div>
                     <a-form-item
+                        v-if="
+                            (form.data.provider === 'internal-standalone' ||
+                                form.data.provider === 'third-party') &&
+                            !form.data.integrationModes.includes('apiClient')
+                        "
                         class="resetLabel"
                         :name="[
-                            'apiClient',
-                            'authConfig',
+                            'sso',
+                            'configuration',
                             'oauth2',
                             'authorizationUrl',
                         ]"
                         :rules="[
                             {
                                 required: true,
-                                message: '请输入授权地址',
+                                message: '该字段是必填字段',
                             },
                         ]"
                     >
@@ -771,87 +960,293 @@
                         </template>
                         <a-input
                             v-model:value="
-                                form.data.apiClient.authConfig.oauth2
+                                form.data.sso.configuration.oauth2
                                     .authorizationUrl
                             "
                             placeholder="请输入授权地址"
                         />
                     </a-form-item>
-                    <a-form-item>
-                        <template #label>
-                            <FormLabel
-                                text="回调地址"
-                                tooltip="授权完成后跳转到具体页面的回调地址"
+
+                    <!-- 第三方应用 -->
+                    <div v-if="form.data.provider === 'third-party'">
+                        <a-form-item
+                            class="resetLabel"
+                            :name="[
+                                'sso',
+                                'configuration',
+                                'oauth2',
+                                'tokenUrl',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '该字段是必填字段',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="token地址"
+                                    required
+                                    tooltip="设置token令牌的地址"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2.tokenUrl
+                                "
+                                placeholder="请输入token地址"
                             />
-                        </template>
-                        <a-input
-                            v-model:value="
-                                form.data.apiClient.authConfig.oauth2
-                                    .redirectUri
-                            "
-                            placeholder="请输入回调地址"
-                        />
-                    </a-form-item>
-                    <a-form-item
-                        class="resetLabel"
-                        :name="[
-                            'apiClient',
-                            'authConfig',
-                            'oauth2',
-                            'clientId',
-                        ]"
-                        :rules="[
-                            {
-                                required: true,
-                                message: '请输入appId',
-                            },
-                        ]"
+                        </a-form-item>
+                        <a-form-item label="logo">
+                            <a-upload
+                                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="{
+                                    [TOKEN_KEY]: LocalStore.get(TOKEN_KEY),
+                                }"
+                                :action="`${BASE_API_PATH}/file/static`"
+                                @change="changeBackUpload"
+                            >
+                                <img
+                                    v-if="
+                                        form.data.sso.configuration.oauth2
+                                            .logoUrl
+                                    "
+                                    :src="
+                                        form.data.sso.configuration.oauth2
+                                            .logoUrl
+                                    "
+                                    alt="avatar"
+                                />
+                                <div v-else>
+                                    <AIcon
+                                        :type="
+                                            form.uploadLoading
+                                                ? 'LoadingOutlined'
+                                                : 'PlusOutlined'
+                                        "
+                                    />
+                                    <!-- <loading-outlined
+                                        v-if="loading"
+                                    ></loading-outlined>
+                                    <plus-outlined v-else></plus-outlined> -->
+                                    <div class="ant-upload-text">
+                                        点击上传图片
+                                    </div>
+                                </div>
+                            </a-upload>
+                        </a-form-item>
+
+                        <a-form-item
+                            label="用户信息地址"
+                            :name="[
+                                'sso',
+                                'configuration',
+                                'oauth2',
+                                'userInfoUrl',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '该字段是必填字段',
+                                },
+                            ]"
+                        >
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2
+                                        .userInfoUrl
+                                "
+                                placeholder="请输入用户信息地址"
+                            />
+                        </a-form-item>
+                        <a-form-item
+                            class="resetLabel"
+                            :name="[
+                                'sso',
+                                'configuration',
+                                'oauth2',
+                                'userProperty',
+                                'userId',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入该字段是必填字段用户ID',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="用户ID"
+                                    required
+                                    tooltip="通过jsonpath表达式从授权结果中获取第三方平台用户的唯一标识"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2
+                                        .userProperty.userId
+                                "
+                                placeholder="输入从用户信息接口返回数据中的用户ID字段。示例:result.id"
+                            />
+                        </a-form-item>
+                        <a-form-item
+                            label="用户名"
+                            :name="[
+                                'sso',
+                                'configuration',
+                                'oauth2',
+                                'userProperty',
+                                'username',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '该字段是必填字段',
+                                },
+                            ]"
+                        >
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2
+                                        .userProperty.username
+                                "
+                                placeholder="输入从用户信息接口返回数据中的用户名字段。示例:result.name"
+                            />
+                        </a-form-item>
+                        <a-form-item label="头像">
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2
+                                        .userProperty.avatar
+                                "
+                                placeholder="输入从用户信息接口返回数据中的用户头像字段。示例:result.avatar"
+                            />
+                        </a-form-item>
+                    </div>
+                    <!-- 非第三方应用 -->
+                    <div
+                        v-else-if="
+                            !form.data.integrationModes.includes('apiClient')
+                        "
                     >
-                        <template #label>
-                            <FormLabel
-                                text="appId"
-                                required
-                                tooltip="第三方应用唯一标识"
+                        <a-form-item
+                            v-if="form.data.provider === 'internal-standalone'"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="回调地址"
+                                    tooltip="授权完成后跳转到具体页面的回调地址"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2
+                                        .redirectUri
+                                "
+                                placeholder="请输入回调地址"
                             />
-                        </template>
-                        <a-input
-                            v-model:value="
-                                form.data.apiClient.authConfig.oauth2.clientId
-                            "
-                            disabled
-                            placeholder="请输入appId"
-                        />
-                    </a-form-item>
-                    <a-form-item
-                        class="resetLabel"
-                        :name="[
-                            'apiClient',
-                            'authConfig',
-                            'oauth2',
-                            'clientSecret',
-                        ]"
-                        :rules="[
-                            {
-                                required: true,
-                                message: '请输入appKey',
-                            },
-                        ]"
-                    >
-                        <template #label>
-                            <FormLabel
-                                text="appKey"
-                                required
-                                tooltip="第三方应用唯一标识的密钥"
+                        </a-form-item>
+                        <!-- 非钉钉 -->
+                        <a-form-item
+                            v-if="form.data.provider !== 'dingtalk-ent-app'"
+                            class="resetLabel"
+                            :name="[
+                                'sso',
+                                'configuration',
+                                'oauth2',
+                                'clientId',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入appId',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="appId"
+                                    required
+                                    tooltip="第三方应用唯一标识"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2.clientId
+                                "
+                                placeholder="请输入appId"
                             />
-                        </template>
-                        <a-input
-                            v-model:value="
-                                form.data.apiClient.authConfig.oauth2
-                                    .clientSecret
+                        </a-form-item>
+                        <!-- 非微信 -->
+                        <a-form-item
+                            v-if="form.data.provider !== 'wechat-webapp'"
+                            class="resetLabel"
+                            :name="[
+                                'sso',
+                                'configuration',
+                                'oauth2',
+                                'clientSecret',
+                            ]"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入appKey',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="appKey"
+                                    required
+                                    tooltip="第三方应用唯一标识的密钥"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.oauth2
+                                        .clientSecret
+                                "
+                                placeholder="请输入appKey"
+                            />
+                        </a-form-item>
+
+                        <!-- 钉钉 + 微信 -->
+                        <a-form-item
+                            v-if="
+                                form.data.provider === 'wechat-webapp' ||
+                                form.data.provider === 'dingtalk-ent-app'
                             "
-                            placeholder="请输入appKey"
-                        />
-                    </a-form-item>
+                            class="resetLabel"
+                            :name="['sso', 'configuration', 'appSecret']"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入appSecret',
+                                },
+                            ]"
+                        >
+                            <template #label>
+                                <FormLabel
+                                    text="appSecret"
+                                    required
+                                    tooltip="应用的唯一标识的秘钥"
+                                />
+                            </template>
+                            <a-input
+                                v-model:value="
+                                    form.data.sso.configuration.appSecret
+                                "
+                                placeholder="请输入appSecret"
+                            />
+                        </a-form-item>
+                    </div>
 
                     <a-form-item class="resetLabel">
                         <template #label>
@@ -862,104 +1257,97 @@
                             />
                         </template>
                         <a-switch
-                            v-model:checked="
-                                form.data.apiClient.authConfig.oauth2
-                                    .clientSecret
-                            "
-                        />
-                    </a-form-item>
-                    <a-form-item
-                        label="用户名前缀"
-                        :name="[
-                            'apiClient',
-                            'authConfig',
-                            'oauth2',
-                            'clientSecret',
-                        ]"
-                        :rules="[
-                            {
-                                required: true,
-                                message: '请输入用户名前缀',
-                            },
-                        ]"
-                    >
-                        <a-input
-                            v-model:value="
-                                form.data.apiClient.authConfig.oauth2
-                                    .clientSecret
-                            "
-                            placeholder="请输入用户名前缀"
-                        />
-                    </a-form-item>
-                    <a-form-item
-                        label="默认密码"
-                        :name="[
-                            'apiClient',
-                            'authConfig',
-                            'oauth2',
-                            'clientSecret',
-                        ]"
-                        :rules="[
-                            {
-                                required: true,
-                                message: '请输入默认密码',
-                            },
-                        ]"
-                    >
-                        <a-input
-                            v-model:value="
-                                form.data.apiClient.authConfig.oauth2
-                                    .clientSecret
-                            "
-                            placeholder="请输入默认密码"
+                            v-model:checked="form.data.sso.autoCreateUser"
                         />
                     </a-form-item>
+                    <div v-if="form.data.sso.autoCreateUser">
+                        <a-form-item
+                            label="用户名前缀"
+                            :name="['sso', 'usernamePrefix']"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入用户名前缀',
+                                },
+                            ]"
+                        >
+                            <a-input
+                                v-model:value="form.data.sso.usernamePrefix"
+                                placeholder="请输入用户名前缀"
+                            />
+                        </a-form-item>
+                        <a-form-item
+                            label="默认密码"
+                            :name="['sso', 'defaultPasswd']"
+                            :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入默认密码',
+                                },
+                            ]"
+                        >
+                            <a-input
+                                v-model:value="form.data.sso.defaultPasswd"
+                                placeholder="请输入默认密码"
+                            />
+                        </a-form-item>
 
-                    <a-form-item label="角色">
-                        <a-select
-                            v-model:value="form.data.apiServer.roleIdList"
-                            :options="form.roleIdList"
-                            placeholder="请选中角色"
-                        ></a-select>
-                        <PermissionButton
-                            :uhasPermission="`${rolePermission}:update`"
-                            type="link"
-                            @click="clickAddItem('roleIdList', 'Role')"
-                            class="add-item"
-                        >
-                            <AIcon type="PlusOutlined" />
-                        </PermissionButton>
-                    </a-form-item>
-                    <a-form-item label="组织">
-                        <a-tree-select
-                            v-model:value="form.data.apiServer.orgIdList"
-                            show-search
-                            style="width: 100%"
-                            :dropdown-style="{
-                                maxHeight: '400px',
-                                overflow: 'auto',
-                            }"
-                            :fieldNames="{
-                                label: 'name',
-                                value: 'id',
-                            }"
-                            multiple
-                            :tree-data="form.orgIdList"
-                            placeholder="请选择组织"
-                        >
-                            <template #title="{ name }">
-                                {{ name }}
-                            </template>
-                        </a-tree-select>
-                        <PermissionButton
-                            :uhasPermission="`${deptPermission}:update`"
-                            type="link"
-                            @click="clickAddItem('roleIdList', 'Role')"
-                            class="add-item"
-                        >
-                            <AIcon type="PlusOutlined" />
-                        </PermissionButton>
-                    </a-form-item>
+                        <a-form-item label="角色">
+                            <a-select
+                                v-model:value="form.data.sso.roleIdList"
+                                :options="form.roleIdList"
+                                placeholder="请选中角色"
+                            ></a-select>
+                            <PermissionButton
+                                :uhasPermission="`${rolePermission}:update`"
+                                type="link"
+                                @click="
+                                    clickAddItem(
+                                        form.data.sso.roleIdList,
+                                        'Role',
+                                    )
+                                "
+                                class="add-item"
+                            >
+                                <AIcon type="PlusOutlined" />
+                            </PermissionButton>
+                        </a-form-item>
+                        <a-form-item label="组织">
+                            <a-tree-select
+                                v-model:value="form.data.sso.orgIdList"
+                                show-search
+                                style="width: 100%"
+                                :dropdown-style="{
+                                    maxHeight: '400px',
+                                    overflow: 'auto',
+                                }"
+                                :fieldNames="{
+                                    label: 'name',
+                                    value: 'id',
+                                }"
+                                multiple
+                                :tree-data="form.orgIdList"
+                                placeholder="请选择组织"
+                            >
+                                <template #title="{ name }">
+                                    {{ name }}
+                                </template>
+                            </a-tree-select>
+                            <PermissionButton
+                                :uhasPermission="`${deptPermission}:update`"
+                                type="link"
+                                @click="
+                                    clickAddItem(
+                                        form.data.sso.orgIdList,
+                                        'Role',
+                                    )
+                                "
+                                class="add-item"
+                            >
+                                <AIcon type="PlusOutlined" />
+                            </PermissionButton>
+                        </a-form-item>
+                    </div>
                 </a-collapse-panel>
             </a-collapse>
 
@@ -975,20 +1363,44 @@
             </a-form-item>
         </a-form>
 
-        <a-button v-if="!routeQuery.view" @click="clickSave">
-            {{ routeQuery.view }}保存
+        <a-button
+            v-if="routeQuery.view !== 'true'"
+            @click="clickSave"
+            type="primary"
+        >
+            保存
         </a-button>
+
+        <div class="dialog">
+            <MenuDialog ref="dialogRef" />
+        </div>
     </div>
 </template>
 
 <script setup lang="ts">
-import { getDepartmentList_api } from '@/api/system/apply';
+import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
+import { LocalStore } from '@/utils/comm';
+
+import {
+    getDepartmentList_api,
+    addApp_api,
+    updateApp_api,
+    getAppInfo_api,
+} from '@/api/system/apply';
 import FormLabel from './FormLabel.vue';
 import RequestTable from './RequestTable.vue';
+import MenuDialog from './MenuDialog.vue';
 import { getImage } from '@/utils/comm';
 import type { formType, dictType, optionsType } from '../typing';
 import { getRoleList_api } from '@/api/system/user';
-import { FormInstance } from 'ant-design-vue';
+import {
+    FormInstance,
+    message,
+    UploadChangeParam,
+    UploadFile,
+} from 'ant-design-vue';
+import { randomString } from '@/utils/utils';
+import { cloneDeep } from 'lodash';
 
 const emit = defineEmits(['changeApplyType']);
 const routeQuery = useRoute().query;
@@ -996,6 +1408,7 @@ const routeQuery = useRoute().query;
 const deptPermission = 'system/Department';
 const rolePermission = 'system/Role';
 
+const dialogRef = ref();
 const initForm: formType = {
     name: '',
     provider: 'internal-standalone',
@@ -1018,6 +1431,7 @@ const initForm: formType = {
             type: 'oauth2', // 类型, 可选值：none, bearer, oauth2, basic, other
             bearer: { token: '' }, // 授权信息
             basic: { username: '', password: '' }, // 基本信息
+            token: '',
             oauth2: {
                 // OAuth2信息
                 authorizationUrl: '', // 授权地址
@@ -1034,7 +1448,7 @@ const initForm: formType = {
     apiServer: {
         // API服务
         appId: '',
-        secureKey: '', // 密钥
+        secureKey: randomString(), // 密钥
         redirectUri: '', // 重定向URL
         roleIdList: [], // 角色列表
         orgIdList: [], // 部门列表
@@ -1086,6 +1500,17 @@ const form = reactive({
     integrationModesISO: [] as string[],
     roleIdList: [] as optionsType,
     orgIdList: [] as dictType,
+
+    errorNumInfo: {
+        page: new Set(),
+        apiClient: new Set(),
+        apiServer: new Set(),
+        ssoClient: new Set(),
+    },
+
+    fileList: [] as any[],
+    fileUrlList: [] as string[],
+    uploadLoading: false,
 });
 // 接入方式的选项
 const joinOptions = computed(() => {
@@ -1160,15 +1585,39 @@ function init() {
     getRoleIdList();
     getOrgIdList();
 
+    if (routeQuery.id) getInfo(routeQuery.id as string);
+
     watch(
         () => form.data.provider,
         (n) => {
             emit('changeApplyType', n);
+            if (n === 'wechat-webapp' || n === 'dingtalk-ent-app') {
+                form.data.integrationModes = ['ssoClient'];
+                form.integrationModesISO = ['ssoClient'];
+            } else form.data.integrationModes = [];
         },
         { immediate: true },
     );
+    watch(
+        () => form.data.integrationModes,
+        (n, o) => {
+            o.forEach((key) => {
+                if (!n.includes(key)) form.errorNumInfo[key].clear();
+            });
+        },
+    );
 }
 
+function getInfo(id: string) {
+    getAppInfo_api(id).then((resp: any) => {
+        form.data = {
+            ...resp.result,
+            integrationModes: resp.result.integrationModes.map(
+                (item: any) => item.value,
+            ),
+        } as formType;
+    });
+}
 // 获取角色列表
 function getRoleIdList() {
     getRoleList_api().then((resp) => {
@@ -1190,27 +1639,93 @@ function getOrgIdList() {
     });
 }
 // 添加角色/组织
-function clickAddItem(prop: 'roleIdList' | 'orgIdList', target: string) {
+function clickAddItem(data: string[], target: string) {
     const tab: any = window.open(`${origin}/#/system/${target}?save=true`);
     tab.onSaveSuccess = (value: string) => {
-        form.data.apiServer[prop] = [
-            ...(form.data.apiServer[prop] || []),
-            value,
-        ];
-        if (prop === 'roleIdList') getRoleIdList();
+        data.push(value);
+        if (target === 'Role') getRoleIdList();
         else getOrgIdList();
     };
 }
 // 保存
 function clickSave() {
-    formRef.value?.validate().then((resp) => {
-        console.log('save');
+    formRef.value?.validate().then(() => {
+        const params = cloneDeep(form.data);
+
+        if (
+            params.provider === 'internal-standalone' &&
+            params.integrationModes.includes('ssoClient') &&
+            params.integrationModes.length === 1
+        )
+            return message.warning('配置单点登录需同时配置api配置');
+
+        //独立应用-api客户端 id?clientId:appId
+        if (params.provider === 'internal-standalone') {
+            if (params.integrationModes.includes('apiClient')) {
+                params.id = params.apiClient.authConfig.oauth2.clientId;
+            }
+            if (
+                params.integrationModes.includes('apiServer') &&
+                !params.integrationModes.includes('apiClient')
+            ) {
+                params.id = params.apiServer.appId;
+            }
+        }
+        const request = routeQuery.id
+            ? updateApp_api(routeQuery.id as string, params)
+            : addApp_api(params);
+        request.then((resp) => {
+            if (resp.status === 200) {
+                const isPage = params.integrationModes.includes('page');
+                if (isPage) {
+                    form.data = params;
+                    dialogRef.value && dialogRef.value.openDialog();
+                } else {
+                    message.success('保存成功');
+                    jumpPage('system/Apply');
+                }
+            }
+        });
     });
 }
+function getErrorNum(
+    name: string | number | string[] | number[],
+    status: boolean,
+) {
+    if (typeof name !== 'object') return;
+    const props = ['page', 'apiClient', 'apiServer', 'ssoClient'];
+    const prop = name[0] === 'sso' ? 'ssoClient' : name[0];
+    if (props.includes(prop + '')) {
+        const key = name.slice(1).join();
+        const set = form.errorNumInfo[prop] as Set<string>;
+        // 如果此项校验成功且在失败列表中，则从此列表中移除，反之则加上
+        if (status) {
+            if (set.has(key)) set.delete(key);
+        } else if (!set.has(key)) set.add(key);
+    }
+}
+function changeBackUpload(info: UploadChangeParam<UploadFile<any>>) {
+    if (info.file.status === 'uploading') {
+        form.uploadLoading = true;
+    } else if (info.file.status === 'done') {
+        console.log(info);
 
+        info.file.url = info.file.response?.result;
+        form.uploadLoading = false;
+        form.data.sso.configuration.oauth2.logoUrl = info.file.response?.result;
+    } else if (info.file.status === 'error') {
+        console.log(info.file);
+        form.uploadLoading = false;
+        message.error('logo上传失败，请稍后再试');
+    }
+}
 function test(...args: any[]) {
     console.log('test:', args);
 }
+
+function jumpPage(arg0: string) {
+    throw new Error('Function not implemented.');
+}
 </script>
 
 <style lang="less" scoped>
@@ -1260,6 +1775,24 @@ function test(...args: any[]) {
                 }
             }
         }
+        :deep(.ant-collapse-header) {
+            > span {
+                position: relative;
+                .error-info {
+                    position: absolute;
+                    text-align: center;
+                    line-height: 14px;
+                    min-width: 14px;
+                    min-height: 14px;
+                    right: -15px;
+                    top: -5px;
+                    font-size: 8px;
+                    background-color: #ff4d4f;
+                    color: #fff;
+                    border-radius: 7px;
+                }
+            }
+        }
     }
 }
 </style>
diff --git a/src/views/system/Apply/Save/components/MenuDialog.vue b/src/views/system/Apply/Save/components/MenuDialog.vue
new file mode 100644
index 00000000..b706bf1e
--- /dev/null
+++ b/src/views/system/Apply/Save/components/MenuDialog.vue
@@ -0,0 +1,49 @@
+<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 f5e1c55d..888d5e76 100644
--- a/src/views/system/Apply/Save/components/RequestTable.vue
+++ b/src/views/system/Apply/Save/components/RequestTable.vue
@@ -12,7 +12,20 @@
                     <a-input v-model:value="record.label" />
                 </template>
                 <template v-else-if="column.dataIndex === 'value'">
-                    <a-input v-model:value="record.value" />
+                    <a-input
+                        v-model:value="record.value"
+                        v-if="props.valueType === 'input'"
+                    />
+                    <a-select
+                        v-else-if="props.valueType === 'select'"
+                        v-model:value="record.value"
+                    >
+                        <a-select-option
+                            v-for="item in props.valueOptions"
+                            :value="item.value"
+                            >{{ item.label }}</a-select-option
+                        >
+                    </a-select>
                 </template>
                 <template v-else-if="column.dataIndex === 'action'">
                     <a-button
@@ -41,21 +54,31 @@
 import type { optionsType } from '../typing';
 
 const emits = defineEmits(['update:value']);
-const props = defineProps<{
-    value: optionsType;
-}>();
+const props = withDefaults(
+    defineProps<{
+        value: optionsType;
+        valueType?: 'input' | 'select';
+        valueOptions?: optionsType;
+    }>(),
+    {
+        valueType: 'input',
+    },
+);
 const columns = [
     {
         title: 'KEY',
         dataIndex: 'key',
+        width: '40%'
     },
     {
         title: 'VALUE',
         dataIndex: 'value',
+        width: '40%'
     },
     {
         title: ' ',
         dataIndex: 'action',
+        width: '20%'
     },
 ];
 
diff --git a/src/views/system/Apply/Save/typing.d.ts b/src/views/system/Apply/Save/typing.d.ts
index 1f49c6e1..af68633c 100644
--- a/src/views/system/Apply/Save/typing.d.ts
+++ b/src/views/system/Apply/Save/typing.d.ts
@@ -15,6 +15,7 @@ export type optionsType = {
     disabled?: boolean
 }[]
 export type formType = {
+    id?:string,
     name: string;
     provider: applyType;
     integrationModes: string[];
@@ -33,6 +34,7 @@ export type formType = {
             type: 'none' | 'bearer' | 'oauth2' | 'basic' | 'other', // 类型, 可选值：none, bearer, oauth2, basic, other
             bearer: { token: string }, // 授权信息	
             basic: { username: string, password: string }, // 基本信息	
+            token: string,
             oauth2: { // OAuth2信息
                 authorizationUrl: string, // 授权地址	
                 tokenUrl: string, // token地址	
@@ -58,12 +60,14 @@ export type formType = {
     sso: { // 统一单点登陆集成
         configuration: { // 配置
             oauth2: { // Oauth2单点登录配置
+                type?: string, // 认证方式
                 authorizationUrl: string, // 授权地址	
                 redirectUri: string, // 重定向地址	
                 clientId: string, // 客户端ID	
                 clientSecret: string, // 客户端密钥	
                 userInfoUrl: string, // 用户信息接口	
                 scope: string, // scope
+                logoUrl?:string, // logo
                 userProperty: { // 用户属性字段信息	
                     userId: string, // 用户ID	
                     username: string, // 用户名