feat: 提交因冲突未合并的代码

@@ -15,7 +15,11 @@
       <!-- 设备选择 -->
       <template #devices="{ model }">
         <span class="hidden">{{ handleChangeOrg(model['organizationId']) }}</span>
-        <SelectDevice ref="selectDeviceRef" :selectOptions="selectOptions" />
+        <SelectDevice
+          ref="selectDeviceRef"
+          :selectOptions="selectOptions"
+          v-model:disabled="deviceDisabled"
+        />
       </template>
     </BasicForm>
   </BasicDrawer>
@@ -83,12 +87,14 @@
     }
   );
 
-  const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm({
-    labelWidth: 120,
-    schemas: formSchema,
-    showActionButtonGroup: false,
-    fieldMapToTime: [[SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS]]],
-  });
+  const [registerForm, { validate, resetFields, setFieldsValue, updateSchema, setProps }] = useForm(
+    {
+      labelWidth: 120,
+      schemas: formSchema,
+      showActionButtonGroup: false,
+      fieldMapToTime: [[SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS]]],
+    }
+  );
 
   const businessText = ref('');
 
@@ -96,11 +102,27 @@
     data: {},
   });
 
+  const deviceDisabled = ref<boolean>(false);
+
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     try {
       await nextTick();
       handleClose();
       businessText.value = data.text;
+      if (businessText.value == BusinessReportConfigTextEnum.BUSINESS_VIEW_TEXT) {
+        deviceDisabled.value = true;
+        setProps({ disabled: true });
+        updateSchema({
+          field: 'organizationId',
+          componentProps: { apiTreeSelectProps: { disabled: true } },
+        });
+      } else {
+        deviceDisabled.value = false;
+        updateSchema({
+          field: 'organizationId',
+          componentProps: { apiTreeSelectProps: { disabled: false } },
+        });
+      }
       setFieldsValue(setDefaultTime());
       updateSchema(disableCustomWeekly(BusinessExecutewayEnum.BUSINESS_EXECUTEWAY_IMMEDIATE));
       setDrawerProps(setPropsForModal(businessText.value));

@@ -6,6 +6,7 @@
       v-model:value="param.attributes"
       class="!w-1/2"
       :options="selectOptions"
+      :disabled="disabled"
       @change="emitChange"
       mode="multiple"
       allowClear
@@ -26,6 +27,10 @@
 
   const props = defineProps({
     value: propTypes.object.def({}),
+    disabled: {
+      type: Boolean,
+      required: false,
+    },
   });
 
   const selectOptions: any = ref([]);

@@ -6,11 +6,17 @@
     :options="selectOptions"
     v-bind="createPickerSearch()"
     @change="handleDeviceChange"
+    :disabled="disabled"
     mode="multiple"
     labelInValue
   />
   <template v-for="(item, index) in deviceList" :key="item.value">
-    <SelectAttributes :ref="bindDeviceRef.deviceAttrRef" :value="item" :index="index" />
+    <SelectAttributes
+      :ref="bindDeviceRef.deviceAttrRef"
+      :value="item"
+      :index="index"
+      :disabled="disabled"
+    />
   </template>
 </template>
 <script lang="ts" setup name="SelectDevice">
@@ -25,6 +31,10 @@
       type: Array as PropType<TSelectOption[]>,
       required: true,
     },
+    disabled: {
+      type: Boolean,
+      required: false,
+    },
   });
 
   const selectValue = ref([]);

@@ -41,7 +41,6 @@
   const [register, { setModalProps, closeModal }] = useModalInner(async (data) => {
     setModalProps({ loading: true });
     const { text, record } = data || {};
-    console.log(data, 'data');
     isUpdate.value = record ? true : false;
     ruleTile.value = text;
     const { name, additionalInfo, debugMode } = record || {};

@@ -4,18 +4,21 @@
       <template #uploadFilesSlot="{ model }">
         <UploadFile
           :url="credentialsFile.caCertFileName"
+          :disabled="disabled"
           @fileUrlEmit="handleFileUrlEmitH"
           v-show="model['type'] === CredentialsEnum.IS_PEM"
         />
         <div class="h-4"></div>
         <UploadFile
           :url="credentialsFile.certFileName"
+          :disabled="disabled"
           @fileUrlEmit="handleFileUrlEmitC"
           v-show="model['type'] === CredentialsEnum.IS_PEM"
         />
         <div class="h-4"></div>
         <UploadFile
           :url="credentialsFile.privateKeyFileName"
+          :disabled="disabled"
           @fileUrlEmit="handleFileUrlEmitB"
           v-show="model['type'] === CredentialsEnum.IS_PEM"
         /> </template
@@ -23,7 +26,7 @@
   </div>
 </template>
 <script lang="ts" setup name="DataFlowMethodIsApi">
-  import { reactive } from 'vue';
+  import { reactive, ref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { modeApiForm } from './config';
   import { modelFormPublicConfig } from '../../../dataflowmodal/config';
@@ -36,10 +39,11 @@
     privateKeyFileName: undefined,
   });
 
-  const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
-    schemas: modeApiForm,
-    ...modelFormPublicConfig,
-  });
+  const [register, { validateFields, setFieldsValue, resetFields, setProps, updateSchema }] =
+    useForm({
+      schemas: modeApiForm,
+      ...modelFormPublicConfig,
+    });
 
   const handleFileUrlEmitH = (fileUrl) => (credentialsFile.caCertFileName = fileUrl);
 
