Merge branch 'revert-128d206d' into 'main'

Revert "fix: 场景联动,数据流转,报表配置处于启用中，都不可以操作"

See merge request yunteng/thingskit-front!929

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

@@ -20,6 +20,7 @@
   };
   };
 
 
   const setValue = (value) => {
   const setValue = (value) => {
+    console.log(value, 'value');
     setFieldsValue(value);
     setFieldsValue(value);
   };
   };
 
 

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

@@ -545,14 +545,7 @@
       unref(skipUnwrap.triggerItemRefs)?.forEach((item) => {
       unref(skipUnwrap.triggerItemRefs)?.forEach((item) => {
         item.setDisabledProps({ disabled: true });
         item.setDisabledProps({ disabled: true });
       });
       });
-
-      unref(skipUnwrap.conditionItemRefs)?.forEach((item) => {
-        item.setDisabledProps({ disabled: true });
-      });
-
-      unref(skipUnwrap.actionItemRefs)?.forEach((item) => {
-        item.setDisabledProps({ disabled: true });
-      });
+      console.log(unref(skipUnwrap.triggerItemRefs), 'skipUnwrap.triggerItemRefs');
     } else {
     } else {
       updateSchema({
       updateSchema({
         field: 'organizationId',
         field: 'organizationId',
@@ -561,9 +554,6 @@
       unref(skipUnwrap.triggerItemRefs)?.forEach((item) => {
       unref(skipUnwrap.triggerItemRefs)?.forEach((item) => {
         item.setCancelDisabled();
         item.setCancelDisabled();
       });
       });
-      unref(skipUnwrap.conditionItemRefs)?.forEach((item) => {
-        item.setCancelDisabled();
-      });
     }
     }
   });
   });
 
 

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

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

@@ -6,12 +6,13 @@
           <div class="flex">
           <div class="flex">
             <span class="mr-2">启用规则:</span>
             <span class="mr-2">启用规则:</span>
             <template v-for="(item, scheduleIndex) in scheduleOptions" :key="item.label">
             <template v-for="(item, scheduleIndex) in scheduleOptions" :key="item.label">
-              <div
+              <a-button
+                type="link"
                 :class="{ 'ml-4': scheduleIndex >= 1, active: scheduleIndex === currentIndex }"
                 :class="{ 'ml-4': scheduleIndex >= 1, active: scheduleIndex === currentIndex }"
                 class="cursor-pointer !p-0"
                 class="cursor-pointer !p-0"
                 :disabled="disabled"
                 :disabled="disabled"
                 @click="handleScheduleChange(item.value)"
                 @click="handleScheduleChange(item.value)"
-                >{{ item.label }}</div
+                >{{ item.label }}</a-button
               >
               >
             </template>
             </template>
           </div>
           </div>
