Merge branch 'f-dev' into 'main'

fix：修改场景联动新增或者编辑 设备、属性、条件筛选、清除告警验证问题

See merge request huang/yun-teng-iot-front!237

 <template>
 <template>
   <BasicModal
   <BasicModal
-    :useWrapper="true"
     width="82vw"
     width="82vw"
     :height="compHeight"
     :height="compHeight"
     v-bind="$attrs"
     v-bind="$attrs"
     @register="registerModal"
     @register="registerModal"
     @ok="handleSubmit"
     @ok="handleSubmit"
     :draggable="false"
     :draggable="false"
+    class="basic-modal"
+    className="{styles.headSetPop}"
   >
   >
     <div
     <div
       style="
       style="
@@ -254,4 +255,7 @@
       transition: border-color 0.3s ease;
       transition: border-color 0.3s ease;
     }
     }
   }
   }
+  .headSetPop :global(.ant-modal-header) {
+    padding: 27px 0px !important;
+  }
 </style>
 </style>

@@ -586,10 +586,10 @@
     getTriggerFormValue.value = unref(skipUnwrap.triggerItemRefs)?.map((item) =>
     getTriggerFormValue.value = unref(skipUnwrap.triggerItemRefs)?.map((item) =>
       genTriggerOrConditionData(item.getFieldsValueFunc())
       genTriggerOrConditionData(item.getFieldsValueFunc())
     );
     );
-    getConditionFormValue.value = unref(skipUnwrap.conditionItemRefs).map((item) =>
+    getConditionFormValue.value = unref(skipUnwrap.conditionItemRefs)?.map((item) =>
       genTriggerOrConditionData(item.getFieldsValueFunc())
       genTriggerOrConditionData(item.getFieldsValueFunc())
     );
     );
-    getActionFormValue.value = unref(skipUnwrap.actionItemRefs).map((item) =>
+    getActionFormValue.value = unref(skipUnwrap.actionItemRefs)?.map((item) =>
       genActionData(item.getFieldsValueFunc())
       genActionData(item.getFieldsValueFunc())
     );
     );
   };
   };
@@ -611,21 +611,6 @@
         id: unref(id),
         id: unref(id),
         tenantId: unref(tenantId),
         tenantId: unref(tenantId),
       };
       };
-      //TODO fengtao---修改之前如果是新增，如果条件筛选页面打开，但没填值，还是可以新增成功
-      const typeBoolean = postAddOrEditData?.triggers?.some((f) => {
-        let type = false;
-        f?.triggerCondition?.condition?.condition?.some((s) => {
-          if (s?.predicate?.value?.defaultValue == undefined) {
-            type = true;
-          } else {
-            type = false;
-          }
-        });
-        return type;
-      });
-      if (typeBoolean) return createMessage.error('请填写条件筛选');
-      //TODO 先暂时不加验证--设备-属性-填了加验证
-      //TODO fengtao
       await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate));
       await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate));
       createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
       createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
       closeDrawer();
       closeDrawer();

@@ -69,6 +69,7 @@
   import AlarmSchedule from './AlarmSchedule.vue';
   import AlarmSchedule from './AlarmSchedule.vue';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import { cloneDeep } from 'lodash-es';
   import { cloneDeep } from 'lodash-es';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   const props = defineProps({
   const props = defineProps({
     title: {
     title: {
@@ -85,6 +86,8 @@
     },
     },
   });
   });
   const emit = defineEmits(['delete']);
   const emit = defineEmits(['delete']);
+  const { createMessage } = useMessage();
+
   const isUpdate = ref(false);
   const isUpdate = ref(false);
   const conditionScreeningRef = ref();
   const conditionScreeningRef = ref();
   const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
   const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
@@ -99,6 +102,30 @@
     const predicate = conditionScreeningRef?.value?.refItem?.conditionScreeningRefs?.value?.map(
     const predicate = conditionScreeningRef?.value?.refItem?.conditionScreeningRefs?.value?.map(
       (item) => item.getFieldsValue()
       (item) => item.getFieldsValue()
     );
     );
+    //TODO-fengtao-设备、属性、条件筛选验证
+    const validate = getFieldsValue();
+    if (validate.device == 'PART') {
+      if (validate.entityId == undefined) return createMessage.error('请选择设备');
+    }
+    if (validate.type2 == '' || validate.type2 == null) return createMessage.error('请选择属性');
+    if (predicate == undefined) return createMessage.error('请填写条件筛选');
+    let predicateIsRequired = false;
+    if (predicate) {
+      predicate.some((f) => {
+        let arr = Object.keys(f);
+        if (arr.length == 0) {
+          predicateIsRequired = true;
+        }
+        if (f.operation == undefined) {
+          predicateIsRequired = true;
+        }
+        if (f.value == undefined) {
+          predicateIsRequired = true;
+        }
+      });
+    }
+    if (predicateIsRequired) return createMessage.error('请填写条件筛选');
+    //TODO-fengtao-设备、属性、条件筛选验证
     return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
     return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
   };
   };
 
 