@@ -78,10 +82,24 @@
   };
 
   const resetValue = () => resetFields();
+
+  const disabled = ref<boolean>(false);
+  const setDisabledProps = (value) => {
+    setProps(value);
+    disabled.value = true;
+    updateSchema({ field: 'headers', componentProps: { disabled: false } });
+  };
+
+  const setCancelDisabled = () => {
+    updateSchema({ field: 'headers', componentProps: { disabled: false } });
+  };
+
   defineExpose({
     getValue,
     setValue,
     resetValue,
+    setDisabledProps,
+    setCancelDisabled,
   });
 </script>
 

@@ -29,7 +29,7 @@ class ApiFormPartialConfig {
     return [
       { label: 'Anonymous', value: 'anonymous' },
       { label: 'Basic', value: 'basic' },
-      { label: 'PEM', value: 'pem' },
+      { label: 'PEM', value: 'cert.PEM' },
     ];
   }
 }

@@ -8,7 +8,7 @@
   import { modelKafkaForm } from './config';
   import { modelFormPublicConfig } from '../../../dataflowmodal/config';
 
-  const [register, { validate, setFieldsValue, resetFields }] = useForm({
+  const [register, { validate, setFieldsValue, resetFields, setProps, updateSchema }] = useForm({
     schemas: modelKafkaForm,
     ...modelFormPublicConfig,
   });
@@ -19,13 +19,28 @@
     return values;
   };
 
-  const setValue = (value) => setFieldsValue(value);
+  const setValue = (value) => {
+    setFieldsValue(value);
+  };
+
+  // ½ûÓÃ±íµ¥
+  const setDisabledProps = (value) => {
+    setProps(value);
+    updateSchema({ field: 'otherProperties', componentProps: { disabled: true } });
+  };
+
+  // È¡Ïû½ûÓÃ
+  const setCancelDisabled = () => {
+    updateSchema({ field: 'otherProperties', componentProps: { disabled: false } });
+  };
 
   const resetValue = () => resetFields();
   defineExpose({
     getValue,
     setValue,
     resetValue,
+    setDisabledProps,
+    setCancelDisabled,
   });
 </script>
 

@@ -4,18 +4,21 @@
       <template #uploadFilesSlot="{ model }">
         <UploadFile
           :url="credentialsFile.caCertFileName"
+          :disabled="disabled"
           @fileUrlEmit="handleFileUrlEmitH"
           v-show="model['type'] === CredentialsEnum.IS_PEM"
         />
         <div class="h-4"></div>
         <UploadFile
           :url="credentialsFile.certFileName"
+          :disabled="disabled"
           @fileUrlEmit="handleFileUrlEmitC"
           v-show="model['type'] === CredentialsEnum.IS_PEM"
         />
         <div class="h-4"></div>
         <UploadFile
           :url="credentialsFile.privateKeyFileName"
+          :disabled="disabled"
           @fileUrlEmit="handleFileUrlEmitB"
           v-show="model['type'] === CredentialsEnum.IS_PEM"
         />
@@ -24,7 +27,7 @@
   </div>
 </template>
 <script lang="ts" setup name="DataFlowMethodIsMqtt">
-  import { reactive } from 'vue';
+  import { reactive, ref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { modeMqttForm } from './config';
   import { UploadFile } from '../../../uploadfile';
@@ -37,7 +40,7 @@
     privateKeyFileName: undefined,
   });
 
-  const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
+  const [register, { validateFields, setFieldsValue, resetFields, setProps }] = useForm({
     schemas: modeMqttForm,
     ...modelFormPublicConfig,
   });
@@ -81,11 +84,18 @@
     });
   };
 
