fix:DEFECT-861 场景联动切换组织刷新未刷新条件筛选数据

@@ -55,7 +55,7 @@
       };
     });
   });
-  const handleSuccess = async (val: { id: string }) => {
+  const handleSuccess = async (opt) => {
     const res = await getScriptManageMeList();
     selectOptions.value = res.map((m) => {
       return {
@@ -63,7 +63,9 @@
         value: m.id,
       };
     });
-    selectScript.script = val.id;
+    if (opt.text !== 'test') {
+      selectScript.script = opt?.res?.id;
+    }
   };
 
   const [register] = useForm({

@@ -7,90 +7,117 @@
       </template>
 
       <template v-for="(item, index) in conditionScreeningList" :key="item">
-        <ConditionScreeningForm :conditionScreeningList="conditionScreeningList" :ref="refItem.conditionScreeningRefs"
-          :index="index" @deleteConditionForm="deleteConditionForm" />
+        <ConditionScreeningForm
+          :conditionScreeningList="conditionScreeningList"
+          :ref="refItem.conditionScreeningRefs"
+          :index="index"
+          @deleteConditionForm="deleteConditionForm"
+        />
       </template>
     </CollapseContainer>
 
     <div class="flex justify-between">
-      <a-button :disabled="isViewDisabledBtn=='isView'?true:false" type="primary" class="mt-4 ml-2"
-        @click="addConditionForm">新增条件筛选</a-button>
-      <a-button :disabled="isViewDisabledBtn=='isView'?true:false" type="primary" class="mt-4 mr-2" @click="preView"
-        v-if="isPreview">保存</a-button>
+      <a-button
+        :disabled="isViewDisabledBtn == 'isView' ? true : false"
+        type="primary"
+        class="mt-4 ml-2"
+        @click="addConditionForm"
+        >新增条件筛选</a-button
+      >
+      <a-button
+        :disabled="isViewDisabledBtn == 'isView' ? true : false"
+        type="primary"
+        class="mt-4 mr-2"
+        @click="preView"
+        v-if="isPreview"
+        >保存</a-button
+      >
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { unref, ref } from 'vue';
-import ConditionScreeningForm from './ConditionScreeningForm.vue';
-import { conditionPreView } from '../config/formatData.ts';
-import { CollapseContainer } from '/@/components/Container/index';
-import RichText from './RichText.vue';
-const props = defineProps({
-  childGetFieldsValue: {
-    type: Function,
-    required: true,
-  },
-});
-const refItem = {
-  conditionScreeningRefs: ref([]),
-};
-const isViewDisabledBtn = window.localStorage.getItem('isViewDisabledBtn')
-const isPreview = ref(true);
-const collapseContainerRef = ref();
-const conditionScreeningList = ref([Date.now()]);
-const addConditionForm = () => {
-  if (!unref(isPreview)) {
-    collapseContainerRef.value.handleExpand();
-  }
-  unref(conditionScreeningList).push(Date.now());
-  const lastIndex = refItem.conditionScreeningRefs.value.length - 1;
-  refItem.conditionScreeningRefs.value[lastIndex]?.appendSchemaByField(
-    {
-      field: 'AND',
-      label: '和',
-      component: 'Input',
-      slot: 'and',
-      // labelWidth: 50,
-      colProps: { span: 3 },
+  import { unref, ref } from 'vue';
+  import ConditionScreeningForm from './ConditionScreeningForm.vue';
+  import { conditionPreView } from '../config/formatData.ts';
+  import { CollapseContainer } from '/@/components/Container/index';
+  import RichText from './RichText.vue';
+  const props = defineProps({
+    childGetFieldsValue: {
+      type: Function,
+      required: true,
     },
-    'value'
-  );
-};
-const handleExpand = (show) => {
-  isPreview.value = show;
-};
+  });
+  const refItem = {
+    conditionScreeningRefs: ref([]),
+  };
+  const isViewDisabledBtn = window.localStorage.getItem('isViewDisabledBtn');
+  const isPreview = ref(true);
+  const collapseContainerRef = ref();
+  const conditionScreeningList = ref([Date.now()]);
+  const addConditionForm = () => {
+    if (!unref(isPreview)) {
+      collapseContainerRef.value.handleExpand();
+    }
+    unref(conditionScreeningList).push(Date.now());
+    const lastIndex = refItem.conditionScreeningRefs.value.length - 1;
+    refItem.conditionScreeningRefs.value[lastIndex]?.appendSchemaByField(
+      {
+        field: 'AND',
+        label: '和',
+        component: 'Input',
+        slot: 'and',
+        // labelWidth: 50,
+        colProps: { span: 3 },
+      },
+      'value'
+    );
+  };
+  const handleExpand = (show) => {
+    isPreview.value = show;
+  };
 
-const otherAttribute = ref([]);
-// 预览条件筛选结果
-const preView = async () => {
-  const attributes = [];
-  const fieldsValue = props.childGetFieldsValue();
-  for (let i = 0; i < unref(refItem.conditionScreeningRefs).length; i++) {
-    const valid = await unref(refItem.conditionScreeningRefs)[i].validate();
-    if (!valid) return;
-    attributes.push({
-      ...unref(refItem.conditionScreeningRefs)[i].getFieldsValue(),
-      attribute: fieldsValue.type2,
-    });
-  }
-  otherAttribute.value = conditionPreView(attributes, fieldsValue.operationType);
-  collapseContainerRef.value.handleExpand();
-};
+  const otherAttribute = ref([]);
+  // 预览条件筛选结果
+  const preView = async () => {
+    const attributes = [];
+    const fieldsValue = props.childGetFieldsValue();
+    for (let i = 0; i < unref(refItem.conditionScreeningRefs).length; i++) {
+      const valid = await unref(refItem.conditionScreeningRefs)[i].validate();
+      if (!valid) return;
+      attributes.push({
+        ...unref(refItem.conditionScreeningRefs)[i].getFieldsValue(),
+        attribute: fieldsValue.type2,
+      });
+    }
+    otherAttribute.value = conditionPreView(attributes, fieldsValue.operationType);
+    // collapseContainerRef.value.handleExpand();
+    collapseContainerRef.value.show = true;
+  };
 
-const resetFilter = () => {
-  otherAttribute.value = [];
-};
-const deleteConditionForm = (index) => {
-  unref(conditionScreeningList).splice(index, 1);
-  const lastIndex = refItem.conditionScreeningRefs.value.length - 2;
-  refItem.conditionScreeningRefs.value[lastIndex]?.removeSchemaByFiled('AND');
-};
+  //ft add 表单数据置空
+  const resetConditionScreenForm = () => {
+    // conditionScreeningList.value = [];
+    resetFilter();
+    for (let i = 0; i < unref(refItem.conditionScreeningRefs).length; i++) {
+      unref(refItem.conditionScreeningRefs)[i]?.resetConditionScreenForm();
+    }
+  };
+  //ft add 表单数据置空
 
-defineExpose({
-  refItem,
-  conditionScreeningList,
-  otherAttribute,
-});
+  const resetFilter = () => {
+    otherAttribute.value = [];
+  };
+  const deleteConditionForm = (index) => {
+    unref(conditionScreeningList).splice(index, 1);
+    const lastIndex = refItem.conditionScreeningRefs.value.length - 2;
+    refItem.conditionScreeningRefs.value[lastIndex]?.removeSchemaByFiled('AND');
+  };
+
+  defineExpose({
+    refItem,
+    conditionScreeningList,
+    otherAttribute,
+    resetConditionScreenForm,
+  });
 </script>

@@ -57,12 +57,16 @@
   const deleteConditionForm = (index: number) => {
     emit('deleteConditionForm', index);
   };
+  // ft add
+  const resetConditionScreenForm = () => resetFields();
+  // ft add
   defineExpose({
     appendSchemaByField,
     removeSchemaByFiled,
     getFieldsValue,
     setFieldsValue,
     validate,
+    resetConditionScreenForm,
   });
 </script>
 

@@ -98,6 +98,13 @@
   });
 
   const alarmScheduleRef = ref<InstanceType<typeof AlarmSchedule>>();
+
+  //ft-add
+  const resetConditionForm = () => {
+    conditionScreeningRef?.value?.resetConditionScreenForm();
+  };
+  //ft-add
+
   const getFieldsValueFunc = () => {
     const predicate = conditionScreeningRef?.value?.refItem?.conditionScreeningRefs?.value?.map(
       (item) => item.getFieldsValue()
@@ -215,7 +222,10 @@
     });
   };
   //TODO-fengtao
-  const resetFieldsValueFunc = () => resetFields();
+  const resetFieldsValueFunc = () => {
+    resetConditionForm();
+    resetFields();
+  };
   // 回显数据函数
   const setFieldsFormValueFun = (fieldsValue) => {
     setFieldsValue(fieldsValue);

@@ -245,7 +245,14 @@
   const setFieldsFormValueFun = (fieldsValue) => {
     setFieldsValue(fieldsValue);
   };
-  const resetFieldsValueFunc = () => resetFields();
+  //ft-add
+  const resetConditionForm = () => {};
+
+  //ft-add
+  const resetFieldsValueFunc = () => {
+    resetFields();
+    resetConditionForm();
+  };
 
   const orgIdItem = ref('');
   const isUpdateItem = ref('');
@@ -379,6 +386,7 @@
     setRichText,
     refItem,
     clearRuleList,
+    resetConditionForm,
   });
 </script>