diff --git a/src/api/media/device.ts b/src/api/media/device.ts
index 4634bfbd..6854d9e4 100644
--- a/src/api/media/device.ts
+++ b/src/api/media/device.ts
@@ -13,8 +13,10 @@ export default {
     del: (id: string) => server.remove(`/media/device/${id}`),
     // 更新通道
     updateChannels: (id: string) => server.post(`/media/device/${id}/channels/_sync`),
-    // 查询产品列表
+    // post查询产品列表
     queryProductList: (data: any) => server.post<ProductType[]>(`/device/product/_query/no-paging`, data),
+    // get获取产品
+    getProductList: (data: any) => server.get(`/device/product/_query/no-paging?paging=false`, data),
     // 快速添加产品
     saveProduct: (data: any) => server.post<any>(`/device/product`, data),
     // 产品发布
diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue
index e2f83a7b..06a24bb7 100644
--- a/src/components/Layout/BasicLayoutPage.vue
+++ b/src/components/Layout/BasicLayoutPage.vue
@@ -14,7 +14,7 @@
             >
               {{ slotProps.route.breadcrumbName }}
             </a>
-            <span v-else >{{ slotProps.route.breadcrumbName }}</span>
+            <span v-else style='cursor: pointer' >{{ slotProps.route.breadcrumbName }}</span>
         </template>
         <template #rightContentRender>
             <div class="right-content">
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index 7cd240dc..ccb0e405 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -4,6 +4,7 @@
     :type='type'
     :request='saveSearchHistory'
     :historyRequest='getSearchHistory'
+    :deleteRequest='deleteSearchHistory'
     :columns='columns'
     :class='props.class'
     @search='searchSubmit'
@@ -13,7 +14,7 @@
 <script setup lang='ts' name='ProSearch'>
 import { PropType } from 'vue'
 import { JColumnsProps } from 'components/Table/types'
-import { saveSearchHistory, getSearchHistory } from '@/api/comm'
+import { saveSearchHistory, getSearchHistory, deleteSearchHistory } from '@/api/comm'
 
 interface Emit {
   (e: 'search', data: any): void
diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index 36da6a30..a4267169 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -89,6 +89,10 @@ const props: JUploadProps = defineProps({
         type: String,
         default: '',
     },
+    accept:{
+        type:Array,
+        default:()=>[],
+    }
 });
 
 const loading = ref<boolean>(false);
diff --git a/src/components/ValueItem/index.vue b/src/components/ValueItem/index.vue
index 49da06d3..516bdcec 100644
--- a/src/components/ValueItem/index.vue
+++ b/src/components/ValueItem/index.vue
@@ -86,8 +86,8 @@
             @cancel="modalVis = false"
             @ok="handleItemModalSubmit"
         >
-            <div style="width: 100%; height: 400px">
-                <MonacoEditor v-model:modelValue="objectValue" />
+            <div style="width: 100%; height: 300px">
+                <JMonacoEditor v-model:modelValue="objectValue" />
             </div>
         </j-modal>
     </div>
@@ -97,7 +97,6 @@
 import { PropType } from 'vue';
 import { UploadChangeParam, UploadFile } from 'ant-design-vue';
 import { DefaultOptionType } from 'ant-design-vue/lib/select';
-import MonacoEditor from '@/components/MonacoEditor/index.vue';
 import GeoComponent from '@/components/GeoComponent/index.vue';
 import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
 import { LocalStore } from '@/utils/comm';
@@ -196,7 +195,7 @@ const timeChange = (e: any) => {
 }
 
 const inputChange = (e: any) => {
-  emit('change', e.target.value)
+  emit('change', e.target ? e.target.value : e)
 }
 
 const dateChange = (e: any) => {
diff --git a/src/store/scene.ts b/src/store/scene.ts
index c25514b2..973f334e 100644
--- a/src/store/scene.ts
+++ b/src/store/scene.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import type { BranchesType, FormModelType, SceneItem } from '@/views/rule-engine/Scene/typings'
+import type { FormModelType, SceneItem } from '@/views/rule-engine/Scene/typings'
 import { detail } from '@/api/rule-engine/scene'
 import { cloneDeep, isArray } from 'lodash-es'
 import { randomString } from '@/utils/utils'
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index a25ae3e1..74fb9892 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -206,6 +206,17 @@ const findDetailRoutes = (routes: any[]): any[] => {
 export const findCodeRoute = (asyncRouterMap: any[]) => {
   const routeMeta = {}
 
+  function getDetail( code: string, url: string) {
+    const detail = findDetailRouteItem(code, url)
+    if (!detail) return
+    routeMeta[(detail as MenuItem).code] = {
+      path: detail.url,
+      title: detail.name,
+      parentName: code,
+      buttons: detail.buttons?.map((b: any) => b.id) || []
+    }
+  }
+
   function findChildren (data: any[], code: string = '') {
     data.forEach(route => {
       routeMeta[route.code] = {
@@ -214,29 +225,24 @@ export const findCodeRoute = (asyncRouterMap: any[]) => {
         parentName: code,
         buttons: route.buttons?.map((b: any) => b.id) || []
       }
-      const detail = findDetailRouteItem(route.code, route.url)
-      if (detail) {
-        routeMeta[(detail as MenuItem).code] = {
-          path: detail.url,
-          title: detail.name,
-          parentName: route.code,
-          buttons: detail.buttons?.map((b: any) => b.id) || []
-        }
-      }
-
       const otherRoutes = extraRouteObj[route.code]
+
       if (otherRoutes) {
         otherRoutes.children.map((item: any) => {
           const _code = `${route.code}/${item.code}`
+          const url = `${route.url}/${item.code}`
           routeMeta[_code] = {
             path: `${route.url}/${item.code}`,
             title: item.name,
             parentName: route.code,
             buttons: item.buttons?.map((b: any) => b.id) || []
           }
+          getDetail(_code, url)
         })
       }
 
+      getDetail(route.code, route.url)
+
       if (route.children) {
         findChildren(route.children, route.code)
       }
diff --git a/src/views/account/Center/components/EditPasswordDialog.vue b/src/views/account/Center/components/EditPasswordDialog.vue
index 566f2bf0..1e8e6843 100644
--- a/src/views/account/Center/components/EditPasswordDialog.vue
+++ b/src/views/account/Center/components/EditPasswordDialog.vue
@@ -25,13 +25,13 @@
                 label="密码"
                 name="newPassword"
                 :rules="[
-                    { required: true,message:'请输入密码' },
+                    { required: true, message: '请输入密码' },
                     { validator: checkMothods.new, trigger: 'blur' },
                 ]"
             >
                 <j-input-password
                     v-model:value="form.newPassword"
-                    placeholder="请输入姓名"
+                    placeholder="请输入密码"
                 />
             </j-form-item>
             <j-form-item
@@ -44,7 +44,7 @@
             >
                 <j-input-password
                     v-model:value="form.confirmPassword"
-                    placeholder="请输入姓名"
+                    placeholder="请再次输入密码"
                 />
             </j-form-item>
         </j-form>
@@ -64,7 +64,7 @@ const emits = defineEmits(['ok', 'update:visible']);
 const props = defineProps<{
     visible: boolean;
 }>();
-const loading = ref(false)
+const loading = ref(false);
 const formRef = ref<FormInstance>();
 const form = ref<formType>({
     oldPassword: '',
@@ -102,7 +102,9 @@ const checkMothods = {
     },
     confirm: async (_rule: Rule, value: string) => {
         if (!value) return Promise.reject();
-
+        else if (form.value.newPassword && value !== form.value.newPassword) {
+            formRef.value?.validate('newPassword');
+        }
         try {
             const resp: any = await validateField_api('password', value);
             if (resp.status === 200 && !resp.result.passed)
@@ -116,18 +118,20 @@ const checkMothods = {
 
 const handleOk = () => {
     formRef.value?.validate().then(() => {
-        loading.value = true
+        loading.value = true;
         const params = {
             oldPassword: form.value.oldPassword,
             newPassword: form.value.newPassword,
         };
-        updateMepsd_api(params).then((resp) => {
-            if (resp.status === 200) {
-                message.success('保存成功');
-                emits('ok');
-                emits('update:visible', false);
-            }
-        }).finally(()=>loading.value = false)
+        updateMepsd_api(params)
+            .then((resp) => {
+                if (resp.status === 200) {
+                    message.success('保存成功');
+                    emits('ok');
+                    emits('update:visible', false);
+                }
+            })
+            .finally(() => (loading.value = false));
     });
 };
 console.clear();
diff --git a/src/views/account/Center/index.vue b/src/views/account/Center/index.vue
index 4fa2727c..adb4792f 100644
--- a/src/views/account/Center/index.vue
+++ b/src/views/account/Center/index.vue
@@ -114,10 +114,7 @@
                 <h3>修改密码</h3>
                 <div class="content">
                     <div class="content" style="align-items: flex-end">
-                        <lock-outlined
-                            style="color: #1d39c4; font-size: 70px"
-                        />
-                        <!-- <AIcon type="LockOutlined" /> -->
+                        <AIcon type="LockOutlined" style="color: #1d39c4; font-size: 70px" />
                         <span
                             style="margin-left: 5px; color: rgba(0, 0, 0, 0.55)"
                             >安全性高的密码可以使帐号更安全。建议您定期更换密码,设置一个包含字母,符号或数字中至少两项且长度超过8位的密码</span
@@ -232,7 +229,6 @@
 import PermissionButton from '@/components/PermissionButton/index.vue';
 import EditInfoDialog from './components/EditInfoDialog.vue';
 import EditPasswordDialog from './components/EditPasswordDialog.vue';
-import { LockOutlined } from '@ant-design/icons-vue';
 import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
 import { LocalStore, getImage } from '@/utils/comm';
 import { message, UploadChangeParam, UploadFile } from 'ant-design-vue';
@@ -247,7 +243,7 @@ import { isNoCommunity } from '@/utils/utils';
 import { userInfoType } from './typing';
 
 const permission = 'system/User';
-const userInfo = ref<userInfoType>({});
+const userInfo = ref<userInfoType>({} as any);
 // 第三方账号
 const bindList = ref<any[]>([]);
 const bindIcon = {
diff --git a/src/views/device/Category/components/modifyModal/index.vue b/src/views/device/Category/components/modifyModal/index.vue
index 0d94cb56..8d947d74 100644
--- a/src/views/device/Category/components/modifyModal/index.vue
+++ b/src/views/device/Category/components/modifyModal/index.vue
@@ -1,10 +1,11 @@
 <!-- 新增编辑弹窗 -->
 <template>
     <j-modal
+        v-if="visible"
         :title="props.title"
         :maskClosable="false"
         destroy-on-close
-        v-model:visible="visible"
+        visible
         @ok="submitData"
         @cancel="close"
         okText="确定"
@@ -93,7 +94,13 @@ const formModel = ref<formState>({
     description: '',
 });
 const rules = ref({
-    name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+    name: [
+        { required: true, message: '请输入名称', trigger: 'blur' },
+        {
+            max: 64,
+            message: '最多可输入64个字符',
+        },
+    ],
     sortIndex: [{ required: true, message: '请输入排序', trigger: 'blur' }],
 });
 const visible = ref(false);
@@ -111,20 +118,20 @@ const submitData = async () => {
             if (props.isChild === 1) {
                 addParams.value = {
                     ...formModel.value,
-                    // sortIndex:
-                        // childArr.value[childArr.value.length - 1].sortIndex + 1,
+                    sortIndex:
+                        childArr.value[childArr.value.length - 1].sortIndex + 1,
                     parentId: addObj.value.id,
                 };
             } else if (props.isChild === 2) {
                 addParams.value = {
                     parentId: addObj.value.id,
                     ...formModel.value,
-                    // sortIndex: 1,
+                    sortIndex: 1,
                 };
             } else if (props.isChild === 3) {
                 addParams.value = {
                     ...formModel.value,
-                    // sortIndex: arr.value[arr.value.length - 1].sortIndex + 1,
+                    sortIndex: arr.value[arr.value.length - 1].sortIndex + 1,
                 };
             }
             const res = await saveTree(addParams.value);
@@ -157,7 +164,7 @@ const submitData = async () => {
 /**
  * 显示弹窗
  */
-const show = (row: any) => {
+const show = async (row: any) => {
     //新增
     if (props.isAdd === 0) {
         if (props.isChild === 1) {
@@ -173,6 +180,7 @@ const show = (row: any) => {
                 visible.value = true;
             }
         } else if (props.isChild === 3) {
+            const res = await getTableData();
             arr.value = listData.value.sort(compare('sortIndex'));
             if (arr.value.length > 0) {
                 formModel.value = {
@@ -244,7 +252,6 @@ const close = () => {
     visible.value = false;
     resetFields();
 };
-getTableData();
 //监听项目ID
 watch([() => props.isAdd], () => {}, { immediate: false, deep: true });
 defineExpose({
diff --git a/src/views/device/Category/index.vue b/src/views/device/Category/index.vue
index 5feb2ee1..6d91cdc9 100644
--- a/src/views/device/Category/index.vue
+++ b/src/views/device/Category/index.vue
@@ -9,8 +9,10 @@
         <JProTable
             ref="tableRef"
             :columns="table.columns"
-            :dataSource="dataSource"
-            model="table"
+            :request="queryTree"
+            model="TABLE"
+            type="TREE"
+            :scroll="{ y: 550 }"
             :defaultParams="{
                 paging: false,
                 sorts: [
@@ -21,7 +23,7 @@
                     },
                 ],
             }"
-            :params="query.params"
+            :params="params"
             :loading="tableLoading"
         >
             <template #headerTitle>
@@ -35,7 +37,7 @@
                 </PermissionButton>
             </template>
             <template #action="slotProps">
-                <j-space :size="16">
+                <j-space>
                     <template
                         v-for="i in getActions(slotProps, 'table')"
                         :key="i.key"
@@ -118,38 +120,13 @@ const query = reactive({
             scopedSlots: true,
         },
     ],
-    params: {
-        paging: false,
-        sorts: [
-            { name: 'sortIndex', order: 'asc' },
-            {
-                name: 'createTime',
-                order: 'desc',
-            },
-        ],
-    },
 });
-/**
- * 查询树形列表
- */
-const getTableData = async () => {
-    tableLoading.value = true;
-    const res = await queryTree(query.params);
-    if (res.status === 200) {
-        dataSource.value = res.result;
-    }
-    tableLoading.value = false;
-};
-getTableData();
+let params = ref();
 /**
  * 搜索
  */
 const handleSearch = (e: any) => {
-    query.params = {
-        ...query.params,
-        ...e,
-    };
-    getTableData();
+    params.value = e 
 };
 /**
  * 操作栏按钮
@@ -200,6 +177,9 @@ const getActions = (
         {
             key: 'delete',
             text: '删除',
+            tooltip: {
+                title: '删除',
+            },
             popConfirm: {
                 title: '确认删除?',
                 okText: ' 确定',
@@ -208,7 +188,7 @@ const getActions = (
                     const resp = await deleteTree(data.id);
                     if (resp.status === 200) {
                         message.success('操作成功！');
-                        getTableData();
+                        tableRef.value.reload();
                     } else {
                         message.error('操作失败！');
                     }
@@ -222,23 +202,31 @@ const getActions = (
 
 const table = reactive({
     columns: [
-        { title: '名称', dataIndex: 'name', key: 'name' },
+        {
+            title: '名称',
+            dataIndex: 'name',
+            key: 'name',
+            ellipsis: true,
+            width: 600,
+        },
         {
             title: '排序',
             dataIndex: 'sortIndex',
             key: 'sortIndex',
             scopedSlots: true,
+            width: 200,
         },
         {
             title: '说明',
             dataIndex: 'description',
             key: 'description',
+            width: 700,
         },
         {
             title: '操作',
             key: 'action',
             fixed: 'right',
-            width: 250,
+            ellipsis: true,
             scopedSlots: true,
         },
     ],
@@ -257,7 +245,7 @@ const table = reactive({
      * 刷新表格数据
      */
     refresh: () => {
-        getTableData();
+        tableRef.value.reload();
     },
 });
 const { add, columns, refresh } = toRefs(table);
diff --git a/src/views/device/DashBoard/index.vue b/src/views/device/DashBoard/index.vue
index 122e5f4e..a4001a96 100644
--- a/src/views/device/DashBoard/index.vue
+++ b/src/views/device/DashBoard/index.vue
@@ -228,7 +228,6 @@ const getOnline = () => {
             onlineYdata.reverse();
             setOnlineChartOpition(x, onlineYdata);
             onlineFooter.value[0].value = y?.[1];
-            console.log(res.result);
         }
     });
 };
diff --git a/src/views/device/Instance/Detail/Diagnose/Message/Function/EditTable.vue b/src/views/device/Instance/Detail/Diagnose/Message/Function/EditTable.vue
index d0d4c40d..5565822f 100644
--- a/src/views/device/Instance/Detail/Diagnose/Message/Function/EditTable.vue
+++ b/src/views/device/Instance/Detail/Diagnose/Message/Function/EditTable.vue
@@ -7,7 +7,7 @@
         :pagination="false"
     >
         <template #bodyCell="{ column, text, record }">
-            <div style="width: 280px">
+            <div>
                 <template v-if="['valueType', 'name'].includes(column.dataIndex)">
                     <span>{{ text }}</span>
                 </template>
diff --git a/src/views/device/Instance/Detail/Diagnose/Message/Function/index.vue b/src/views/device/Instance/Detail/Diagnose/Message/Function/index.vue
index cfd71262..671183c5 100644
--- a/src/views/device/Instance/Detail/Diagnose/Message/Function/index.vue
+++ b/src/views/device/Instance/Detail/Diagnose/Message/Function/index.vue
@@ -214,7 +214,7 @@ defineExpose({ saveBtn });
 
 <style lang="less" scoped>
 .function {
-    padding: 15px;
+    padding: 24px 15px 0 15px;
     background-color: #e7eaec;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/Diagnose/Message/index.vue b/src/views/device/Instance/Detail/Diagnose/Message/index.vue
index f5bed24d..f61517a3 100644
--- a/src/views/device/Instance/Detail/Diagnose/Message/index.vue
+++ b/src/views/device/Instance/Detail/Diagnose/Message/index.vue
@@ -30,7 +30,7 @@
         <j-col :span="8">
             <div class="right-log">
                 <TitleComponent data="日志" />
-                <div :style="{ marginTop: '10px' }">
+                <div class="right-log-box">
                     <template v-if="logList.length">
                         <Log
                             v-for="item in logList"
@@ -38,7 +38,9 @@
                             :key="item.key"
                         />
                     </template>
-                    <j-empty v-else />
+                    <div v-else class="right-log-box-empty">
+                        <j-empty />
+                    </div>
                 </div>
             </div>
         </j-col>
@@ -187,8 +189,21 @@ onUnmounted(() => {
     padding-left: 20px;
     border-left: 1px solid rgba(0, 0, 0, 0.09);
     overflow: hidden;
-    max-height: 600px;
+    height: 100%;
     overflow-y: auto;
     min-height: 400px;
+
+    .right-log-box {
+        padding-top: 10px;
+        height: calc(100% - 40px);
+        width: 100%;
+        .right-log-box-empty {
+            height: 100%;
+            width: 100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+    }
 }
 </style>
diff --git a/src/views/device/Instance/Detail/EdgeMap/MSelect.vue b/src/views/device/Instance/Detail/EdgeMap/MSelect.vue
index 1b66df49..f465c18d 100644
--- a/src/views/device/Instance/Detail/EdgeMap/MSelect.vue
+++ b/src/views/device/Instance/Detail/EdgeMap/MSelect.vue
@@ -1,14 +1,14 @@
 <template>
-    <a-select allowClear v-model:value="_value" @change="onChange" placeholder="请选择" style="width: 100%">
-        <a-select-option
+    <j-select allowClear v-model:value="_value" @change="onChange" placeholder="请选择" style="width: 100%">
+        <j-select-option
             v-for="item in list"
             :key="item.id"
             :value="item.id"
             :label="item.name"
             :filter-option="filterOption"
-            >{{ item.name }}</a-select-option
+            >{{ item.name }}</j-select-option
         >
-    </a-select>
+    </j-select>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue b/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue
index 7a112a28..3049f0ac 100644
--- a/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue
+++ b/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue
@@ -1,5 +1,5 @@
 <template>
-    <a-modal
+    <j-modal
         width="900px"
         title="批量映射"
         visible
@@ -10,49 +10,49 @@
             <div class="map-tree-top">
                 采集器的点位名称与属性名称一致时将自动映射绑定；有多个采集器点位名称与属性名称一致时以第1个采集器的点位数据进行绑定
             </div>
-            <a-spin :spinning="loading">
+            <j-spin :spinning="loading">
                 <div class="map-tree-content">
-                    <a-card class="map-tree-content-card" title="源数据">
-                        <a-tree
+                    <j-card class="map-tree-content-card" title="源数据">
+                        <j-tree
                             checkable
                             :height="300"
                             :tree-data="dataSource"
                             :checkedKeys="checkedKeys"
                             @check="onCheck"
                         />
-                    </a-card>
+                    </j-card>
                     <div style="width: 100px">
-                        <a-button
+                        <j-button
                             :disabled="rightList.length >= leftList.length"
                             @click="onRight"
-                            >加入右侧</a-button
+                            >加入右侧</j-button
                         >
                     </div>
-                    <a-card class="map-tree-content-card" title="采集器">
-                        <a-list
+                    <j-card class="map-tree-content-card" title="采集器">
+                        <j-list
                             size="small"
                             :data-source="rightList"
                             class="map-tree-content-card-list"
                         >
                             <template #renderItem="{ item }">
-                                <a-list-item>
+                                <j-list-item>
                                     {{ item.title }}
                                     <template #actions>
-                                        <a-popconfirm
+                                        <j-popconfirm
                                             title="确定删除?"
                                             @confirm="_delete(item.key)"
                                         >
                                             <AIcon type="DeleteOutlined" />
-                                        </a-popconfirm>
+                                        </j-popconfirm>
                                     </template>
-                                </a-list-item>
+                                </j-list-item>
                             </template>
-                        </a-list>
-                    </a-card>
+                        </j-list>
+                    </j-card>
                 </div>
-            </a-spin>
+            </j-spin>
         </div>
-    </a-modal>
+    </j-modal>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/device/Instance/Detail/EdgeMap/index.vue b/src/views/device/Instance/Detail/EdgeMap/index.vue
index 0b59e97c..67d5060c 100644
--- a/src/views/device/Instance/Detail/EdgeMap/index.vue
+++ b/src/views/device/Instance/Detail/EdgeMap/index.vue
@@ -1,46 +1,46 @@
 <template>
-    <a-spin :spinning="loading" v-if="metadata.properties.length">
-        <a-card>
+    <j-spin :spinning="loading" v-if="metadata.properties.length">
+        <j-card>
             <template #extra>
-                <a-space>
-                    <a-button @click="visible = true">批量映射</a-button>
-                    <a-button type="primary" @click="onSave">保存</a-button>
-                </a-space>
+                <j-space>
+                    <j-button @click="visible = true">批量映射</j-button>
+                    <j-button type="primary" @click="onSave">保存</j-button>
+                </j-space>
             </template>
-            <a-form ref="formRef" :model="modelRef">
-                <a-table :dataSource="modelRef.dataSource" :columns="columns">
+            <j-form ref="formRef" :model="modelRef">
+                <j-table :dataSource="modelRef.dataSource" :columns="columns">
                     <template #headerCell="{ column }">
                         <template v-if="column.key === 'collectorId'">
                             采集器
-                            <a-tooltip title="边缘网关代理的真实物理设备">
+                            <j-tooltip title="边缘网关代理的真实物理设备">
                                 <AIcon type="QuestionCircleOutlined" />
-                            </a-tooltip>
+                            </j-tooltip>
                         </template>
                     </template>
                     <template #bodyCell="{ column, record, index }">
                         <template v-if="column.dataIndex === 'channelId'">
-                            <a-form-item
+                            <j-form-item
                                 :name="['dataSource', index, 'channelId']"
                             >
-                                <a-select
+                                <j-select
                                     style="width: 100%"
                                     v-model:value="record[column.dataIndex]"
                                     placeholder="请选择"
                                     allowClear
                                     :filter-option="filterOption"
                                 >
-                                    <a-select-option
+                                    <j-select-option
                                         v-for="item in channelList"
                                         :key="item.value"
                                         :value="item.value"
                                         :label="item.label"
-                                        >{{ item.label }}</a-select-option
+                                        >{{ item.label }}</j-select-option
                                     >
-                                </a-select>
-                            </a-form-item>
+                                </j-select>
+                            </j-form-item>
                         </template>
                         <template v-if="column.dataIndex === 'collectorId'">
-                            <a-form-item
+                            <j-form-item
                                 :name="['dataSource', index, 'collectorId']"
                                 :rules="[
                                     {
@@ -55,10 +55,10 @@
                                     type="COLLECTOR"
                                     :edgeId="instanceStore.current.parentId"
                                 />
-                            </a-form-item>
+                            </j-form-item>
                         </template>
                         <template v-if="column.dataIndex === 'pointId'">
-                            <a-form-item
+                            <j-form-item
                                 :name="['dataSource', index, 'pointId']"
                                 :rules="[
                                     {
@@ -73,33 +73,33 @@
                                     type="POINT"
                                     :edgeId="instanceStore.current.parentId"
                                 />
-                            </a-form-item>
+                            </j-form-item>
                         </template>
                         <template v-if="column.dataIndex === 'id'">
-                            <a-badge
+                            <j-badge
                                 v-if="record[column.dataIndex]"
                                 status="success"
                                 text="已绑定"
                             />
-                            <a-badge v-else status="error" text="未绑定" />
+                            <j-badge v-else status="error" text="未绑定" />
                         </template>
                         <template v-if="column.key === 'action'">
-                            <a-tooltip title="解绑">
-                                <a-popconfirm
+                            <j-tooltip title="解绑">
+                                <j-popconfirm
                                     title="确认解绑"
                                     :disabled="!record.id"
                                     @confirm="unbind(record.id)"
                                 >
-                                    <a-button type="link" :disabled="!record.id"
+                                    <j-button type="link" :disabled="!record.id"
                                         ><AIcon type="icon-jiebang"
-                                    /></a-button>
-                                </a-popconfirm>
-                            </a-tooltip>
+                                    /></j-button>
+                                </j-popconfirm>
+                            </j-tooltip>
                         </template>
                     </template>
-                </a-table>
-            </a-form>
-        </a-card>
+                </j-table>
+            </j-form>
+        </j-card>
         <PatchMapping
             :deviceId="instanceStore.current.id"
             v-if="visible"
@@ -108,10 +108,10 @@
             :metaData="modelRef.dataSource"
             :edgeId="instanceStore.current.parentId"
         />
-    </a-spin>
-    <a-card v-else>
+    </j-spin>
+    <j-card v-else>
         <JEmpty description='暂无数据，请配置物模型' style="margin: 10% 0" />
-    </a-card>
+    </j-card>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/device/Instance/Detail/Function/components/Advance.vue b/src/views/device/Instance/Detail/Function/components/Advance.vue
index d892abeb..b1fb2218 100644
--- a/src/views/device/Instance/Detail/Function/components/Advance.vue
+++ b/src/views/device/Instance/Detail/Function/components/Advance.vue
@@ -8,7 +8,7 @@
             >
                 <j-row :gutter="30">
                     <j-col :span="15">
-                        <MonacoEditor
+                        <JMonacoEditor
                             :ref="`monacoEditor${func.id}`"
                             v-model="func.json"
                             theme="vs-dark"
diff --git a/src/views/device/Instance/Detail/Parsing/index.vue b/src/views/device/Instance/Detail/Parsing/index.vue
index 11324960..06c61892 100644
--- a/src/views/device/Instance/Detail/Parsing/index.vue
+++ b/src/views/device/Instance/Detail/Parsing/index.vue
@@ -25,7 +25,7 @@
                 </div>
                 <div>
                     脚本语言:
-                    <j-select :defaultValue="'JavaScript'" style="width: 200;margin-left: 5px;">
+                    <j-select :defaultValue="'JavaScript'" style="width: 200px;margin-left: 5px;">
                         <j-select-option value="JavaScript">JavaScript(ECMAScript 5)</j-select-option>
                     </j-select>
                     <AIcon type="ExpandOutlined" style="margin-left: 20px;" @click="toggle" />
@@ -52,8 +52,7 @@
                             <template v-if="instanceStore.current.transport === 'MQTT'">
                                 <div style="margin-right: 5px;">Topic:</div>
                                 <j-auto-complete placeholder="请输入Topic" style="width: 300px" :options="topicList"
-                                    :allowClear="true" :filterOption="(inputValue: any, option: any) =>
-                                        option!.value.indexOf(inputValue) !== -1" v-model:value="topic" />
+                                    :allowClear="true" :filterOption="filterOption" v-model:value="topic" />
                             </template>
                             <template v-else>
                                 <div style="margin-right: 5px;">URL:</div>
@@ -134,6 +133,7 @@ const resStyle = computed(() => (isBoolean(resultValue.value.success) ? {
 } : {
     'margin-top': '10px',
 }))
+const filterOption =  (inputValue: any, option: any) => option!.value.indexOf(inputValue) !== -1
 
 const isDisabled = computed(() => simulation.value === '')
 
diff --git a/src/views/device/Product/Detail/BasicInfo/indev.vue b/src/views/device/Product/Detail/BasicInfo/indev.vue
index ed0a99af..5d0fbd22 100644
--- a/src/views/device/Product/Detail/BasicInfo/indev.vue
+++ b/src/views/device/Product/Detail/BasicInfo/indev.vue
@@ -41,19 +41,21 @@
         </j-descriptions>
     </j-card>
     <!-- 编辑 -->
-    <Save ref="saveRef" :isAdd="isAdd" :title="title" />
+    <Save ref="saveRef" :isAdd="isAdd" :title="title"  @success="refresh"/>
 </template>
 
 <script lang="ts" setup>
 import { useProductStore } from '@/store/product';
 import Save from '../../Save/index.vue';
 import moment from 'moment';
+import { useRoute } from 'vue-router';
 import {
     EditOutlined,
     DeleteOutlined,
     PlusOutlined,
 } from '@ant-design/icons-vue';
 const productStore = useProductStore();
+const route = useRoute();
 const saveRef = ref();
 const isAdd = ref(2);
 const title = ref('编辑');
@@ -69,4 +71,10 @@ const editConfig = () => {
 const changeTables = () => {
     productStore.tabActiveKey = 'Device';
 };
+/**
+ * 修改成功刷新
+ */
+const refresh = () =>{
+    productStore.refresh(route.params.id as string);
+}
 </script>
diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue
index 024c7de9..5f8d872d 100644
--- a/src/views/device/Product/Detail/DeviceAccess/index.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/index.vue
@@ -269,7 +269,8 @@
     <!-- 选择设备 -->
     <j-modal
         title="设备接入配置"
-        :visible="visible"
+        v-if="visible"
+        visible
         width="1200px"
         okText="确定"
         cancelText="取消"
@@ -280,6 +281,7 @@
             :columns="query.columns"
             target="deviceModal"
             @search="search"
+            type='simple'
         />
         <JProTable
             :columns="query.columns"
@@ -442,6 +444,7 @@ const showModal = () => {
  * 关闭弹窗
  */
 const cancel = () => {
+    queryParams.value = {};
     visible.value = false;
 };
 /**
@@ -968,6 +971,7 @@ const submitData = async () => {
                     message.success('操作成功！');
                 }
                 visible.value = false;
+                queryParams.value = {};
             });
         }
     } else {
diff --git a/src/views/device/Product/Detail/index.vue b/src/views/device/Product/Detail/index.vue
index 5101ef4f..ac561b62 100644
--- a/src/views/device/Product/Detail/index.vue
+++ b/src/views/device/Product/Detail/index.vue
@@ -151,7 +151,6 @@ watch(
     () => route.params.id,
     (newId) => {
         if (newId) {
-            console.log(newId);
             productStore.tabActiveKey = 'Info';
             productStore.refresh(newId as string);
         }
@@ -230,7 +229,7 @@ const getProtocol = async () => {
  * 详情页跳转到设备页
  */
 const jumpDevice = () => {
-    console.log(productStore.current?.id);
+    // console.log(productStore.current?.id);
     const searchParams = {
         column: 'productId',
         termType: 'eq',
diff --git a/src/views/device/Product/DialogTips/index.vue b/src/views/device/Product/DialogTips/index.vue
index 72928eb9..afa3fb44 100644
--- a/src/views/device/Product/DialogTips/index.vue
+++ b/src/views/device/Product/DialogTips/index.vue
@@ -22,8 +22,8 @@
                 <div class="product-title">产品创建成功</div>
             </div>
             <div style="display: flex">
-                <div class="product-id">产品ID: {{ idValue.value }}</div>
-                <div class="product-btn" @click="showDetail">查看详情</div>
+                <div class="product-id">产品ID: {{ idValue }}</div>
+                <div class="product-btn" @click="showDetail" style="cursor: pointer;">查看详情</div>
             </div>
             <div>接下来推荐操作:</div>
             <div class="product-main">1、配置产品接入方式</div>
@@ -49,10 +49,12 @@
 import { getImage } from '@/utils/comm.ts';
 import { useProductStore } from '@/store/product';
 import { CheckCircleOutlined } from '@ant-design/icons-vue';
+import { useMenuStore } from '@/store/menu';
 const visible = ref<boolean>(false);
 const productStore = useProductStore();
 const router = useRouter();
 const idValue = ref({});
+const menuStore = useMenuStore();
 /**
  * 弹窗关闭
  */
@@ -70,17 +72,12 @@ const show = (id: string) => {
  * 查看详情
  */
 const showDetail = () => {
-    jump(idValue.value);
-};
-/**
- * 跳转页面
- */
-const jump = (id: string) => {
-    router.push('/iot/device/product/detail/' + id);
+    menuStore.jumpPage('device/Product/Detail',{id:idValue.value})
 };
 defineExpose({
     show: show,
 });
+
 </script>
 <style lang="less" scoped>
 .product-tips {
diff --git a/src/views/device/Product/Save/index.vue b/src/views/device/Product/Save/index.vue
index 69b5d9af..03a22ac5 100644
--- a/src/views/device/Product/Save/index.vue
+++ b/src/views/device/Product/Save/index.vue
@@ -23,73 +23,15 @@
                 <j-row type="flex">
                     <j-col flex="180px">
                         <j-form-item name="photoUrl">
-                            <Upload v-model="form.photoUrl" />
+                            <j-pro-upload
+                                v-model="form.photoUrl"
+                                :accept="
+                                    imageTypes && imageTypes.length
+                                        ? imageTypes.toString()
+                                        : ''
+                                "
+                            />
                         </j-form-item>
-                        <!-- <j-form-item>
-                            <div class="upload-image-warp-logo">
-                                <div class="upload-image-border-logo">
-                                    <a-upload
-                                        name="file"
-                                        :action="FILE_UPLOAD"
-                                        :headers="headers"
-                                        :showUploadList="false"
-                                        :beforeUpload="beforeUpload"
-                                        @change="handleChange"
-                                        :accept="
-                                            imageTypes && imageTypes.length
-                                                ? imageTypes.toString()
-                                                : ''
-                                        "
-                                    >
-                                        <div class="upload-image-content-logo">
-                                            <div
-                                                class="loading-logo"
-                                                v-if="logoLoading"
-                                            >
-                                                <LoadingOutlined
-                                                    style="font-size: 28px"
-                                                />
-                                            </div>
-                                            <div
-                                                class="upload-image"
-                                                v-if="photoValue"
-                                                :style="
-                                                    photoValue
-                                                        ? `background-image: url(${photoValue});`
-                                                        : ''
-                                                "
-                                            ></div>
-                                            <div
-                                                v-if="photoValue"
-                                                class="upload-image-mask"
-                                            >
-                                                点击修改
-                                            </div>
-                                            <div v-else>
-                                                <div v-if="logoLoading">
-                                                    <LoadingOutlined
-                                                        style="font-size: 28px"
-                                                    />
-                                                </div>
-                                                <div v-else>
-                                                    <PlusOutlined
-                                                        style="font-size: 28px"
-                                                    />
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </a-upload>
-                                    <div v-if="logoLoading">
-                                        <div class="upload-loading-mask">
-                                            <LoadingOutlined
-                                                v-if="logoLoading"
-                                                style="font-size: 28px"
-                                            />
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </j-form-item> -->
                     </j-col>
                     <j-col flex="auto">
                         <j-form-item name="id">
@@ -125,6 +67,7 @@
                         placeholder="请选择产品分类"
                         :tree-data="treeList"
                         @change="valueChange"
+                        allow-clear
                         :fieldNames="{ label: 'name', value: 'id' }"
                         :filterTreeNode="
                             (v, option) => filterSelectNode(v, option)
@@ -185,8 +128,11 @@
                         </j-row>
                     </j-radio-group>
                 </j-form-item>
-                <j-form-item label="说明" name="describe">
+                <j-form-item label="说明" name="description">
                     <j-textarea
+                        :maxlength="200"
+                        showCount
+                        :auto-size="{ minRows: 4, maxRows: 5 }"
                         v-model:value="form.describe"
                         placeholder="请输入说明"
                     />
@@ -318,6 +264,9 @@ const rules = reactive({
             trigger: 'blur',
         },
     ],
+    description: [
+        { max: 200, message: '最多可输入200位字符', trigger: 'blur' },
+    ],
 });
 
 const valueChange = (value: string, label: string) => {
@@ -395,7 +344,7 @@ const submitData = () => {
                     message.success('保存成功！');
                     visible.value = false;
                     emit('success');
-                    dialogRef.value.show(form.id);
+                    dialogRef.value.show(res.result.id);
                 } else {
                     message.error('操作失败');
                 }
diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index 1277a802..72424a42 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -123,9 +123,6 @@
                     :status="statusMap.get(slotProps.state)"
                 />
             </template>
-            <template #id="slotProps">
-                <a>{{ slotProps.id }}</a>
-            </template>
             <template #action="slotProps">
                 <j-space :size="16">
                     <template
@@ -202,7 +199,7 @@ const columns = [
         scopedSlots: true,
     },
     {
-        title: '名称',
+        title: '产品名称',
         dataIndex: 'name',
         key: 'name',
     },
diff --git a/src/views/home/components/BootCard.vue b/src/views/home/components/BootCard.vue
index be223180..ff47a7a2 100644
--- a/src/views/home/components/BootCard.vue
+++ b/src/views/home/components/BootCard.vue
@@ -34,8 +34,11 @@ const props = defineProps({
 const { cardData, cardTitle } = toRefs(props);
 
 const jumpPage = (item: bootConfig) => {
-    if (item.auth === undefined || item.auth) _jumpPage(item.link, item.params);
-    else message.warning('暂无权限，请联系管理员');
+    if (item.auth === undefined || item.auth) {
+        _jumpPage(item.link, item.params);
+    } else {
+        message.warning('暂无权限，请联系管理员');
+    }
 };
 </script>
 
diff --git a/src/views/home/components/BootCardSmall.vue b/src/views/home/components/BootCardSmall.vue
index 4fb576ec..89da9e0e 100644
--- a/src/views/home/components/BootCardSmall.vue
+++ b/src/views/home/components/BootCardSmall.vue
@@ -37,8 +37,11 @@ const { cardData, cardTitle } = toRefs(props);
 const { jumpPage: _jumpPage } = useMenuStore();
 
 const jumpPage = (item: bootConfig) => {
-    if (item.auth === undefined || item.auth) _jumpPage(item.link, item.params);
-    else message.warning('暂无权限，请联系管理员');
+    if (item.auth === undefined || item.auth) {
+        _jumpPage(item.link, item.params);
+    } else {
+        message.warning('暂无权限，请联系管理员');
+    }
 };
 </script>
 
diff --git a/src/views/home/components/ComprehensiveHome/index.vue b/src/views/home/components/ComprehensiveHome/index.vue
index ca5aaff8..3be3776e 100644
--- a/src/views/home/components/ComprehensiveHome/index.vue
+++ b/src/views/home/components/ComprehensiveHome/index.vue
@@ -13,7 +13,7 @@
                 <j-row :gutter="24">
                     <j-col :span="12"><DeviceCountCard /></j-col>
                     <j-col :span="12"><BasicCountCard /></j-col>
-                    <j-col :span="24" style="margin-top: 24px;">
+                    <j-col :span="24" style="margin-top: 24px">
                         <PlatformPicCard image="/images/home/content1.svg" />
                     </j-col>
                 </j-row>
@@ -157,7 +157,7 @@ const deviceStepDetails: recommendList[] = [
         linkUrl: 'device/Instance',
         auth: devicePermission('import'),
         params: {
-            type: 'import'
+            type: 'import',
         },
     },
 ];
@@ -227,17 +227,4 @@ const opsStepDetails: recommendList[] = [
 
 const productDialogVisible = ref(false);
 const deviceDialogVisible = ref(false);
-
-
-
-// 设备管理-产品---新增弹窗  {save:true}
-// 设备管理-产品-产品详情---设备接入标签页 {id: 'xxxx', tab:'xxx'}
-// 规则引擎-规则编排---新增弹窗 {save: true}
-
-
-// 设备管理-设备---新增弹窗
-// 设备管理-设备---导入弹窗
-// 设备管理-设备-设备详情---设备诊断标签页
-
-// 运维管理-日志管理---系统日志标签页
 </script>
diff --git a/src/views/home/components/DevOpsHome/index.vue b/src/views/home/components/DevOpsHome/index.vue
index 93bd4b05..cc698a68 100644
--- a/src/views/home/components/DevOpsHome/index.vue
+++ b/src/views/home/components/DevOpsHome/index.vue
@@ -46,9 +46,6 @@ const opsBootConfig: bootConfig[] = [
         english: 'STEP3',
         label: '实时监控',
         link: 'link/DashBoard',
-        params: {
-            type: 'add',
-        },
     },
 ];
 const opsStepDetails: recommendList[] = [
diff --git a/src/views/home/components/StepCard.vue b/src/views/home/components/StepCard.vue
index e6277eef..5e6de26b 100644
--- a/src/views/home/components/StepCard.vue
+++ b/src/views/home/components/StepCard.vue
@@ -38,7 +38,9 @@ const props = defineProps({
 
 // 跳转页面
 const jumpPage = (row: recommendList) => {
-    if (row.auth === false) return message.warning('暂无权限，请联系管理员');
+    if (row.auth === false) {
+        return message.warning('暂无权限，请联系管理员');
+    }
     row.onClick ? row.onClick(row) : _jumpPage(row.linkUrl, row.params);
 };
 </script>
diff --git a/src/views/home/components/dialogs/DeviceChooseDialog.vue b/src/views/home/components/dialogs/DeviceChooseDialog.vue
index 94a35a02..d0bbdf50 100644
--- a/src/views/home/components/dialogs/DeviceChooseDialog.vue
+++ b/src/views/home/components/dialogs/DeviceChooseDialog.vue
@@ -52,7 +52,9 @@ const props = defineProps<{
 
 // 弹窗控制
 const confirm = () => {
-    if (selectedKeys.value.length < 1) return message.warn('请选择设备');
+    if (selectedKeys.value.length < 1) {
+        return message.warn('请选择设备');
+    }
     emits('confirm', selectedKeys.value[0]);
     emits('update:visible', false);
 };
diff --git a/src/views/home/components/dialogs/ProductChooseDialog.vue b/src/views/home/components/dialogs/ProductChooseDialog.vue
index 5ee070b0..a4d1ac08 100644
--- a/src/views/home/components/dialogs/ProductChooseDialog.vue
+++ b/src/views/home/components/dialogs/ProductChooseDialog.vue
@@ -46,8 +46,8 @@ const form = ref({
 
 const productList = ref<[productItem] | []>([]);
 const getOptions = () => {
-    getProductList_api().then((resp: any) => {
-        productList.value = resp.result
+    getProductList_api().then(({ result }: any) => {
+        productList.value = result
             .filter((i: any) => !i?.accessId)
             .map((item: { name: any; id: any }) => ({
                 label: item.name,
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 72e5709a..6751556b 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,6 +1,6 @@
 <template>
     <page-container>
-        <div class="iot-home-container" v-loading="loading">
+        <div class="iot-home-container">
             <InitHome v-if="currentView === 'init'" @refresh="setCurrentView" />
             <DeviceHome v-else-if="currentView === 'device'" />
             <DevOpsHome v-else-if="currentView === 'ops'" />
@@ -54,25 +54,26 @@ import { getMe_api, getView_api } from '@/api/home';
 import { getAppInfo_api } from '@/api/system/apply';
 
 const currentView = ref<string>('');
-const loading = ref<boolean>(true);
 const clientId = useUserInfo().$state.userInfos.id;
 const secureKey = ref<string>('');
 const showKey = ref(false);
 // 获取选择的视图
 const setCurrentView = () => {
-    getView_api().then((resp: any) => {
-        if (resp.status === 200) {
-            if (resp.result) {
-                if (resp.result.username === 'admin')
-                    currentView.value = 'comprehensive';
-                else currentView.value = resp.result?.content;
-            } else currentView.value = 'init';
+    getView_api().then(({ status, result }: any) => {
+        if (status === 200) {
+            currentView.value = 'init';
+            if (result) {
+                currentView.value =
+                    result.username === 'admin'
+                        ? 'comprehensive'
+                        : result?.content;
+            }
         }
     });
 };
 
 if (isNoCommunity) {
-    // 判断是否是api用户   是则跳转  否则获取选中的视图
+    // 判断是否是api用户   不是则获取选中的视图
     getMe_api().then((resp: any) => {
         if (resp && resp.status === 200) {
             const isApiUser = resp.result.dimensions.find(
@@ -85,10 +86,14 @@ if (isNoCommunity) {
                 getAppInfo_api(clientId).then((resp: any) => {
                     secureKey.value = resp.result.apiServer.secureKey;
                 });
-            } else setCurrentView();
+            } else {
+                setCurrentView();
+            }
         }
     });
-} else setCurrentView();
+} else {
+    setCurrentView();
+}
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/media/DashBoard/components/Card.vue b/src/views/media/DashBoard/components/Card.vue
index 42683516..3f8110c8 100644
--- a/src/views/media/DashBoard/components/Card.vue
+++ b/src/views/media/DashBoard/components/Card.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="wrapper">
+    <div class="card-wrapper">
         <div class="card-header">
             <div class="title">{{ title }}</div>
             <div class="tools">
@@ -156,7 +156,7 @@ watch(
 </script>
 
 <style scoped lang="less">
-.wrapper {
+.card-wrapper {
     padding: 24px;
     background-color: #fff;
     .card-header {
diff --git a/src/views/media/Device/Channel/Save.vue b/src/views/media/Device/Channel/Save.vue
index 7c1df256..2dc4fe43 100644
--- a/src/views/media/Device/Channel/Save.vue
+++ b/src/views/media/Device/Channel/Save.vue
@@ -238,6 +238,8 @@ watch(
  * @param value
  */
 let validateChannelId = async (_rule: Rule, value: string) => {
+    // ID非必填, 没有输入ID时, 不校验ID是否存在
+    if (!value) return;
     const { result } = await ChannelApi.validateField({
         deviceId: route.query.id,
         channelId: value,
diff --git a/src/views/media/Device/Channel/index.vue b/src/views/media/Device/Channel/index.vue
index 4fb16986..f7a9a6ba 100644
--- a/src/views/media/Device/Channel/index.vue
+++ b/src/views/media/Device/Channel/index.vue
@@ -20,9 +20,8 @@
             </div>
             <div class="right">
                 <pro-search
-                    type="simple"
                     :columns="columns"
-                    target="product"
+                    target="channel"
                     @search="handleSearch"
                 />
 
diff --git a/src/views/media/Device/Save/index.vue b/src/views/media/Device/Save/index.vue
index 50ff4092..4ef4eeaa 100644
--- a/src/views/media/Device/Save/index.vue
+++ b/src/views/media/Device/Save/index.vue
@@ -15,6 +15,7 @@
                                 :checkStyle="true"
                                 :disabled="!!route.query.id"
                                 v-model="formData.channel"
+                                @change="formData.productId = undefined"
                             />
                         </j-form-item>
                         <j-row :gutter="24">
@@ -264,7 +265,7 @@ const formData = ref({
     name: '',
     channel: 'gb28181-2016',
     photoUrl: getImage('/device-media.png'),
-    productId: '',
+    productId: undefined,
     others: {
         access_pwd: '',
     },
diff --git a/src/views/media/Device/index.vue b/src/views/media/Device/index.vue
index eb420206..e5888f35 100644
--- a/src/views/media/Device/index.vue
+++ b/src/views/media/Device/index.vue
@@ -13,7 +13,7 @@
                 sorts: [{ name: 'createTime', order: 'desc' }],
             }"
             :params="params"
-            :gridColumn="3"
+            :gridColumn="2"
         >
             <template #headerTitle>
                 <PermissionButton
@@ -92,6 +92,23 @@
                     </template>
                 </CardBox>
             </template>
+
+            <template #channelNumber="slotProps">
+                {{ slotProps.channelNumber || 0 }}
+            </template>
+            <template #provider="slotProps">
+                {{ providerType[slotProps.provider] }}
+            </template>
+            <template #state="slotProps">
+                <j-badge
+                    :text="slotProps.state?.text"
+                    :status="
+                        slotProps.state?.value === 'online'
+                            ? 'success'
+                            : 'error'
+                    "
+                />
+            </template>
             <template #action="slotProps">
                 <j-space :size="16">
                     <template
@@ -125,6 +142,7 @@ import { message } from 'ant-design-vue';
 import { getImage } from '@/utils/comm';
 import { PROVIDER_OPTIONS } from '@/views/media/Device/const';
 import { providerType } from './const';
+import encodeQuery from '@/utils/encodeQuery';
 
 import { useMenuStore } from 'store/menu';
 
@@ -138,6 +156,8 @@ const columns = [
         title: 'ID',
         dataIndex: 'id',
         key: 'id',
+        width: 200,
+        fixed: 'left',
         search: {
             type: 'string',
         },
@@ -153,14 +173,14 @@ const columns = [
     },
     {
         title: '接入方式',
-        dataIndex: 'type',
-        key: 'type',
+        dataIndex: 'provider',
+        key: 'provider',
         scopedSlots: true,
         search: {
             type: 'select',
             options: PROVIDER_OPTIONS,
             handleValue: (v: any) => {
-                return '123';
+                return v;
             },
         },
     },
@@ -168,6 +188,8 @@ const columns = [
         title: '通道数量',
         dataIndex: 'channelNumber',
         key: 'channelNumber',
+        scopedSlots: true,
+        width: 100,
     },
     {
         title: '厂商',
@@ -181,15 +203,31 @@ const columns = [
         title: '产品名称',
         dataIndex: 'productId',
         key: 'productId',
-        scopedSlots: true,
+        // scopedSlots: true,
         search: {
             type: 'select',
-            options: [
-                { label: '固定地址', value: 'fixed-media' },
-                { label: 'GB/T28181', value: 'gb28181-2016' },
-            ],
+            options: () =>
+                new Promise((resolve) => {
+                    DeviceApi.getProductList(
+                        encodeQuery({
+                            terms: {
+                                messageProtocol$in: [
+                                    'gb28181-2016',
+                                    'fixed-media',
+                                ],
+                            },
+                        }),
+                    ).then((resp: any) => {
+                        resolve(
+                            resp.result.map((pItem: any) => ({
+                                label: pItem.name,
+                                value: pItem.id,
+                            })),
+                        );
+                    });
+                }),
             handleValue: (v: any) => {
-                return '123';
+                return v;
             },
         },
     },
@@ -198,6 +236,7 @@ const columns = [
         dataIndex: 'state',
         key: 'state',
         scopedSlots: true,
+        width: 100,
         search: {
             type: 'select',
             options: [
@@ -206,7 +245,7 @@ const columns = [
                 { label: '在线', value: 'online' },
             ],
             handleValue: (v: any) => {
-                return '123';
+                return v;
             },
         },
     },
@@ -308,7 +347,8 @@ const getActions = (
             key: 'delete',
             text: '删除',
             tooltip: {
-                title: '在线设备无法删除',
+                title:
+                    data.state.value === 'online' ? '在线设备无法删除' : '删除',
             },
             disabled: data.state.value === 'online',
             popConfirm: {
diff --git a/src/views/media/Home/index.vue b/src/views/media/Home/index.vue
index 5bf74e50..4385da6a 100644
--- a/src/views/media/Home/index.vue
+++ b/src/views/media/Home/index.vue
@@ -25,7 +25,7 @@
         <!-- 选择设备 -->
         <j-modal
             title="选择设备"
-            width="800px"
+            width="850px"
             v-model:visible="visible"
             :maskClosable="false"
             :destroyOnClose="true"
@@ -57,6 +57,7 @@
                         deviceItem = record;
                     }
                 }"
+                :alertRender="false"
                 :pagination="{
                     showSizeChanger: true,
                     pageSizeOptions: ['10', '20', '50', '100'],
@@ -160,6 +161,7 @@ const columns = [
         key: 'id',
         search: {
             type: 'string',
+            defaultTermType: 'eq',
         },
     },
     {
diff --git a/src/views/notice/Config/SyncUser/index.vue b/src/views/notice/Config/SyncUser/index.vue
index abff0115..d8a8c1b9 100644
--- a/src/views/notice/Config/SyncUser/index.vue
+++ b/src/views/notice/Config/SyncUser/index.vue
@@ -316,15 +316,10 @@ const getBindUsers = async () => {
  * 获取所有用户未绑定的用户
  */
 const allUserList = ref([]);
-const getAllUsers = async () => {
+const getAllUsers = async (terms?: any) => {
     const params = {
         paging: false,
-        terms: [
-            {
-                column: `id$user-third$${props.data.type}_${props.data.provider}$not`,
-                value: props.data.id,
-            },
-        ],
+        terms,
     };
     const { result } = await configApi.getPlatformUsers(params);
     allUserList.value = result.map((m: any) => ({
@@ -355,11 +350,11 @@ const getTableData = () => {
                 const bindUser = bindUsers.find(
                     (f: any) => f.thirdPartyUserId === deptUser.id,
                 );
-                // if (bindUser) {
-                //     unBindUser = unBindUsers.find(
-                //         (f: any) => f.id === bindUser.userId,
-                //     );
-                // }
+                if (bindUser) {
+                    unBindUser = unBindUsers.find(
+                        (f: any) => f.id === bindUser.userId,
+                    );
+                }
                 dataSource.value.push({
                     thirdPartyUserId: deptUser.id,
                     thirdPartyUserName: deptUser.name,
@@ -422,7 +417,12 @@ const handleBind = (row: any) => {
     bindVis.value = true;
     // formData.value = row;
     Object.assign(formData.value, row);
-    getAllUsers();
+    getAllUsers([
+        {
+            column: `id$user-third$${props.data.type}_${props.data.provider}$not`,
+            // value: props.data.id,
+        },
+    ]);
 };
 
 /**
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue
index 1481ff82..5e0250e2 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue
@@ -7,41 +7,31 @@
         :pagination="false"
     >
         <template #bodyCell="{ column, text, record }">
-            <div>
-                <template
-                    v-if="['valueType', 'name'].includes(column.dataIndex)"
-                >
-                    <span>{{ text }}</span>
-                </template>
-                <template v-else>
-                    <ParamsDropdown
-                        placeholder="请选择"
-                        :options="[]"
-                        :tabsOptions="tabOptions"
-                        :metricOption="upperOptions(record.valueType)"
-                        v-model:value="record.value"
-                    >
-                        <template v-slot="{label}">
-                            <j-input :value="label" />
-                        </template>
-                    </ParamsDropdown>
-                </template>
-            </div>
+            <template v-if="column.dataIndex === 'name'">
+                <span>{{ text }}</span>
+            </template>
+            <template v-else-if="column.dataIndex === 'valueType'">
+                <span>{{ record.valueType.type }}</span>
+            </template>
+            <template v-else>
+                <FunctionItem
+                    :builtInList="builtInList"
+                    @change="onChange"
+                    :source="record.source"
+                    :data="record"
+                    v-model:value="record.value"
+                />
+            </template>
         </template>
     </j-table>
 </template>
 
 <script lang="ts" setup>
 import { PropType } from 'vue';
-import ParamsDropdown from '../../../components/ParamsDropdown';
-
-type Emits = {
-    (e: 'update:modelValue', data: Record<string, any>[]): void;
-};
-const _emit = defineEmits<Emits>();
+import FunctionItem from './FunctionItem.vue';
 
 const _props = defineProps({
-    modelValue: {
+    value: {
         type: Array as PropType<Record<string, any>[]>,
         default: () => undefined,
     },
@@ -49,20 +39,13 @@ const _props = defineProps({
         type: Array,
         default: () => [],
     },
+    functions: {
+        type: Array,
+        default: () => [],
+    },
 });
 
-const tabOptions = [
-    {
-        label: '手动输入',
-        component: 'string',
-        key: 'fixed',
-    },
-    {
-        label: '内置参数',
-        component: 'tree',
-        key: 'upper',
-    },
-];
+const emit = defineEmits(['update:value']);
 
 const columns = [
     {
@@ -82,33 +65,29 @@ const columns = [
     },
 ];
 
-const dataSource = computed({
-    get: () => {
-        return _props.modelValue || [];
-    },
-    set: (val: any) => {
-        _emit('update:modelValue', val);
-    },
+const dataSource = ref<any[]>([]);
+
+watchEffect(() => {
+    const list = (_props.functions || []).map((item: any) => {
+        const _item = _props.value?.find((i) => i.name === item?.id) || {};
+        return {
+            ...item,
+            ..._item,
+            name: item.name,
+        };
+    });
+    dataSource.value = list;
 });
 
-const filterParamsData = (type?: string, data?: any[]): any[] => {
-    if (type && data) {
-        return data.filter((item) => {
-            if (item.children) {
-                const _children = filterParamsData(type, item.children);
-                item.children = _children;
-                return _children.length ? true : false;
-            } else if (item.type === type) {
-                //   optionMap.current.set(item.id, item);
-                return true;
-            }
-            return false;
-        });
-    }
-    return data || [];
-};
-
-const upperOptions = (_type: string) => {
-    return filterParamsData(_type, _props?.builtInList) || [];
+const onChange = () => {
+    const arr = [...dataSource.value].map((item) => {
+        return {
+            name: item.id,
+            source: item.source,
+            upperKey: item.upperKey || item.value,
+            value: item.value,
+        };
+    });
+    emit('update:value', arr);
 };
 </script>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
new file mode 100644
index 00000000..4ac0e416
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
@@ -0,0 +1,117 @@
+<template>
+    <ParamsDropdown
+        placeholder="请选择"
+        :options="handleOptions"
+        :tabsOptions="tabOptions"
+        :metricOptions="upperOptions"
+        v-model:value="_value"
+        v-model:source="_source"
+        @select="onChange"
+    >
+        <template v-slot="{ label }">
+            <j-input :value="label" />
+        </template>
+    </ParamsDropdown>
+</template>
+
+<script lang="ts" setup>
+import ParamsDropdown from '../../../components/ParamsDropdown';
+import { handleParamsData } from './index';
+
+const props = defineProps({
+    data: {
+        type: Object,
+        default: () => {},
+    },
+    builtInList: {
+        type: Array,
+        default: () => [],
+    },
+    value: {
+        type: String,
+    },
+    source: {
+        type: String,
+        default: 'fixed',
+    },
+});
+
+const emit = defineEmits(['update:value', 'update:source', 'change']);
+
+const _value = ref();
+const _source = ref();
+
+const tabOptions = computed(() => {
+    return [
+        {
+            label: '手动输入',
+            component: props.data?.valueType?.type,
+            key: 'fixed',
+        },
+        {
+            label: '内置参数',
+            component: 'tree',
+            key: 'upper',
+        },
+    ];
+});
+
+const handleOptions = computed(() => {
+    const _item = props.data?.valueType || 'int';
+    const _type = _item?.type;
+    if (_type === 'boolean') {
+        return [
+            {
+                label: _item.trueText || true,
+                value: _item.trueValue || true,
+            },
+            {
+                label: _item.falseText || false,
+                value: _item.falseValue || false,
+            },
+        ];
+    }
+    if (_type === 'enum') {
+        return _item?.elements.map((i: any) => {
+            return {
+                label: i.text,
+                value: i.value,
+            };
+        });
+    }
+    return [];
+});
+
+const filterParamsData = (type?: string, data?: any[]): any[] => {
+    if (type && data) {
+        const list = data.filter((item) => {
+            if (item.children) {
+                const _children = filterParamsData(type, item.children);
+                item.children = _children;
+                return _children.length ? true : false;
+            } else if (item.type === type) {
+                //   optionMap.current.set(item.id, item);
+                return true;
+            }
+            return false;
+        });
+        return handleParamsData(list);
+    }
+    return data || [];
+};
+
+const upperOptions = computed(() => {
+    return filterParamsData(props.data.valueType?.type, props?.builtInList);
+});
+
+const onChange = () => {
+    emit('update:value', _value.value);
+    emit('update:source', _source.value);
+    emit('change', { source: _source.value, value: _value.value });
+};
+
+watchEffect(() => {
+    _value.value = props.value;
+    _source.value = props.source || 'fixed';
+});
+</script>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
index d4ac0fba..f2dc5ad0 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
@@ -1,50 +1,59 @@
 <template>
-    <div>
-        <j-form :layout="'vertical'" ref="formRef" :model="modelRef">
-            <j-row>
-                <j-col :span="11">
-                    <j-form-item
-                        :name="['message', 'properties']"
-                        label="读取属性"
-                        :rules="[{ required: true, message: '请选择读取属性' }]"
+    <j-form
+        :layout="'vertical'"
+        ref="propertyFormRef"
+        :model="propertyModelRef"
+    >
+        <j-row :gutter="24">
+            <j-col :span="12">
+                <j-form-item
+                    name="properties"
+                    label="读取属性"
+                    :rules="[{ required: true, message: '请选择读取属性' }]"
+                >
+                    <j-select
+                        showSearch
+                        placeholder="请选择属性"
+                        v-model:value="propertyModelRef.properties"
+                        @change="onChange"
                     >
-                        <j-select
-                            showSearch
-                            placeholder="请选择属性"
-                            v-model:value="modelRef.properties"
+                        <j-select-option
+                            v-for="item in metadata?.properties || []"
+                            :value="item?.id"
+                            :key="item?.id"
+                            >{{ item?.name }}</j-select-option
                         >
-                            <j-select-option
-                                v-for="item in metadata?.properties || []"
-                                :value="item?.id"
-                                :key="item?.id"
-                                >{{ item?.name }}</j-select-option
-                            >
-                        </j-select>
-                    </j-form-item>
-                </j-col>
-                <j-col :span="2"></j-col>
-                <j-col :span="11">
-                    <j-form-item
-                        :name="['message', 'propertiesValue']"
-                        label="属性值"
-                        :rules="[{ required: true, message: '请选择' }]"
+                    </j-select>
+                </j-form-item>
+            </j-col>
+            <j-col :span="12" v-if="propertyModelRef.properties">
+                <j-form-item
+                    name="propertiesValue"
+                    label="属性值"
+                    :rules="[{ required: true, message: '请选择' }]"
+                >
+                    <ParamsDropdown
+                        placeholder="请选择"
+                        :options="handleOptions"
+                        :tabsOptions="tabOptions"
+                        :metricOptions="upperOptions"
+                        v-model:value="propertyModelRef.propertiesValue"
+                        v-model:source="propertyModelRef.source"
+                        @select="onValueChange"
                     >
-                        <ParamsDropdown
-                            icon="icon-canshu"
-                            placeholder="请选择"
-                            :options="[]"
-                            :tabsOptions="tabOptions"
-                            :metricOption="upperOptions(getType)"
-                            v-model:value="modelRef.propertiesValue"
-                        />
-                    </j-form-item>
-                </j-col>
-            </j-row>
-        </j-form>
-    </div>
+                        <template v-slot="{ label }">
+                            <j-input :value="label" />
+                        </template>
+                    </ParamsDropdown>
+                </j-form-item>
+            </j-col>
+        </j-row>
+    </j-form>
 </template>
 
 <script lang="ts" setup>
+import ParamsDropdown from '../../../components/ParamsDropdown';
+import { handleParamsData } from './index';
 const props = defineProps({
     value: {
         type: Object,
@@ -60,37 +69,44 @@ const props = defineProps({
     },
     builtInList: {
         type: Array,
-        default: () => []
+        default: () => [],
     },
 });
 
-const formRef = ref();
+const emit = defineEmits(['update:value']);
 
-const modelRef = reactive({
-    properties: '',
-    propertiesValue: '',
-    source: '',
+const propertyFormRef = ref();
+
+const propertyModelRef = reactive({
+    properties: undefined,
+    propertiesValue: undefined,
+    source: 'fixed',
 });
 
-const tabOptions = [
-    {
-        label: '手动输入',
-        component: 'string',
-        key: 'fixed',
-    },
-    {
-        label: '内置参数',
-        component: 'tree',
-        key: 'upper',
-    },
-];
 const getType = computed(() => {
-    return props.metadata.properties.find((item: any) => item.id === modelRef.properties)?.valueType?.type
-})
+    return props.metadata.properties.find(
+        (item: any) => item.id === propertyModelRef.properties,
+    );
+});
+
+const tabOptions = computed(() => {
+    return [
+        {
+            label: '手动输入',
+            component: getType.value?.valueType?.type,
+            key: 'fixed',
+        },
+        {
+            label: '内置参数',
+            component: 'tree',
+            key: 'upper',
+        },
+    ];
+});
 
 const filterParamsData = (type?: string, data?: any[]): any[] => {
     if (type && data) {
-        return data.filter((item) => {
+        const list = data.filter((item) => {
             if (item.children) {
                 const _children = filterParamsData(type, item.children);
                 item.children = _children;
@@ -101,40 +117,74 @@ const filterParamsData = (type?: string, data?: any[]): any[] => {
             }
             return false;
         });
+        return handleParamsData(list);
     }
     return data || [];
 };
 
-const upperOptions = (type: string) => {
-    return filterParamsData(type, props?.builtInList) || []
-}
+const upperOptions = computed(() => {
+    return filterParamsData(getType.value?.valueType?.type, props?.builtInList);
+});
+
+const handleOptions = computed(() => {
+    const _item = getType.value?.valueType;
+    const _type = _item?.type;
+    if (_type === 'boolean') {
+        return [
+            {
+                label: _item.trueText,
+                value: _item.trueValue,
+            },
+            {
+                label: _item.falseText,
+                value: _item.falseValue,
+            },
+        ];
+    }
+    if (_type === 'enum') {
+        return _item?.elements.map((i: any) => {
+            return {
+                label: i.text,
+                value: i.value,
+            };
+        });
+    }
+    return [];
+});
+
+const onChange = () => {
+    propertyModelRef.propertiesValue = undefined;
+    propertyModelRef.source = 'fixed'
+    emit('update:value', {
+        [`${propertyModelRef.properties}`]: {
+            value: propertyModelRef?.propertiesValue,
+            source: propertyModelRef?.source,
+        },
+    });
+};
+
+const onValueChange = () => {
+    const obj = {
+        [`${propertyModelRef.properties}`]: {
+            value: propertyModelRef?.propertiesValue,
+            source: propertyModelRef?.source,
+        },
+    }
+    emit('update:value', obj);
+};
 
 watch(
     () => props.value,
     (newVal) => {
-        const _keys = Object.keys(newVal)?.[0];
-        if (_keys) {
-            (modelRef.properties = _keys),
-                (modelRef.propertiesValue = newVal[_keys]?.value);
-            modelRef.source = newVal[_keys]?.source;
+        if (newVal) {
+            const _keys = Object.keys(newVal)?.[0];
+            if (_keys) {
+                propertyModelRef.properties = _keys as any;
+                propertyModelRef.propertiesValue = newVal[_keys]?.value;
+                propertyModelRef.source = newVal[_keys]?.source;
+            }
         }
     },
     { deep: true, immediate: true },
 );
-
-const onFormSave = () => {
-    return new Promise((resolve, reject) => {
-        formRef.value
-            .validate()
-            .then(async (_data: any) => {
-                // 处理回传数据
-                resolve(_data);
-            })
-            .catch((err: any) => {
-                reject(err);
-            });
-    });
-};
-
-defineExpose({ onFormSave });
 </script>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/index.ts b/src/views/rule-engine/Scene/Save/action/Device/actions/index.ts
new file mode 100644
index 00000000..4926b165
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/index.ts
@@ -0,0 +1,10 @@
+export const handleParamsData = (data: any[]): any[] => {
+    return data?.map(item => {
+        return {
+            ...item,
+            key: item.column,
+            disabled: !!item.children?.length,
+            children: handleParamsData(item.children)
+        }
+    }) || []
+}
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
index c4f27a45..ff7cdbb5 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
@@ -22,7 +22,6 @@
                         showSearch
                         placeholder="请选择功能"
                         v-model:value="modelRef.message.functionId"
-                        @change="(val) => onFunctionChange(val, [])"
                     >
                         <j-select-option
                             v-for="item in metadata?.functions || []"
@@ -37,7 +36,11 @@
                     :name="['message', 'inputs']"
                     :rules="[{ required: true, message: '请输入功能值' }]"
                 >
-                    <EditTable v-model:modelValue="modelRef.message.inputs" :builtInList="builtInList" />
+                    <EditTable
+                        :functions="functions"
+                        v-model:value="modelRef.message.inputs"
+                        :builtInList="builtInList"
+                    />
                 </j-form-item>
             </template>
             <template v-else-if="deviceMessageType === 'READ_PROPERTY'">
@@ -49,7 +52,7 @@
                     <j-select
                         showSearch
                         placeholder="请选择属性"
-                        v-model:value="modelRef.message.properties"
+                        v-model:value="modelRef.message.properties[0]"
                     >
                         <j-select-option
                             v-for="item in metadata?.properties || []"
@@ -77,9 +80,9 @@ import TopCard from '../device/TopCard.vue';
 import { detail } from '@/api/device/instance';
 import EditTable from './EditTable.vue';
 import WriteProperty from './WriteProperty.vue';
-import { queryBuiltInParams } from '@/api/rule-engine/scene';
 import { useSceneStore } from '@/store/scene';
-import { storeToRefs } from 'pinia'
+import { storeToRefs } from 'pinia';
+import { getParams } from '../../../util'
 
 const sceneStore = useSceneStore();
 const { data } = storeToRefs(sceneStore);
@@ -118,7 +121,7 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
-    branchGroup: {
+    branchesName: {
         type: Number,
         default: 0,
     },
@@ -128,7 +131,7 @@ const formRef = ref();
 
 const modelRef = reactive({
     message: {
-        messageType: undefined,
+        messageType: 'INVOKE_FUNCTION',
         functionId: undefined,
         properties: undefined,
         inputs: [],
@@ -149,48 +152,61 @@ const deviceMessageType = computed(() => {
 
 const builtInList = ref<any[]>([]);
 
-const onFunctionChange = (val: string, values?: any[]) => {
+const functions = computed(() => {
     const _item = (metadata.value?.functions || []).find((item: any) => {
-        return val === item.id;
+        return modelRef.message?.functionId === item.id;
     });
-    const list = (_item?.inputs || []).map((item: any) => {
-        const _a = values?.find((i) => i.name === item.id);
-        return {
-            id: item.id,
-            value: _a?.value,
-            valueType: item?.valueType?.type,
-            ..._a,
-            name: item.name,
-        };
+    return _item?.inputs || [];
+});
+
+const _property = computed(() => {
+    const _item = (metadata.value?.properties || []).find((item: any) => {
+        if (deviceMessageType.value === 'WRITE_PROPERTY') {
+            return (
+                Object.keys(modelRef.message.properties || {})?.[0] === item.id
+            );
+        }
+        return modelRef.message?.properties?.[0] === item.id;
     });
-    modelRef.message.inputs = list;
+    return _item;
+});
+
+const _function = computed(() => {
+    const _item = (metadata.value?.functions || []).find((item: any) => {
+        return modelRef.message?.functionId === item.id;
+    });
+    return _item;
+});
+
+const queryBuiltIn = async () => {
+    const _params = {
+        branch: props.thenName,
+        branchGroup: props.branchesName,
+        action: props.name - 1,
+    };
+    const _data = await getParams(_params, unref(data));
+    builtInList.value = _data
 };
 
 const onMessageTypeChange = (val: string) => {
-    if (['WRITE_PROPERTY', 'INVOKE_FUNCTION'].includes(val)) {
-        const _params = {
-            branch: props.thenName,
-            branchGroup: props.branchGroup,
-            action: props.name - 1,
-        };
-        queryBuiltInParams(unref(data), _params).then((res: any) => {
-            if (res.status === 200) {
-                builtInList.value = res.result
-            }
-        });
+    const flag = ['WRITE_PROPERTY', 'INVOKE_FUNCTION'].includes(val)
+    modelRef.message = {
+        messageType: val,
+        functionId: undefined,
+        properties:(flag ? undefined : []) as any,
+        inputs: [],
+    };
+    if (flag) {
+        queryBuiltIn();
     }
 };
 
 watch(
-    () => [
-        props.values?.productDetail,
-        props.values.selectorValues,
-        props.values?.selector,
-    ],
-    ([newVal1, newVal2, newVal3]) => {
-        if (newVal1?.id) {
-            if (newVal3?.selector === 'fixed') {
-                const id = newVal2?.[0]?.value;
+    () => props.values,
+    (newVal) => {
+        if (newVal?.productDetail?.id) {
+            if (newVal?.selector === 'fixed') {
+                const id = newVal?.selectorValues?.[0]?.value;
                 if (id) {
                     detail(id).then((resp) => {
                         if (resp.status === 200) {
@@ -201,7 +217,9 @@ watch(
                     });
                 }
             } else {
-                metadata.value = JSON.parse(newVal1?.metadata || '{}');
+                metadata.value = JSON.parse(
+                    newVal?.productDetail?.metadata || '{}',
+                );
             }
         }
     },
@@ -211,24 +229,33 @@ watch(
 watch(
     () => props.values?.message,
     (newVal) => {
-        console.log(newVal)
         if (newVal?.messageType) {
             modelRef.message = newVal;
-            if (newVal.messageType === 'INVOKE_FUNCTION' && newVal.functionId) {
-                onFunctionChange(newVal.functionId, newVal?.inputs);
+            if (['WRITE_PROPERTY', 'INVOKE_FUNCTION'].includes(newVal.messageType)) {
+                queryBuiltIn();
             }
-            onMessageTypeChange(newVal.messageType)
         }
     },
-    { deep: true, immediate: true },
+    { immediate: true },
 );
 
 const onFormSave = () => {
     return new Promise((resolve, reject) => {
         formRef.value
             .validate()
-            .then(async (_data: any) => {
-                resolve(_data);
+            .then((_data: any) => {
+                // 处理三种情况的值的格式
+                const obj = {
+                    message: {
+                        ...modelRef.message,
+                        ..._data.message,
+                        propertiesName:
+                            deviceMessageType.value === 'INVOKE_FUNCTION'
+                                ? _function.value?.name
+                                : _property.value?.name,
+                    },
+                };
+                resolve(obj);
             })
             .catch((err: any) => {
                 reject(err);
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
index 00eb1e33..33e8c8fd 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
@@ -7,7 +7,7 @@
         target="scene-trigger-device-device"
     />
     <j-divider style="margin: 0" />
-    <j-pro-table
+    <JProTable
         ref="actionRef"
         model="CARD"
         :columns="columns"
@@ -62,7 +62,7 @@
                 </template>
             </CardBox>
         </template>
-    </j-pro-table>
+    </JProTable>
 </template>
   
   <script setup lang='ts' name='Product'>
@@ -180,7 +180,6 @@ watchEffect(() => {
   <style scoped lang='less'>
 .search {
     margin-bottom: 0;
-    padding-right: 0px;
-    padding-left: 0px;
+    padding: 0 0 24px 0;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/RelationSelect.vue b/src/views/rule-engine/Scene/Save/action/Device/device/RelationSelect.vue
new file mode 100644
index 00000000..7c538e7d
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/RelationSelect.vue
@@ -0,0 +1,56 @@
+<template>
+    <j-select
+        placeholder="请选择关系"
+        :options="relationList"
+        show-search
+        :value="value ? value[0]?.value?.relation : undefined"
+        @change="onRelationChange"
+    />
+</template>
+
+<script lang="ts" setup>
+import NoticeApi from '@/api/notice/config';
+const props = defineProps({
+    value: {
+        type: Array,
+        default: () => [{value: {}}]
+    },
+});
+
+const emit = defineEmits(['update:value', 'change']);
+const relationList = ref<any[]>([]);
+
+onMounted(() => {
+    queryRelationList()
+})
+
+const queryRelationList = () => {
+    NoticeApi.getRelationUsers({
+        paging: false,
+        sorts: [{ name: 'createTime', order: 'desc' }],
+        terms: [{ termType: 'eq', column: 'objectTypeName', value: '设备' }],
+    }).then((resp) => {
+        if (resp.status === 200) {
+            relationList.value = (resp.result as any[]).map((item) => {
+                return {
+                    label: item.name,
+                    value: item.relation,
+                };
+            });
+        }
+    });
+};
+
+const onRelationChange = (val: any, options: any) => {
+    const _values = [
+        {
+            value: {
+                objectType: 'user',
+                relation: val,
+            },
+        },
+    ];
+    emit('update:value', _values);
+    emit('change', _values, options);
+};
+</script>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue b/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
index 4d4c245a..8f8b701e 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
@@ -61,7 +61,7 @@
                         </j-button>
                         <j-button
                             danger
-                            v-if="tagData.length > 1"
+                            v-if="tagList.length > 1"
                             style="padding: 0 8px"
                             @click="deleteItem(index)"
                         >
@@ -109,6 +109,7 @@ const addItem = () => {
 
 const deleteItem = (_index: number) => {
     tagList.value.splice(_index, 1);
+    onValueChange();
 };
 
 const onTypeSelect = (key: any, _index: number) => {
@@ -168,26 +169,23 @@ watch(
 );
 
 const onValueChange = () => {
-    const newValue = tagList.value
-        .filter((item) => !!item.value)
-        .map((item: any) => {
-            return {
-                column: item.id,
-                type: item.type,
-                value: item.value,
-            };
-        });
-    const arr = newValue
-        .filter((item) => !!item.value)
-        .map((item: any) => {
-            return {
-                column: item.name,
-                type: item.type,
-                value: item.value,
-            };
-        });
+    const _data = tagList.value.filter((item) => !!item.value);
+    const newValue = _data.map((item: any) => {
+        return {
+            column: item.id,
+            type: item.type,
+            value: item.value,
+        };
+    });
+    const arr = _data.map((item: any) => {
+        return {
+            column: item.name,
+            type: item.type,
+            value: item.value,
+        };
+    });
     emits('update:value', [{ value: newValue, name: '标签' }]);
-    emits('change', [{ value: newValue, name: '标签' }], undefined);
+    emits('change', [{ value: newValue, name: '标签' }], arr);
 };
 </script>
 
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/index.vue b/src/views/rule-engine/Scene/Save/action/Device/device/index.vue
index 0bffa2b4..45d5febb 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/index.vue
@@ -30,12 +30,9 @@
                 name="selectorValues"
                 :rules="[{ required: true, message: '请选择关系' }]"
             >
-                <j-select
-                    placeholder="请选择关系"
-                    v-model:value="modelRef.selectorValues"
-                    :options="relationList"
-                    show-search
+                <RelationSelect
                     @change="onRelationChange"
+                    v-model:value="modelRef.selectorValues"
                 />
             </j-form-item>
             <j-form-item
@@ -81,11 +78,13 @@
 import { useSceneStore } from '@/store/scene';
 import TopCard from './TopCard.vue';
 import { storeToRefs } from 'pinia';
-import { queryBuiltInParams } from '@/api/rule-engine/scene';
 import { getImage } from '@/utils/comm';
 import NoticeApi from '@/api/notice/config';
 import Device from './Device.vue';
 import Tag from './Tag.vue';
+import RelationSelect from './RelationSelect.vue';
+import { getParams } from '../../../util';
+import { handleParamsData } from '../../../components/Terms/util';
 
 const props = defineProps({
     values: {
@@ -100,7 +99,7 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
-    branchGroup: {
+    branchesName: {
         type: Number,
         default: 0,
     },
@@ -130,7 +129,6 @@ const modelRef = reactive({
 const list = ref<any[]>([]);
 const builtInList = ref<any[]>([]);
 const tagList = ref<any[]>([]);
-const relationList = ref<any[]>([]);
 
 const TypeList = [
     {
@@ -191,35 +189,21 @@ const filterTree = (nodes: any[]) => {
 const sourceChangeEvent = async () => {
     const _params = {
         branch: props.thenName,
-        branchGroup: props.branchGroup,
+        branchGroup: props.branchesName,
         action: props.name - 1,
     };
-    const resp = await queryBuiltInParams(unref(data), _params);
-    if (resp.status === 200) {
-        const array = filterTree(resp.result as any[]);
-        //判断相同产品才有按变量
-        // if (props.formProductId === DeviceModel.productId)// TODO
-        builtInList.value = array;
+    //判断相同产品才有按变量
+    const productId =
+        data.value?.branches?.[props.branchesName].then?.[props.thenName]
+            ?.actions?.[props.name > 0 ? props.name - 1 : 0]?.device?.productId;
+    if (productId === props.values?.productDetail?.id) {
+        const _data = await getParams(_params, unref(data));
+        builtInList.value = handleParamsData(filterTree(_data), 'id');
+    } else {
+        builtInList.value = [];
     }
 };
 
-const queryRelationList = () => {
-    NoticeApi.getRelationUsers({
-        paging: false,
-        sorts: [{ name: 'createTime', order: 'desc' }],
-        terms: [{ termType: 'eq', column: 'objectTypeName', value: '设备' }],
-    }).then((resp) => {
-        if (resp.status === 200) {
-            relationList.value = (resp.result as any[]).map((item) => {
-                return {
-                    label: item.name,
-                    value: item.relation,
-                };
-            });
-        }
-    });
-};
-
 const filterType = async () => {
     const _list = TypeList.filter((item) => item.value === 'fixed');
     if (unref(data)?.trigger?.type === 'device') {
@@ -266,11 +250,8 @@ const filterType = async () => {
     }
 };
 
-const onSelectorChange = (val: string) => {
+const onSelectorChange = () => {
     modelRef.selectorValues = undefined;
-    if (val === 'relation') {
-        queryRelationList();
-    }
 };
 
 const onDeviceChange = (_detail: any) => {
@@ -303,16 +284,13 @@ const onTagChange = (val: any[], arr: any[]) => {
         modelRef.deviceId = 'deviceId';
         modelRef.source = 'fixed';
     }
-    if (arr) {
-        tagList.value = arr;
-    }
-    emits('save', unref(modelRef), {});
+    emits('save', unref(modelRef), {}, arr ? { tagList: arr } : {});
 };
 
 const onVariableChange = (val: any, node: any) => {
     modelRef.deviceId = val;
-    emits('save', unref(modelRef), node);
     modelRef.selectorValues = [{ value: val, name: node.description }] as any;
+    emits('save', unref(modelRef), node);
 };
 
 watchEffect(() => {
diff --git a/src/views/rule-engine/Scene/Save/action/Device/index.vue b/src/views/rule-engine/Scene/Save/action/Device/index.vue
index b5f87a40..7bd56ed7 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/index.vue
@@ -29,7 +29,7 @@
                 v-else-if="current === 1"
                 :name="name"
                 :parallel="parallel"
-                :branchGroup="branchGroup"
+                :branchesName="branchesName"
                 :thenName="thenName"
                 :values="DeviceModel"
                 @save="onDeviceSave"
@@ -38,7 +38,7 @@
             <Action
                 v-else-if="current === 2"
                 :name="name"
-                :branchGroup="branchGroup"
+                :branchesName="branchesName"
                 :thenName="thenName"
                 :values="DeviceModel"
                 ref="actionRef"
@@ -91,7 +91,7 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
-    branchGroup: {
+    branchesName: {
         type: Number,
         default: 0,
     },
@@ -132,18 +132,18 @@ const onCancel = () => {
 
 const onSave = (_data: any) => {
     const item: any = {
-      selector: DeviceModel.selector,
-      source: DeviceModel.source,
-      selectorValues: DeviceModel.selectorValues,
-      productId: DeviceModel.productId,
-      message: _data.message,
+        selector: DeviceModel.selector,
+        source: DeviceModel.source,
+        selectorValues: DeviceModel.selectorValues,
+        productId: DeviceModel.productId,
+        message: _data.message,
     };
     //处理按变量
     if (DeviceModel.selector === 'variable') {
-      item.selector = 'fixed';
+        item.selector = 'fixed';
     }
     if (DeviceModel.selector === 'relation') {
-      item.upperKey = 'scene.deviceId';
+        item.upperKey = 'scene.deviceId';
     }
     const _options: any = {
         name: '-', //设备名称
@@ -154,23 +154,24 @@ const onSave = (_data: any) => {
         productName: DeviceModel.productDetail.name,
         relationName: DeviceModel.relationName,
         triggerName: data.value.options?.trigger?.name || '触发设备',
-        taglist: [],
+        tagList: [],
         columns: [],
         otherColumns: [],
     };
-    _options.name = DeviceModel.deviceDetail?.name;
+    _options.name =
+        DeviceModel.deviceDetail?.name || DeviceModel.selectorValues?.[0]?.name;
     const _type = _data.message.messageType;
     if (_type === 'INVOKE_FUNCTION') {
         _options.type = '执行';
-        _options.properties = DeviceModel.propertiesName;
+        _options.properties = _data.message.propertiesName;
     }
     if (_type === 'READ_PROPERTY') {
         _options.type = '读取';
-        _options.properties = DeviceModel.propertiesName;
+        _options.properties = _data.message.propertiesName;
     }
     if (_type === 'WRITE_PROPERTY') {
         _options.type = '设置';
-        _options.properties = DeviceModel.propertiesName;
+        _options.properties = _data.message.propertiesName;
         _options.propertiesValue =
             typeof DeviceModel.propertiesValue === 'object'
                 ? JSON.stringify(DeviceModel.propertiesValue)
@@ -183,6 +184,13 @@ const onSave = (_data: any) => {
         }
     }
     if (_options.selector === 'tag') {
+        // const arr = _data.map((item: any) => {
+        //     return {
+        //         column: item.name,
+        //         type: item.type,
+        //         value: item.value,
+        //     };
+        // });
         _options.taglist = DeviceModel.tagList.map((it) => ({
             name: it.column || it.name,
             type: it.type ? (it.type === 'and' ? '并且' : '或者') : '',
@@ -205,6 +213,8 @@ const save = async (step?: number) => {
         if (deviceRef.value) {
             await deviceRef.value?.onFormSave();
             current.value = 2;
+        } else if (DeviceModel.selectorValues.length) {
+            current.value = 2;
         }
     } else {
         if (actionRef.value) {
@@ -228,8 +238,8 @@ const prev = () => {
 
 const saveClick = () => save();
 
-const onDeviceSave = (_data: any, _detail: any) => {
-    Object.assign(DeviceModel, _data);
+const onDeviceSave = (_data: any, _detail: any, obj?: any) => {
+    Object.assign(DeviceModel, { ..._data, ...obj });
     DeviceModel.deviceDetail = _detail;
 };
 
@@ -241,6 +251,28 @@ watch(
             detail(newValue.productId).then((resp) => {
                 if (resp.status === 200) {
                     DeviceModel.productDetail = resp.result;
+                    if (
+                        DeviceModel.selector === 'tag' &&
+                        DeviceModel.selectorValues[0]?.value
+                    ) {
+                        const metadata = JSON.parse(
+                            DeviceModel.productDetail?.metadata || '{}',
+                        );
+                        const tags = metadata.tags || [];
+                        const arr = DeviceModel.selectorValues[0]?.value
+                            .filter((item: any) => !!item.value)
+                            .map((item: any) => {
+                                return {
+                                    column:
+                                        tags.find(
+                                            (i: any) => i.id === item.column,
+                                        )?.name || item.column,
+                                    type: item.type,
+                                    value: item.value,
+                                };
+                            });
+                        DeviceModel.tagList = arr;
+                    }
                 }
             });
         }
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
index 9ca8fc29..13b973fd 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
@@ -19,7 +19,7 @@
         :options='columnOptions'
         icon='icon-zhihangdongzuoxie-1'
         type='column'
-        value-name='column'
+        value-name='id'
         label-name='fullName'
         placeholder='请选择参数'
         v-model:value='paramsValue.column'
@@ -39,21 +39,27 @@
         v-if='showDouble'
         icon='icon-canshu'
         placeholder='参数值'
+        value-name='id'
+        label-name='name'
         :options='valueOptions'
-        :metricOptions='metricOption'
+        :metricOptions='columnOptions'
         :tabsOptions='tabsOptions'
         v-model:value='paramsValue.value.value'
         v-model:source='paramsValue.value.source'
+        @select='valueSelect'
       />
       <ParamsDropdown
         v-else
         icon='icon-canshu'
         placeholder='参数值'
+        value-name='id'
+        label-name='name'
         :options='valueOptions'
-        :metricOptions='metricOption'
+        :metricOptions='columnOptions'
         :tabsOptions='tabsOptions'
         v-model:value='paramsValue.value.value'
         v-model:source='paramsValue.value.source'
+        @select='valueSelect'
       />
       <j-popconfirm title='确认删除？' @confirm='onDelete'>
         <div v-show='showDelete' class='button-delete'> <AIcon type='CloseOutlined' /></div>
@@ -74,7 +80,6 @@ import DropdownButton from '../../components/DropdownButton'
 import { getOption } from '../../components/DropdownButton/util'
 import ParamsDropdown, { DoubleParamsDropdown } from '../../components/ParamsDropdown'
 import { inject } from 'vue'
-import { ContextKey } from '../../components/Terms/util'
 import { useSceneStore } from 'store/scene'
 import { storeToRefs } from 'pinia';
 
@@ -112,7 +117,7 @@ const props = defineProps({
     type: Number,
     default: 0
   },
-  branchName: {
+  actionName: {
     type: Number,
     default: 0
   },
@@ -120,6 +125,10 @@ const props = defineProps({
     type: Number,
     default: 0
   },
+  branchName: {
+    type: Number,
+    default: 0
+  },
   value: {
     type: Object as PropType<TermsType>,
     default: () => ({
@@ -144,27 +153,22 @@ const paramsValue = reactive<TermsType>({
 })
 
 const showDelete = ref(false)
-const columnOptions: any = inject(ContextKey) //
+const columnOptions: any = inject('filter-params') //
 const termTypeOptions = ref<Array<{ id: string, name: string}>>([]) // 条件值
 const valueOptions = ref<any[]>([]) // 默认手动输入下拉
-const metricOption = ref<any[]>([])  //
-const tabsOptions = ref<Array<TabsOption>>([{ label: '内置参数', key: 'upper', component: 'tree' }])
-// { label: '手动输入', key: 'fixed', component: 'string' },
+const arrayParamsKey = ['nbtw', 'btw', 'in', 'nin']
 
+const tabsOptions = ref<Array<TabsOption>>(
+  [
+    { label: '手动输入', key: 'fixed', component: 'string' },
+    { label: '内置参数', key: 'upper', component: 'tree' }
+  ]
+)
 
 const handOptionByColumn = (option: any) => {
   if (option) {
     termTypeOptions.value = option.termTypes || []
-    metricOption.value = option.metrics || []
-    tabsOptions.value.length = 1
     tabsOptions.value[0].component = option.dataType
-
-    if (option.metrics && option.metrics.length) {
-      tabsOptions.value.push(
-        { label: '指标值', key: 'metric', component: 'select' }
-      )
-    }
-
     if (option.dataType === 'boolean') {
       valueOptions.value = [
         { label: '是', value: true },
@@ -177,23 +181,17 @@ const handOptionByColumn = (option: any) => {
     }
   } else {
     termTypeOptions.value = []
-    metricOption.value = []
     valueOptions.value = []
   }
 }
 
 watchEffect(() => {
-  const option = getOption(columnOptions.value, paramsValue.column, 'column')
+  const option = getOption(columnOptions.value, paramsValue.column, 'id')
   handOptionByColumn(option)
 })
 
 const showDouble = computed(() => {
-  const isRange = paramsValue.termType ? ['nbtw', 'btw', 'in', 'nin'].includes(paramsValue.termType) : false
-  if (metricOption.value.length) {
-    metricOption.value = metricOption.value.filter(item => isRange ? item.range : !item.range)
-  } else {
-    metricOption.value = []
-  }
+  const isRange = paramsValue.termType ? arrayParamsKey.includes(paramsValue.termType) : false
   return isRange
 })
 
@@ -218,14 +216,19 @@ const columnSelect = () => {
   emit('update:value', { ...paramsValue })
 }
 
-const termsTypeSelect = () => {
+const termsTypeSelect = (e: { key: string }) => {
+  const value = arrayParamsKey.includes(e.key) ? [ undefined, undefined ] : undefined
   paramsValue.value = {
     source: tabsOptions.value[0].key,
-    value: undefined
+    value: value
   }
   emit('update:value', { ...paramsValue })
 }
 
+const valueSelect = () => {
+  emit('update:value', { ...paramsValue })
+}
+
 const termAdd = () => {
   const terms = {
     column: undefined,
@@ -237,11 +240,11 @@ const termAdd = () => {
     type: 'and',
     key: `params_${new Date().getTime()}`
   }
-  formModel.value.branches?.[props.branchName]?.then?.[props.thenName]?.actions?.[props.name].terms?.push(terms)
+  formModel.value.branches?.[props.branchName]?.then?.[props.thenName]?.actions?.[props.actionName].terms?.[props.termsName].terms?.push(terms)
 }
 
 const onDelete = () => {
-  formModel.value.branches?.[props.branchName]?.then?.[props.thenName]?.actions?.[props.name].terms?.splice(props.name, 1)
+  formModel.value.branches?.[props.branchName]?.then?.[props.thenName]?.actions?.[props.actionName].terms?.[props.termsName].terms?.splice(props.name, 1)
 }
 
 nextTick(() => {
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue b/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
index d62a5062..f7c1c7ec 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
@@ -1,11 +1,203 @@
 <template>
-
+  <div class='terms-params filter-group'>
+    <div class='terms-params-warp'>
+      <div v-if='!isFirst' class='term-type-warp'>
+        <DropdownButton
+          :options='[
+              { label: "并且", value: "and" },
+              { label: "或者", value: "or" },
+            ]'
+          type='type'
+          v-model:value='formModel.branches[branchName].then[thenName].actions[actionName].terms[name].type'
+        />
+      </div>
+      <div
+        class='terms-params-content'
+        @mouseover='mouseover'
+        @mouseout='mouseout'
+      >
+        <j-popconfirm
+          title='确认删除？'
+          @confirm='onDelete'
+        >
+          <div v-show='showDelete' class='terms-params-delete'>
+            <AIcon type='CloseOutlined' />
+          </div>
+        </j-popconfirm>
+        <j-form-item
+          v-for='(item, index) in termsOptions'
+          :key='item.key'
+          :name='["branches", branchName, "then", thenName, "actions", actionName, "terms", name, "terms", index]'
+          :rules='rules'
+        >
+          <FilterItem
+            v-model:value='formModel.branches[branchName].then[thenName].actions[actionName].terms[name].terms[index]'
+            :isFirst='index === 0'
+            :isLast='index === termsOptions.length - 1'
+            :showDeleteBtn='termsOptions.length !== 1'
+            :name='index'
+            :termsName='name'
+            :actionName='actionName'
+            :thenName='thenName'
+            :branchName='branchName'
+          />
+        </j-form-item>
+      </div>
+      <div v-if='isLast' class='terms-group-add' @click='addTerms'>
+        <div class='terms-content'>
+          <AIcon type='PlusOutlined' style='font-size: 12px;padding-right: 4px;' />
+          <span>分组</span>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup lang='ts' name='FilterGroup'>
-export default {
-  name: 'FilterGroup'
+import { storeToRefs } from 'pinia'
+import { useSceneStore } from 'store/scene'
+import DropdownButton from '../../components/DropdownButton'
+import FilterItem from './FilterCondition.vue'
+import { isArray } from 'lodash-es'
+import { provide } from 'vue'
+import { randomString } from '@/utils/utils'
+import { useParams } from '@/views/rule-engine/Scene/Save/util'
+
+const sceneStore = useSceneStore()
+const { data: formModel } = storeToRefs(sceneStore)
+
+
+
+const props = defineProps({
+  isFirst: {
+    type: Boolean,
+    default: true
+  },
+  isLast: {
+    type: Boolean,
+    default: true
+  },
+  showDeleteBtn: {
+    type: Boolean,
+    default: true
+  },
+  name: {
+    type: Number,
+    default: 0
+  },
+  branchName: {
+    type: Number,
+    default: 0
+  },
+  thenName: {
+    type: Number,
+    default: 0
+  },
+  actionName: {
+    type: Number,
+    default: 0
+  }
+})
+
+const { columnOptions } = useParams({
+  branch: props.branchName,
+  branchGroup: props.thenName,
+  action: props.actionName
+}, [
+  formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName]
+])
+
+provide('filter-params', columnOptions)
+
+const termsOptions = computed(() => {
+  return formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName].terms?.[props.name].terms
+})
+
+const showDelete = ref(false)
+
+const mouseover = () => {
+  showDelete.value = true
 }
+
+const mouseout = () => {
+  showDelete.value = false
+}
+
+const addTerms = () => {
+  const item: any = {
+    type: 'and',
+    key: randomString(),
+    terms: [
+      {
+        column: undefined,
+        value: {
+          type: 'fixed',
+          value: undefined
+        },
+        termType: undefined,
+        type: 'and',
+        key: randomString()
+      }
+    ]
+  }
+
+  formModel.value
+    .branches![props.branchName]
+    .then[props.thenName]
+    .actions[props.actionName]
+    .terms?.push(item)
+}
+
+const onDelete = () => {
+  formModel.value
+    .branches![props.branchName]
+    .then[props.thenName]
+    .actions[props.actionName]
+    .terms?.splice(props.name, 1)
+}
+
+const rules = [
+  {
+    validator(_: any, v?: Record<string, any>) {
+      console.log('-----v',v)
+      if (v !== undefined) {
+        if (!Object.keys(v).length) {
+          return Promise.reject(new Error('该数据已发生变更，请重新配置'))
+        }
+        if (!v.column) {
+          return Promise.reject(new Error('请选择参数'))
+        }
+
+        if (!v.termType) {
+          return Promise.reject(new Error('请选择操作符'))
+        }
+
+        if (v.value === undefined) {
+          return Promise.reject(new Error('请选择或输入参数值'))
+        } else {
+          if (
+            isArray(v.value.value) &&
+            v.value.value.some((_v: any) => _v === undefined)
+          ) {
+            return Promise.reject(new Error('请选择或输入参数值'))
+          } else if (v.value.value === undefined) {
+            return Promise.reject(new Error('请选择或输入参数值'))
+          }
+        }
+      } else {
+        return Promise.reject(new Error('请选择参数'))
+      }
+      return Promise.resolve()
+    }
+  }
+]
+
+// watchEffect(() => {
+//   if (formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName]) {
+//     getParams()
+//   }
+// })
+
 </script>
 
 <style scoped>
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
index 0e4d6a13..f93c8e96 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
@@ -19,14 +19,16 @@
                     v-if="data?.executor === 'alarm'"
                 >
                     <template v-if="data?.alarm?.mode === 'trigger'">
-                        满足条件后将触发<j-button style="padding: 0;"
+                        满足条件后将触发<j-button
+                            style="padding: 0"
                             type="link"
                             @click.stop="triggerVisible = true"
                             >关联此场景的告警</j-button
                         >
                     </template>
                     <template v-else>
-                        满足条件后将解除<j-button style="padding: 0;"
+                        满足条件后将解除<j-button
+                            style="padding: 0"
                             type="link"
                             @click.stop="triggerVisible = true"
                             >关联此场景的告警</j-button
@@ -278,10 +280,16 @@
                             />
                             {{ data?.options?.type }}
                             <span
-                                v-for="i in data?.options?.taglist || []"
+                                v-for="(i, _index) in data?.options?.taglist ||
+                                []"
                                 :key="i.value"
                             >
-                                {{ i.type }}
+                                {{
+                                    _index !== 0 &&
+                                    _index !==
+                                        (data?.options?.taglist || []).length &&
+                                    i.type
+                                }}
                                 {{ i.name }}为{{ i.value }}
                             </span>
                             的{{ data?.options?.productName }}
@@ -318,19 +326,33 @@
             </j-popconfirm>
         </div>
         <template v-if="!isLast && type === 'serial'">
-            <div :class='["actions-item-filter-warp", termsOptions.length ? "filter-border" : ""]'>
-              <template v-if='termsOptions.length'>
-                <div class='actions-item-filter-warp-tip'>
-                  满足此条件后执行后续动作
+            <div
+                :class="[
+                    'actions-item-filter-warp',
+                    termsOptions.length ? 'filter-border' : '',
+                ]"
+            >
+                <template v-if="termsOptions.length">
+                    <div class="actions-item-filter-warp-tip">
+                        满足此条件后执行后续动作
+                    </div>
+                    <div class="actions-item-filter-overflow">
+                        <FilterGroup
+                            v-for="(item, index) in termsOptions"
+                            :key="item.key"
+                            :branchName="branchesName"
+                            :thenName="thenName"
+                            :actionName="name"
+                            :name="index"
+                            :isLast="index === termsOptions.length - 1"
+                            :isFirst="index === 0"
+                        />
+                    </div>
+                </template>
+                <div v-else class="filter-add-button">
+                    <AIcon type="PlusOutlined" style="padding-right: 4px" />
+                    <span>添加过滤条件</span>
                 </div>
-                <div class='actions-item-filter-overflow'>
-
-                </div>
-              </template>
-              <div v-else class='filter-add-button'>
-                <AIcon type='PlusOutlined' style='padding-right: 4px;' />
-                <span>添加过滤条件</span>
-              </div>
             </div>
         </template>
         <!-- 编辑 -->
@@ -370,7 +392,8 @@ import ActionTypeComponent from '../Modal/ActionTypeComponent.vue';
 import TriggerAlarm from '../TriggerAlarm/index.vue';
 import { useSceneStore } from '@/store/scene';
 import { storeToRefs } from 'pinia';
-import { iconMap, itemNotifyIconMap, typeIconMap } from './util'
+import { iconMap, itemNotifyIconMap, typeIconMap } from './util';
+import FilterGroup from './FilterGroup.vue';
 
 const sceneStore = useSceneStore();
 const { data: _data } = storeToRefs(sceneStore);
@@ -381,8 +404,8 @@ const props = defineProps({
         default: 0,
     },
     thenName: {
-      type: Number,
-      default: 0,
+        type: Number,
+        default: 0,
     },
     name: {
         type: Number,
@@ -412,11 +435,15 @@ const triggerVisible = ref<boolean>(false);
 const actionType = ref('');
 
 const termsOptions = computed(() => {
-  if (!props.parallel) { // 串行
-    return _data.value.branches![props.branchesName].then?.[props.thenName].actions?.[props.name].terms || []
-  }
-  return []
-})
+    if (!props.parallel) {
+        // 串行
+        return (
+            _data.value.branches![props.branchesName].then?.[props.thenName]
+                .actions?.[props.name].terms || []
+        );
+    }
+    return [];
+});
 
 const onDelete = () => {
     emit('delete');
@@ -454,6 +481,14 @@ const onPropsCancel = () => {
     actionType.value = '';
 };
 
+watch(
+    () => props.data,
+    () => {
+        if (props.data) {
+        }
+    },
+    { immediate: true, deep: true },
+);
 </script>
 
 <style lang="less" scoped>
@@ -574,16 +609,16 @@ const onPropsCancel = () => {
     }
 
     .actions-item-filter-warp-tip {
-      position: absolute;
-      top: 0;
-      left: 16px;
-      z-index: 2;
-      color: rgba(0, 0, 0, 0.55);
-      font-weight: 800;
-      font-size: 14px;
-      line-height: 1;
-      background-color: #fff;
-      transform: translateY(-50%);
+        position: absolute;
+        top: 0;
+        left: 16px;
+        z-index: 2;
+        color: rgba(0, 0, 0, 0.55);
+        font-weight: 800;
+        font-size: 14px;
+        line-height: 1;
+        background-color: #fff;
+        transform: translateY(-50%);
     }
 
     .actions-item-filter-overflow {
@@ -594,11 +629,11 @@ const onPropsCancel = () => {
         row-gap: 16px;
     }
 
-    .filter-add-button{
-      width: 100%;
-      color: rgba(0, 0, 0, 0.3);
-      text-align: center;
-      cursor: pointer;
+    .filter-add-button {
+        width: 100%;
+        color: rgba(0, 0, 0, 0.3);
+        text-align: center;
+        cursor: pointer;
     }
 
     .terms-params {
@@ -615,28 +650,6 @@ const onPropsCancel = () => {
             align-items: baseline;
         }
 
-        .terms-params-content {
-            position: relative;
-            display: flex;
-            background-color: #fafafa;
-            border: unset;
-            row-gap: 16px;
-
-            .terms-params-item {
-                display: flex;
-                align-items: center;
-            }
-
-            .ant-form-item {
-                margin-bottom: 8px;
-                &:not(:first-child) {
-                    .ant-form-item-explain-error {
-                        padding-left: 80px !important;
-                    }
-                }
-            }
-        }
-
         .term-type-warp {
             // display: inline-block;
             width: 50px;
diff --git a/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue b/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue
index a1d01318..30132090 100644
--- a/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue
+++ b/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <template v-if="actionType === 'device'">
-            <Device v-bind="props" :value="data?.device" @cancel="onCancel" @save="onPropsOk" :thenName="branchesName" />
+            <Device v-bind="props" :value="data?.device" @cancel="onCancel" @save="onPropsOk" />
         </template>
         <template v-else-if="actionType === 'notify'">
             <Notify :options="data?.options" :value="data?.notify" @cancel="onCancel" @save="onPropsOk" />
@@ -24,7 +24,7 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
-    branchGroup: {
+    thenName: {
         type: Number,
         default: 0,
     },
diff --git a/src/views/rule-engine/Scene/Save/action/Modal/index.vue b/src/views/rule-engine/Scene/Save/action/Modal/index.vue
index 7671d0ec..9af550d7 100644
--- a/src/views/rule-engine/Scene/Save/action/Modal/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Modal/index.vue
@@ -47,7 +47,7 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
-    branchGroup: {
+    thenName: {
         type: Number,
         default: 0,
     },
diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
index ca1690c7..65a6b8ee 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
@@ -279,7 +279,6 @@ const onChange = (
     } else {
         _values = getObj(_source, _value, isRelation);
     }
-    console.log(_values, '_values')
     emit('update:value', _values);
     emit('change', { sendTo: _names.filter((item) => !!item).join(',') });
 };
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue
index 7565b070..c5dc0bb4 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue
@@ -2,6 +2,8 @@
   <ParamsDropdown
     v-model:value='myValue[0]'
     v-model:source='mySource'
+    :valueName='valueName'
+    :labelName='labelName'
     :options='options'
     :icon='icon'
     :placeholder='placeholder'
@@ -12,6 +14,8 @@
   <ParamsDropdown
     v-model:value='myValue[1]'
     v-model:source='mySource'
+    :valueName='valueName'
+    :labelName='labelName'
     :icon='icon'
     :placeholder='placeholder'
     :tabs-options='tabsOptions'
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
index 5488eecf..6ecfcc97 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
@@ -81,7 +81,7 @@ import ValueItem from '@/components/ValueItem/index.vue'
 import type { ValueType } from './typings'
 import { defaultSetting } from './typings'
 import { DropdownMenus, DropdownTimePicker} from '../DropdownButton'
-import { getComponent, getOption } from '../DropdownButton/util'
+import { getOption } from '../DropdownButton/util'
 
 type Emit = {
   (e: 'update:value', data: ValueType): void
@@ -109,29 +109,26 @@ nextTick(() => {
 const tabsChange = (e: string) => {
   mySource.value = e
   myValue.value = undefined
-}
-
-const updateValue = () => {
   emit('update:source', mySource.value)
-  emit('update:value', myValue.value)
+  emit('update:value', undefined)
+  emit('select', {})
 }
 
-const treeSelect = (e: any) => {
+const treeSelect = (v: any, option: any) => {
+  const node = option.node
   visible.value = false
-  label.value = e.fullname || e.name
-  emit('update:value', e[props.valueName])
-  emit('select', e)
+  label.value = node.fullname || node.name
+  emit('update:value', node[props.valueName])
+  emit('select', node)
 }
 
 const valueItemChange = (e: string) => {
-  console.log('valueItemSelect', e)
   label.value = e
   emit('update:value', e)
   emit('select', e)
 }
 
 const onSelect = (e: string, option: any) => {
-  console.log(e, option)
   visible.value = false
   label.value = option.label
   emit('update:value', e)
@@ -150,7 +147,8 @@ const visibleChange = (v: boolean) => {
 }
 
 watchEffect(() => {
-  const option = getOption(props.options, props.value as string, props.valueName) // 回显label值
+  const _options = props.source === 'upper' ? props.metricOptions : props.options
+  const option = getOption(_options, props.value as string, props.valueName) // 回显label值
   myValue.value = props.value
   mySource.value = props.source
   if (option) {
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
index 8c65f72f..cff182e7 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
@@ -149,6 +149,7 @@ const termTypeOptions = ref<Array<{ id: string, name: string}>>([]) // 条件值
 const valueOptions = ref<any[]>([]) // 默认手动输入下拉
 const metricOption = ref<any[]>([])  // 根据termType获取对应指标值
 const tabsOptions = ref<Array<TabsOption>>([{ label: '手动输入', key: 'manual', component: 'string' }])
+const arrayParamsKey = ['nbtw', 'btw', 'in', 'nin']
 let metricsCacheOption: any[] = [] // 缓存指标值
 
 const handOptionByColumn = (option: any) => {
@@ -187,7 +188,7 @@ watchEffect(() => {
 })
 
 const showDouble = computed(() => {
-  const isRange = paramsValue.termType ? ['nbtw', 'btw', 'in', 'nin'].includes(paramsValue.termType) : false
+  const isRange = paramsValue.termType ? arrayParamsKey.includes(paramsValue.termType) : false
   if (metricsCacheOption.length) {
     metricOption.value = metricsCacheOption.filter(item => isRange ? item.range : !item.range)
   } else {
@@ -217,10 +218,11 @@ const columnSelect = () => {
   emit('update:value', { ...paramsValue })
 }
 
-const termsTypeSelect = () => {
+const termsTypeSelect = (e: { key: string }) => {
+  const value = arrayParamsKey.includes(e.key) ? [ undefined, undefined ] : undefined
   paramsValue.value = {
     source: tabsOptions.value[0].key,
-    value: undefined
+    value: value
   }
   emit('update:value', { ...paramsValue })
 }
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue b/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue
index fd039682..29c65d65 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue
@@ -47,7 +47,7 @@ import { storeToRefs } from 'pinia';
 import { useSceneStore } from 'store/scene'
 import { cloneDeep } from 'lodash-es'
 import { provide } from 'vue'
-import { ContextKey } from './util'
+import { ContextKey, handleParamsData } from './util'
 import { getParseTerm } from '@/api/rule-engine/scene'
 import type { FormModelType } from '@/views/rule-engine/Scene/typings'
 import Branches from './Branchs.vue'
@@ -65,17 +65,6 @@ const change = (e: boolean) => {
   open.value = e
 }
 
-const handleParamsData = (data: any[]): any[] => {
-  return data?.map(item => {
-    return {
-      ...item,
-      key: item.column,
-      disabled: !!item.children,
-      children: handleParamsData(item.children)
-    }
-  }) || []
-}
-
 const queryColumn = (dataModel: FormModelType) => {
   const cloneDevice = cloneDeep(dataModel)
   cloneDevice.branches = cloneDevice.branches?.filter(item => !!item)
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/index.less b/src/views/rule-engine/Scene/Save/components/Terms/index.less
index 7e41ff28..ea9a009a 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/index.less
+++ b/src/views/rule-engine/Scene/Save/components/Terms/index.less
@@ -33,6 +33,19 @@
   }
 }
 
+.terms-params-delete {
+  .deleteBtn();
+
+  &.danger {
+    color: #e50012;
+    background-color: rgba(229, 0, 18, 0.1);
+  }
+
+  &.filter-terms-params-delete {
+    transform: translateY(6px);
+  }
+}
+
 .actions-terms {
   .actions-terms-warp {
     display: flex;
@@ -115,11 +128,8 @@
   .terms-params-content {
     position: relative;
     display: flex;
-    // flex-wrap: wrap;
-    padding: 8px;
-    padding-bottom: 0;
+    padding: 8px 8px 0px 8px;
     border: 1px dashed #e0e0e0;
-    //background-color: #fafafa;
     border-radius: 6px;
     row-gap: 16px;
     .terms-params-item {
@@ -162,6 +172,19 @@
       border-radius: 2px;
     }
   }
+
+
+
+  &.filter-group {
+    .terms-params-content {
+      background-color: #fafafa;
+      border: none;
+    }
+
+    .terms-params-delete {
+      transform: translateY(6px);
+    }
+  }
 }
 
 .terms-params-item {
@@ -189,15 +212,4 @@
   }
 }
 
-.terms-params-delete {
-  .deleteBtn();
 
-  &.danger {
-    color: #e50012;
-    background-color: rgba(229, 0, 18, 0.1);
-  }
-
-  &.filter-terms-params-delete {
-    transform: translateY(6px);
-  }
-}
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/util.ts b/src/views/rule-engine/Scene/Save/components/Terms/util.ts
index f00552fd..02bf9723 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/util.ts
+++ b/src/views/rule-engine/Scene/Save/components/Terms/util.ts
@@ -1 +1,12 @@
-export const ContextKey = 'columnOptions'
\ No newline at end of file
+export const ContextKey = 'columnOptions'
+
+export const handleParamsData = (data: any[], key: string = 'column'): any[] => {
+  return data?.map(item => {
+    return {
+      ...item,
+      key: item[key],
+      disabled: !!item.children,
+      children: handleParamsData(item.children, key)
+    }
+  }) || []
+}
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/util.ts b/src/views/rule-engine/Scene/Save/util.ts
new file mode 100644
index 00000000..12b702db
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/util.ts
@@ -0,0 +1,49 @@
+import { queryBuiltInParams } from '@/api/rule-engine/scene'
+import { handleParamsData } from './components/Terms/util'
+import { useSceneStore } from 'store/scene'
+import { storeToRefs } from 'pinia'
+import type { FormModelType } from '@/views/rule-engine/Scene/typings'
+
+interface Params {
+  branch: number
+  branchGroup: number
+  action: number
+}
+
+export const getParams = (params: Params, sceneModel: FormModelType): Promise<any[]> => {
+  return new Promise(res => {
+    const data = sceneModel.branches!.filter(item => !!item)
+    queryBuiltInParams({
+      ...sceneModel,
+      branches: data
+    }, params).then(resp => {
+      if (resp.success) {
+        res(resp.result as any[])
+      }
+    })
+  })
+}
+
+/**
+ * @param params
+ */
+export const useParams = (params: Params, effect: any[] = []) => {
+  const sceneStore = useSceneStore()
+  const { data: formModel } = storeToRefs(sceneStore)
+  const columnOptions = ref<any[]>([])
+
+  const handleParams = async () => {
+    const _data = await getParams(params, formModel.value)
+    columnOptions.value = handleParamsData(_data, 'id')
+  }
+
+  watchEffect(() => {
+    if (effect[0]) {
+      handleParams()
+    }
+  })
+
+  return {
+    columnOptions
+  }
+}
\ 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 7ebb7f31..b25cdc2c 100644
--- a/src/views/system/Apply/Save/components/RequestTable.vue
+++ b/src/views/system/Apply/Save/components/RequestTable.vue
@@ -2,7 +2,7 @@
     <div class="request-table-container">
         <j-table
             :columns="columns"
-            :datj-source="tableData"
+            :data-source="tableData"
             :pagination="false"
             size="small"
             bordered
diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue
index ee0f413e..5ded3be7 100644
--- a/src/views/system/Platforms/Api/components/ApiTest.vue
+++ b/src/views/system/Platforms/Api/components/ApiTest.vue
@@ -94,12 +94,13 @@
                         <AIcon type="PlusOutlined" />新增
                     </j-button>
                 </div>
-                <MonacoEditor
+                <j-monaco-editor
                     v-if="refStr"
-                    v-model:modelValue="requestBody.code"
-                    style="height: 300px; width: 100%"
-                    theme="vs"
                     ref="editorRef"
+                    language="json"
+                    style="height: 100%"
+                    theme="vs"
+                    v-model:modelValue="requestBody.code"
                 />
             </div>
         </div>
@@ -115,7 +116,6 @@
 <script setup lang="ts">
 import { JsonViewer } from 'vue3-json-viewer';
 import 'vue3-json-viewer/dist/index.css';
-import MonacoEditor from '@/components/MonacoEditor/index.vue';
 import type { apiDetailsType } from '../typing';
 import InputCard from './InputCard.vue';
 import { cloneDeep, toLower } from 'lodash';
diff --git a/src/views/system/Platforms/Api/components/HomePage.vue b/src/views/system/Platforms/Api/components/HomePage.vue
index eefcac13..df333674 100644
--- a/src/views/system/Platforms/Api/components/HomePage.vue
+++ b/src/views/system/Platforms/Api/components/HomePage.vue
@@ -98,11 +98,11 @@
                 <div>
                     <p>使用和签名相同的算法(不需要对响应结果排序)</p>
                     <div>
-                        <MonacoEditor
-                            style="width: 100%; height: 620px"
-                            theme="vs-dark"
+                        <j-monaco-editor
                             language="java"
-                            v-model="javaStr1"
+                            style="height: 370px"
+                            theme="vs-dark"
+                            v-model:modelValue="javaStr1"
                         />
                     </div>
                 </div>
@@ -119,20 +119,20 @@
             <h3>添加 SDK 依赖</h3>
             <div class="h3-text">将以下Maven依赖加入到pom.xml文件中</div>
             <div>
-                <MonacoEditor
-                    style="width: 100%; height: 100px"
-                    theme="vs-dark"
-                    v-model="javaStr2"
+                <j-monaco-editor
                     language="java"
+                    style="height: 370px"
+                    theme="vs-dark"
+                    v-model:modelValue="javaStr2"
                 />
             </div>
             <h3>SDK 客户端的初始化和请求方式</h3>
             <div>
-                <MonacoEditor
-                    style="width: 100%; height: 370px"
-                    theme="vs-dark"
-                    v-model="javaStr"
+                <j-monaco-editor
                     language="java"
+                    style="height: 370px"
+                    theme="vs-dark"
+                    v-model:modelValue="javaStr"
                 />
             </div>
         </div>
@@ -141,7 +141,6 @@
 
 <script setup lang="ts">
 import { getImage } from '@/utils/comm';
-import MonacoEditor from '@/components/MonacoEditor/index.vue';
 
 const data = [
     {
diff --git a/src/views/system/Role/Detail/components/PermissTree.vue b/src/views/system/Role/Detail/components/PermissTree.vue
index dc7875ab..7527e3f7 100644
--- a/src/views/system/Role/Detail/components/PermissTree.vue
+++ b/src/views/system/Role/Detail/components/PermissTree.vue
@@ -260,14 +260,17 @@ function menuChange(
     // 更新选中状态
     if (row.buttons && row.buttons.length > 0) setStatus(row, 'buttons');
     else setStatus(row, 'children');
+
     // 更新数据权限
-    if (row.selectAccesses !== undefined) {
-        if (!row.granted) {
+    if (row.accessSupport && row.accessSupport.value === 'support') {
+        // 如果当前数据权限已有值，且菜单权限没有被选中或被半选   则清空对应的数据权限
+        if (row.selectAccesses && !row.granted && !row.indeterminate)
             row.selectAccesses = '';
-        } else if (row.selectAccesses === '') {
+        // 如果当前数据权限没有值，且菜单权限有被选中或者是被半选   则将数据权限变为默认值'creator'
+        else if (!row.selectAccesses && (row.granted || row.indeterminate))
             row.selectAccesses = 'creator';
-        }
     }
+
     // 更新上层节点的状态
     if (row.parentId) {
         // 找到对应的父节点  判断该父节点的选中状态为 全选中/部分选中/未选中
@@ -401,3 +404,11 @@ type tableItemType = {
     assetAccesses?: any[];
 };
 </script>
+
+<style lang="less" scoped>
+.permiss-tree-container {
+    :deep(.ant-checkbox-wrapper) {
+        margin-left: 0;
+    }
+}
+</style>
diff --git a/yarn.lock b/yarn.lock
index 01226190..8d75e7bc 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.0.1", "@gar/promisify@^1.1.3":
+"@gar/promisify@^1.0.1":
   version "1.1.3"
   resolved "http://47.108.170.157:9013/@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"
   integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
@@ -708,67 +708,64 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/arborist@*", "@npmcli/arborist@^6.2.5":
-  version "6.2.5"
-  resolved "http://47.108.170.157:9013/@npmcli%2farborist/-/arborist-6.2.5.tgz#b35c6ec42feeb7b44d6a6fcd2ea323e35b256d80"
-  integrity sha512-+GPm+9WrDnl9q+LvuMB2W+roVinHTGDdYWOtYzRfpAnuiqaATFbH14skpXjlJ7LvyUcyd1oJhuGq6XXJLGFNng==
+"@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.5.0", "@npmcli/arborist@^2.9.0":
+  version "2.10.0"
+  resolved "http://47.108.170.157:9013/@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.2"
-    "@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 "http://47.108.170.157:9013/@npmcli%2fci-detect/-/ci-detect-3.0.2.tgz#facf5e48f553dd876cc9f5a749b269186ed7f7e6"
-  integrity sha512-P7nZG0skRVa9lH0OQmFG62CrzOySUiuPbKopjVAj3sXP0m1om9XfIvTp46h+NvlpTyd121JekiXFZj+1pnbm9g==
-
-"@npmcli/config@*":
-  version "6.1.3"
-  resolved "http://47.108.170.157:9013/@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 "http://47.108.170.157:9013/@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 "http://47.108.170.157:9013/@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 "http://47.108.170.157:9013/@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 "http://47.108.170.157:9013/@npmcli%2fdisparity-colors/-/disparity-colors-1.0.1.tgz#b23c864c9658f9f0318d5aa6d17986619989535c"
+  integrity sha512-kQ1aCTTU45mPXN+pdAaRxlxr3OunkyztjbbxDY/aIcPS5CnCUrx+1+NvA6pTcYR7wmLZe37+Mi5v3nfbwPxq3A==
   dependencies:
     ansi-styles "^4.3.0"
 
@@ -780,22 +777,7 @@
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/fs@^2.1.0":
-  version "2.1.2"
-  resolved "http://47.108.170.157:9013/@npmcli%2ffs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/fs@^3.1.0":
-  version "3.1.0"
-  resolved "http://47.108.170.157:9013/@npmcli%2ffs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e"
-  integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==
-  dependencies:
-    semver "^7.3.5"
-
-"@npmcli/git@^2.1.0":
+"@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"
   integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
@@ -809,22 +791,7 @@
     semver "^7.3.5"
     which "^2.0.2"
 
-"@npmcli/git@^4.0.0", "@npmcli/git@^4.0.1":
-  version "4.0.3"
-  resolved "http://47.108.170.157:9013/@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"
-    mkdirp "^1.0.4"
-    npm-pick-manifest "^8.0.0"
-    proc-log "^3.0.0"
-    promise-inflight "^1.0.1"
-    promise-retry "^2.0.1"
-    semver "^7.3.5"
-    which "^3.0.0"
-
-"@npmcli/installed-package-contents@^1.0.6":
+"@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"
   integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
@@ -832,17 +799,9 @@
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-"@npmcli/installed-package-contents@^2.0.1", "@npmcli/installed-package-contents@^2.0.2":
-  version "2.0.2"
-  resolved "http://47.108.170.157:9013/@npmcli%2finstalled-package-contents/-/installed-package-contents-2.0.2.tgz#bfd817eccd9e8df200919e73f57f9e3d9e4f9e33"
-  integrity sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==
-  dependencies:
-    npm-bundled "^3.0.0"
-    npm-normalize-package-bin "^3.0.0"
-
-"@npmcli/map-workspaces@*":
+"@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"
+  resolved "http://47.108.170.157:9013/@npmcli%2fmap-workspaces/-/map-workspaces-1.0.4.tgz#915708b55afa25e20bc2c14a766c124c2c5d4cab"
   integrity sha512-wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q==
   dependencies:
     "@npmcli/name-from-folder" "^1.0.1"
@@ -850,27 +809,16 @@
     minimatch "^3.0.4"
     read-package-json-fast "^2.0.1"
 
-"@npmcli/map-workspaces@^3.0.2":
-  version "3.0.2"
-  resolved "http://47.108.170.157:9013/@npmcli%2fmap-workspaces/-/map-workspaces-3.0.2.tgz#aa3f9ebccb213073d6d6bf743047272108c29f06"
-  integrity sha512-bCEC4PG7HbadtAYkW/TTUVNEOSr5Dhfmv6yGLgByJgCvdCqq7teq09cjvJ1LhzJU/euWjvYMcQxsfj7yDD2ikg==
+"@npmcli/metavuln-calculator@^1.1.0":
+  version "1.1.1"
+  resolved "http://47.108.170.157:9013/@npmcli%2fmetavuln-calculator/-/metavuln-calculator-1.1.1.tgz#2f95ff3c6d88b366dd70de1c3f304267c631b458"
+  integrity sha512-9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ==
   dependencies:
-    "@npmcli/name-from-folder" "^2.0.0"
-    glob "^8.0.1"
-    minimatch "^6.1.6"
-    read-package-json-fast "^3.0.0"
+    cacache "^15.0.5"
+    pacote "^11.1.11"
+    semver "^7.3.2"
 
-"@npmcli/metavuln-calculator@^5.0.0":
-  version "5.0.0"
-  resolved "http://47.108.170.157:9013/@npmcli%2fmetavuln-calculator/-/metavuln-calculator-5.0.0.tgz#917c3be49ebed0b424b07f38060b929127e4c499"
-  integrity sha512-BBFQx4M12wiEuVwCgtX/Depx0B/+NHMwDWOlXT41/Pdy5W/1Fenk+hibUlMSrFWwASbX+fY90UbILAEIYH02/A==
-  dependencies:
-    cacache "^17.0.0"
-    json-parse-even-better-errors "^3.0.0"
-    pacote "^15.0.0"
-    semver "^7.3.5"
-
-"@npmcli/move-file@^1.0.1":
+"@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"
   integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
@@ -878,48 +826,23 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "http://47.108.170.157:9013/@npmcli%2fmove-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@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"
   integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
 
-"@npmcli/name-from-folder@^2.0.0":
-  version "2.0.0"
-  resolved "http://47.108.170.157:9013/@npmcli%2fname-from-folder/-/name-from-folder-2.0.0.tgz#c44d3a7c6d5c184bb6036f4d5995eee298945815"
-  integrity sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==
-
-"@npmcli/node-gyp@^1.0.2":
+"@npmcli/node-gyp@^1.0.1", "@npmcli/node-gyp@^1.0.2":
   version "1.0.3"
   resolved "http://47.108.170.157:9013/@npmcli%2fnode-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
   integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
 
-"@npmcli/node-gyp@^3.0.0":
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/@npmcli%2fnode-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a"
-  integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==
-
-"@npmcli/package-json@*":
+"@npmcli/package-json@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.jetlinks.cn/@npmcli%2fpackage-json/-/package-json-1.0.1.tgz"
+  resolved "http://47.108.170.157:9013/@npmcli%2fpackage-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89"
   integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg==
   dependencies:
     json-parse-even-better-errors "^2.3.1"
 
-"@npmcli/package-json@^3.0.0":
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/@npmcli%2fpackage-json/-/package-json-3.0.0.tgz#c9219a197e1be8dbf43c4ef8767a72277c0533b6"
-  integrity sha512-NnuPuM97xfiCpbTEJYtEuKz6CFbpUHtaT0+5via5pQeI25omvQDFbp1GcGJ/c4zvL/WX0qbde6YiLgfZbWFgvg==
-  dependencies:
-    json-parse-even-better-errors "^3.0.0"
-
 "@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"
@@ -927,21 +850,7 @@
   dependencies:
     infer-owner "^1.0.4"
 
-"@npmcli/promise-spawn@^6.0.0", "@npmcli/promise-spawn@^6.0.1":
-  version "6.0.2"
-  resolved "http://47.108.170.157:9013/@npmcli%2fpromise-spawn/-/promise-spawn-6.0.2.tgz#c8bc4fa2bd0f01cb979d8798ba038f314cfa70f2"
-  integrity sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==
-  dependencies:
-    which "^3.0.0"
-
-"@npmcli/query@^3.0.0":
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/@npmcli%2fquery/-/query-3.0.0.tgz#51a0dfb85811e04f244171f164b6bc83b36113a7"
-  integrity sha512-MFNDSJNgsLZIEBVZ0Q9w9K7o07j5N4o4yjtdz2uEpuCZlXGMuPENiRaFYk0vRqAA64qVuUQwC05g27fRtfUgnA==
-  dependencies:
-    postcss-selector-parser "^6.0.10"
-
-"@npmcli/run-script@*", "@npmcli/run-script@^1.8.2":
+"@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"
   integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
@@ -951,17 +860,6 @@
     node-gyp "^7.1.0"
     read-package-json-fast "^2.0.1"
 
-"@npmcli/run-script@^6.0.0":
-  version "6.0.0"
-  resolved "http://47.108.170.157:9013/@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"
-
 "@rollup/pluginutils@^4.1.2", "@rollup/pluginutils@^4.2.0":
   version "4.2.1"
   resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz"
@@ -1004,11 +902,6 @@
   resolved "https://registry.jetlinks.cn/@tootallnate%2fonce/-/once-1.1.2.tgz"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "http://47.108.170.157:9013/@tootallnate%2fonce/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"
   resolved "https://registry.npmmirror.com/@tsconfig/node10/-/node10-1.0.9.tgz"
@@ -1029,13 +922,6 @@
   resolved "https://registry.npmmirror.com/@tsconfig/node16/-/node16-1.0.3.tgz"
   integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
 
-"@tufjs/models@1.0.0":
-  version "1.0.0"
-  resolved "http://47.108.170.157:9013/@tufjs%2fmodels/-/models-1.0.0.tgz#5a5784e8770b7d014b5f87bff35af1f71fdebf1f"
-  integrity sha512-RRMu4uMxWnZlxaIBxahSb2IssFZiu188sndesZflWOe1cA/qUqtemSIoBWbuVKPvvdktapImWNnKpBcc+VrCQw==
-  dependencies:
-    minimatch "^6.1.0"
-
 "@tweenjs/tween.js@^18.6.4":
   version "18.6.4"
   resolved "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-18.6.4.tgz"
@@ -1369,23 +1255,11 @@ JSONStream@^1.0.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@*, abbrev@1, 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"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-abbrev@^2.0.0:
-  version "2.0.0"
-  resolved "http://47.108.170.157:9013/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
-  integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
-
-abort-controller@^3.0.0:
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/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"
@@ -1403,7 +1277,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
+agentkeepalive@^4.1.3:
   version "4.3.0"
   resolved "http://47.108.170.157:9013/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255"
   integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==
@@ -1510,12 +1384,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 "http://47.108.170.157:9013/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
   integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==
 
-ansistyles@*:
+ansistyles@~0.1.3:
   version "0.1.3"
   resolved "http://47.108.170.157:9013/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
   integrity sha512-6QWEyvMgIXX0eO972y7YPBLSBsq7UWKFAoNNTLGaOJ9bstcEL9sCbcjf96dVfNDdUsRoGOK82vWFJlKApXds7g==
@@ -1561,27 +1435,19 @@ aproba@^1.0.3:
   resolved "https://registry.jetlinks.cn/aproba/-/aproba-2.0.0.tgz"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-archy@*:
+archy@~1.0.0:
   version "1.0.0"
   resolved "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/are-we-there-yet/-/are-we-there-yet-4.0.0.tgz#3ff397dc14f08b52dd8b2a64d3cee154ab8760d2"
-  integrity sha512-nSXlV+u3vtVjRgihdTzbfWYzxPWGo424zPgQbHD0ZqIla3jqYAewDcvee0Ua2hjS5IfTAmjGlx1Jf0PKwjZDEw==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^4.1.0"
-
 are-we-there-yet@~1.1.2:
   version "1.1.7"
   resolved "http://47.108.170.157:9013/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
@@ -1707,11 +1573,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 "http://47.108.170.157:9013/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"
@@ -1719,15 +1580,17 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bin-links@^4.0.1:
-  version "4.0.1"
-  resolved "http://47.108.170.157:9013/bin-links/-/bin-links-4.0.1.tgz#afeb0549e642f61ff889b58ea2f8dca78fb9d8d3"
-  integrity sha512-bmFEM39CyX336ZGGRsGPlc6jZHriIoHacOQcTt72MktIjpPhZoP4te2jOyUXF3BLILmJ8aNLncoPVeIIFlrDeA==
+bin-links@^2.2.1:
+  version "2.3.0"
+  resolved "http://47.108.170.157:9013/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"
@@ -1803,27 +1666,12 @@ 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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
-  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
-  dependencies:
-    semver "^7.0.0"
-
-cacache@*, cacache@^15.0.5, cacache@^15.2.0:
+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"
   integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
@@ -1847,49 +1695,6 @@ cacache@*, cacache@^15.0.5, cacache@^15.2.0:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
-cacache@^16.1.0:
-  version "16.1.3"
-  resolved "http://47.108.170.157:9013/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
-  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    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"
-
-cacache@^17.0.0, cacache@^17.0.4:
-  version "17.0.4"
-  resolved "http://47.108.170.157:9013/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"
-
 cacheable-request@^6.0.0:
   version "6.1.0"
   resolved "https://registry.npmmirror.com/cacheable-request/-/cacheable-request-6.1.0.tgz"
@@ -1969,14 +1774,6 @@ caseless@~0.12.0:
   resolved "https://registry.jetlinks.cn/caseless/-/caseless-0.12.0.tgz"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
-chalk@*, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.jetlinks.cn/chalk/-/chalk-4.1.2.tgz"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz"
@@ -2005,6 +1802,14 @@ 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.1.2:
+  version "4.1.2"
+  resolved "http://47.108.170.157:9013/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 change-case@^4.1.2:
   version "4.1.2"
   resolved "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz"
@@ -2043,7 +1848,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"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
@@ -2058,17 +1863,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 "http://47.108.170.157:9013/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
-  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
-
-cidr-regex@4.0.2:
-  version "4.0.2"
-  resolved "http://47.108.170.157:9013/cidr-regex/-/cidr-regex-4.0.2.tgz#ca8216d1761eed0bd9c4f5e8740f2d7363dd05bb"
-  integrity sha512-xvqVyyE8emYjipWVxsA+Vcsbt8TbJJsTHbOeMMA5qsmXUu5VZJzNBGwI4rr1IZ0FQI2z7bfry4NNACP5Cf67CA==
+cidr-regex@^3.1.1:
+  version "3.1.1"
+  resolved "http://47.108.170.157:9013/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"
@@ -2092,13 +1892,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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/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"
@@ -2107,7 +1907,7 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@*:
+cli-table3@^0.6.0:
   version "0.6.3"
   resolved "http://47.108.170.157:9013/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
   integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
@@ -2176,10 +1976,12 @@ clone@^1.0.2:
   resolved "https://registry.jetlinks.cn/clone/-/clone-1.0.4.tgz"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-cmd-shim@^6.0.0:
-  version "6.0.1"
-  resolved "http://47.108.170.157:9013/cmd-shim/-/cmd-shim-6.0.1.tgz#a65878080548e1dca760b3aea1e21ed05194da9d"
-  integrity sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==
+cmd-shim@^4.0.1:
+  version "4.1.0"
+  resolved "http://47.108.170.157:9013/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"
@@ -2218,7 +2020,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 "http://47.108.170.157:9013/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -2249,12 +2051,12 @@ colorpicker-v3@^2.10.2:
     "@vueuse/core" "^7.5.5"
     vue "^3.2.25"
 
-columnify@*:
-  version "1.6.0"
-  resolved "http://47.108.170.157:9013/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
-  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
+columnify@~1.5.4:
+  version "1.5.4"
+  resolved "http://47.108.170.157:9013/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:
@@ -2500,11 +2302,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 "http://47.108.170.157:9013/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-
 csstype@^2.6.8:
   version "2.6.21"
   resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz"
@@ -2631,7 +2428,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 "http://47.108.170.157:9013/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
   integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
@@ -2793,7 +2590,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.12, encoding@^0.1.13:
+encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.jetlinks.cn/encoding/-/encoding-0.1.13.tgz"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -2914,16 +2711,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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/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"
@@ -3014,7 +2801,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 "http://47.108.170.157:9013/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
   integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
@@ -3142,13 +2929,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 "http://47.108.170.157:9013/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"
@@ -3164,33 +2944,20 @@ 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 "http://47.108.170.157:9013/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "http://47.108.170.157:9013/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"
-
-gauge@^5.0.0:
-  version "5.0.0"
-  resolved "http://47.108.170.157:9013/gauge/-/gauge-5.0.0.tgz#e270ca9d97dae84abf64e5277ef1ebddc7dd1e2f"
-  integrity sha512-0s5T5eciEG7Q3ugkxAkFtaDhrrhXsCRivA5y8C9WMHWuI8UlMOJg7+Iwf7Mccii+Dfs3H5jHepU0joPVyQU0Lw==
-  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"
+    wide-align "^1.1.2"
 
 gauge@~2.7.3:
   version "2.7.4"
@@ -3282,17 +3049,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob@*:
-  version "9.2.1"
-  resolved "http://47.108.170.157:9013/glob/-/glob-9.2.1.tgz#f47e34e1119e7d4f93a546e75851ba1f1e68de50"
-  integrity sha512-Pxxgq3W0HyA3XUvSXcFhRSs+43Jsx0ddxcFrbjxNGkL2Ak5BAUBxLqI5G6ADDeCHLfzzXFhe0b1yYcctGmytMA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    minimatch "^7.4.1"
-    minipass "^4.2.4"
-    path-scurry "^1.6.1"
-
-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.npmmirror.com/glob/-/glob-7.2.3.tgz"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -3304,17 +3061,6 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.1:
-  version "8.1.0"
-  resolved "http://47.108.170.157:9013/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"
-
 global-dirs@^0.1.0, global-dirs@^0.1.1:
   version "0.1.1"
   resolved "https://registry.npmmirror.com/global-dirs/-/global-dirs-0.1.1.tgz"
@@ -3397,7 +3143,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.3, 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==
@@ -3484,19 +3230,12 @@ 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 "http://47.108.170.157:9013/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"
   integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
@@ -3526,7 +3265,7 @@ 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 "http://47.108.170.157:9013/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
@@ -3540,15 +3279,6 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "http://47.108.170.157:9013/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
-  dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.jetlinks.cn/http-signature/-/http-signature-1.2.0.tgz"
@@ -3607,11 +3337,6 @@ 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 "http://47.108.170.157:9013/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
 ignore-walk@^3.0.3:
   version "3.0.4"
   resolved "https://registry.jetlinks.cn/ignore-walk/-/ignore-walk-3.0.4.tgz"
@@ -3619,13 +3344,6 @@ ignore-walk@^3.0.3:
   dependencies:
     minimatch "^3.0.4"
 
-ignore-walk@^6.0.0:
-  version "6.0.1"
-  resolved "http://47.108.170.157:9013/ignore-walk/-/ignore-walk-6.0.1.tgz#f05e232992ebf25fef13613668fea99857e7e8cf"
-  integrity sha512-/c8MxUAqpRccq+LyDOecwF+9KqajueJHh8fz7g3YqjMZt+NSfJzx05zrKiXwa2sKwFCzaiZ5qUVfRj0pmxixEA==
-  dependencies:
-    minimatch "^6.1.6"
-
 ignore@^5.1.1:
   version "5.2.4"
   resolved "https://registry.jetlinks.cn/ignore/-/ignore-5.2.4.tgz"
@@ -3677,11 +3395,6 @@ inherits@2, inherits@^2.0.3, inherits@~2.0.3:
   resolved "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@*:
-  version "2.0.0"
-  resolved "https://registry.jetlinks.cn/ini/-/ini-2.0.0.tgz"
-  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
-
 ini@1.3.7:
   version "1.3.7"
   resolved "https://registry.npmmirror.com/ini/-/ini-1.3.7.tgz"
@@ -3692,23 +3405,23 @@ ini@^1.1.0, ini@^1.3.4, ini@~1.3.0:
   resolved "https://registry.npmmirror.com/ini/-/ini-1.3.8.tgz"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-ini@^3.0.0:
-  version "3.0.1"
-  resolved "http://47.108.170.157:9013/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
-  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
+ini@^2.0.0:
+  version "2.0.0"
+  resolved "http://47.108.170.157:9013/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-init-package-json@*:
-  version "5.0.0"
-  resolved "http://47.108.170.157:9013/init-package-json/-/init-package-json-5.0.0.tgz#030cf0ea9c84cfc1b0dc2e898b45d171393e4b40"
-  integrity sha512-kBhlSheBfYmq3e0L1ii+VKe3zBTLL5lDCDWR+f9dLmEGSB3MqLlMlsolubSsyI88Bg6EA+BIMlomAnQ1SwgQBw==
+init-package-json@^2.0.5:
+  version "2.0.5"
+  resolved "http://47.108.170.157:9013/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"
@@ -3729,10 +3442,10 @@ inquirer@^7.0.4:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-ip-regex@^5.0.0:
-  version "5.0.0"
-  resolved "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5"
+  integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
 
 ip@^2.0.0:
   version "2.0.0"
@@ -3770,14 +3483,14 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-cidr@*:
-  version "5.0.2"
-  resolved "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
   integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
@@ -3987,8 +3700,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.5:
   version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#9eeb6d847065e375468da18e7ea79b987cb1e7de"
-  integrity sha512-zrMe/4PjtWNCQtlP6kNLA7hVyQ7ftPSgivQZp8TGcpbUMOU/IYyCLQ0+VoWcqEopTSt1zEzEazodR4EjEzv7pQ==
+  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#4f136aac4cc6aa6f4c6515b9f54b70cd9f254419"
+  integrity sha512-K5U2xwhZYSmkMUsWFcqnCh4NxFM+HDfcQurmcDMQTr0/1fkG4LPqhETN0HmurLcnJAu7C4Ks1HRZJRlGqBCxAw==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"
@@ -4033,16 +3746,11 @@ 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@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.jetlinks.cn/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
-json-parse-even-better-errors@^3.0.0:
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz#2cb2ee33069a78870a0c7e3da560026b89669cf7"
-  integrity sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
@@ -4114,21 +3822,11 @@ just-diff-apply@^3.0.0:
   resolved "http://47.108.170.157:9013/just-diff-apply/-/just-diff-apply-3.1.2.tgz#710d8cda00c65dc4e692df50dbe9bac5581c2193"
   integrity sha512-TCa7ZdxCeq6q3Rgms2JCRHTCfWAETPZ8SzYUbkYF6KR3I03sN29DaOIC+xyWboIcMvjAsD5iG2u/RWzHD8XpgQ==
 
-just-diff-apply@^5.2.0:
-  version "5.5.0"
-  resolved "http://47.108.170.157:9013/just-diff-apply/-/just-diff-apply-5.5.0.tgz#771c2ca9fa69f3d2b54e7c3f5c1dfcbcc47f9f0f"
-  integrity sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==
-
 just-diff@^3.0.1:
   version "3.1.1"
   resolved "https://registry.jetlinks.cn/just-diff/-/just-diff-3.1.1.tgz"
   integrity sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ==
 
-just-diff@^5.0.1:
-  version "5.2.0"
-  resolved "http://47.108.170.157:9013/just-diff/-/just-diff-5.2.0.tgz#60dca55891cf24cd4a094e33504660692348a241"
-  integrity sha512-6ufhP9SHjb7jibNFrNxyFZ6od3g+An6Ai9mhGRvcYe8UJlH0prseN64M+6ZBBUoKYHZsitDP42gAJ8+eVWr3lw==
-
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.npmmirror.com/keyv/-/keyv-3.1.0.tgz"
@@ -4189,118 +3887,115 @@ less@^4.1.3:
     needle "^3.1.0"
     source-map "~0.6.0"
 
-libnpmaccess@*:
-  version "7.0.2"
-  resolved "http://47.108.170.157:9013/libnpmaccess/-/libnpmaccess-7.0.2.tgz#7f056c8c933dd9c8ba771fa6493556b53c5aac52"
-  integrity sha512-vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw==
+libnpmaccess@^4.0.2:
+  version "4.0.3"
+  resolved "http://47.108.170.157:9013/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.13"
-  resolved "http://47.108.170.157:9013/libnpmdiff/-/libnpmdiff-5.0.13.tgz#833712814f9e7f8fb0463660b46ab52e0d040a02"
-  integrity sha512-PFuFUZZvKwboVAZePql97O4J63Rtps1HA9XAdzSHJoaRogFbmBlxymFXASjNjKCNlqz7G9oVizM1V6+rxx+Vow==
+libnpmdiff@^2.0.4:
+  version "2.0.4"
+  resolved "http://47.108.170.157:9013/libnpmdiff/-/libnpmdiff-2.0.4.tgz#bb1687992b1a97a8ea4a32f58ad7c7f92de53b74"
+  integrity sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ==
   dependencies:
-    "@npmcli/arborist" "^6.2.5"
-    "@npmcli/disparity-colors" "^3.0.0"
-    "@npmcli/installed-package-contents" "^2.0.2"
+    "@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.13"
-  resolved "http://47.108.170.157:9013/libnpmexec/-/libnpmexec-5.0.13.tgz#3e2e1cdf48d441d6dbbd8ff46a41dde9939fe8e2"
-  integrity sha512-++Ek3+CNnFpPayUbizpacdY6QicgHzTdwwzYTO6AkPns5LWLoCilom+52+acV+TRbcLz/DPiuIIUgSRSBFFqqw==
+libnpmexec@^2.0.1:
+  version "2.0.1"
+  resolved "http://47.108.170.157:9013/libnpmexec/-/libnpmexec-2.0.1.tgz#729ae3e15a3ba225964ccf248117a75d311eeb73"
+  integrity sha512-4SqBB7eJvJWmUKNF42Q5qTOn20DRjEE4TgvEh2yneKlAiRlwlhuS9MNR45juWwmoURJlf2K43bozlVt7OZiIOw==
   dependencies:
-    "@npmcli/arborist" "^6.2.5"
-    "@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.13"
-  resolved "http://47.108.170.157:9013/libnpmfund/-/libnpmfund-4.0.13.tgz#6f1b2e24e8b3b53e463c007aa1e2280d79f02a99"
-  integrity sha512-HKU4JiAkdEGA4mnqkjo+mtZ0n1YYwdoNvfuK+2qTOyYKmgTm48EOd/GxhW11kfyDWoTUTPp3hzBSQylhXLSm6g==
+libnpmfund@^1.1.0:
+  version "1.1.0"
+  resolved "http://47.108.170.157:9013/libnpmfund/-/libnpmfund-1.1.0.tgz#ee91313905b3194b900530efa339bc3f9fc4e5c4"
+  integrity sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ==
   dependencies:
-    "@npmcli/arborist" "^6.2.5"
+    "@npmcli/arborist" "^2.5.0"
 
-libnpmhook@*:
-  version "9.0.3"
-  resolved "http://47.108.170.157:9013/libnpmhook/-/libnpmhook-9.0.3.tgz#5dbd6a146feb7e11993d36a26f750ae2347bb1d9"
-  integrity sha512-wMZe58sI7KLhg0+nUWZW5KdMfjNNcOIIbkoP19BDHYoUF9El7eeUWkGNxUGzpHkPKiGoQ1z/v6CYin4deebeuw==
+libnpmhook@^6.0.2:
+  version "6.0.3"
+  resolved "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/libnpmorg/-/libnpmorg-5.0.3.tgz#bd0a11d7a84b5f5c14689fb1e244fbb540700d63"
-  integrity sha512-QCLLB2oKCCwdiedQRcsj5eHAyYXM7vICM5f0gB9aRQzyVzx57S3anBIzhEUOhJxq6cWKtXRfkR5GsCxHEJ0CxA==
+libnpmorg@^2.0.2:
+  version "2.0.3"
+  resolved "http://47.108.170.157:9013/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.13"
-  resolved "http://47.108.170.157:9013/libnpmpack/-/libnpmpack-5.0.13.tgz#3a28d106272018f772819329b074b6aa51a4c00f"
-  integrity sha512-cqK1ZlgYEZPGzNFNqlq7trJqK/ZVcTJSc9xzG7d/HnENEYern/Mhyoh1dhtQBM2CR6fTCdgT++Sk8uV0ZhCsQQ==
+libnpmpack@^2.0.1:
+  version "2.0.1"
+  resolved "http://47.108.170.157:9013/libnpmpack/-/libnpmpack-2.0.1.tgz#d3eac25cc8612f4e7cdeed4730eee339ba51c643"
+  integrity sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ==
   dependencies:
-    "@npmcli/arborist" "^6.2.5"
-    "@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.1"
-  resolved "http://47.108.170.157:9013/libnpmpublish/-/libnpmpublish-7.1.1.tgz#68ea941b83aff0ec3c31008b3d0de1f8b509c111"
-  integrity sha512-O4DPBkqEeYO5xvMsl31jliC/Y8MFVvOAO9EspbIR8Qu9YJ4Pv4btN4r65UB804nZsd3A8TY96AnquG2ZRJxTRA==
-  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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/libnpmversion/-/libnpmversion-4.0.2.tgz#cad9cd1b287fcf9576a64edfe71491b49a65d06f"
-  integrity sha512-n1X70mFHv8Piy4yos+MFWUARSkTbyV5cdsHScaIkuwYvRAF/s2VtYScDzWB4Oe8uNEuGNdjiRR1E/Dh1tMvv6g==
+  resolved "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/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"
@@ -4524,11 +4219,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.14.1, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
-  version "7.18.3"
-  resolved "http://47.108.170.157:9013/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
-  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
-
 magic-string@^0.25.7:
   version "0.25.9"
   resolved "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz"
@@ -4570,7 +4260,7 @@ 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@^9.0.1:
+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"
   integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
@@ -4592,49 +4282,6 @@ make-fetch-happen@*, make-fetch-happen@^9.0.1:
     socks-proxy-agent "^6.0.0"
     ssri "^8.0.0"
 
-make-fetch-happen@^10.0.3:
-  version "10.2.1"
-  resolved "http://47.108.170.157:9013/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"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
-    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 "^9.0.0"
-
-make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1:
-  version "11.0.3"
-  resolved "http://47.108.170.157:9013/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz#ed83dd3685b97f75607156d2721848f6eca561b9"
-  integrity sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==
-  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"
-
 map-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/map-obj/-/map-obj-1.0.1.tgz"
@@ -4829,20 +4476,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 "http://47.108.170.157:9013/minimatch/-/minimatch-6.2.0.tgz#2b70fd13294178c69c04dfc05aebdb97a4e79e42"
-  integrity sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^7.4.1:
-  version "7.4.2"
-  resolved "http://47.108.170.157:9013/minimatch/-/minimatch-7.4.2.tgz#157e847d79ca671054253b840656720cb733f10f"
-  integrity sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==
-  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"
@@ -4875,28 +4508,6 @@ minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
   optionalDependencies:
     encoding "^0.1.12"
 
-minipass-fetch@^2.0.3:
-  version "2.1.2"
-  resolved "http://47.108.170.157:9013/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
-  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
-  dependencies:
-    minipass "^3.1.6"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
-minipass-fetch@^3.0.0:
-  version "3.0.1"
-  resolved "http://47.108.170.157:9013/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"
-
 minipass-flush@^1.0.5:
   version "1.0.5"
   resolved "https://registry.jetlinks.cn/minipass-flush/-/minipass-flush-1.0.5.tgz"
@@ -4912,7 +4523,7 @@ minipass-json-stream@^1.0.1:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
 
-minipass-pipeline@*, minipass-pipeline@^1.2.2, 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"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -4926,19 +4537,19 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@*, minipass@^4.0.0, minipass@^4.0.2, minipass@^4.2.4:
-  version "4.2.5"
-  resolved "http://47.108.170.157:9013/minipass/-/minipass-4.2.5.tgz#9e0e5256f1e3513f8c34691dd68549e85b2c8ceb"
-  integrity sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==
-
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, 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 "http://47.108.170.157:9013/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
   integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
+minipass@^4.0.0:
+  version "4.2.5"
+  resolved "http://47.108.170.157:9013/minipass/-/minipass-4.2.5.tgz#9e0e5256f1e3513f8c34691dd68549e85b2c8ceb"
+  integrity sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==
+
+minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.jetlinks.cn/minizlib/-/minizlib-2.1.2.tgz"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -4946,16 +4557,16 @@ minizlib@^2.0.0, 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"
+  resolved "http://47.108.170.157:9013/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
   integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
   dependencies:
     chownr "^2.0.0"
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
-mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.jetlinks.cn/mkdirp/-/mkdirp-1.0.4.tgz"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -5034,16 +4645,16 @@ 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"
@@ -5054,11 +4665,6 @@ mute-stream@0.0.8, mute-stream@~0.0.4:
   resolved "https://registry.jetlinks.cn/mute-stream/-/mute-stream-0.0.8.tgz"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-mute-stream@~1.0.0:
-  version "1.0.0"
-  resolved "http://47.108.170.157:9013/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"
@@ -5078,7 +4684,7 @@ needle@^3.1.0:
     iconv-lite "^0.6.3"
     sax "^1.2.4"
 
-negotiator@^0.6.2, negotiator@^0.6.3:
+negotiator@^0.6.2:
   version "0.6.3"
   resolved "http://47.108.170.157:9013/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -5091,7 +4697,7 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-gyp@*, node-gyp@^7.1.0:
+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"
   integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
@@ -5107,22 +4713,6 @@ node-gyp@*, node-gyp@^7.1.0:
     tar "^6.0.2"
     which "^2.0.2"
 
-node-gyp@^9.0.0:
-  version "9.3.1"
-  resolved "http://47.108.170.157:9013/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4"
-  integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==
-  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"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
 node-html-parser@^5.3.3:
   version "5.4.2"
   resolved "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz"
@@ -5136,27 +4726,13 @@ 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@^5.0.0:
+nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.jetlinks.cn/nopt/-/nopt-5.0.0.tgz"
   integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
   dependencies:
     abbrev "1"
 
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "http://47.108.170.157:9013/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
-nopt@^7.0.0:
-  version "7.0.0"
-  resolved "http://47.108.170.157:9013/nopt/-/nopt-7.0.0.tgz#09220f930c072109c98ef8aaf39e1d5f0ff9b0d4"
-  integrity sha512-e6Qw1rcrGoSxEH0hQ4GBSdUjkMOtXGhGFXdNT/3ZR0S37eR9DMj5za3dEDWE6o1T3/DP8ZOsPP4MIiky0c3QeA==
-  dependencies:
-    abbrev "^2.0.0"
-
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
@@ -5167,7 +4743,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==
@@ -5177,16 +4753,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 "http://47.108.170.157:9013/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"
@@ -5202,10 +4768,10 @@ 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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5"
+  integrity sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==
   dependencies:
     chalk "^4.0.0"
 
@@ -5216,56 +4782,18 @@ npm-bundled@^1.1.1:
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
-npm-bundled@^3.0.0:
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/npm-bundled/-/npm-bundled-3.0.0.tgz#7e8e2f8bb26b794265028491be60321a25a39db7"
-  integrity sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==
-  dependencies:
-    npm-normalize-package-bin "^3.0.0"
-
-npm-install-checks@*, npm-install-checks@^4.0.0:
+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"
   integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
   dependencies:
     semver "^7.1.1"
 
-npm-install-checks@^6.0.0:
-  version "6.0.0"
-  resolved "http://47.108.170.157:9013/npm-install-checks/-/npm-install-checks-6.0.0.tgz#9a021d8e8b3956d61fd265c2eda4735bcd3d9b83"
-  integrity sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==
-  dependencies:
-    semver "^7.1.1"
-
-npm-normalize-package-bin@^1.0.1:
+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"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-normalize-package-bin@^3.0.0:
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/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@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.2:
-  version "8.1.5"
-  resolved "https://registry.jetlinks.cn/npm-package-arg/-/npm-package-arg-8.1.5.tgz"
-  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
-  dependencies:
-    hosted-git-info "^4.0.1"
-    semver "^7.3.4"
-    validate-npm-package-name "^3.0.0"
-
-npm-package-arg@^10.0.0, npm-package-arg@^10.1.0:
-  version "10.1.0"
-  resolved "http://47.108.170.157:9013/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-package-arg@^6.0.0:
   version "6.1.1"
   resolved "https://registry.npmmirror.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz"
@@ -5276,6 +4804,15 @@ npm-package-arg@^6.0.0:
     semver "^5.6.0"
     validate-npm-package-name "^3.0.0"
 
+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"
+  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    semver "^7.3.4"
+    validate-npm-package-name "^3.0.0"
+
 npm-packlist@^2.1.4:
   version "2.2.2"
   resolved "https://registry.jetlinks.cn/npm-packlist/-/npm-packlist-2.2.2.tgz"
@@ -5286,14 +4823,7 @@ npm-packlist@^2.1.4:
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-npm-packlist@^7.0.0:
-  version "7.0.4"
-  resolved "http://47.108.170.157:9013/npm-packlist/-/npm-packlist-7.0.4.tgz#033bf74110eb74daf2910dc75144411999c5ff32"
-  integrity sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==
-  dependencies:
-    ignore-walk "^6.0.0"
-
-npm-pick-manifest@*, npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
+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"
   integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
@@ -5303,25 +4833,14 @@ npm-pick-manifest@*, npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
     npm-package-arg "^8.1.2"
     semver "^7.3.4"
 
-npm-pick-manifest@^8.0.0, npm-pick-manifest@^8.0.1:
-  version "8.0.1"
-  resolved "http://47.108.170.157:9013/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz#c6acd97d1ad4c5dbb80eac7b386b03ffeb289e5f"
-  integrity sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==
+npm-profile@^5.0.3:
+  version "5.0.4"
+  resolved "http://47.108.170.157:9013/npm-profile/-/npm-profile-5.0.4.tgz#73e5bd1d808edc2c382d7139049cc367ac43161b"
+  integrity sha512-OKtU7yoAEBOnc8zJ+/uo5E4ugPp09sopo+6y1njPp+W99P8DvQon3BJYmpvyK2Bf1+3YV5LN1bvgXRoZ1LUJBA==
   dependencies:
-    npm-install-checks "^6.0.0"
-    npm-normalize-package-bin "^3.0.0"
-    npm-package-arg "^10.0.0"
-    semver "^7.3.5"
+    npm-registry-fetch "^11.0.0"
 
-npm-profile@*:
-  version "7.0.1"
-  resolved "http://47.108.170.157:9013/npm-profile/-/npm-profile-7.0.1.tgz#a37dae08b22e662ece2c6e08946f9fcd9fdef663"
-  integrity sha512-VReArOY/fCx5dWL66cbJ2OMogTQAVVQA//8jjmjkarboki3V7UJ0XbGFW+khRwiAJFQjuH0Bqr/yF7Y5RZdkMQ==
-  dependencies:
-    npm-registry-fetch "^14.0.0"
-    proc-log "^3.0.0"
-
-npm-registry-fetch@*, 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"
   integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
@@ -5333,19 +4852,6 @@ npm-registry-fetch@*, npm-registry-fetch@^11.0.0:
     minizlib "^2.0.0"
     npm-package-arg "^8.0.0"
 
-npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3:
-  version "14.0.3"
-  resolved "http://47.108.170.157:9013/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz#8545e321c2b36d2c6fe6e009e77e9f0e527f547b"
-  integrity sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==
-  dependencies:
-    make-fetch-happen "^11.0.0"
-    minipass "^4.0.0"
-    minipass-fetch "^3.0.0"
-    minipass-json-stream "^1.0.1"
-    minizlib "^2.1.2"
-    npm-package-arg "^10.0.0"
-    proc-log "^3.0.0"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-2.0.2.tgz"
@@ -5367,10 +4873,10 @@ npm-run-path@^5.1.0:
   dependencies:
     path-key "^4.0.0"
 
-npm-user-validate@*:
-  version "2.0.0"
-  resolved "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/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"
@@ -5448,16 +4954,6 @@ npm@<8.0.0:
     which "^2.0.2"
     write-file-atomic "^3.0.3"
 
-npmlog@*, npmlog@^7.0.1:
-  version "7.0.1"
-  resolved "http://47.108.170.157:9013/npmlog/-/npmlog-7.0.1.tgz#7372151a01ccb095c47d8bf1d0771a4ff1f53ac8"
-  integrity sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==
-  dependencies:
-    are-we-there-yet "^4.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^5.0.0"
-    set-blocking "^2.0.0"
-
 npmlog@^4.1.2:
   version "4.1.2"
   resolved "http://47.108.170.157:9013/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -5468,14 +4964,14 @@ npmlog@^4.1.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-npmlog@^6.0.0:
-  version "6.0.2"
-  resolved "http://47.108.170.157:9013/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+npmlog@^5.0.1:
+  version "5.0.1"
+  resolved "http://47.108.170.157:9013/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:
@@ -5510,7 +5006,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.jetlinks.cn/oauth-sign/-/oauth-sign-0.9.0.tgz"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.1.0:
+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"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
@@ -5555,7 +5051,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 "http://47.108.170.157:9013/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
@@ -5655,9 +5151,9 @@ package-json@^6.3.0:
     registry-url "^5.0.0"
     semver "^6.2.0"
 
-pacote@*:
+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"
+  resolved "http://47.108.170.157:9013/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
   integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
   dependencies:
     "@npmcli/git" "^2.1.0"
@@ -5680,30 +5176,6 @@ pacote@*:
     ssri "^8.0.1"
     tar "^6.1.0"
 
-pacote@^15.0.0, pacote@^15.0.8:
-  version "15.1.1"
-  resolved "http://47.108.170.157:9013/pacote/-/pacote-15.1.1.tgz#94d8c6e0605e04d427610b3aacb0357073978348"
-  integrity sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ==
-  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"
-    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"
-
 param-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz"
@@ -5719,24 +5191,15 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-conflict-json@*:
+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"
+  resolved "http://47.108.170.157:9013/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz#54ec175bde0f2d70abf6be79e0e042290b86701b"
   integrity sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw==
   dependencies:
     json-parse-even-better-errors "^2.3.0"
     just-diff "^3.0.1"
     just-diff-apply "^3.0.0"
 
-parse-conflict-json@^3.0.0:
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/parse-conflict-json/-/parse-conflict-json-3.0.0.tgz#eb266cbeeb66e73c3e92806da4d4ace3b798acff"
-  integrity sha512-ipcKLCmZbAj7n+h9qQREvdvsBUMPetGk9mM4ljCvs5inZznAlkHPk5XPc7ROtknUKw7kO6Jnz10Y3Eec7tky/A==
-  dependencies:
-    json-parse-even-better-errors "^3.0.0"
-    just-diff "^5.0.1"
-    just-diff-apply "^5.2.0"
-
 parse-git-config@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmmirror.com/parse-git-config/-/parse-git-config-1.1.1.tgz"
@@ -5828,14 +5291,6 @@ path-parse@^1.0.7:
   resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-scurry@^1.6.1:
-  version "1.6.1"
-  resolved "http://47.108.170.157:9013/path-scurry/-/path-scurry-1.6.1.tgz#dab45f7bb1d3f45a0e271ab258999f4ab7e23132"
-  integrity sha512-OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA==
-  dependencies:
-    lru-cache "^7.14.1"
-    minipass "^4.0.2"
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz"
@@ -5898,14 +5353,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 "http://47.108.170.157:9013/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"
@@ -5935,10 +5382,10 @@ 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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/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"
@@ -5973,12 +5420,12 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-promzard@^1.0.0:
-  version "1.0.0"
-  resolved "http://47.108.170.157:9013/promzard/-/promzard-1.0.0.tgz#3246f8e6c9895a77c0549cefb65828ac0f6c006b"
-  integrity sha512-KQVDEubSUHGSt5xLakaToDFrSoZhStB8dXLzk2xvwR67gJktrHFvpR63oZgHyK19WKbHFLXJqCPXdVR3aBP8Ig==
+promzard@^0.3.0:
+  version "0.3.0"
+  resolved "http://47.108.170.157:9013/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"
@@ -6032,7 +5479,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 "http://47.108.170.157:9013/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
   integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
@@ -6062,12 +5509,12 @@ 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 "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
+  integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
 
-read-package-json-fast@*, read-package-json-fast@^2.0.1:
+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"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
@@ -6075,23 +5522,15 @@ read-package-json-fast@*, read-package-json-fast@^2.0.1:
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json-fast@^3.0.0, read-package-json-fast@^3.0.2:
-  version "3.0.2"
-  resolved "http://47.108.170.157:9013/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049"
-  integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
+read-package-json@^4.1.1:
+  version "4.1.2"
+  resolved "http://47.108.170.157:9013/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703"
+  integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==
   dependencies:
-    json-parse-even-better-errors "^3.0.0"
-    npm-normalize-package-bin "^3.0.0"
-
-read-package-json@*, read-package-json@^6.0.0:
-  version "6.0.0"
-  resolved "http://47.108.170.157:9013/read-package-json/-/read-package-json-6.0.0.tgz#6a741841ad72a40e77a82b9c3c8c10e865bbc519"
-  integrity sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==
-  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"
@@ -6112,20 +5551,13 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-read@*:
+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"
+  resolved "http://47.108.170.157:9013/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
     mute-stream "~0.0.4"
 
-read@^2.0.0:
-  version "2.0.0"
-  resolved "http://47.108.170.157:9013/read/-/read-2.0.0.tgz#1d469a7321088e53b86ca77bf60a609e02f4eed8"
-  integrity sha512-88JMmpeeRYzW9gvIpYyXlYadWanW4vB2CYtDDVBfbRpbSogUNjTWEBXxJXMIVFSLjWVdCcdcIjI3+VV3Z2e9mw==
-  dependencies:
-    mute-stream "~1.0.0"
-
 readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.jetlinks.cn/readable-stream/-/readable-stream-3.6.0.tgz"
@@ -6148,19 +5580,9 @@ readable-stream@^2.0.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^4.1.0:
-  version "4.3.0"
-  resolved "http://47.108.170.157:9013/readable-stream/-/readable-stream-4.3.0.tgz#0914d0c72db03b316c9733bb3461d64a3cc50cba"
-  integrity sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ==
-  dependencies:
-    abort-controller "^3.0.0"
-    buffer "^6.0.3"
-    events "^3.3.0"
-    process "^0.11.10"
-
-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"
+  resolved "http://47.108.170.157:9013/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
   dependencies:
     debuglog "^1.0.1"
@@ -6343,13 +5765,6 @@ rfdc@^1.3.0:
   resolved "https://registry.npmmirror.com/rfdc/-/rfdc-1.3.0.tgz"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
-rimraf@*, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.jetlinks.cn/rimraf/-/rimraf-3.0.2.tgz"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^2.6.2:
   version "2.7.1"
   resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
@@ -6357,6 +5772,13 @@ rimraf@^2.6.2:
   dependencies:
     glob "^7.1.3"
 
+rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.jetlinks.cn/rimraf/-/rimraf-3.0.2.tgz"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 rollup-plugin-copy@^3.4.0:
   version "3.4.0"
   resolved "https://registry.jetlinks.cn/rollup-plugin-copy/-/rollup-plugin-copy-3.4.0.tgz"
@@ -6457,18 +5879,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.2, 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.npmmirror.com/semver/-/semver-7.3.8.tgz"
   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"
@@ -6527,14 +5949,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 "http://47.108.170.157:9013/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"
@@ -6602,15 +6016,6 @@ socks-proxy-agent@^6.0.0:
     debug "^4.3.3"
     socks "^2.6.2"
 
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "http://47.108.170.157:9013/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
 socks@^2.6.2:
   version "2.7.1"
   resolved "http://47.108.170.157:9013/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
@@ -6695,27 +6100,13 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@*, ssri@^8.0.0, ssri@^8.0.1:
+ssri@^8.0.0, ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.jetlinks.cn/ssri/-/ssri-8.0.1.tgz"
   integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
   dependencies:
     minipass "^3.1.1"
 
-ssri@^10.0.0, ssri@^10.0.1:
-  version "10.0.1"
-  resolved "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
-
 string-argv@^0.3.1:
   version "0.3.1"
   resolved "https://registry.npmmirror.com/string-argv/-/string-argv-0.3.1.tgz"
@@ -6779,6 +6170,11 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-package@^1.0.1:
+  version "1.0.1"
+  resolved "http://47.108.170.157:9013/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"
@@ -6882,7 +6278,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.0.2, tar@^6.1.0, 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 "http://47.108.170.157:9013/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
   integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
@@ -6921,7 +6317,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 "http://47.108.170.157:9013/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
@@ -6953,7 +6349,7 @@ tiny-emitter@^2.0.0:
   resolved "https://registry.jetlinks.cn/tiny-emitter/-/tiny-emitter-2.1.0.tgz"
   integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
 
-tiny-relative-date@*:
+tiny-relative-date@^1.3.0:
   version "1.3.0"
   resolved "http://47.108.170.157:9013/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
@@ -6990,16 +6386,11 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-treeverse@*:
+treeverse@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.jetlinks.cn/treeverse/-/treeverse-1.0.4.tgz"
+  resolved "http://47.108.170.157:9013/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
   integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
 
-treeverse@^3.0.0:
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/treeverse/-/treeverse-3.0.0.tgz#dd82de9eb602115c6ebd77a574aae67003cb48c8"
-  integrity sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==
-
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmmirror.com/trim-newlines/-/trim-newlines-3.0.1.tgz"
@@ -7039,14 +6430,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.1.1"
-  resolved "http://47.108.170.157:9013/tuf-js/-/tuf-js-1.1.1.tgz#54d3aef2b57a19100789cb72e6295b0fbe583935"
-  integrity sha512-WTp382/PR96k0dI4GD5RdiRhgOU0rAC7+lnoih/5pZg3cyb3aNMqDozleEEWwyfT3+FOg7Qz9JU3n6A44tLSHw==
-  dependencies:
-    "@tufjs/models" "1.0.0"
-    make-fetch-happen "^11.0.1"
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.jetlinks.cn/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
@@ -7125,20 +6508,6 @@ unique-filename@^1.1.1:
   dependencies:
     unique-slug "^2.0.0"
 
-unique-filename@^2.0.0:
-  version "2.0.1"
-  resolved "http://47.108.170.157:9013/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
-  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
-  dependencies:
-    unique-slug "^3.0.0"
-
-unique-filename@^3.0.0:
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
-  integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
-  dependencies:
-    unique-slug "^4.0.0"
-
 unique-random-array@1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/unique-random-array/-/unique-random-array-1.0.0.tgz"
@@ -7158,20 +6527,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-slug@^3.0.0:
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/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 "http://47.108.170.157:9013/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
-  integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 unique-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/unique-string/-/unique-string-1.0.0.tgz"
@@ -7338,7 +6693,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, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.jetlinks.cn/util-deprecate/-/util-deprecate-1.0.2.tgz"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
@@ -7366,20 +6721,13 @@ 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@^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==
   dependencies:
     builtins "^1.0.3"
 
-validate-npm-package-name@^5.0.0:
-  version "5.0.0"
-  resolved "http://47.108.170.157:9013/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz#f16afd48318e6f90a1ec101377fa0384cfc8c713"
-  integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==
-  dependencies:
-    builtins "^5.0.0"
-
 vanilla-jsoneditor@^0.7.9:
   version "0.7.11"
   resolved "https://registry.npmjs.org/vanilla-jsoneditor/-/vanilla-jsoneditor-0.7.11.tgz"
@@ -7578,13 +6926,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@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmmirror.com/which/-/which-2.0.2.tgz"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  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"
@@ -7592,14 +6933,14 @@ which@^1.2.9, which@^1.3.0:
   dependencies:
     isexe "^2.0.0"
 
-which@^3.0.0:
-  version "3.0.0"
-  resolved "http://47.108.170.157:9013/which/-/which-3.0.0.tgz#a9efd016db59728758a390d23f1687b6e8f59f8e"
-  integrity sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/which/-/which-2.0.2.tgz"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0, wide-align@^1.1.5:
+wide-align@^1.1.0, wide-align@^1.1.2:
   version "1.1.5"
   resolved "http://47.108.170.157:9013/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -7652,16 +6993,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@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.jetlinks.cn/write-file-atomic/-/write-file-atomic-3.0.3.tgz"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
 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"
@@ -7671,13 +7002,15 @@ write-file-atomic@^2.0.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@^5.0.0:
-  version "5.0.0"
-  resolved "http://47.108.170.157:9013/write-file-atomic/-/write-file-atomic-5.0.0.tgz#54303f117e109bf3d540261125c8ea5a7320fab0"
-  integrity sha512-R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w==
+write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
+  version "3.0.3"
+  resolved "http://47.108.170.157:9013/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"
-    signal-exit "^3.0.7"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
 
 xdg-basedir@^3.0.0:
   version "3.0.0"