+  const disabled = ref<boolean>(false);
+  const setDisabledProps = (value) => {
+    setProps(value);
+    disabled.value = true;
+  };
+
   const resetValue = () => resetFields();
   defineExpose({
     getValue,
     setValue,
     resetValue,
+    setDisabledProps,
   });
 </script>
 

@@ -145,7 +145,6 @@ export const modeMqttForm: FormSchema[] = [
         options: MqttFormPartialConfig.getType(),
         onChange(e) {
           if (e) {
-            console.log('执行');
             setFieldsValue({
               password: undefined,
               username: undefined,

@@ -8,10 +8,11 @@
   import { modeRabbitMqForm } from './config';
   import { modelFormPublicConfig } from '../../../dataflowmodal/config';
 
-  const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
-    schemas: modeRabbitMqForm,
-    ...modelFormPublicConfig,
-  });
+  const [register, { validateFields, setFieldsValue, resetFields, setProps, updateSchema }] =
+    useForm({
+      schemas: modeRabbitMqForm,
+      ...modelFormPublicConfig,
+    });
 
   const getValue = async () => {
     const values = await validateFields();
@@ -22,10 +23,22 @@
   const setValue = (value) => setFieldsValue(value);
 
   const resetValue = () => resetFields();
+
+  const setDisabledProps = (value) => {
+    setProps(value);
+    updateSchema({ field: 'clientProperties', componentProps: { disabled: true } });
+  };
+
+  const setCancelDisabled = () => {
+    updateSchema({ field: 'clientProperties', componentProps: { disabled: false } });
+  };
+
   defineExpose({
     getValue,
     setValue,
     resetValue,
+    setDisabledProps,
+    setCancelDisabled,
   });
 </script>
 <style lang="less" scoped></style>

@@ -104,10 +104,35 @@
     if (!findDateFlow) return;
     findDateFlow[3](0);
   };
+
+  const setProps = async () => {
+    await nextTick();
+    props.dataFlowType === BusinessDataFlowMethodEnum.DATAFLOW_METHOD_KAFKA &&
+      dataFlowMethodIsKafkaRef.value?.setDisabledProps({ disabled: true });
+    props.dataFlowType === BusinessDataFlowMethodEnum.DATAFLOW_METHOD_MQTT &&
+      dataFlowMethodIsMqttRef.value?.setDisabledProps({ disabled: true });
+    props.dataFlowType === BusinessDataFlowMethodEnum.DATAFLOW_METHOD_RABBITMQ &&
+      dataFlowMethodIsRabbitMqRef.value?.setDisabledProps({ disabled: true });
+    props.dataFlowType === BusinessDataFlowMethodEnum.DATAFLOW_METHOD_REST_API &&
+      dataFlowMethodIsApiRef.value?.setDisabledProps({ disabled: true });
+  };
+
+  const setCancelDisabled = async () => {
+    await nextTick();
+    props.dataFlowType === BusinessDataFlowMethodEnum.DATAFLOW_METHOD_KAFKA &&
+      dataFlowMethodIsKafkaRef.value?.setCancelDisabled();
+    props.dataFlowType === BusinessDataFlowMethodEnum.DATAFLOW_METHOD_RABBITMQ &&
+      dataFlowMethodIsRabbitMqRef.value?.setCancelDisabled();
+    props.dataFlowType === BusinessDataFlowMethodEnum.DATAFLOW_METHOD_REST_API &&
+      dataFlowMethodIsApiRef.value?.setCancelDisabled();
+  };
+
   defineExpose({
     getValue,
     setValue,
     resetValue,
+    setCancelDisabled,
+    setProps,
   });
 </script>
 <style lang="less" scoped>

@@ -3,6 +3,7 @@
     <a-upload-dragger
       v-model:fileList="fileList.list"
       name="file"
+      :disabled="disabled"
       :multiple="false"
       @change="handleChange($event)"
       :before-upload="() => false"
@@ -37,6 +38,10 @@
       type: String,
       default: '',
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   });
 
   const emit = defineEmits(['fileUrlEmit']);

@@ -153,11 +153,14 @@
   let getActionFormValue = ref([]);
   const editEntryIdData = ref([]);
   const editAlarmConfigData = ref([]);
-  const isUpdate = ref(false);
+  const isUpdate = ref<boolean | number>(false);
   const id = ref(undefined);
   const tenantId = ref(undefined);
   const isView = ref(true);
-  const [registerForm, { resetFields, validate, setFieldsValue, getFieldsValue }] = useForm({
+  const [
+    registerForm,
+    { resetFields, validate, setFieldsValue, getFieldsValue, setProps, updateSchema },
+  ] = useForm({
     labelWidth: 120,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -532,6 +535,37 @@
       showFooter: unref(isView),
       loading: false,
     });
+
+    if (isUpdate.value == 3) {
+      setProps({ disabled: true });
+      updateSchema({
+        field: 'organizationId',
+        componentProps: { apiTreeSelectProps: { disabled: true } },
+      });
+      await nextTick();
+      unref(skipUnwrap.triggerItemRefs)?.forEach((item) => {
+        item.setDisabledProps({ disabled: true });
+      });
+
+      unref(skipUnwrap.conditionItemRefs)?.forEach((item) => {
+        item.setDisabledProps({ disabled: true });
+      });
+
+      unref(skipUnwrap.actionItemRefs)?.forEach((item) => {
+        item.setDisabledProps({ disabled: true });
+      });
+    } else {
+      updateSchema({
+        field: 'organizationId',
+        componentProps: { apiTreeSelectProps: { disabled: false } },
+      });
+      unref(skipUnwrap.triggerItemRefs)?.forEach((item) => {
+        item.setCancelDisabled();
+      });
+      unref(skipUnwrap.conditionItemRefs)?.forEach((item) => {
+        item.setCancelDisabled();
+      });
+    }
   });
 
   // 设置设备的options

@@ -29,6 +29,7 @@
         <template #operationType="{ model, field }">
           <Select
             :options="options"
+            :disabled="disabled"
             v-model:value="model[field]"
             @change="operationType = model[field]"
             placeholder="请选择比较类型"
@@ -39,6 +40,7 @@
           <Input v-model:value="model[field]" placeholder="请输入持续时间">
             <template #addonAfter>
               <Select
+                :disabled="disabled"
                 v-model:value="model[`timeUnit`]"
                 :options="timeUnitOptions"
                 style="width: 60px"
@@ -58,7 +60,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, provide, nextTick } from 'vue';
+  import { ref, provide, nextTick, unref } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Card, Select, Input, Tooltip } from 'ant-design-vue';
@@ -86,12 +88,13 @@
   const emit = defineEmits(['delete']);
   const isUpdate = ref(false);
   const conditionScreeningRef = ref();
