Merge branch 'revert-204d053a' into 'main'

Revert "fix: 修改场景联动,数据流转,报表配置处于启用中不能操作"

See merge request yunteng/thingskit-front!930

@@ -3,26 +3,24 @@
     <a-input
       placeholder="请输入参数key"
       v-model:value="param.label"
-      :disabled="disabled"
       style="width: 38%; margin-bottom: 5px"
       @change="emitChange"
     />
     <a-input
       placeholder="请输入参数value"
-      :disabled="disabled"
       v-model:value="param.value"
       style="width: 38%; margin: 0 0 5px 60px"
       @change="emitChange"
     />
     <MinusCircleOutlined
-      v-if="dynamicInput.params.length > min && !disabled"
+      v-if="dynamicInput.params.length > min"
       class="dynamic-delete-button"
       @click="remove(param)"
       style="width: 50px"
     />
   </div>
   <div>
-    <a-button :disabled="disabled" type="dashed" style="width: 38%" @click="add">
+    <a-button type="dashed" style="width: 38%" @click="add">
       <PlusOutlined />
       新增
     </a-button>
@@ -51,17 +49,11 @@
       value: propTypes.object.def({}),
       //自定义删除按钮多少才会显示
       min: propTypes.integer.def(0),
-      disabled: {
-        type: Boolean,
-        default: false,
-      },
     },
     emits: ['change', 'update:value'],
     setup(props, { emit }) {
       //input动态数据
       const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
-
-      console.log(dynamicInput, 'dynamicInput');
       //删除Input
       const remove = (item: Params) => {
         let index = dynamicInput.params.indexOf(item);
@@ -71,11 +63,6 @@
         emitChange();
       };
 
-      // const disabled = computed(() => {
-      //   const { disabled } = props || {};
-      //   return disabled;
-      // });
-
       //新增Input
       const add = () => {
         dynamicInput.params.push({
@@ -121,7 +108,6 @@
         emitChange,
         remove,
         add,
-        // disabled,
       };
     },
   });

@@ -37,7 +37,6 @@
   const getBindProps = computed<Recordable>(() => {
     const { value, apiTreeSelectProps = {} } = props;
     const { params = {} } = apiTreeSelectProps;
-    console.log(props, 'props');
     return {
       replaceFields: { children: 'children', key: 'id', title: 'name', value: 'id' },
       getPopupContainer: () => document.body,

@@ -14,11 +14,7 @@
       <!-- 设备选择 -->
       <template #devices="{ model }">
         <span class="hidden">{{ handleChangeOrg(model['organizationId']) }}</span>
-        <SelectDevice
-          ref="selectDeviceRef"
-          :selectOptions="selectOptions"
-          v-model:disabled="deviceDisabled"
-        />
+        <SelectDevice ref="selectDeviceRef" :selectOptions="selectOptions" />
       </template>
     </BasicForm>
   </BasicDrawer>
@@ -86,14 +82,12 @@
     }
   );
 
-  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 [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm({
+    labelWidth: 120,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+    fieldMapToTime: [[SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS]]],
+  });
 
   const businessText = ref('');
 
@@ -101,27 +95,11 @@
     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));

@@ -11,7 +11,6 @@
       v-model:value="param.attributes"
       style="width: 38%; margin-left: 1.8vw"
       :options="selectOptions"
-      :disabled="disabled"
       @change="emitChange"
       mode="multiple"
       allowClear
@@ -32,10 +31,6 @@
 
   const props = defineProps({
     value: propTypes.object.def({}),
-    disabled: {
-      type: Boolean,
-      required: false,
-    },
   });
 
   const selectOptions: any = ref([]);

@@ -5,17 +5,11 @@
     style="width: 100%"
     :options="selectOptions"
     @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"
-      :disabled="disabled"
-    />
+    <SelectAttributes :ref="bindDeviceRef.deviceAttrRef" :value="item" :index="index" />
   </template>
 </template>
 <script lang="ts" setup name="SelectDevice">
@@ -29,10 +23,6 @@
       type: Array as PropType<TSelectOption[]>,
       required: true,
     },
-    disabled: {
-      type: Boolean,
-      required: false,
-    },
   });
 
   const selectValue = ref([]);

@@ -4,21 +4,18 @@
       <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
@@ -26,7 +23,7 @@
   </div>
 </template>
 <script lang="ts" setup name="DataFlowMethodIsApi">
