Merge branch 'sqy_dev' into 'main'

'fix:[DEFECT-337]:修复告警输出选择的问题'

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

@@ -41,7 +41,7 @@ export const useUserStore = defineStore({
     //平台信息
     //平台信息
     platInfo: storage.get('platformInfo') || null,
     platInfo: storage.get('platformInfo') || null,
     enterPriseInfo: storage.get('enterPriseInfo') || null,
     enterPriseInfo: storage.get('enterPriseInfo') || null,
-    outTarget: 'DEVICE_OUT',
+
     // user info
     // user info
     userInfo: null,
     userInfo: null,
     userUpdateInfo: null,
     userUpdateInfo: null,
@@ -64,9 +64,7 @@ export const useUserStore = defineStore({
     getUserInfo(): UserInfo {
     getUserInfo(): UserInfo {
       return this.userInfo || getAuthCache<UserInfo>(USER_INFO_KEY) || {};
       return this.userInfo || getAuthCache<UserInfo>(USER_INFO_KEY) || {};
     },
     },
-    getOutTarget(): any {
-      return this.outTarget;
-    },
+
     getUserUpdateInfo(): UserUpdateInfo {
     getUserUpdateInfo(): UserUpdateInfo {
       return this.userUpdateInfo || {};
       return this.userUpdateInfo || {};
     },
     },
@@ -93,9 +91,7 @@ export const useUserStore = defineStore({
     setEnterPriseInfo(enterPriseInfo: any) {
     setEnterPriseInfo(enterPriseInfo: any) {
       this.enterPriseInfo = enterPriseInfo;
       this.enterPriseInfo = enterPriseInfo;
     },
     },
-    setOutTarget(outTarget) {
-      this.outTarget = outTarget;
-    },
+
     storeToken(jwtToken: string, refreshToken: string) {
     storeToken(jwtToken: string, refreshToken: string) {
       this.jwtToken = jwtToken;
       this.jwtToken = jwtToken;
       this.refreshToken = refreshToken;
       this.refreshToken = refreshToken;

@@ -66,7 +66,9 @@
               :triggerData="triggerData"
               :triggerData="triggerData"
               :ref="skipUnwrap.actionItemRefs"
               :ref="skipUnwrap.actionItemRefs"
               :deviceList="deviceList"
               :deviceList="deviceList"
+              :arr="arr"
               @deleteAction="deleteAction"
               @deleteAction="deleteAction"
+              @getActionFormArr="getActionFormArr"
             />
             />
           </template>
           </template>
           <!-- 按钮 -->
           <!-- 按钮 -->
@@ -97,7 +99,6 @@
   } from '/@/api/ruleengine/ruleengineApi';
   } from '/@/api/ruleengine/ruleengineApi';
   import TriggerOrCondition from './cpns/Trigger-Condition.vue';
   import TriggerOrCondition from './cpns/Trigger-Condition.vue';
   import Action from './cpns/Action.vue';
   import Action from './cpns/Action.vue';
-  import { useUserStore } from '/@/store/modules/user';
   import { findOperation } from './config/formatData.ts';
   import { findOperation } from './config/formatData.ts';
   import { formatToDateTime } from '/@/utils/dateUtil';
   import { formatToDateTime } from '/@/utils/dateUtil';
 
 
@@ -344,8 +345,6 @@
           // 如果是设备输出设置脚本值
           // 如果是设备输出设置脚本值
           if (action.outTarget === 'DEVICE_OUT') {
           if (action.outTarget === 'DEVICE_OUT') {
             unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params);
             unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params);
-          } else {
-            userStore.setOutTarget(action.outTarget);
           }
           }
           // 清除告警有值?{数组}
           // 清除告警有值?{数组}
           if (action?.doContext?.clearRule?.length) {
           if (action?.doContext?.clearRule?.length) {
@@ -565,7 +564,6 @@
       setDrawerProps({ confirmLoading: false });
       setDrawerProps({ confirmLoading: false });
     }
     }
   };
   };
-  const userStore = useUserStore();
   // 删除
   // 删除
   const deleteTriggerOrCondition = ({ index, title }) => {
   const deleteTriggerOrCondition = ({ index, title }) => {
     if (title === '触发器') {
     if (title === '触发器') {
@@ -574,11 +572,13 @@
       unref(conditionData).splice(index, 1);
       unref(conditionData).splice(index, 1);
     }
     }
   };
   };
-  const deleteAction = ({ actionIndex, outTarget }) => {
+  const deleteAction = (actionIndex) => {
     unref(actionData).splice(actionIndex, 1);
     unref(actionData).splice(actionIndex, 1);
-    if (unref(outTarget) === 'MSG_NOTIFY') {
-      userStore.setOutTarget('DEVICE_OUT');
-    }
+    unref(arr).splice(actionIndex, 1);
+  };
+  const arr = ref([]);
+  const getActionFormArr = () => {
+    arr.value = unref(skipUnwrap.actionItemRefs).map((item) => item.getFieldsValue());
   };
   };
   const handleClose = () => {
   const handleClose = () => {
     id.value = undefined;
     id.value = undefined;
@@ -600,6 +600,5 @@
     unref(skipUnwrap.actionItemRefs).map((item) => {
     unref(skipUnwrap.actionItemRefs).map((item) => {
       item.resetFieldsValueFunc();
       item.resetFieldsValueFunc();
     });
     });
-    userStore.setOutTarget('DEVICE_OUT');
   };
   };
 </script>
 </script>

@@ -67,7 +67,6 @@
   import jsoneditor from 'jsoneditor';
   import jsoneditor from 'jsoneditor';
   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 { useUserStore } from '/@/store/modules/user';
   import ClearAlarm from './ClearAlarm.vue';
   import ClearAlarm from './ClearAlarm.vue';
 
 
   const props = defineProps({
   const props = defineProps({
@@ -87,29 +86,30 @@
       type: Array,
       type: Array,
       required: true,
       required: true,
     },
     },
+    arr: {
+      type: Array,
+      default: () => [],
+    },
   });
   });
   const isAddClearRule = computed(() => clearRuleList.value.length < props.triggerData.length);
   const isAddClearRule = computed(() => clearRuleList.value.length < props.triggerData.length);
   const refItem = {
   const refItem = {
     clearRuleRefs: ref([]),
     clearRuleRefs: ref([]),
   };
   };