-  const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
-    //TODO-wenwei-修复
-    schemas: cloneDeep(trigger_condition_schema),
-    //TODO-wenwei-修复
-    showActionButtonGroup: false,
-  });
+  const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue, setProps }] =
+    useForm({
+      //TODO-wenwei-修复
+      schemas: cloneDeep(trigger_condition_schema),
+      //TODO-wenwei-修复
+      showActionButtonGroup: false,
+    });
 
   const alarmScheduleRef = ref<InstanceType<typeof AlarmSchedule>>();
   const getFieldsValueFunc = () => {
@@ -144,6 +147,7 @@
   const currentIndex = ref(0);
   const [registerModal, { openModal }] = useModal();
   const handleScheduleChange = (value) => {
+    if (unref(disabled)) return;
     const index = scheduleOptions.findIndex((item) => item.value === value);
     // 报警日程弹窗
     if (index !== 0) {
@@ -164,6 +168,16 @@
     currentIndex.value = index;
   };
   const scheduleData = ref(null);
+
+  const disabled = ref<boolean>(false);
+  const setDisabledProps = (value) => {
+    setProps(value);
+    disabled.value = true;
+  };
+
+  const setCancelDisabled = () => {
+    disabled.value = false;
+  };
   defineExpose({
     getFieldsValue,
     updateFieldDeviceId,
@@ -182,6 +196,8 @@
     isUpdate,
     alarmScheduleRef,
     updateFieldAttributeFunc,
+    setDisabledProps,
+    setCancelDisabled,
   });
 </script>
 <style>

@@ -31,8 +31,11 @@
   const emit = defineEmits(['deleteConditionForm']);
   const operationType = inject('operationType');
   let schemas = ref([]);
+  const isViewDisabledBtn = window.localStorage.getItem('isViewDisabledBtn');
   onMounted(() => {
     schemas.value = isType(operationType.value);
+
+    if (isViewDisabledBtn == 'isView') setProps({ disabled: true });
   });
   watch(operationType, (newValue) => {
     schemas.value = isType(newValue);
@@ -47,6 +50,7 @@
       getFieldsValue,
       setFieldsValue,
       validate,
+      setProps,
     },
   ] = useForm({
     showActionButtonGroup: false,
@@ -55,6 +59,7 @@
     schemas,
   });
   const deleteConditionForm = (index: number) => {
+    if (isViewDisabledBtn == 'isView') return;
     emit('deleteConditionForm', index);
   };
   // ft add

@@ -8,7 +8,8 @@
             <template v-for="(item, scheduleIndex) in scheduleOptions" :key="item.label">
               <div
                 :class="{ 'ml-4': scheduleIndex >= 1, active: scheduleIndex === currentIndex }"
-                class="cursor-pointer"
+                class="cursor-pointer !p-0"
+                :disabled="disabled"
                 @click="handleScheduleChange(item.value)"
                 >{{ item.label }}</div
               >
@@ -28,6 +29,7 @@
         <template #operationType="{ model, field }">
           <Select
             :options="options"
+            :disabled="disabled"
             v-model:value="model[field]"
             @change="operationType = model[field]"
             placeholder="请选择比较类型"
@@ -38,6 +40,7 @@
           <Input v-model:value="model[field]" placeholder="请输入持续时间">
             <template #addonAfter>
               <Select
+                :disabled="disabled"
                 v-model:value="model[`timeUnit`]"
                 :options="timeUnitOptions"
                 style="width: 60px"
@@ -71,6 +74,7 @@
   import { Icon } from '/@/components/Icon';
   import { useModal } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { unref } from 'vue';
 
   const { useByProductGetAttribute } = useCommonFun();
   defineProps({
@@ -92,12 +96,13 @@
 
   const isUpdate = ref(false);
   const conditionScreeningRef = ref();
-  const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
-    //TODO-wenwei-修复
-    schemas: cloneDeep(trigger_condition_schema),
-    //TODO-wenwei-修复
-    showActionButtonGroup: false,
-  });
+  const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue, setProps }] =
+    useForm({
+      //TODO-wenwei-修复
+      schemas: cloneDeep(trigger_condition_schema),
+      //TODO-wenwei-修复
+      showActionButtonGroup: false,
+    });
 
   const alarmScheduleRef = ref<InstanceType<typeof AlarmSchedule>>();
 
