From 4c4cd57ef0b4d2a5f8943e2b25953f5efdb2ba20 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Mon, 13 Oct 2025 10:17:19 +0800 Subject: [PATCH] fix: iot --- apps/web-antd/src/api/iot/rule/scene/index.ts | 1 + apps/web-antd/src/api/iot/thingmodel/index.ts | 4 +- .../iot/rule/scene/form/RuleSceneForm.vue | 80 ++++----- .../configs/CurrentTimeConditionConfig.vue | 77 +++++---- .../form/configs/DeviceControlConfig.vue | 105 ++++++----- .../form/configs/DeviceTriggerConfig.vue | 88 +++++----- .../form/configs/MainConditionInnerConfig.vue | 147 ++++++++-------- .../form/configs/SubConditionGroupConfig.vue | 39 +++-- .../scene/form/inputs/JsonParamsInput.vue | 103 +++++------ .../iot/rule/scene/form/inputs/ValueInput.vue | 97 ++++++----- .../scene/form/sections/ActionSection.vue | 163 +++++++++--------- .../scene/form/sections/BasicInfoSection.vue | 72 ++++---- .../scene/form/sections/TriggerSection.vue | 124 +++++++------ .../scene/form/selectors/DeviceSelector.vue | 33 ++-- .../scene/form/selectors/OperatorSelector.vue | 21 ++- .../scene/form/selectors/ProductSelector.vue | 30 ++-- .../scene/form/selectors/PropertySelector.vue | 130 ++++++-------- .../src/views/iot/rule/scene/index.vue | 4 +- .../thingmodel/modules/ThingModelEvent.vue | 4 + .../iot/thingmodel/modules/ThingModelForm.vue | 55 +++--- .../iot/thingmodel/modules/ThingModelTSL.vue | 19 +- .../modules/components/DataDefinition.vue | 31 ++-- .../dataSpecs/ThingModelArrayDataSpecs.vue | 28 +-- .../dataSpecs/ThingModelEnumDataSpecs.vue | 59 ++++--- .../dataSpecs/ThingModelNumberDataSpecs.vue | 24 +-- .../dataSpecs/ThingModelStructDataSpecs.vue | 78 ++++----- .../web-antd/src/views/iot/utils/constants.ts | 59 ++++--- 27 files changed, 857 insertions(+), 818 deletions(-) diff --git a/apps/web-antd/src/api/iot/rule/scene/index.ts b/apps/web-antd/src/api/iot/rule/scene/index.ts index 247b9a5f7..5fc3224e1 100644 --- a/apps/web-antd/src/api/iot/rule/scene/index.ts +++ b/apps/web-antd/src/api/iot/rule/scene/index.ts @@ -90,6 +90,7 @@ export interface TriggerCondition { operator?: string; value?: any; type?: string; + param?: string; } /** IoT 场景联动规则动作 */ diff --git a/apps/web-antd/src/api/iot/thingmodel/index.ts b/apps/web-antd/src/api/iot/thingmodel/index.ts index d97704b7f..341e0964e 100644 --- a/apps/web-antd/src/api/iot/thingmodel/index.ts +++ b/apps/web-antd/src/api/iot/thingmodel/index.ts @@ -114,13 +114,13 @@ export interface ThingModelFormRules { } /** 验证布尔型名称 */ -export const validateBoolName = (_rule: any, value: any, callback: any) => { +export function validateBoolName(_rule: any, value: any, callback: any) { if (value) { callback(); } else { callback(new Error('枚举描述不能为空')); } -}; +} /** 查询产品物模型分页 */ export function getThingModelPage(params: PageParam) { diff --git a/apps/web-antd/src/views/iot/rule/scene/form/RuleSceneForm.vue b/apps/web-antd/src/views/iot/rule/scene/form/RuleSceneForm.vue index 7d29e35cd..e2004c963 100644 --- a/apps/web-antd/src/views/iot/rule/scene/form/RuleSceneForm.vue +++ b/apps/web-antd/src/views/iot/rule/scene/form/RuleSceneForm.vue @@ -1,9 +1,15 @@ diff --git a/apps/web-antd/src/views/iot/rule/scene/form/configs/CurrentTimeConditionConfig.vue b/apps/web-antd/src/views/iot/rule/scene/form/configs/CurrentTimeConditionConfig.vue index 6503c4ac7..f6628181c 100644 --- a/apps/web-antd/src/views/iot/rule/scene/form/configs/CurrentTimeConditionConfig.vue +++ b/apps/web-antd/src/views/iot/rule/scene/form/configs/CurrentTimeConditionConfig.vue @@ -2,9 +2,20 @@