@@ -68,6 +68,7 @@
   import 'jsoneditor/dist/jsoneditor.min.css';
   import 'jsoneditor/dist/jsoneditor.min.css';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import ClearAlarm from './ClearAlarm.vue';
   import ClearAlarm from './ClearAlarm.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   const props = defineProps({
   const props = defineProps({
     actionIndex: {
     actionIndex: {
@@ -99,6 +100,8 @@
   const refItem = {
   const refItem = {
     clearRuleRefs: ref([]),
     clearRuleRefs: ref([]),
   };
   };
+  const { createMessage } = useMessage();
+
   const emit = defineEmits(['deleteAction', 'getActionFormArr']);
   const emit = defineEmits(['deleteAction', 'getActionFormArr']);
   const options = computed(() => {
   const options = computed(() => {
     return [
     return [
@@ -133,6 +136,51 @@
         schedule: item.alarmScheduleRef.scheduleData,
         schedule: item.alarmScheduleRef.scheduleData,
       };
       };
     });
     });
+    //TODO-fengtao-清除告警验证
+    let deviceIdIsRequired = false;
+    let attrIsRequired = false;
+    let predicateIsRequired = false;
+    let predicateDoubleIsRequired = false;
+    if (clearRule) {
+      clearRule.some((s) => {
+        if (s.device == 'PART') {
+          if (s.entityId == undefined) {
+            deviceIdIsRequired = true;
+          }
+        }
+        if (s.type2 == '' || s.type2 == null) {
+          attrIsRequired = true;
+        }
+        if (s.predicate == undefined) {
+          predicateIsRequired = true;
+        }
+        if (s?.predicate) {
+          s?.predicate.some((f) => {
+            let arr = Object.keys(f);
+            if (arr.length == 0) {
+              predicateDoubleIsRequired = true;
+            }
+            if (f.operation == undefined) {
+              predicateDoubleIsRequired = true;
+            }
+            if (f.value == undefined) {
+              predicateDoubleIsRequired = true;
+            }
+          });
+        }
+      });
+    }
+    if (deviceIdIsRequired) return createMessage.error('请选择设备');
+    if (attrIsRequired) return createMessage.error('请选择属性');
+    if (predicateIsRequired) return createMessage.error('请填写条件筛选');
+    if (predicateDoubleIsRequired) return createMessage.error('请填写条件筛选');
+    //TODO-fengtao-清除告警验证
+    //TODO-fengtao-设备验证
+    const validate = getFieldsValue();
+    if (validate.device == 'PART') {
+      if (validate.deviceId == undefined) return createMessage.error('请选择设备');
+    }
+    //TODO-fengtao-设备验证
     return {
     return {
       ...getFieldsValue(),
       ...getFieldsValue(),
       doContext: unref(jsonInstance.value)?.get(),
       doContext: unref(jsonInstance.value)?.get(),
@@ -163,7 +211,6 @@
       };
       };
     });
     });
     deviceListItem.value = deviceList.value;
     deviceListItem.value = deviceList.value;
-    console.log(' deviceListItem.value', deviceListItem.value);
     updateSchema({
     updateSchema({
       field: 'deviceId',
       field: 'deviceId',
       componentProps: {
       componentProps: {

@@ -144,16 +144,21 @@
             .then((res) => {
             .then((res) => {
               closeDrawer(); //关闭侧框
               closeDrawer(); //关闭侧框
               emit('success');
               emit('success');
+              setTimeout(() => {
+                setDrawerProps({ confirmLoading: false });
+              }, 300);
             })
             })
             .catch((e) => {
             .catch((e) => {
               const { createMessage } = useMessage();
               const { createMessage } = useMessage();
               createMessage.error(`${e.message}`);
               createMessage.error(`${e.message}`);
+            })
+            .finally(() => {
+              setTimeout(() => {
+                setDrawerProps({ confirmLoading: false });
+              }, 300);
             });
             });
         } catch (e) {
         } catch (e) {
         } finally {
         } finally {
-          setTimeout(() => {
-            setDrawerProps({ confirmLoading: false });
-          }, 300);
         }
         }
       }
       }