From 2b57d81eb99f1a8e094e03a2d1baee0a6595b5f7 Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Thu, 30 Nov 2023 17:09:50 +0800
Subject: [PATCH] fix: bug#20731
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修改lodash依赖包

* fix: bug#20731
---
 src/views/DataCollect/Channel/index.vue                        | 2 +-
 .../Collector/Point/components/BatchUpdate/index.vue           | 2 +-
 src/views/DataCollect/Collector/Tree/index.vue                 | 2 +-
 src/views/Northbound/AliCloud/Detail/index.vue                 | 2 +-
 src/views/Northbound/DuerOS/Detail/index.vue                   | 2 +-
 src/views/device/Firmware/index.vue                            | 2 +-
 src/views/device/Instance/Detail/Diagnose/Message/index.vue    | 2 +-
 src/views/device/Instance/Detail/Info/components/Tags/Save.vue | 2 +-
 src/views/device/Instance/Detail/Parsing/index.vue             | 2 +-
 src/views/device/Instance/Detail/Running/index.vue             | 2 +-
 src/views/device/Product/Detail/DataAnalysis/index.vue         | 2 +-
 src/views/device/Product/Detail/DeviceAccess/index.vue         | 2 +-
 src/views/device/Product/index.vue                             | 3 +--
 src/views/device/components/Metadata/Base/Base.vue             | 3 +--
 src/views/device/components/Metadata/Base/Edit/BaseForm.vue    | 2 +-
 src/views/device/components/Metadata/Base/Edit/index.vue       | 2 +-
 .../Metadata/Base/components/Properties/Metrics/ValueItem.vue  | 2 +-
 .../Metadata/Base/components/Properties/OtherSetting.vue       | 3 +--
 src/views/device/components/Metadata/Cat/index.vue             | 3 +--
 src/views/iframe/index.vue                                     | 2 +-
 src/views/link/Protocol/index.vue                              | 2 +-
 src/views/media/Device/Channel/Tree/index.vue                  | 2 +-
 .../rule-engine/Scene/Save/action/Device/device/index.vue      | 2 +-
 .../Scene/Save/components/DropdownButton/DropdownButton.vue    | 2 +-
 .../rule-engine/Scene/Save/components/Terms/ParamsItem.vue     | 3 +--
 src/views/system/Apply/Save/components/EditForm.vue            | 2 +-
 src/views/system/DataSource/Management/index.vue               | 3 +--
 src/views/system/Menu/Setting/index.vue                        | 2 +-
 src/views/system/Platforms/Api/components/ApiTest.vue          | 2 +-
 29 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/src/views/DataCollect/Channel/index.vue b/src/views/DataCollect/Channel/index.vue
index 2b857813..0ec2378e 100644
--- a/src/views/DataCollect/Channel/index.vue
+++ b/src/views/DataCollect/Channel/index.vue
@@ -149,7 +149,7 @@ import { StatusColorEnum, updateStatus } from './data';
 import { useMenuStore } from 'store/menu';
 import Save from './Save/index.vue';
 import { protocolList } from '@/utils/consts';
-import _ from 'lodash';
+import _ from 'lodash-es';
 
 const menuStory = useMenuStore();
 const tableRef = ref<Record<string, any>>({});
diff --git a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
index 5864a71b..70066ea3 100644
--- a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
+++ b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
@@ -87,7 +87,7 @@
 <script lang="ts" setup>
 import type { FormInstance } from 'ant-design-vue';
 import { savePointBatch } from '@/api/data-collect/collector';
