Merge branch 'ww' into 'main'

fix: DEFECT-1031 trigger action deviceType echo incorrect See merge request yunteng/thingskit-front!476

Merge branch 'ww' into 'main'
fix: DEFECT-1031 trigger action deviceType echo incorrect See merge request yunteng/thingskit-front!476
xp.Huang
2 parents e7f4a57c afd51011
Showing 5 changed files with 27 additions and 30 deletions
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
src/views/rule/linkedge/config/config.data.ts
src/views/rule/linkedge/cpns/ClearAlarm.vue
src/views/rule/linkedge/cpns/Trigger-Condition.vue
src/views/rule/linkedge/cpns/action.vue
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @c7019a2
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @c7019a2
@@ -324,6 +324,7 @@
             detail: condition?.triggerCondition?.alarmDetails,
             entityId: condition?.entityId,
             deviceProfileId: condition?.deviceProfileId,
+            deviceType: condition?.deviceType,
             replaceValue: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             time: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             timeUnit: condition?.triggerCondition?.condition?.spec?.unit,
@@ -348,7 +349,7 @@
           unref(skipUnwrap.conditionItemRefs)[index].setConditionScreeningList([
             ...new Array(condition.triggerCondition.condition.condition.length).keys(),
           ]);
-          // 操作符类型 NUMERIC|String|Boolean|DATE_TIME
+          // 操作符类型 NUMERIC|String|Boolean|DATorganizeImportsE_TIME
           const valueType = condition.triggerCondition?.condition.condition[0].valueType;
           // 循环设置条件筛选值。TODO:此处设置顺序有问题
@@ -387,7 +388,6 @@
       doActions.forEach((action, index) => {
         nextTick(() => {
           const selectProductId = ref('');
-          console.log('doActions', unref(skipUnwrap.actionItemRefs));
           // 设置执行动作外层值
           unref(skipUnwrap.actionItemRefs)[index].setFieldsFormValueFun({
             ...action,
@@ -566,10 +566,10 @@
     //TODO fengtao
     setFields(skipUnwrap.triggerItemRefs, true);
     setFields(skipUnwrap.conditionItemRefs, true);
-    // setFields(skipUnwrap.actionItemRefs, true);
+    setFields(skipUnwrap.actionItemRefs, true);
     const data = await getOrganizationAlarmConfig({ organizationId: newValue });
     alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id }));
-    setFields(skipUnwrap.actionItemRefs, true);
+    // setFields(skipUnwrap.actionItemRefs, true);
     // console.log(unref(organizationIdRef));
     // setAlarmConfig(skipUnwrap.actionItemRefs, true);
   });
@@ -694,6 +694,8 @@
       }
       if (mustTriggerCondition) return;
       if (mustCondition) return;
+      console.log(postAddOrEditData);
+      return;
       //FT change
       await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate));
       createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
