From a4aa193781cbe2232b022e599815d321c448892f Mon Sep 17 00:00:00 2001 From: 100011797 <2642441182@qq.com> Date: Mon, 10 Jul 2023 15:42:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FRuleEditor-copy/Debug/index.vue | 4 +-- src/components/FRuleEditor/Debug/index.vue | 5 ++- .../Layout/components/NoticeItem.vue | 14 ++++++-- src/components/NormalUpload/index.vue | 3 +- src/components/Player/ScreenPlayer.vue | 6 ++-- src/components/Upload/index.vue | 11 +++--- .../Northbound/AliCloud/Detail/index.vue | 4 +-- src/views/Northbound/AliCloud/index.vue | 11 +++--- src/views/Northbound/DuerOS/Detail/index.vue | 4 +-- src/views/Northbound/DuerOS/index.vue | 11 +++--- src/views/account/Center/bind/index.vue | 7 ++-- .../Center/components/UploadAvatar/index.vue | 11 +++--- .../Category/components/modifyModal/index.vue | 13 +++---- src/views/device/Category/index.vue | 6 ++-- .../ChildDevice/BindChildDevice/index.vue | 6 ++-- .../ChildDevice/EdgeMap/PatchMapping.vue | 12 +++---- .../Detail/ChildDevice/EdgeMap/index.vue | 8 ++--- .../Instance/Detail/ChildDevice/index.vue | 8 ++--- .../Instance/Detail/Diagnose/Status/index.tsx | 29 +++++++-------- .../Instance/Detail/EdgeMap/PatchMapping.vue | 8 ++--- .../Detail/Function/components/Advance.vue | 4 +-- .../Detail/Function/components/Simple.vue | 4 +-- .../Detail/Info/components/Config/Save.vue | 4 +-- .../Detail/Info/components/Config/index.vue | 6 ++-- .../Detail/Info/components/Relation/Save.vue | 4 +-- .../Detail/Info/components/Tags/Save.vue | 4 +-- .../device/Instance/Detail/Parsing/index.vue | 9 ++--- .../Detail/Running/Property/Indicators.vue | 4 +-- .../Instance/Detail/Running/Property/Save.vue | 4 +-- .../Detail/Running/Property/ValueRender.vue | 11 +++--- .../Detail/Running/Property/index.vue | 4 +-- .../components/BindParentDevice/index.vue | 6 ++-- .../components/EditTable/PatchMapping.vue | 8 ++--- .../Detail/components/EditTable/index.vue | 6 ++-- src/views/device/Instance/Detail/index.vue | 9 +++-- src/views/device/Instance/Import/file.vue | 3 +- src/views/device/Instance/Save/index.vue | 5 ++- src/views/device/Instance/index.vue | 23 ++++++------ .../Product/Detail/DataAnalysis/index.vue | 8 ++--- .../Detail/DeviceAccess/accessModal.vue | 5 ++- .../Product/Detail/DeviceAccess/index.vue | 5 +-- .../Detail/DeviceAccess/metadataModal.vue | 5 ++- src/views/device/Product/Detail/index.vue | 8 ++--- src/views/device/Product/Save/index.vue | 11 +++--- src/views/device/Product/index.vue | 19 +++++----- .../components/Metadata/Base/Edit/index.vue | 18 ++++------ .../device/components/Metadata/Base/index.vue | 11 +++--- .../device/components/Metadata/Cat/index.vue | 4 +-- .../components/Metadata/Import/index.vue | 13 ++++--- .../device/components/Metadata/index.vue | 2 +- src/views/edge/Device/Save/index.vue | 5 ++- src/views/edge/Device/index.vue | 13 ++++--- src/views/edge/Resource/index.vue | 11 +++--- src/views/home/components/BootCard.vue | 4 +-- src/views/home/components/BootCardSmall.vue | 4 +-- src/views/home/components/StepCard.vue | 4 +-- .../components/dialogs/DeviceChooseDialog.vue | 4 +-- src/views/init-home/Basic/index.vue | 16 ++++----- src/views/init-home/InitData/index.vue | 5 ++- src/views/init-home/index.vue | 5 ++- .../iot-card/CardManagement/BindDevice.vue | 4 +-- src/views/iot-card/CardManagement/Import.vue | 4 +-- src/views/iot-card/CardManagement/Save.vue | 5 ++- .../iot-card/CardManagement/UploadFile.vue | 3 +- src/views/iot-card/CardManagement/index.vue | 35 +++++++++---------- src/views/iot-card/Home/index.vue | 5 ++- src/views/iot-card/Platform/Detail/index.vue | 4 +-- src/views/iot-card/Platform/index.vue | 9 +++-- src/views/iot-card/Recharge/Save.vue | 3 +- src/views/link/plugin/Save.vue | 4 +-- src/views/link/plugin/index.vue | 7 ++-- .../Cascade/Channel/BindChannel/index.vue | 8 ++--- src/views/media/Cascade/Channel/index.vue | 18 +++++----- src/views/media/Cascade/Save/index.vue | 5 ++- src/views/media/Cascade/index.vue | 11 +++--- src/views/media/Device/Channel/Save.vue | 6 ++-- src/views/media/Device/Channel/index.vue | 5 +-- src/views/media/Device/Playback/iconNode.vue | 4 +-- src/views/media/Device/Playback/timeLine.vue | 5 +-- src/views/media/Device/Save/SaveProduct.vue | 5 ++- src/views/media/Device/Save/index.vue | 5 ++- src/views/media/Device/index.vue | 9 +++-- src/views/media/Home/index.vue | 6 ++-- src/views/notice/Config/Debug/index.vue | 4 +-- src/views/notice/Config/Detail/index.vue | 5 ++- src/views/notice/Config/SyncUser/index.vue | 12 +++---- src/views/notice/Config/index.vue | 13 ++++--- src/views/notice/Template/Debug/index.vue | 4 +-- src/views/notice/Template/Detail/index.vue | 6 ++-- src/views/notice/Template/index.vue | 12 +++---- .../Alarm/Config/Io/Save/input.vue | 5 +-- .../Alarm/Config/Io/Save/output.vue | 5 +-- src/views/rule-engine/Alarm/Config/index.vue | 5 ++- .../Alarm/Configuration/Save/Base/index.vue | 5 ++- .../Configuration/Save/Scene/Save/index.vue | 7 ++-- .../Alarm/Configuration/Save/Scene/index.vue | 5 ++- .../Alarm/Configuration/Save/index.vue | 4 +-- .../rule-engine/Alarm/Configuration/index.vue | 15 ++++---- src/views/rule-engine/Instance/Save/index.vue | 11 +++--- src/views/rule-engine/Instance/index.vue | 12 +++---- src/views/rule-engine/Scene/Save/index.vue | 6 ++-- src/views/rule-engine/Scene/index.vue | 15 ++++---- .../Save/components/ApplyList/MUpload.vue | 9 +++-- .../system/Apply/Save/components/EditForm.vue | 33 ++--------------- .../system/Apply/componenets/MenuDialog.vue | 8 ++--- src/views/system/Apply/index.vue | 7 ++-- src/views/system/Basis/index.vue | 21 ++++++----- .../system/DataSource/Management/index.vue | 3 +- .../DataSource/components/EditDialog.vue | 4 +-- src/views/system/DataSource/index.vue | 6 ++-- .../components/AddDeviceOrProductDialog.vue | 9 +++-- .../components/EditPermissionDialog.vue | 4 +-- .../system/Department/components/LeftTree.vue | 5 ++- src/views/system/Department/device/index.vue | 11 +++--- src/views/system/Department/product/index.vue | 11 +++--- .../user/components/AddBindUserDialog.vue | 6 ++-- src/views/system/Department/user/index.vue | 6 ++-- src/views/system/License/index.vue | 6 ++-- src/views/system/License/init/index.vue | 6 ++-- src/views/system/Menu/Detail/BasicInfo.vue | 5 +-- src/views/system/Menu/Detail/ButtonMange.vue | 6 ++-- .../Menu/components/ButtonAddDialog.vue | 5 +-- src/views/system/Menu/index.vue | 4 +-- .../Permission/components/EditDialog.vue | 5 +-- src/views/system/Permission/index.vue | 16 ++++----- .../Platforms/Api/components/ChooseApi.vue | 7 ++-- .../Relationship/components/EditDialog.vue | 4 +-- src/views/system/Relationship/index.vue | 6 ++-- .../system/Role/Detail/Permiss/index.vue | 5 +-- src/views/system/Role/Detail/User/index.vue | 6 ++-- .../Role/Detail/components/AddUserDialog.vue | 6 ++-- .../system/Role/components/AddDialog.vue | 4 +-- src/views/system/Role/index.vue | 4 +-- .../system/User/components/EditUserDialog.vue | 5 ++- src/views/system/User/index.vue | 6 ++-- 135 files changed, 489 insertions(+), 560 deletions(-) diff --git a/src/components/FRuleEditor-copy/Debug/index.vue b/src/components/FRuleEditor-copy/Debug/index.vue index a1767adb..93593e59 100644 --- a/src/components/FRuleEditor-copy/Debug/index.vue +++ b/src/components/FRuleEditor-copy/Debug/index.vue @@ -73,11 +73,11 @@ import { PropType } from 'vue'; import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue'; import { useProductStore } from '@/store/product'; -import { message } from 'jetlinks-ui-components'; import { useRuleEditorStore } from '@/store/ruleEditor'; import moment from 'moment'; import { getWebSocket } from '@/utils/websocket'; import { PropertyMetadata } from '@/views/device/Product/typings'; +import { onlyMessage } from '@/utils/comm'; const props = defineProps({ @@ -137,7 +137,7 @@ const runScript = () => { } if (!props.virtualRule?.script) { isBeginning.value = true; - message.warning('请编辑规则'); + onlyMessage('请编辑规则', 'warning'); return; } ws.value = getWebSocket(`virtual-property-debug-${props.id}-${new Date().getTime()}`, diff --git a/src/components/FRuleEditor/Debug/index.vue b/src/components/FRuleEditor/Debug/index.vue index f4c20867..f095a2bc 100644 --- a/src/components/FRuleEditor/Debug/index.vue +++ b/src/components/FRuleEditor/Debug/index.vue @@ -105,13 +105,12 @@ diff --git a/src/views/device/components/Metadata/Cat/index.vue b/src/views/device/components/Metadata/Cat/index.vue index 8dcdda33..3f390e7c 100644 --- a/src/views/device/components/Metadata/Cat/index.vue +++ b/src/views/device/components/Metadata/Cat/index.vue @@ -26,13 +26,13 @@ diff --git a/src/views/home/components/BootCardSmall.vue b/src/views/home/components/BootCardSmall.vue index abb0f874..49995b67 100644 --- a/src/views/home/components/BootCardSmall.vue +++ b/src/views/home/components/BootCardSmall.vue @@ -25,9 +25,9 @@ diff --git a/src/views/home/components/StepCard.vue b/src/views/home/components/StepCard.vue index 492fca09..b547c73e 100644 --- a/src/views/home/components/StepCard.vue +++ b/src/views/home/components/StepCard.vue @@ -26,9 +26,9 @@ diff --git a/src/views/media/Cascade/Channel/index.vue b/src/views/media/Cascade/Channel/index.vue index c82de34f..444b306c 100644 --- a/src/views/media/Cascade/Channel/index.vue +++ b/src/views/media/Cascade/Channel/index.vue @@ -156,8 +156,8 @@ diff --git a/src/views/notice/Config/Debug/index.vue b/src/views/notice/Config/Debug/index.vue index 4c6bce92..cb2f70b3 100644 --- a/src/views/notice/Config/Debug/index.vue +++ b/src/views/notice/Config/Debug/index.vue @@ -112,13 +112,13 @@ import type { TemplateFormData, IVariableDefinitions, } from '@/views/notice/Template/types'; -import { message } from 'jetlinks-ui-components'; import ToUser from '@/views/notice/Template/Detail/components/ToUser.vue'; import ToOrg from '@/views/notice/Template/Detail/components/ToOrg.vue'; import ToTag from '@/views/notice/Template/Detail/components/ToTag.vue'; import type { Rule } from 'ant-design-vue/es/form'; import { phoneRegEx } from '@/utils/validate'; +import { onlyMessage } from '@/utils/comm'; type Emits = { (e: 'update:visible', data: boolean): void; @@ -246,7 +246,7 @@ const handleOk = () => { ConfigApi.debug(params, props.data.id, formData.value.templateId) .then((res) => { if (res.success) { - message.success('操作成功'); + onlyMessage('操作成功'); handleCancel(); } }) diff --git a/src/views/notice/Config/Detail/index.vue b/src/views/notice/Config/Detail/index.vue index 68eb715b..fa1b1a34 100644 --- a/src/views/notice/Config/Detail/index.vue +++ b/src/views/notice/Config/Detail/index.vue @@ -323,9 +323,8 @@