-  const emit = defineEmits(['deleteAction']);
-  const userStore = useUserStore();
-  const options = computed(() => [
-    { label: '设备输出', value: 'DEVICE_OUT' },
-    {
-      label: '告警输出',
-      value: 'MSG_NOTIFY',
-      disabled: userStore.getOutTarget === 'MSG_NOTIFY' || !props.triggerData.length,
-    },
-  ]);
-  const outTarget = ref('');
-
-  // TODO:此处有个小Bug,日后在调试。
-  const changeOutTarget = (value: 'DEVICE_OUT' | 'MSG_NOTIFY') => {
-    outTarget.value = value;
-    if (userStore.getOutTarget === 'DEVICE_OUT') {
-      userStore.setOutTarget(value);
-    }
+  const emit = defineEmits(['deleteAction', 'getActionFormArr']);
+  const options = computed(() => {
+    return [
+      { label: '设备输出', value: 'DEVICE_OUT' },
+      {
+        label: '告警输出',
+        value: 'MSG_NOTIFY',
+        disabled:
+          props.arr.filter((item) => item.outTarget === 'MSG_NOTIFY').length ||
+          !props.triggerData.length,
+      },
+    ];
+  });
+  const changeOutTarget = () => {
+    emit('getActionFormArr');
   };
   };
   const [registerAction, { getFieldsValue, resetFields, updateSchema, setFieldsValue, validate }] =
   const [registerAction, { getFieldsValue, resetFields, updateSchema, setFieldsValue, validate }] =
     useForm({
     useForm({
@@ -163,7 +163,6 @@
         options: alarmConfigList,
         options: alarmConfigList,
       },
       },
     });
     });
-    userStore.setOutTarget('DEVICE_OUT');
   };
   };
 
 
   const checked = ref(false);
   const checked = ref(false);
@@ -172,7 +171,7 @@
   };
   };
 
 
   const handleDelete = (actionIndex) => {
   const handleDelete = (actionIndex) => {
-    emit('deleteAction', { actionIndex, outTarget });
+    emit('deleteAction', actionIndex);
   };
   };
 
 
   const clearRuleList = ref([]);
   const clearRuleList = ref([]);
@@ -243,6 +242,7 @@
   };
   };
 
 
   defineExpose({
   defineExpose({
+    getFieldsValue,
     getFieldsValueFunc,
     getFieldsValueFunc,
     setFieldsFormValueFun,
     setFieldsFormValueFun,
     resetFieldsValueFunc,
     resetFieldsValueFunc,