--- a/src/views/rule/linkedge/config/config.data.ts
View file @c7019a2
+++ b/src/views/rule/linkedge/config/config.data.ts
View file @c7019a2
@@ -250,8 +250,7 @@ export const trigger_condition_schema: FormSchema[] = [
         getPopupContainer: () => document.body,
         onChange: async (e) => {
           if (e) {
-            setFieldsValue({ type2: '' });
-            setFieldsValue({ entityId: [] });
+            setFieldsValue({ type2: '', entityId: [] });
             const res = await getAttribute(e);
             const options = ref<TOption[]>([]);
             useByProductGetAttribute(res, updateSchema, options);
@@ -446,7 +445,6 @@ export const actionSchema: FormSchema[] = [
     componentProps: ({ formActionType, formModel }) => {
       const { setFieldsValue } = formActionType;
       const deviceType = formModel['deviceType'];
-      console.log(deviceType);
       return {
         api: queryDeviceProfileBy,
         params: {
@@ -457,8 +455,7 @@ export const actionSchema: FormSchema[] = [
         valueField: 'id',
         getPopupContainer: () => document.body,
         onChange: () => {
-          setFieldsValue({ deviceId: [] });
-          setFieldsValue({ thingsModelId: '' });
+          setFieldsValue({ thingsModelId: '', deviceId: [] });
         },
       };
     },
--- a/src/views/rule/linkedge/cpns/ClearAlarm.vue
View file @c7019a2
+++ b/src/views/rule/linkedge/cpns/ClearAlarm.vue
View file @c7019a2
@@ -101,9 +101,9 @@
     return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
   };
-  const updateFieldDeviceId = (deviceList: any[], _, isUpdate) => {
-    console.log(deviceList);
-    console.log(isUpdate);
+  const updateFieldDeviceId = () => {
+    // console.log(deviceList);
+    // console.log(isUpdate);
   };
   const resetFieldsValueFunc = () => resetFields();
@@ -157,7 +157,6 @@
       alarmScheduleRef.value.scheduleData = {
         type: value,
       };
-      console.log(value);
     }
     currentIndex.value = index;
   };
--- a/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @c7019a2
+++ b/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @c7019a2
@@ -57,20 +57,20 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, provide, nextTick } from 'vue';
+  import { Card, Input, Select, Tooltip } from 'ant-design-vue';
+  import { cloneDeep } from 'lodash-es';
+  import { nextTick, provide, ref } from 'vue';
+  import { TOption, trigger_condition_schema } from '../config/config.data';
+  import { options, scheduleOptions, timeUnitOptions } from '../config/formatData';
+  import useCommonFun from '../hooks/useCommonFun';
+  import AlarmSchedule from './AlarmSchedule.vue';
+  import ConditionScreening from './ConditionScreening.vue';
+  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Icon } from '/@/components/Icon';
-  import { Tooltip, Card, Select, Input } from 'ant-design-vue';
-  import { trigger_condition_schema, TOption } from '../config/config.data';
-  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
-  import ConditionScreening from './ConditionScreening.vue';
-  import { scheduleOptions, timeUnitOptions, options } from '../config/formatData';
-  import AlarmSchedule from './AlarmSchedule.vue';
   import { useModal } from '/@/components/Modal';
-  import { cloneDeep } from 'lodash-es';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import useCommonFun from '../hooks/useCommonFun';
   const { useByProductGetAttribute } = useCommonFun();
   defineProps({
@@ -203,7 +203,6 @@
       alarmScheduleRef.value.scheduleData = {
         type: value,
       };
-      console.log(value);
     }
     currentIndex.value = index;
   };
@@ -212,14 +211,14 @@
   };
   const scheduleData = ref(null);
   //FT add 2022-10-27
-  const updateFieldAlarmConfig = (alarmConfigList) => {
+  const updateFieldAlarmConfig = () => {
     //什么也不做
-    console.log(alarmConfigList);
+    // console.log(alarmConfigList);
   };
   //FT add 2022-10-27
-  const updateEditFieldAlarmConfig = (alarmConfigList) => {
+  const updateEditFieldAlarmConfig = () => {
     //什么也不做
-    console.log(alarmConfigList);
+    // console.log(alarmConfigList);
   };
   defineExpose({
--- a/src/views/rule/linkedge/cpns/action.vue
View file @c7019a2
+++ b/src/views/rule/linkedge/cpns/action.vue
View file @c7019a2
@@ -19,7 +19,8 @@
           @dropdown-visible-change="handleDropdownVisibleChange"
           placeholder="请选择执行动作"
           allowClear
-      /></template>
+        />
+      </template>
       <template #alarmConfigSlot="{ model, field }">
         <a-select
           allowClear
@@ -169,6 +170,7 @@
       },
     ];
   });
+
   const changeOutTarget = () => {
     emit('getActionFormArr');
   };
@@ -262,8 +264,6 @@
   };
   const setFieldsFormValueFun = (fieldsValue) => {
-    console.log(getFieldsValue());
-
     setFieldsValue({
       ...fieldsValue,
       ...(isNumber(fieldsValue.commandType)