@@ -168,6 +173,7 @@
   };
   //TODO-fengtao
   const handleDelete = (params: { index: number; title: string }) => {
+    if (unref(disabled)) return;
     emit('delete', params);
   };
   const operationType = ref<string>('');
@@ -192,6 +198,7 @@
   const [registerModal, { openModal }] = useModal();
   const currentIndex = ref(0);
   const handleScheduleChange = (value) => {
+    if (unref(disabled)) return;
     const index = scheduleOptions.findIndex((item) => item.value === value);
     // 报警日程弹窗
     if (index !== 0) {
@@ -223,6 +230,16 @@
     // console.log(alarmConfigList);
   };
 
+  const disabled = ref<boolean>(false);
+  const setDisabledProps = (value) => {
+    setProps(value);
+    disabled.value = true;
+  };
+
+  const setCancelDisabled = () => {
+    disabled.value = false;
+  };
+
   defineExpose({
     getFieldsValueFunc,
     updateFieldDeviceId,
@@ -240,6 +257,8 @@
     updateFieldAttributeFunc,
     updateFieldAlarmConfig,
     updateEditFieldAlarmConfig,
+    setDisabledProps,
+    setCancelDisabled,
   });
 </script>
 

@@ -159,7 +159,6 @@
   });
 
   const resize = async () => {
-    console.log(123321);
     await nextTick();
 
     // 修改echarts大小

@@ -24,27 +24,7 @@
           defaultValue: option.backgroundColor,
         },
       },
-      {
-        field: ComponentConfigFieldEnum.MAX_NUMBER,
-        label: '最大值',
-        component: 'InputNumber',
-        defaultValue: 100,
-        componentProps: ({ formActionType }) => {
-          const { setFieldsValue } = formActionType;
-          return {
-            placeholder: '请输入最大值',
-            min: 100,
-            onChange: async (e) => {
-              if (!e) {
-                await nextTick();
-                setFieldsValue({
-                  [ComponentConfigFieldEnum.MAX_NUMBER]: 100,
-                });
-              }
-            },
-          };
-        },
-      },
+
       {
         field: ComponentConfigFieldEnum.VALUE_SIZE,
         label: '数值字体大小',

@@ -90,6 +90,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
   const isUpdate = unref(mode) === DataActionModeEnum.UPDATE;
   const selectWidgetKeys = useSelectWidgetKeys();
   const category = unref(selectWidgetKeys).categoryKey;
+
   return [
     {
       field: DataSourceField.IS_GATEWAY_DEVICE,

@@ -286,6 +286,7 @@ export const useSocket = (dataSourceRef: Ref<WidgetDataType[]>) => {
         throw Error(error as string);
       }
     },
+    autoReconnect: true,
   });
 
   const initSubscribe = () => {