@@ -74,7 +75,6 @@
   import { Icon } from '/@/components/Icon';
   import { Icon } from '/@/components/Icon';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { unref } from 'vue';
 
 
   const { useByProductGetAttribute } = useCommonFun();
   const { useByProductGetAttribute } = useCommonFun();
   defineProps({
   defineProps({
@@ -173,7 +173,6 @@
   };
   };
   //TODO-fengtao
   //TODO-fengtao
   const handleDelete = (params: { index: number; title: string }) => {
   const handleDelete = (params: { index: number; title: string }) => {
-    if (unref(disabled)) return;
     emit('delete', params);
     emit('delete', params);
   };
   };
   const operationType = ref<string>('');
   const operationType = ref<string>('');
@@ -198,7 +197,6 @@
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
   const currentIndex = ref(0);
   const currentIndex = ref(0);
   const handleScheduleChange = (value) => {
   const handleScheduleChange = (value) => {
-    if (unref(disabled)) return;
     const index = scheduleOptions.findIndex((item) => item.value === value);
     const index = scheduleOptions.findIndex((item) => item.value === value);
     // 报警日程弹窗
     // 报警日程弹窗
     if (index !== 0) {
     if (index !== 0) {

@@ -13,7 +13,6 @@
     <BasicForm @register="registerAction">
     <BasicForm @register="registerAction">
       <template #outTarget="{ model, field }">
       <template #outTarget="{ model, field }">
         <Select
         <Select
-          :disabled="disabled"
           :options="options"
           :options="options"
           v-model:value="model[field]"
           v-model:value="model[field]"
           @change="changeOutTarget"
           @change="changeOutTarget"
@@ -25,7 +24,6 @@
       <template #alarmConfigSlot="{ model, field }">
       <template #alarmConfigSlot="{ model, field }">
         <a-select
         <a-select
           allowClear
           allowClear
-          :disabled="disabled"
           placeholder="请选择告警配置"
           placeholder="请选择告警配置"
           v-model:value="model[field]"
           v-model:value="model[field]"
           style="width: 205px; margin-left: 10px"
           style="width: 205px; margin-left: 10px"
@@ -43,22 +41,14 @@
       </template>
       </template>
       <template #doContext="{ model, field }">
       <template #doContext="{ model, field }">
         <div v-if="model['transportType'] === TransportTypeEnum.TCP">
         <div v-if="model['transportType'] === TransportTypeEnum.TCP">
-          <Input v-model:value="model[field]" :disabled="disabled" placeholder="请输入自定义命令" />
+          <Input v-model:value="model[field]" placeholder="请输入自定义命令" />
         </div>
         </div>
         <div
         <div
           v-show="model['transportType'] !== TransportTypeEnum.TCP"
           v-show="model['transportType'] !== TransportTypeEnum.TCP"
           class="flex"
           class="flex"
           style="align-items: center"
           style="align-items: center"
         >
         >
-          <div v-show="!disabled" ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
-
-          <a-textarea
-            v-show="disabled"
-            :disabled="true"
-            :value="JSON.stringify(disabledValue)"
-            :rows="4"
-          />
-
+          <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
           <a-button style="margin: -5px 0" type="text" @click="handlePremitter">格式化</a-button>
           <a-button style="margin: -5px 0" type="text" @click="handlePremitter">格式化</a-button>
           <Tooltip
           <Tooltip
             :title="
             :title="
@@ -74,9 +64,7 @@
         </div>
         </div>
       </template>
       </template>
       <template #clearAlarm>
       <template #clearAlarm>
-        <Checkbox v-model:checked="checked" :disabled="disabled" @change="handleCheckedChange">
-          清除告警
-        </Checkbox>
+        <Checkbox v-model:checked="checked" @change="handleCheckedChange"> 清除告警 </Checkbox>
         <Tooltip title="清除告警与触发器一一对应">
         <Tooltip title="清除告警与触发器一一对应">
           <QuestionCircleOutlined />
           <QuestionCircleOutlined />
         </Tooltip>
         </Tooltip>
@@ -204,11 +192,10 @@
   const changeOutTarget = () => {
   const changeOutTarget = () => {
     emit('getActionFormArr');
     emit('getActionFormArr');
   };
   };
-  const [registerAction, { getFieldsValue, resetFields, setFieldsValue, validate, setProps }] =
-    useForm({
-      schemas: actionSchema,
-      showActionButtonGroup: false,
-    });
+  const [registerAction, { getFieldsValue, resetFields, setFieldsValue, validate }] = useForm({
+    schemas: actionSchema,
+    showActionButtonGroup: false,
+  });
 
 
   // 获取整个执行动作表单值
   // 获取整个执行动作表单值
   const getFieldsValueFunc = () => {
   const getFieldsValueFunc = () => {
@@ -382,7 +369,6 @@
   };
   };
 
 
   const handleDelete = (actionIndex) => {
   const handleDelete = (actionIndex) => {
-    if (unref(disabled)) return;
     emit('deleteAction', actionIndex);
     emit('deleteAction', actionIndex);
   };
   };
 
 
@@ -418,8 +404,6 @@
   const jsoneditorRef = ref();
   const jsoneditorRef = ref();
   const jsonValue = ref({});
   const jsonValue = ref({});
   const jsonInstance = ref();
   const jsonInstance = ref();
-
-  const disabledValue = ref(); //查看时使用表单全部禁用使用这个来获取表单数据
   onMounted(() => {
   onMounted(() => {
     nextTick(() => {
     nextTick(() => {
       let options = {
       let options = {
@@ -436,7 +420,6 @@
   const getJsonValue = () => unref(jsonInstance).get();
   const getJsonValue = () => unref(jsonInstance).get();
   const setJsonValue = (Json) => {
   const setJsonValue = (Json) => {
     nextTick(() => {
     nextTick(() => {
-      disabledValue.value = Json;
       unref(jsonInstance).set(Json);
       unref(jsonInstance).set(Json);
     });
     });
   };
   };
@@ -464,23 +447,6 @@
     emit('getActionFormArr');
     emit('getActionFormArr');
   };
   };
 
 
-  const disabled = ref<boolean>(false);
-  const setDisabledProps = async (value) => {
-    setProps(value);
-    disabled.value = true;
-    await nextTick();
-    unref(refItem.clearRuleRefs)?.forEach((item) => {
-      item.setDisabledProps(value);
-    });
-  };
-
-  const setCancelDisabled = () => {
-    disabled.value = false;
-    unref(refItem.clearRuleRefs)?.forEach((item) => {
-      item.setCancelDisabled();
-    });
-  };
-
   defineExpose({
   defineExpose({
     getFieldsValue,
     getFieldsValue,
     getFieldsValueFunc,
     getFieldsValueFunc,
@@ -501,8 +467,6 @@
     clearRuleList,
     clearRuleList,
     resetConditionForm,
     resetConditionForm,
     handleDropdownVisibleChange,
     handleDropdownVisibleChange,
-    setDisabledProps,
-    setCancelDisabled,
   });
   });
 </script>
 </script>