Merge branch 'ft_local_dev' into 'main'

fix：修改场景联动弹窗两次

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

 <template>
   <div :class="prefixCls">
-    <CollapseHeader v-bind="$props" :prefixCls="prefixCls" :show="show" @expand="handleExpand">
+    <CollapseHeader
+      v-bind="$props"
+      :prefixCls="prefixCls"
+      :show="!isClose ? isClose : show"
+      @expand="handleExpand"
+    >
       <template #title>
         <slot name="title"></slot>
       </template>
@@ -12,7 +17,7 @@
     <div class="p-2">
       <CollapseTransition :enable="canExpan">
         <Skeleton v-if="loading" :active="loading" />
-        <div :class="`${prefixCls}__body`" v-else v-show="show">
+        <div :class="`${prefixCls}__body`" v-else v-show="!isClose ? isClose : show">
           <slot></slot>
         </div>
       </CollapseTransition>
@@ -35,6 +40,7 @@
   import { useDesign } from '/@/hooks/web/useDesign';
 
   const props = defineProps({
+    isClose: { type: Boolean, default: true },
     title: { type: String, default: '' },
     loading: { type: Boolean },
     /**
@@ -58,7 +64,7 @@
      */
     lazyTime: { type: Number, default: 0 },
   });
-  const emit = defineEmits(['expand']);
+  const emit = defineEmits(['expand', 'change', 'hchange']);
 
   const show = ref(true);
 