-import { cloneDeep, isObject } from 'lodash';
+import { cloneDeep, isObject } from 'lodash-es';
 import { regOnlyNumber } from '../../../data';
 
 const props = defineProps({
diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index c149c653..f60c5d94 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -148,7 +148,7 @@ import {
 } from '@/api/data-collect/collector';
 import Save from './Save/index.vue';
 import { onlyMessage } from '@/utils/comm';
-import _ from 'lodash';
+import _ from 'lodash-es';
 import { colorMap } from '../data.ts';
 
 const props = defineProps({
diff --git a/src/views/Northbound/AliCloud/Detail/index.vue b/src/views/Northbound/AliCloud/Detail/index.vue
index 00304fa1..03c59189 100644
--- a/src/views/Northbound/AliCloud/Detail/index.vue
+++ b/src/views/Northbound/AliCloud/Detail/index.vue
@@ -481,7 +481,7 @@ import {
     getAliyunProductsList,
     queryProductList,
 } from '@/api/northbound/alicloud';
-import _ from 'lodash';
+import _ from 'lodash-es';
 import { onlyMessage } from '@/utils/comm';
 import MSelect from '../../components/MSelect/index.vue';
 import { _deploy } from '@/api/device/product';
diff --git a/src/views/Northbound/DuerOS/Detail/index.vue b/src/views/Northbound/DuerOS/Detail/index.vue
index e2102f3f..8da55d93 100644
--- a/src/views/Northbound/DuerOS/Detail/index.vue
+++ b/src/views/Northbound/DuerOS/Detail/index.vue
@@ -546,7 +546,7 @@ import {
     savePatch,
     detail,
 } from '@/api/northbound/dueros';
-import _, { cloneDeep } from 'lodash';
+import _, { cloneDeep } from 'lodash-es';
 import { useMenuStore } from '@/store/menu';
 import { onlyMessage } from '@/utils/comm';
 import MSelect from '../../components/MSelect/index.vue';
diff --git a/src/views/device/Firmware/index.vue b/src/views/device/Firmware/index.vue
index 1f283482..ffb58577 100644
--- a/src/views/device/Firmware/index.vue
+++ b/src/views/device/Firmware/index.vue
@@ -74,7 +74,7 @@
 import type { ActionsType } from '@/components/Table/index';
 import { query, queryProduct, remove } from '@/api/device/firmware';
 import dayjs from 'dayjs';
-import _ from 'lodash';
+import _ from 'lodash-es';
 import Save from './Save/index.vue';
 import { useMenuStore } from 'store/menu';
 import type { FormDataType } from './type';
diff --git a/src/views/device/Instance/Detail/Diagnose/Message/index.vue b/src/views/device/Instance/Detail/Diagnose/Message/index.vue
index f61517a3..288cb72f 100644
--- a/src/views/device/Instance/Detail/Diagnose/Message/index.vue
+++ b/src/views/device/Instance/Detail/Diagnose/Message/index.vue
@@ -57,7 +57,7 @@ import { map } from 'rxjs/operators';
 import { useInstanceStore } from '@/store/instance';
 import { getWebSocket } from '@/utils/websocket';
 import { randomString } from '@/utils/utils';
-import _ from 'lodash';
+import _ from 'lodash-es';
 
 const message = reactive<MessageType>({
     up: {
diff --git a/src/views/device/Instance/Detail/Info/components/Tags/Save.vue b/src/views/device/Instance/Detail/Info/components/Tags/Save.vue
index 0b90ec85..e0ad45a6 100644
--- a/src/views/device/Instance/Detail/Info/components/Tags/Save.vue
+++ b/src/views/device/Instance/Detail/Info/components/Tags/Save.vue
@@ -49,7 +49,7 @@
 
 <script lang="ts" setup>
 import { useInstanceStore } from '@/store/instance';
-import _ from 'lodash';
+import _ from 'lodash-es';
 import { saveTags, delTags } from '@/api/device/instance'
 import { onlyMessage } from '@/utils/comm';
 
diff --git a/src/views/device/Instance/Detail/Parsing/index.vue b/src/views/device/Instance/Detail/Parsing/index.vue
index d70bd7e4..a629144c 100644
--- a/src/views/device/Instance/Detail/Parsing/index.vue
+++ b/src/views/device/Instance/Detail/Parsing/index.vue
@@ -160,7 +160,7 @@ import {
   delDeviceCode, queryCodeTips, queryProductCodeTips,
 } from '@/api/device/instance';
 import { message } from 'jetlinks-ui-components';
-import { isBoolean } from 'lodash';
+import { isBoolean } from 'lodash-es';
 import { onlyMessage } from '@/utils/comm';
 
 const defaultValue =
diff --git a/src/views/device/Instance/Detail/Running/index.vue b/src/views/device/Instance/Detail/Running/index.vue
index afd0186c..3ff066df 100644
--- a/src/views/device/Instance/Detail/Running/index.vue
+++ b/src/views/device/Instance/Detail/Running/index.vue
@@ -30,7 +30,7 @@
 
 <script lang="ts" setup>
 import { useInstanceStore } from '@/store/instance';
-import _ from 'lodash';
+import _ from 'lodash-es';
 import Event from './Event/index.vue';
 import Property from './Property/index.vue';
 
diff --git a/src/views/device/Product/Detail/DataAnalysis/index.vue b/src/views/device/Product/Detail/DataAnalysis/index.vue
index 1d117db8..25f4f2d2 100644
--- a/src/views/device/Product/Detail/DataAnalysis/index.vue
+++ b/src/views/device/Product/Detail/DataAnalysis/index.vue
@@ -119,7 +119,7 @@ import {
   testCode,
   saveProductCode, queryProductCodeTips,
 } from '@/api/device/instance';
-import { isBoolean } from 'lodash';
+import { isBoolean } from 'lodash-es';
 import { onlyMessage } from '@/utils/comm';
 
 const defaultValue =
diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue
index f4916bb9..ed24de15 100644
--- a/src/views/device/Product/Detail/DeviceAccess/index.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/index.vue
@@ -300,7 +300,7 @@ import 'driver.js/dist/driver.min.css';
 import { marked } from 'marked';
 import type { TableColumnType } from 'ant-design-vue';
 import { useMenuStore } from '@/store/menu';
-import _ from 'lodash';
+import _ from 'lodash-es';
 import { accessConfigTypeFilter } from '@/utils/setting';
 import AccessModal from './accessModal.vue'
 import MetaDataModal from './metadataModal.vue'
diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index f3753bbd..5d255d8f 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -190,14 +190,13 @@ import {
     updateDevice,
 } from '@/api/device/product';
 import { isNoCommunity, downloadObject } from '@/utils/utils';
-import { omit } from 'lodash-es';
+import { omit , cloneDeep } from 'lodash-es';
 import { typeOptions } from '@/components/Search/util';
 import Save from './Save/index.vue';
 import { useMenuStore } from 'store/menu';
 import { useRoute } from 'vue-router';
 import { useRouterParams } from '@/utils/hooks/useParams';
 import { accessConfigTypeFilter } from '@/utils/setting';
-import {cloneDeep} from "lodash";
 /**
  * 表格数据
  */
diff --git a/src/views/device/components/Metadata/Base/Base.vue b/src/views/device/components/Metadata/Base/Base.vue
index a3fbc31c..60f4775f 100644
--- a/src/views/device/components/Metadata/Base/Base.vue
+++ b/src/views/device/components/Metadata/Base/Base.vue
@@ -269,12 +269,11 @@ import { asyncUpdateMetadata, updateMetadata } from '../metadata';
 import { useMetadataStore } from '@/store/metadata';
 import { DeviceInstance } from '@/views/device/Instance/typings';
 import { onlyMessage , LocalStore} from '@/utils/comm';
-import {omit} from "lodash-es";
+import { omit , cloneDeep} from "lodash-es";
 import { PropertiesModal, FunctionModal, EventModal, TagsModal } from './DetailModal'
 import { Modal } from 'jetlinks-ui-components'
 import {EventEmitter} from "@/utils/utils";
 import {computed, watch} from "vue";
-import {cloneDeep} from "lodash";
 import {useSystem} from "store/system";
 import {storeToRefs} from "pinia";
 import { FULL_CODE } from 'jetlinks-ui-components/es/DataTable'
diff --git a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
index c1776126..2777adc9 100644
--- a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
@@ -71,7 +71,7 @@ import { EventLevel, ExpandsTypeList } from '@/views/device/data';
 import { useMetadataStore } from '@/store/metadata';
 import { validateJson } from './validator';
 import { Rule } from 'ant-design-vue/es/form';
-import { debounce } from 'lodash';
+import { debounce } from 'lodash-es';
 
 const props = defineProps({
   type: {
diff --git a/src/views/device/components/Metadata/Base/Edit/index.vue b/src/views/device/components/Metadata/Base/Edit/index.vue
index 3a70a2ed..1bf5c3dc 100644
--- a/src/views/device/components/Metadata/Base/Edit/index.vue
+++ b/src/views/device/components/Metadata/Base/Edit/index.vue
@@ -21,7 +21,7 @@ import { DeviceInstance } from '@/views/device/Instance/typings';
 import BaseForm from './BaseForm.vue';
 import { PropType } from 'vue';
 import { _deploy } from '@/api/device/product';
-import { cloneDeep } from 'lodash';
+import { cloneDeep } from 'lodash-es';
 import { onlyMessage } from '@/utils/comm';
 
 const props = defineProps({
diff --git a/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue b/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
index f587bcb2..9d247f56 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
@@ -41,7 +41,7 @@ import { reactive } from 'vue';
 import type { PropType } from 'vue';
 import Item from './item.vue'
 import {Form} from "jetlinks-ui-components";
-import {cloneDeep} from "lodash";
+import { cloneDeep } from "lodash-es";
 import { FULL_CODE } from 'jetlinks-ui-components/es/DataTable'
 import dayjs from "dayjs";
 
diff --git a/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue b/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue
index 36a95a79..434b30aa 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue
@@ -68,12 +68,11 @@
 <script setup lang="ts" name="OtherSetting">
 import Metrics from './Metrics/Metrics.vue'
 import {watch} from "vue";
-import {cloneDeep} from "lodash";
 import {useProductStore} from "store/product";
 import {useInstanceStore} from "store/instance";
 import {getMetadataConfig, getMetadataDeviceConfig} from "@/api/device/product";
 import ModelButton from '@/views/device/components/Metadata/Base/components/ModelButton.vue'
-import {omit} from "lodash-es";
+import { omit , cloneDeep} from "lodash-es";
 import { FULL_CODE } from 'jetlinks-ui-components/es/DataTable'
 
 const props = defineProps({
diff --git a/src/views/device/components/Metadata/Cat/index.vue b/src/views/device/components/Metadata/Cat/index.vue
index 8c963baf..525236ff 100644
--- a/src/views/device/components/Metadata/Cat/index.vue
+++ b/src/views/device/components/Metadata/Cat/index.vue
@@ -33,8 +33,7 @@ import type { Key } from 'ant-design-vue/es/_util/type';
 import { convertMetadata, getCodecs, detail as productDetail } from '@/api/device/product';
 import { detail } from '@/api/device/instance'
 import { onlyMessage } from '@/utils/comm';
-import {cloneDeep} from "lodash";
-import {omit} from "lodash-es";
+import { omit , cloneDeep } from "lodash-es";
 
 interface Props {
   visible: boolean;
diff --git a/src/views/iframe/index.vue b/src/views/iframe/index.vue
index 797e51b8..11a2bb5a 100644
--- a/src/views/iframe/index.vue
+++ b/src/views/iframe/index.vue
@@ -4,7 +4,7 @@
         <iframe
             v-if="loading"
             :src="iframeUrl"
-            scrolling="no"
+            scrolling="yes"
             frameBorder="0"
             style="width: 100%; height: 100%"
         ></iframe>
diff --git a/src/views/link/Protocol/index.vue b/src/views/link/Protocol/index.vue
index 94a932fa..21083d01 100644
--- a/src/views/link/Protocol/index.vue
+++ b/src/views/link/Protocol/index.vue
@@ -146,7 +146,7 @@ import { getImage } from '@/utils/comm';
 import { list, remove } from '@/api/link/protocol';
 import { onlyMessage } from '@/utils/comm';
 import Save from './Save/index.vue';
-import _ from 'lodash';
+import _ from 'lodash-es';
 
 const tableRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
diff --git a/src/views/media/Device/Channel/Tree/index.vue b/src/views/media/Device/Channel/Tree/index.vue
index 827ce9ee..b73a6bd2 100644
--- a/src/views/media/Device/Channel/Tree/index.vue
+++ b/src/views/media/Device/Channel/Tree/index.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script setup lang="ts">
-import { debounce } from 'lodash';
+import { debounce } from 'lodash-es';
 import ChannelApi from '@/api/media/channel';
 import DeviceApi from '@/api/media/device';
 
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 1a04129c..343c01ce 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
@@ -80,7 +80,7 @@ import Tag from './Tag.vue';
 import RelationSelect from './RelationSelect.vue';
 import { getParams } from '../../../util';
 import { handleParamsData } from '../../../components/Terms/util';
-import _ from 'lodash';
+import _ from 'lodash-es';
 
 const props = defineProps({
     values: {
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
index d6eb252f..1f5e11d6 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
@@ -127,7 +127,7 @@ const dropdownButtonClass = computed(() => ({
 const treeSelect = (v: any, option: any) => {
   const node = option.node
   visible.value = false
-  label.value = node.fullname || node.name
+  label.value = node.fullName || node.name
   selectValue.value = v[0]
   emit('update:value', node[props.valueName])
   emit('select', node)
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 0517eeaa..38a46a6c 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
@@ -82,8 +82,7 @@ import { ContextKey, arrayParamsKey, timeTypeKeys } from './util'
 import { useSceneStore } from 'store/scene'
 import { storeToRefs } from 'pinia';
 import { Form } from 'jetlinks-ui-components'
-import {indexOf, isArray, isObject, isString, pick} from 'lodash-es'
-import {cloneDeep} from "lodash";
+import {indexOf, isArray, isObject, isString, pick , cloneDeep } from 'lodash-es'
 
 const sceneStore = useSceneStore()
 const { data: formModel } = storeToRefs(sceneStore)
diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index 7d3ca1bf..2bc45205 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -1428,7 +1428,7 @@ import { getImage, onlyMessage } from '@/utils/comm';
 import type { formType, dictType, optionsType, applyType } from '../typing';
 import { getRoleList_api } from '@/api/system/user';
 import { randomString } from '@/utils/utils';
-import { cloneDeep, difference } from 'lodash';
+import { cloneDeep, difference } from 'lodash-es';
 import { useMenuStore } from '@/store/menu';
 import { Rule } from 'ant-design-vue/lib/form';
 import ApplyList from './ApplyList/index.vue';
diff --git a/src/views/system/DataSource/Management/index.vue b/src/views/system/DataSource/Management/index.vue
index c3a1e21b..4be27c59 100644
--- a/src/views/system/DataSource/Management/index.vue
+++ b/src/views/system/DataSource/Management/index.vue
@@ -235,8 +235,7 @@ import { onlyMessage } from '@/utils/comm';
 import { randomString } from '@/utils/utils';
 import { FormInstance } from 'ant-design-vue';
 import { DataNode } from 'ant-design-vue/lib/tree';
-import _ from 'lodash';
-import { cloneDeep } from 'lodash';
+import _ , { cloneDeep } from 'lodash-es';
 import type { dbColumnType, dictItemType, sourceItemType } from '../typing';
 
 const id = useRoute().query.id as string;
diff --git a/src/views/system/Menu/Setting/index.vue b/src/views/system/Menu/Setting/index.vue
index 5fc19416..fc7732c9 100644
--- a/src/views/system/Menu/Setting/index.vue
+++ b/src/views/system/Menu/Setting/index.vue
@@ -76,7 +76,7 @@ import {
 } from './utils';
 import BaseMenu from '@/views/init-home/data/baseMenu';
 import type { AntTreeNodeDropEvent } from 'ant-design-vue/es/tree';
-import { cloneDeep } from 'lodash';
+import { cloneDeep } from 'lodash-es';
 import { onlyMessage } from '@/utils/comm';
 import {
     USER_CENTER_MENU_CODE,
diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue
index ed67b4f9..891c4e44 100644
--- a/src/views/system/Platforms/Api/components/ApiTest.vue
+++ b/src/views/system/Platforms/Api/components/ApiTest.vue
@@ -131,7 +131,7 @@ import { JsonViewer } from 'vue3-json-viewer';
 import 'vue3-json-viewer/dist/index.css';
 import type { apiDetailsType } from '../typing';
 import InputCard from './InputCard.vue';
-import { cloneDeep, toLower } from 'lodash';
+import { cloneDeep, toLower } from 'lodash-es';
 import { FormInstance } from 'ant-design-vue';
 import server from '@/utils/request';
 import { findData, getCodeText } from '../utils';