Merge branch 'main_dev' into 'main'

perf: 优化场景联动显示

See merge request yunteng/thingskit-front!1004

@@ -471,7 +471,6 @@ export const formSchema: BFormSchema[] = [
     dynamicRules: () => {
       return [
         {
-          // required: model[SchemaFiled.AGG] !== AggregateDataEnum.NONE,
           required: true,
           message: '间隔时间为必填项',
           type: 'number',
@@ -479,7 +478,11 @@ export const formSchema: BFormSchema[] = [
       ];
     },
     ifShow({ values }) {
-      return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && exectueIsImmed(values.executeWay);
+      return (
+        values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD &&
+        exectueIsImmed(values.executeWay) &&
+        values[SchemaFiled.DATA_TYPE] !== DataTypeEnum.ORIGINAL
+      );
     },
     componentProps({ formModel, formActionType }) {
       const options =

@@ -34,7 +34,12 @@
                   @change="(value) => handleChangeChars(value, item.device, item)"
                   v-bind="createPickerSearch()"
                   placeholder="请选择设备属性"
-                  :options="item?.attributes?.map((item1) => ({ label: item1, value: item1 }))"
+                  :options="
+                    item?.attributes?.map((attrItem: any) => ({
+                      label: attrItem.label,
+                      value: attrItem.value,
+                    }))
+                  "
                 />
               </div>
               <div class="w-full h-full flex justify-center items-center">
@@ -64,6 +69,8 @@
   import { ExecuteReportRecord } from '/@/api/export/model/exportModel';
   import { Select, Spin, Empty } from 'ant-design-vue';
   import { createPickerSearch } from '/@/utils/pickerSearch';
+  import { getDeviceDetail } from '/@/api/device/deviceManager';
+  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
 
   interface ResponsData {
     attr: string;
@@ -141,20 +148,66 @@
     return chartOption;
   };
 
+  const handleDeviceProfileAttributes = async (entityId: string) => {
+    const deviceDetailRes = await getDeviceDetail(entityId);
+    const { deviceProfileId } = deviceDetailRes;
+    if (!deviceProfileId) return;
+    const attributeRes = await getAttribute(deviceProfileId);
+    return handleDataFormat(deviceDetailRes, attributeRes);
+  };
+
+  const handleDataFormat = (deviceDetail: any, attributes: any) => {
+    const { name, tbDeviceId } = deviceDetail;
+    const attribute = attributes.map((item: any) => ({
+      identifier: item.identifier,
+      name: item.name,
+      detail: item.detail,
+    }));
+    return {
+      name,
+      tbDeviceId,
+      attribute,
+    };
+  };
+
   const [register, { setModalProps }] = useModalInner(
     async (data: { record: ExecuteReportRecord }) => {
       setModalProps({ loading: true });
       try {
         currentRecord = data.record;
         const deviceInfo = data.record.executeCondition.executeAttributes || [];
-        chartInstance.value = deviceInfo.map((item) => ({
-          ...item,
-          active: item.attributes.at(0),
-        }));
+        let attributesList: Recordable[] = [];
+        // 处理为物模型里的标识符名
+        const reflectDeviceList = deviceInfo.map(async (item) => {
+          const { device, attributes } = item as Recordable;
+          if (!device) return;
+          const thingsModel = (await handleDeviceProfileAttributes(item.device)) as Recordable;
+          const { tbDeviceId, attribute } = thingsModel as Recordable;
+          if (!tbDeviceId) return;
+          if (device === tbDeviceId) {
+            attributesList = attributes.reduce((acc, curr) => {
+              attribute.forEach((item: Recordable) => {
+                if (item.identifier === curr) {
+                  acc.push({
+                    label: item.name,
+                    value: item.identifier,
+                  });
+                }
+              });
+              return [...acc];
+            }, []);
+          }
+          return {
+            ...item,
+            active: attributes.at(0),
+            attributes: attributesList,
+          };
+        });
+        chartInstance.value = (await Promise.all(reflectDeviceList)) as any as ChartInstance[];
         for (const item of unref(chartInstance)) {
           const { attributes, device } = item;
 
-          const keys = attributes.length ? attributes.at(0) : '';
+          const keys = attributes.length ? (attributes as any[]).at(0)?.value : '';
 
           const sendParams = {
             ...data.record.executeCondition.executeCondition,

@@ -9,6 +9,7 @@ export const formSchemas: FormSchema[] = [
     field: CheckExistenceFieldsEnum.MESSAGE_NAMES,
     component: 'Select',
     label: CheckExistenceFieldsNameEnum.MESSAGE_NAMES,
+    rules: [{ required: true, type: 'array' }],
     componentProps: {
       mode: 'tags',
       open: false,
@@ -20,6 +21,7 @@ export const formSchemas: FormSchema[] = [
     field: CheckExistenceFieldsEnum.METADATA_NAMES,
     component: 'Select',
     label: CheckExistenceFieldsNameEnum.METADATA_NAMES,
+    rules: [{ required: true, type: 'array' }],
     componentProps: {
       mode: 'tags',
       open: false,

@@ -25,7 +25,7 @@ export const getFormSchemas = (route: RouteLocationNormalizedLoaded): FormSchema
       component: 'ApiSearchSelect',
       componentProps: () => {
         return {
-          placeholder: '请选择所属产品',
+          placeholder: '请选择规则链',
           showSearch: true,
           params: {
             pageSize: 50,

@@ -62,7 +62,7 @@ export const formSchemas: FormSchema[] = [
   {
     field: FormFieldsEnum.STATUS,
     label: '状态',
-    component: 'Input',
+    component: 'Select',
     componentProps: {
       options: Object.keys(StatusEnum).map((value) => ({ label: StatusNameEnum[value], value })),
       allowClear: true,

@@ -13,23 +13,26 @@
         <template v-for="(item, optionIndex) in options" :key="item.flag">
           <div :class="optionIndex >= 1 ? 'mt-4' : ''" class="flex">
             <div class="ml-4 mr-4 flex items-center">
-              <Checkbox v-model:checked="item.enabled">星期{{ item.flag }}</Checkbox>
+              <Checkbox v-model:checked="item.enabled" :disabled="modalStatus"
+                >星期{{ item.flag }}</Checkbox
+              >
             </div>
             <TimePicker
               placeholder="开始时间"
               v-model:value="item.startsOn"
               value-format="x"
               format="HH:mm"
-              :disabled="!item.enabled"
+              @change="handleBlur(item.startsOn, item.endsOn, item)"
+              :disabled="!item.enabled || modalStatus"
             />
             <span class="ml-4 mr-4 flex items-center">~</span>
             <TimePicker
-              @change="handleBlur(item.startsOn, item.endsOn)"
+              @change="handleBlur(item.startsOn, item.endsOn, item)"
               placeholder="结束时间"
               v-model:value="item.endsOn"
               value-format="x"
               format="HH:mm"
-              :disabled="!item.enabled"
+              :disabled="!item.enabled || modalStatus"
             />
           </div>
         </template>
@@ -40,6 +43,8 @@
           v-model:value="timeState.startsOn"
           value-format="x"
           format="HH:mm"
+          :disabled="modalStatus"
+          @change="handleTimeBlur(timeState.startsOn, timeState.endsOn)"
         />
         <span class="ml-4 mr-4">~</span>
         <TimePicker
@@ -48,6 +53,7 @@
           v-model:value="timeState.endsOn"
           value-format="x"
           format="HH:mm"
+          :disabled="modalStatus"
         />
       </template>
     </BasicForm>
@@ -55,7 +61,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { reactive, ref, watch, nextTick } from 'vue';
+  import { reactive, ref, watch, nextTick, unref } from 'vue';
   import { useModalInner, BasicModal } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form';
   import { alarmScheduleSchemas } from '../config/config.data';
@@ -66,7 +72,7 @@
   const title = ref('');
   const isUpdateFlag = ref(false);
   const { createMessage } = useMessage();
-  const [registerForm, { setFieldsValue, getFieldsValue }] = useForm({
+  const [registerForm, { setFieldsValue, getFieldsValue, setProps }] = useForm({
     showActionButtonGroup: false,
     schemas: alarmScheduleSchemas,
   });
@@ -143,7 +149,7 @@
       nextTick(() => {
         setModalProps({
           okButtonProps: {
-            disabled: flag,
+            disabled: flag || unref(modalStatus),
           },
         });
       });
@@ -153,6 +159,7 @@
     }
   );
 
+  const modalStatus = ref(false);
   const [registerModal, { closeModal, setModalProps }] = useModalInner((data) => {
     watch([timeState, basicFormRef.value.formModel], ([timeState, formModel]) => {
       setModalProps({
@@ -160,7 +167,8 @@
           disabled:
             timeState.startsOn === null ||
             timeState.endsOn === null ||
-            !formModel.daysOfWeek?.length,
+            !formModel.daysOfWeek?.length ||
+            unref(modalStatus),
         },
       });
       watch(
@@ -171,7 +179,7 @@
         }
       );
     });
-    const { value, currentIndex, isUpdate, scheduleData } = data;
+    const { value, currentIndex, isUpdate, scheduleData, disabled } = data;
     isUpdateFlag.value = isUpdate;
     if (value === 'SPECIFIC_TIME') {
       title.value = '定时启用';
@@ -179,6 +187,16 @@
       title.value = '自定义启用';
     }
 
+    if (disabled) {
+      modalStatus.value = disabled;
+      setProps({ disabled });
+      setModalProps({
+        okButtonProps: {
+          disabled,
+        },
+      });
+    }
+
     index.value = currentIndex;
     const dayZenoTime = Math.round(new Date(new Date().toLocaleDateString()).getTime());
     // 编辑
@@ -211,13 +229,15 @@
   const scheduleData = ref({
     type: 'ANY_TIME',
   });
-  const handleBlur = (eS, eE) => {
-    if (eS > eE) {
+  const handleBlur = (eS, eE, item: Recordable) => {
+    if (eS && eE && eS > eE) {
+      item?.endsOn && (item.endsOn = null);
       return createMessage.warn('开始时间不能大于结束时间');
     }
   };
   const handleTimeBlur = (eS, eE) => {
-    if (eS > eE) {
+    if (eS && eE && eS > eE) {
+      timeState.endsOn = null;
       return createMessage.warn('开始时间不能大于结束时间');
     }
   };

@@ -147,22 +147,24 @@
   const currentIndex = ref(0);
   const [registerModal, { openModal }] = useModal();
   const handleScheduleChange = (value) => {
-    if (unref(disabled)) return;
+    // if (unref(disabled)) return;
     const index = scheduleOptions.findIndex((item) => item.value === value);
     // 报警日程弹窗
     if (index !== 0) {
+      if (unref(disabled) && unref(currentIndex) !== index) return;
       openModal(true, {
         isUpdate: isUpdate.value,
         value,
         currentIndex: currentIndex.value,
         scheduleData,
+        disabled: unref(disabled),
       });
     } else {
       alarmScheduleRef.value.scheduleData = {
         type: value,
       };
     }
-    currentIndex.value = index;
+    if (!unref(disabled)) currentIndex.value = index;
   };
   const handleCancel = (index) => {
     currentIndex.value = index;

@@ -30,7 +30,7 @@
         class="mt-4 mr-2"
         @click="preView"
         v-if="isPreview"
-        >保存</a-button
+        >添加</a-button
       >
     </div>
   </div>

@@ -199,22 +199,24 @@
   const [registerModal, { openModal }] = useModal();
   const currentIndex = ref(0);
   const handleScheduleChange = (value) => {
-    if (unref(disabled)) return;
+    // if (unref(disabled)) return;
     const index = scheduleOptions.findIndex((item) => item.value === value);
     // 报警日程弹窗
     if (index !== 0) {
+      if (unref(disabled) && unref(currentIndex) !== index) return;
       openModal(true, {
         isUpdate: isUpdate.value,
         value,
         currentIndex: currentIndex.value,
         scheduleData,
+        disabled: unref(disabled),
       });
     } else {
       alarmScheduleRef.value.scheduleData = {
         type: value,
       };
     }
-    currentIndex.value = index;
+    if (!unref(disabled)) currentIndex.value = index;
   };
   const handleCancel = (index) => {
     currentIndex.value = index;