@@ -69,6 +75,8 @@
    */
   function handleExpand() {
     show.value = !show.value;
+    emit('change', !show.value);
+    emit('hchange', !show.value);
     if (props.triggerWindowResize) {
       // 200 milliseconds here is because the expansion has animation,
       useTimeoutFn(triggerWindowResize, 200);

@@ -40,7 +40,7 @@ export const CoapSchemas: FormSchema[] = [
         { label: 'Efento NB-IoT', value: 'EFENTO' },
       ],
     },
-    colProps: { span: 22},
+    colProps: { span: 22 },
   },
   {
     field: 'transportPayloadType',
@@ -163,9 +163,7 @@ export const CoapSchemas: FormSchema[] = [
     colProps: { span: 22 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 17,
     },
     defaultValue: `
     syntax ="proto3";
@@ -193,9 +191,7 @@ export const CoapSchemas: FormSchema[] = [
     colProps: { span: 22 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 9,
     },
     defaultValue: `
     syntax ="proto3";
@@ -215,9 +211,7 @@ export const CoapSchemas: FormSchema[] = [
     colProps: { span: 22 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 11,
     },
     defaultValue: `
     syntax ="proto3";
@@ -238,9 +232,7 @@ export const CoapSchemas: FormSchema[] = [
     colProps: { span: 22 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 9,
     },
     defaultValue: `
     syntax ="proto3";

@@ -8,16 +8,12 @@
 <script lang="ts" setup>
   import { reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import {
-    CoapSchemas,
-    // deviceTelemetryProtoSchemaData,
-    // deviceAttributesProtoSchemaData,
-    // deviceRpcRequestProtoSchemaData,
-    // deviceRpcResponseProtoSchemaData,
-  } from './Coap';
+  import { CoapSchemas } from './Coap';
 
   const emits = defineEmits(['prev']);
-  let coapAllData = reactive({});
+  const coapAllData = reactive({
+    coapData: {},
+  });
   const transportCoapData: any = reactive({
     coapDeviceTypeConfiguration: {
       coapDeviceType: null,
@@ -61,25 +57,43 @@
   const getFormData = async () => {
     const val = await validate();
     if (!val) return;
-    transportCoapData.coapDeviceTypeConfiguration.coapDeviceType = val.coapDeviceType;
-    transportCoapData.coapDeviceTypeConfiguration.transportPayloadTypeConfiguration.transportPayloadType =
-      val.transportPayloadType;
-    transportCoapData.coapDeviceTypeConfiguration.transportPayloadTypeConfiguration.deviceTelemetryProtoSchema =
-      val.deviceTelemetryProtoSchema;
-    transportCoapData.coapDeviceTypeConfiguration.transportPayloadTypeConfiguration.deviceAttributesProtoSchema =
-      val.deviceAttributesProtoSchema;
-    transportCoapData.coapDeviceTypeConfiguration.transportPayloadTypeConfiguration.deviceRpcRequestProtoSchema =
-      val.deviceRpcRequestProtoSchema;
-    transportCoapData.coapDeviceTypeConfiguration.transportPayloadTypeConfiguration.deviceRpcResponseProtoSchema =
-      val.deviceRpcResponseProtoSchema;
-    transportCoapData.clientSettings.powerMode = val.powerMode;
-    transportCoapData.clientSettings.edrxCycle = val.edrxCycle;
-    transportCoapData.clientSettings.pagingTransmissionWindow = val.pagingTransmissionWindow;
-    transportCoapData.clientSettings.psmActivityTimer = val.psmActivityTimer;
-    coapAllData = {
+    for (let o in val) {
+      for (let u in transportCoapData) {
+        switch (u) {
+          case 'coapDeviceTypeConfiguration':
+            for (let t in transportCoapData.coapDeviceTypeConfiguration) {
+              if (t === 'coapDeviceType') {
+                Reflect.set(transportCoapData.coapDeviceTypeConfiguration, t, val[t]);
+              }
+              if (t === 'transportPayloadTypeConfiguration') {
+                for (let t in transportCoapData.coapDeviceTypeConfiguration
+                  .transportPayloadTypeConfiguration) {
+                  if (t === o) {
+                    Reflect.set(
+                      transportCoapData.coapDeviceTypeConfiguration
+                        .transportPayloadTypeConfiguration,
+                      t,
+                      val[t]
+                    );
+                  }
+                }
+              }
+            }
+            break;
+          case 'clientSettings':
+            for (let t in transportCoapData.clientSettings) {
+              if (t === o) {
+                Reflect.set(transportCoapData.clientSettings, t, val[t]);
+              }
+            }
+            break;
+        }
+      }
+    }
+    coapAllData.coapData = {
       ...transportCoapData,
     };
-    return coapAllData;
+    return coapAllData.coapData;
   };
   defineExpose({
     getFormData,

@@ -7,7 +7,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { serverSchemas } from '../index';
 
-  const [registerServer, { getFieldsValue, setFieldsValue }] = useForm({
+  const [registerServer, { getFieldsValue, setFieldsValue, resetFields }] = useForm({
     labelWidth: 180,
     schemas: serverSchemas,
     actionColOptions: {
@@ -24,9 +24,11 @@
     if (!value) return;
     return value;
   };
+  const resetFormData = () => resetFields();
   defineExpose({
     getBootStrapFormFunc,
     editBootStrapFormFunc,
+    resetFormData,
   });
 </script>
 <style lang="less" scoped></style>

@@ -284,8 +284,11 @@ export const serverSchemas: FormSchema[] = [
   {
     field: 'securityMode',
     component: 'Select',
-    label: '安全配置模式',
+    label: '安全配置',
     defaultValue: 'NO_SEC',
+    helpMessage: [
+      'X.509 Certificate模式和Raw Public Key模式和Pre-Shared Key模式下，port端口必须是5686',
+    ],
     componentProps: {
       options: [
         {
@@ -312,6 +315,7 @@ export const serverSchemas: FormSchema[] = [
     field: 'shortServerId',
     component: 'InputNumber',
     label: '短服务器ID',
+    helpMessage: ['短服务器ID是唯一的'],
     required: true,
     defaultValue: 123,
     colProps: { span: 8 },
@@ -320,6 +324,7 @@ export const serverSchemas: FormSchema[] = [
     field: 'host',
     component: 'Input',
     label: '主机',
+    helpMessage: ['主机是唯一的'],
     required: true,
     defaultValue: '0.0.0.0',
     colProps: { span: 8 },
@@ -328,6 +333,7 @@ export const serverSchemas: FormSchema[] = [
     field: 'port',
     component: 'Input',
     label: '端口',
+    helpMessage: ['端口必须是5685'],
     required: true,
     defaultValue: 5685,
     colProps: { span: 8 },

 <template>
   <div>
-    <Tabs
-      v-model:activeKey="currentKey"
-      :size="currentSize"
-      :animated="true"
-      @change="handleChange"
-    >
+    <Tabs v-model:activeKey="currentKey" :size="currentSize" :animated="true">
       <TabPane forceRender key="1" tab="LWM2M Model">
         <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerModel" />
       </TabPane>
@@ -17,22 +12,27 @@
             >包括引导服务器更新
           </Checkbox>
           <CollapseContainer
+            @hchange="hChange"
+            @change="eChange(item, index)"
             v-for="(item, index) in dynamicBOOTSTRAP.bootstrap"
             :key="item"
             :title="collapseTitle(item)"
             class="mt-4"
+            :isClose="item.close"
           >
             <template #action>
-              <Button
-                style="margin-right: 1vw"
-                size="small"
-                type="text"
-                @click="handleRemove(index)"
+              <Popconfirm
+                title="您确定要删除该项？"
+                ok-text="确定"
+                cancel-text="取消"
+                @confirm="handleRemove(index)"
               >
-                <template #icon>
-                  <DeleteOutlined />
-                </template>
-              </Button>
+                <Button style="margin-right: 1vw" size="small" type="text">
+                  <template #icon>
+                    <DeleteOutlined />
+                  </template>
+                </Button>
+              </Popconfirm>
             </template>
             <div style="border: 1px solid #d9d9d9; width: 100%">
               <div style="margin: 10px 15px">
@@ -89,17 +89,30 @@
   import { modelSchemas, settingsSchemas, deviceSchemas } from './index';
   import BootStrapForm from './cpns/BootStrapForm.vue';
   import { DeleteOutlined, PlusCircleOutlined } from '@ant-design/icons-vue';
-  import { Button, Checkbox } from 'ant-design-vue';
+  import { Button, Checkbox, Popconfirm } from 'ant-design-vue';
   import { CollapseContainer } from '/@/components/Container';
   import { useModal } from '/@/components/Modal';
   import ServerConfigModal from './cpns/ServerConfigModal.vue';
 
+  const eChange = (_, e1) => {
+    if (eS) {
+      dynamicBOOTSTRAP.bootstrap.forEach((bootstrap, index: number) => {
+        if (index === e1) {
+          bootstrap.close = true;
+        }
+      });
+    }
+  };
+  let eS = false;
+  const hChange = (e) => {
+    eS = e;
+  };
   const collapseTitle = (item) => {
     return `LwM2M Server        Short server ID: ${item.shortServerId}        Security config mode: ${item.securityMode}`;
   };
   const bootstrapServerUpdateEnable = ref(false);
   const dynamicBOOTSTRAP: any = reactive({
-    bootstrap: [{ securityMode: 'NO_SEC', shortServerId: 1234 }],
+    bootstrap: [{ securityMode: 'NO_SEC', shortServerId: 1234, close: false }],
   });
   const dynamicBindRef: any = {
     BootStrapFormItemRef: ref([]),
@@ -108,7 +121,6 @@
   const currentSize = ref('large');
   let allObj: any = reactive({});
   let allEchoObj: any = reactive({});
-  let allEchoStatus = ref(false);
   let clientLwM2mSettingsObj = reactive({});
   let observeAttrObj = reactive({
     attribute: [],
@@ -160,55 +172,28 @@
       dynamicBOOTSTRAP.bootstrap.push({
         securityMode: 'NO_SEC',
         shortServerId: 1234,
+        close: false,
       });
     }
   };
   const handleRemove = (index) => {
     dynamicBOOTSTRAP.bootstrap.splice(index, 1);
   };
-  const handleChange = (e) => {
-    if (allEchoStatus.value) {
-      switch (e) {
-        case '1':
-          break;
-        case '2':
-          nextTick(() => {
-            bootstrapServerUpdateEnable.value = allEchoObj.bootstrapServerUpdateEnable;
-            dynamicBOOTSTRAP.bootstrap = allEchoObj.bootstrap;
-            dynamicBOOTSTRAP.bootstrap.forEach((bootstrap, index: number) => {
-              nextTick(() => {
-                unref(dynamicBindRef.BootStrapFormItemRef)[index]?.editBootStrapFormFunc(bootstrap);
-              });
-            });
-          });
-          break;
-        case '3':
-          nextTick(() => {
-            settingsSetFieldsValueFunc({
-              powerMode: allEchoObj?.clientLwM2mSettings?.powerMode,
-              psmActivityTimer: allEchoObj?.clientLwM2mSettings?.psmActivityTimer,
-              edrxCycle: allEchoObj?.clientLwM2mSettings?.edrxCycle,
-              pagingTransmissionWindow: allEchoObj?.clientLwM2mSettings?.pagingTransmissionWindow,
-              fwUpdateStrategy: allEchoObj?.clientLwM2mSettings?.fwUpdateStrategy,
-              swUpdateStrategy: allEchoObj?.clientLwM2mSettings?.swUpdateStrategy,
-              clientOnlyObserveAfterConnect:
-                allEchoObj?.clientLwM2mSettings?.clientOnlyObserveAfterConnect,
-              fwUpdateResource: allEchoObj?.clientLwM2mSettings?.fwUpdateResource,
-              swUpdateResource: allEchoObj?.clientLwM2mSettings?.swUpdateResource,
-              compositeOperationsSupport:
-                allEchoObj?.clientLwM2mSettings?.compositeOperationsSupport,
-            });
-          });
-          break;
-        case '4':
-          break;
-      }
-    }
-  };
   const setFormData = (v) => {
     if (v) {
       allEchoObj = v;
-      allEchoStatus.value = true;
+      settingsSetFieldsValueFunc({
+        ...allEchoObj?.clientLwM2mSettings,
+      });
+      nextTick(() => {
+        bootstrapServerUpdateEnable.value = allEchoObj.bootstrapServerUpdateEnable;
+        dynamicBOOTSTRAP.bootstrap = allEchoObj.bootstrap;
+        dynamicBOOTSTRAP.bootstrap.forEach((bootstrap, index: number) => {
+          nextTick(() => {
+            unref(dynamicBindRef.BootStrapFormItemRef)[index]?.editBootStrapFormFunc(bootstrap);
+          });
+        });
+      });
     }
   };
   const tempBootStrap: any = [];
@@ -249,11 +234,13 @@
   };
 
   const resetFormData = () => {
-    allEchoStatus.value = false;
     nextTick(() => {
       resetObjectListValue();
       resetSettingsValue();
       resetDeviceValue();
+      unref(dynamicBindRef.BootStrapFormItemRef).map((item) => {
+        item.resetFormData();
+      });
     });
   };
   const selectCheckStatus = ref(false);
@@ -272,12 +259,14 @@
         dynamicBOOTSTRAP.bootstrap.push({
           securityMode: 'NO_SEC',
           shortServerId: 1234,
+          close: false,
         });
         break;
       case 'Bootstrap':
         dynamicBOOTSTRAP.bootstrap.push({
           securityMode: 'NO_SEC',
           shortServerId: 1234,
+          close: false,
         });
         break;
     }
@@ -290,7 +279,6 @@
     registerDevice,
     getFormData,
     setFormData,
-    handleChange,
     resetFormData,
     dynamicBOOTSTRAP,
     dynamicBindRef,

@@ -100,9 +100,7 @@ export const MqttSchemas: FormSchema[] = [
     colProps: { span: 23 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 17,
     },
     defaultValue: `
     syntax ="proto3";
@@ -129,9 +127,7 @@ export const MqttSchemas: FormSchema[] = [
     colProps: { span: 23 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 11,
     },
     defaultValue: `
     syntax ="proto3";
@@ -150,9 +146,7 @@ export const MqttSchemas: FormSchema[] = [
     colProps: { span: 23 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 11,
     },
     defaultValue: `
     syntax ="proto3";
@@ -172,9 +166,7 @@ export const MqttSchemas: FormSchema[] = [
     colProps: { span: 23 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 11,
     },
     defaultValue: `
     syntax ="proto3";
@@ -235,3 +227,19 @@ message RpcResponseMsg {
   optional string payload = 1;
 }
 `;
+
+export const fixedTextA = `支持单[+]和多级[#]通配符。 [+] is suitable for any topic filter
+level。例如：v1/devices/+/telemetry or +/devices/+/attributes。 [#]可以替换 topic
+filter 本身，并且必须是 topic 的最后一个符号。例如：# or v1/devices/me/#。`;
+
+export const fixedTextB = `启用时，默认情况下，平台将使用Protobuf有效载荷格式。如果解析失败，平台将尝试使用JSON负载格式。
+有助于固件更新期间的向后兼容性。例如，固件的初始版本使用Json，而新版本使用Protobuf。
+在设备组的固件更新过程中，需要同时支持Protobuf和JSON。兼容性模式会导致性能略有下降，
+因此建议在更新所有设备后禁用此模式。`;
+
+export const fixedTextC = `启用后，平台将使用Json负载格式通过以下主题推送属性
+和RPC:v1/devices/me/attributes/response/$request id、v1/devices/me/attributes、
+v1/devices/me/RPC/request/$request id、v1/devices/me/RPC/response/$request id。
+此设置不会影响使用新（v2）主题发送的属性和rpc订阅： v2/a/res/$request
+id、v2/a、v2/r/req/$request id、v2/r/res/$request id。 其中，$request
+id是整数请求标识符。`;

@@ -13,31 +13,21 @@
         <template #descSlot>
           <div style="width: 47rem; margin-left: 2rem">
             <p>
-              支持单[+]和多级[#]通配符。 [+] is suitable for any topic filter
-              level。例如：v1/devices/+/telemetry or +/devices/+/attributes。 [#]可以替换 topic
-              filter 本身，并且必须是 topic 的最后一个符号。例如：# or v1/devices/me/#。
+              {{ fixedTextA }}
             </p>
           </div>
         </template>
         <template #desc1>
           <div style="width: 47rem; margin-left: 2rem">
             <p>
-              启用时，默认情况下，平台将使用Protobuf有效载荷格式。如果解析失败，平台将尝试使用JSON负载格式。
-              有助于固件更新期间的向后兼容性。例如，固件的初始版本使用Json，而新版本使用Protobuf。
-              在设备组的固件更新过程中，需要同时支持Protobuf和JSON。兼容性模式会导致性能略有下降，
-              因此建议在更新所有设备后禁用此模式。
+              {{ fixedTextB }}
             </p>
           </div>
         </template>
         <template #desc2>
           <div style="width: 47rem; margin-left: 2rem">
             <p>
-              启用后，平台将使用Json负载格式通过以下主题推送属性
-              和RPC:v1/devices/me/attributes/response/$request\u id、v1/devices/me/attributes、
-              v1/devices/me/RPC/request/$request\u id、v1/devices/me/RPC/response/$request\u id。
-              此设置不会影响使用新（v2）主题发送的属性和rpc订阅： v2/a/res/$request\u
-              id、v2/a、v2/r/req/$request\u id、v2/r/res/$request\u id。 其中，$request\u
-              id是整数请求标识符。
+              {{ fixedTextC }}
             </p>
           </div>
         </template>
@@ -48,17 +38,13 @@
 <script lang="ts" setup>
   import { reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import {
-    MqttSchemas,
-    // deviceTelemetryProtoSchemaData,
-    // deviceAttributesProtoSchemaData,
-    // deviceRpcRequestProtoSchemaData,
-    // deviceRpcResponseProtoSchemaData,
-  } from './Mqtt';
+  import { MqttSchemas, fixedTextA, fixedTextB, fixedTextC } from './Mqtt';
 
   const emits = defineEmits(['prev']);
 
-  let allMqttData: any = reactive({});
+  const allMqttData: any = reactive({
+    mqttData: {},
+  });
   const transportMqttData: any = reactive({
     transportPayloadTypeConfiguration: {
       transportPayloadType: null,
@@ -94,33 +80,27 @@
   const getFormData = async () => {
     let val = await validate();
     if (!val) return;
-    delete val.desc;
-    transportMqttData.transportPayloadTypeConfiguration.transportPayloadType =
-      val.transportPayloadType;
-    transportMqttData.transportPayloadTypeConfiguration.enableCompatibilityWithJsonPayloadFormat =
-      val.enableCompatibilityWithJsonPayloadFormat;
-    transportMqttData.transportPayloadTypeConfiguration.useJsonPayloadFormatForDefaultDownlinkTopics =
-      val.useJsonPayloadFormatForDefaultDownlinkTopics;
-    transportMqttData.transportPayloadTypeConfiguration.deviceAttributesProtoSchema =
-      val.deviceAttributesProtoSchema;
-    transportMqttData.transportPayloadTypeConfiguration.deviceRpcRequestProtoSchema =
-      val.deviceRpcRequestProtoSchema;
-    transportMqttData.transportPayloadTypeConfiguration.deviceRpcResponseProtoSchema =
-      val.deviceRpcResponseProtoSchema;
-    transportMqttData.transportPayloadTypeConfiguration.deviceTelemetryProtoSchema =
-      val.deviceTelemetryProtoSchema;
-    allMqttData = {
+    for (let o in val) {
+      for (let u in transportMqttData) {
+        if (u === 'transportPayloadTypeConfiguration') {
+          for (let t in transportMqttData.transportPayloadTypeConfiguration) {
+            if (t === o) {
+              Reflect.set(transportMqttData.transportPayloadTypeConfiguration, t, val[t]);
+            }
+          }
+        }
+      }
+    }
+    for (let i in val) {
+      if (i !== 'deviceAttributesTopic' && i !== 'deviceTelemetryTopic') {
+        Reflect.deleteProperty(val, i);
+      }
+    }
+    allMqttData.mqttData = {
       ...val,
       ...transportMqttData,
     };
-    delete allMqttData.deviceTelemetryProtoSchema;
-    delete allMqttData.deviceAttributesProtoSchema;
-    delete allMqttData.deviceRpcRequestProtoSchema;
-    delete allMqttData.deviceRpcResponseProtoSchema;
-    delete allMqttData.useJsonPayloadFormatForDefaultDownlinkTopics;
-    delete allMqttData.enableCompatibilityWithJsonPayloadFormat;
-    delete allMqttData.transportPayloadType;
-    return allMqttData;
+    return allMqttData.mqttData;
   };
   defineExpose({
     getFormData,

@@ -15,15 +15,15 @@
         <!-- 基础表单 -->
         <!-- 触发器-begin -->
         <!-- <Divider orientation="left">触发器</Divider> -->
-        <Divider orientation="left"
-          ><a-tooltip>
+        <Divider orientation="left">
+          <a-tooltip>
             <template #title
               >场景联动触发的首要条件，"触发器"之间的关系为或，“执行条件”与“触发器”之间的关系为且。</template
             >
-            触发器<QuestionCircleOutlined
-              :style="{ fontSize: '14px', marginLeft: '5px' }"
-            /> </a-tooltip
-        ></Divider>
+            触发器
+            <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
+          </a-tooltip>
+        </Divider>
         <div>
           <template v-for="(item, index) in triggerData" :key="item">
             <TriggerOrCondition
@@ -45,16 +45,16 @@
         <!-- 触发器-end -->
 
         <!-- 执行条件-begin -->
-        <Divider orientation="left"
-          ><a-tooltip>
+        <Divider orientation="left">
+          <a-tooltip>
             <template #title
               >场景联动触发的次要条件，"执行条件"之间的关系为或，
               “执行条件”与“触发器”之间的关系为且。</template
             >
-            执行条件<QuestionCircleOutlined
-              :style="{ fontSize: '14px', marginLeft: '5px' }"
-            /> </a-tooltip
-        ></Divider>
+            执行条件
+            <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
+          </a-tooltip>
+        </Divider>
         <div>
           <template v-for="(item, index) in conditionData" :key="item">
             <TriggerOrCondition
@@ -76,15 +76,15 @@
         <!-- 执行条件-end -->
 
         <!-- 执行动作-begin -->
-        <Divider orientation="left"
-          ><a-tooltip>
+        <Divider orientation="left">
+          <a-tooltip>
             <template #title
               >触发器和执行条件都满足时，场景联动会做什么，例如：设备联动、告警通知等。</template
             >
-            执行动作<QuestionCircleOutlined
-              :style="{ fontSize: '14px', marginLeft: '5px' }"
-            /> </a-tooltip
-        ></Divider>
+            执行动作
+            <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
+          </a-tooltip>
+        </Divider>
         <div>
           <template v-for="(item, index) in actionData" :key="item">
             <Action
@@ -637,6 +637,30 @@
         id: unref(id),
         tenantId: unref(tenantId),
       };
+      //FT change
+      let mustTriggerCondition = false;
+      let mustCondition = false;
+      if (postAddOrEditData?.triggers !== null && postAddOrEditData?.triggers.length > 0) {
+        postAddOrEditData?.triggers.some((s) => {
+          if (s.triggerCondition?.condition?.condition == undefined) {
+            mustTriggerCondition = true;
+          }
+        });
+      } else {
+        mustTriggerCondition = false;
+      }
+      if (postAddOrEditData?.doConditions !== null && postAddOrEditData?.doConditions.length > 0) {
+        postAddOrEditData?.doConditions.some((s) => {
+          if (s.triggerCondition?.condition?.condition == undefined) {
+            mustCondition = true;
+          }
+        });
+      } else {
+        mustCondition = false;
+      }
+      if (mustTriggerCondition) return;
+      if (mustCondition) return;
+      //FT change
       await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate));
       createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
       closeDrawer();

@@ -60,7 +60,7 @@
   import { exportPage, deleteExportManage } from '/@/api/export/exportManager';
 
   const searchInfo = reactive<Recordable>({});
-  const [registerTable, { reload, setProps, setTableData }] = useTable({
+  const [registerTable, { reload, setProps }] = useTable({
     title: '转换脚本列表',
     api: exportPage,
     columns,
@@ -102,24 +102,6 @@
 
   // 新增或编辑
   const handleCreateOrEdit = (record: Recordable | null) => {
-    setTableData([
-      {
-        id: 1,
-        reportConfigName: '11',
-        organizationName: 0,
-        dataType: '11',
-        executeWay: '11',
-        executeTime: '2022-05-21',
-      },
-      {
-        id: 2,
-        reportConfigName: '11',
-        organizationName: 0,
-        dataType: '11',
-        executeWay: '11',
-        executeTime: '2022-05-21',
-      },
-    ]);
     if (record) {
       openModal(true, {
         isUpdate: false,