-  import { reactive, ref } from 'vue';
+  import { reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { modeApiForm } from './config';
   import { modelFormPublicConfig } from '../../../dataflowmodal/config';
@@ -39,11 +36,10 @@
     privateKeyFileName: undefined,
   });
 
-  const [register, { validateFields, setFieldsValue, resetFields, setProps, updateSchema }] =
-    useForm({
-      schemas: modeApiForm,
-      ...modelFormPublicConfig,
-    });
+  const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
+    schemas: modeApiForm,
+    ...modelFormPublicConfig,
+  });
 
   const handleFileUrlEmitH = (fileUrl) => (credentialsFile.caCertFileName = fileUrl);
 
@@ -82,24 +78,10 @@
   };
 
   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: 'cert.PEM' },
+      { label: 'PEM', value: 'pem' },
     ];
   }
 }

@@ -8,7 +8,7 @@
   import { modelKafkaForm } from './config';
   import { modelFormPublicConfig } from '../../../dataflowmodal/config';
 
-  const [register, { validate, setFieldsValue, resetFields, setProps, updateSchema }] = useForm({
+  const [register, { validate, setFieldsValue, resetFields }] = useForm({
     schemas: modelKafkaForm,
     ...modelFormPublicConfig,
   });
@@ -19,29 +19,13 @@
     return values;
   };
 
-  const setValue = (value) => {
-    console.log(value, 'value');
-    setFieldsValue(value);
-  };
-
-  // 禁用表单
-  const setDisabledProps = (value) => {
-    setProps(value);
-    updateSchema({ field: 'otherProperties', componentProps: { disabled: true } });
-  };
-
-  // 取消禁用
-  const setCancelDisabled = () => {
-    updateSchema({ field: 'otherProperties', componentProps: { disabled: false } });
-  };
+  const setValue = (value) => setFieldsValue(value);
 
   const resetValue = () => resetFields();
   defineExpose({
     getValue,
     setValue,
     resetValue,
-    setDisabledProps,
-    setCancelDisabled,
   });
 </script>
 

@@ -4,21 +4,18 @@
       <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"
         />
@@ -27,7 +24,7 @@
   </div>
 </template>
 <script lang="ts" setup name="DataFlowMethodIsMqtt">
-  import { reactive, ref } from 'vue';
+  import { reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { modeMqttForm } from './config';
   import { UploadFile } from '../../../uploadfile';
@@ -40,7 +37,7 @@
     privateKeyFileName: undefined,
   });
 
-  const [register, { validateFields, setFieldsValue, resetFields, setProps }] = useForm({
+  const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
     schemas: modeMqttForm,
     ...modelFormPublicConfig,
   });
@@ -84,18 +81,11 @@
     });
   };
 
-  const disabled = ref<boolean>(false);
-  const setDisabledProps = (value) => {
-    setProps(value);
-    disabled.value = true;
-  };
-
   const resetValue = () => resetFields();
   defineExpose({
     getValue,
     setValue,
     resetValue,
-    setDisabledProps,
   });
 </script>
 

@@ -8,11 +8,10 @@
   import { modeRabbitMqForm } from './config';
   import { modelFormPublicConfig } from '../../../dataflowmodal/config';
 
-  const [register, { validateFields, setFieldsValue, resetFields, setProps, updateSchema }] =
-    useForm({
-      schemas: modeRabbitMqForm,
-      ...modelFormPublicConfig,
-    });
+  const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
+    schemas: modeRabbitMqForm,
+    ...modelFormPublicConfig,
+  });
 
   const getValue = async () => {
     const values = await validateFields();
@@ -23,22 +22,10 @@
   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>

@@ -25,7 +25,7 @@
 
   const emit = defineEmits(['currentDataFlowMethodEmitNext']);
 
-  const [register, { validateFields, setFieldsValue, resetFields, setProps }] = useForm({
+  const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
     schemas: modeForm(props.saveContent),
     ...modelFormPublicConfig,
   });
@@ -66,7 +66,6 @@
     getValue,
     setValue,
     resetValue,
-    setProps,
   });
 </script>
 <style lang="less" scoped>

@@ -74,9 +74,6 @@
     resetValue();
     const { text, record } = data;
     businessText.value = text;
-    if (businessText.value == BusinessDataFlowTextEnum.BUSINESS_MODAL_VIEW_TEXT) {
-      dataFlowMethodRef.value?.setProps({ disabled: true });
-    }
     restData.data = record;
     setModalProps(modalProps(businessText.value));
     if (!record) return;
@@ -164,12 +161,6 @@
 
   //下一步
   const handleNextDataFlowParams = async (value) => {
-    //判断是否是查看 查看禁用表单
-    if (businessText.value == BusinessDataFlowTextEnum.BUSINESS_MODAL_VIEW_TEXT) {
-      dataFlowParamsRef.value?.setProps();
-    } else {
-      dataFlowParamsRef.value?.setCancelDisabled();
-    }
     value
       .then(async (res) => {
         currentStep.value = 1;

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

@@ -153,14 +153,11 @@
   let getActionFormValue = ref([]);
   const editEntryIdData = ref([]);
   const editAlarmConfigData = ref([]);
-  const isUpdate = ref<boolean | number>(false);
+  const isUpdate = ref(false);
   const id = ref(undefined);
   const tenantId = ref(undefined);
   const isView = ref(true);
-  const [
-    registerForm,
-    { resetFields, validate, setFieldsValue, getFieldsValue, setProps, updateSchema },
-  ] = useForm({
+  const [registerForm, { resetFields, validate, setFieldsValue, getFieldsValue }] = useForm({
     labelWidth: 120,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -534,27 +531,6 @@
       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 });
-      });
-      console.log(unref(skipUnwrap.triggerItemRefs), 'skipUnwrap.triggerItemRefs');
-    } else {
-      updateSchema({
-        field: 'organizationId',
-        componentProps: { apiTreeSelectProps: { disabled: false } },
-      });
-      unref(skipUnwrap.triggerItemRefs)?.forEach((item) => {
-        item.setCancelDisabled();
-      });
-    }
   });
 
   // 设置设备的options

@@ -6,13 +6,11 @@
           <div class="flex">
             <span class="mr-2">启用规则:</span>
             <template v-for="(item, scheduleIndex) in scheduleOptions" :key="item.label">
-              <a-button
-                type="link"
+              <div
                 :class="{ 'ml-4': scheduleIndex >= 1, active: scheduleIndex === currentIndex }"
-                class="cursor-pointer !p-0"
-                :disabled="disabled"
+                class="cursor-pointer"
                 @click="handleScheduleChange(item.value)"
-                >{{ item.label }}</a-button
+                >{{ item.label }}</div
               >
             </template>
           </div>
@@ -30,7 +28,6 @@
         <template #operationType="{ model, field }">
           <Select
             :options="options"
-            :disabled="disabled"
             v-model:value="model[field]"
             @change="operationType = model[field]"
             placeholder="请选择比较类型"
@@ -41,7 +38,6 @@
           <Input v-model:value="model[field]" placeholder="请输入持续时间">
             <template #addonAfter>
               <Select
-                :disabled="disabled"
                 v-model:value="model[`timeUnit`]"
                 :options="timeUnitOptions"
                 style="width: 60px"
@@ -96,13 +92,12 @@
 
   const isUpdate = ref(false);
   const conditionScreeningRef = ref();
-  const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue, setProps }] =
-    useForm({
-      //TODO-wenwei-修复
-      schemas: cloneDeep(trigger_condition_schema),
-      //TODO-wenwei-修复
-      showActionButtonGroup: false,
-    });
+  const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
+    //TODO-wenwei-修复
+    schemas: cloneDeep(trigger_condition_schema),
+    //TODO-wenwei-修复
+    showActionButtonGroup: false,
+  });
 
   const alarmScheduleRef = ref<InstanceType<typeof AlarmSchedule>>();
 
@@ -228,16 +223,6 @@
     // console.log(alarmConfigList);
   };
 
-  const disabled = ref<boolean>(false);
-  const setDisabledProps = (value) => {
-    setProps(value);
-    disabled.value = true;
-  };
-
-  const setCancelDisabled = () => {
-    disabled.value = false;
-  };
-
   defineExpose({
     getFieldsValueFunc,
     updateFieldDeviceId,
@@ -255,8 +240,6 @@
     updateFieldAttributeFunc,
     updateFieldAlarmConfig,
     updateEditFieldAlarmConfig,
-    setDisabledProps,
-    setCancelDisabled,
   });
 </script>
 

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