Merge branch 'main_dev' into ft

@@ -206,10 +206,7 @@ export const step1Schemas: FormSchema[] = [
     },
     ifShow: ({ values }) => {
       return (
-        values?.transportType === TransportTypeEnum.TCP &&
-        (values.deviceType === DeviceTypeEnum.SENSOR ||
-          values.deviceType === DeviceTypeEnum.GATEWAY) &&
-        values?.codeType === TaskTypeEnum.CUSTOM
+        values?.transportType === TransportTypeEnum.TCP && values?.codeType === TaskTypeEnum.CUSTOM
       );
     },
   },

@@ -263,6 +263,7 @@
                     class="!text-lg"
                     icon="ant-design:form-outlined"
                     @click.stop="handleUpdate(item)"
+                    :disabled="item.name == 'default'"
                   />
                 </Tooltip>
                 <AuthDropDown
@@ -286,7 +287,7 @@
                         onConfirm: handleDelete.bind(null, [item.id]),
                         disabled: item.default,
                       },
-                      disabled: item.default,
+                      disabled: item.default || item.name == 'default',
                     },
                   ]"
                 />

-<template>
-  <div>属性</div>
-</template>
-
-<script setup lang="ts"></script>
-
-<style lang="less" scoped></style>

-<template>
-  <div>警告</div>
-</template>
-
-<script setup lang="ts"></script>
-
-<style lang="less" scoped></style>

-import ChainDetailDrawer from './index.vue';
-export { ChainDetailDrawer };

-<template>
-  <BasicDrawer
-    v-bind="$attrs"
-    isDetail
-    @register="register"
-    destroyOnClose
-    @close="closeDrawer"
-    :title="deviceDetail.alias || deviceDetail.name"
-    width="80%"
-  >
-    <Tabs v-model:activeKey="activeKey" :size="size">
-      <TabPane key="1" tab="详情">
-        <div>详情</div>
-      </TabPane>
-      <TabPane key="2" tab="属性">
-        <Attribute />
-      </TabPane>
-      <TabPane key="3" tab="最新遥测数据"><div>最新遥测数据</div></TabPane>
-      <TabPane key="4" tab="警告">
-        <div>警告</div>
-      </TabPane>
-      <TabPane key="5" tab="事件">
-        <div>事件</div>
-      </TabPane>
-      <!-- 网关设备并且场家是TBox -->
-      <TabPane key="6" tab="关联">
-        <div>关联</div>
-      </TabPane>
-      <!-- 网关设备并且是TBox -->
-
-      <TabPane key="7" tab="审计日志">
-        <div>审计日志</div>
-      </TabPane>
-    </Tabs>
-  </BasicDrawer>
-</template>
-<script lang="ts" setup>
-  import { ref } from 'vue';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-
-  import { Tabs, TabPane } from 'ant-design-vue';
-  import { DeviceRecord } from '/@/api/device/model/deviceModel';
-
-  import Attribute from './component/Attribute.vue';
-
-  // defineProps({});
-
-  // defineEmits([]);
-
-  const activeKey = ref('1');
-  const size = ref('small');
-  const deviceDetail = ref<DeviceRecord>({} as unknown as DeviceRecord);
-  // 详情回显
-  const [register] = useDrawerInner(async (data) => {
-    console.log(data, 'data');
-  });
-  const closeDrawer = () => {
-    activeKey.value = '1';
-  };
-</script>

@@ -5,7 +5,7 @@
         <Authority>
           <a-button type="primary" @click="handleAdd"> 新增规则链 </a-button>
         </Authority>
-        <Upload :show-upload-list="false" :customRequest="handleImport">
+        <Upload :show-upload-list="false" accept=".json," :customRequest="handleImport">
           <Button type="primary" :loading="importLoading"> 导入规则链 </Button>
         </Upload>
         <Authority>
@@ -64,7 +64,7 @@
               ifShow: !record.root,
               popConfirm: {
                 title: '是否确认删除',
-                confirm: handleDeleteOrBatchDelete.bind(null, record),
+                confirm: handleDeleteOrBatchDelete.bind(null, record.id.id),
               },
             },
           ]"
@@ -113,7 +113,7 @@
 
   const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
   const importLoading = ref<boolean>(false);
-  const hasBatchDelete = ref<boolean>(false);
+  const hasBatchDelete = ref<boolean>(true);
 
   const beforeFetch = (params) => {
     Reflect.set(params, 'page', params.page - 1);
@@ -148,8 +148,11 @@
       labelWidth: 120,
       schemas: searchFormSchema,
     },
+    resizeHeightOffset: 40,
+    canResize: true,
     fetchSetting: {
       pageField: 'page',
+      totalField: 'totalElements',
       listField: 'data',
     },
     beforeFetch: (params) => beforeFetch(params),
@@ -208,6 +211,7 @@
         });
         const { ruleChain, metadata } = data as any;
 
+        // 创建规则链
         const value = await createRuleChine(ruleChain);
         const { id } = value;
 
@@ -215,6 +219,7 @@
           ruleChainId: id,
           ...metadata,
         };
+        // 导入规则链详情nodes的东西
         const rules = await importRuleChine(values);
 
         rules
@@ -239,9 +244,17 @@
     const { firstNodeIndex, nodes, connections, ruleChainConnections } = await exportRuleChine(
       record.id.id
     );
+
+    const node = nodes.map((item) => {
+      return {
+        ...item,
+        id: undefined,
+        ruleChainId: undefined,
+      };
+    });
     const value = {
       ruleChain: { additionalInfo, name, type, firstRuleNodeId, root, debugMode, configuration },
-      metadata: { firstNodeIndex, nodes, connections, ruleChainConnections },
+      metadata: { firstNodeIndex, nodes: node, connections, ruleChainConnections },
     };
     exportJSONFile(value, name);
   };
@@ -257,26 +270,25 @@
       setProps({
         loading: false,
       });
+      reload();
     }
-    reload();
   };
 
-  const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
+  const handleDeleteOrBatchDelete = async (id: string | null) => {
     setProps({
       loading: true,
     });
     try {
-      if (!record) {
+      if (!id) {
         const ids = getSelectRowKeys();
         await Promise.all(ids.map((item) => deleteRuleChine(item)));
         return;
       }
-      await deleteRuleChine(record.id.id);
+      await deleteRuleChine(id);
     } finally {
       setProps({
         loading: false,
       });
-
       createMessage.success('删除成功');
       clearSelectedRowKeys();
       reload();

@@ -212,6 +212,7 @@
         return {
           value: item.id,
           label: item.name,
+          status: item.status,
         };
       });
       deviceList.value = editEntryIdData.value;
@@ -576,7 +577,11 @@
     setFields(skipUnwrap.conditionItemRefs, true);
     setFields(skipUnwrap.actionItemRefs, true);
     const data = await getOrganizationAlarmConfig({ organizationId: newValue });
-    alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id }));
+    alarmConfigList.value = data.map((item) => ({
+      label: item.name,
+      value: item.id,
+      status: item.status,
+    }));
     setEditAlarmConfig(skipUnwrap.actionItemRefs, alarmConfigList);
     // setFields(skipUnwrap.actionItemRefs, true);
     // console.log(unref(organizationIdRef));
@@ -587,7 +592,7 @@
     const data = await getOrganizationAlarmConfig({
       organizationId: isUpdate.value ? provideOrgid.value : addOrgId.value,
     });
-    const res = data.map((item) => ({ label: item.name, value: item.id }));
+    const res = data.map((item) => ({ label: item.name, value: item.id, status: item.status }));
     isUpdate.value ? (editAlarmConfigData.value = res) : (alarmConfigList.value = res);
     unref(skipUnwrap.actionItemRefs)?.map((item: any) => {
       if (isUpdate.value) {

@@ -143,7 +143,7 @@
     }
     if (predicateIsRequired) return createMessage.error('请填写条件筛选');
     //TODO-fengtao-设备、属性、条件筛选验证
-    return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
+    return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value?.scheduleData };
   };
 
   //TODO-fengtao

@@ -361,10 +361,10 @@
   };
   //FT add 2022-10-27
   const updateEditFieldAlarmConfig = (alarmConfigList) => {
-    alarmConfigOptions.value = alarmConfigList.value;
+    alarmConfigOptions.value = alarmConfigList.value.filter((item) => item.status);
   };
   const updateFieldAlarmConfig = (alarmConfigList) => {
-    alarmConfigOptions.value = alarmConfigList.value;
+    alarmConfigOptions.value = alarmConfigList.value.filter((item) => item.status);
   };
   //FT add 2022-10-27
 

@@ -2,18 +2,19 @@
   import { Button, Spin } from 'ant-design-vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicModal, useModal } from '/@/components/Modal';
-  import { formSchemas } from './config';
+  import { formSchemas, FormFieldsEnum } from './config';
   import { ref } from 'vue';
   import { unref } from 'vue';
   import { composeModbusModalData } from './util';
   import { ModbusCommandValueType } from './type';
   import { genModbusCommand } from '/@/api/task';
+  import { isNullOrUnDef } from '/@/utils/is';
 
   const emit = defineEmits(['update:value']);
 
   const [registerModal] = useModal();
 
-  const [registerForm, { getFieldsValue }] = useForm({
+  const [registerForm, { getFieldsValue, validate }] = useForm({
     schemas: formSchemas,
     showActionButtonGroup: false,
     rowProps: { gutter: 10 },
@@ -25,8 +26,12 @@
   const loading = ref(false);
   const handleGetValue = async () => {
     try {
+      await validate();
       const value = getFieldsValue();
       const record = composeModbusModalData(value as ModbusCommandValueType);
+
+      if (record[FormFieldsEnum.REGISTER_VALUES]?.some((item) => isNullOrUnDef(item))) return;
+
       loading.value = true;
       const result = await genModbusCommand(record);
       commandValue.value = result;
@@ -46,7 +51,7 @@
     return arr.reduce((prev, next) => `${prev} ${next.join('')}`, '');
   };
 
-  const handleOk = () => {
+  const handleOk = async () => {
     emit('update:value', unref(commandValue));
   };
 </script>

@@ -212,6 +212,7 @@ export const formSchemas: FormSchema[] = [
         showTotalControl: false,
         itemProps: () => {
           return {
+            required: true,
             valueField: 'value',
             changeEvent: 'update:value',
           } as FormSchema;

@@ -41,6 +41,7 @@
             {
               label: '删除',
               auth: 'api:yt:role:delete',
+              ifShow: !record.status,
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {

@@ -40,7 +40,9 @@ export const useSort = (
     inited = true;
   }
 
-  onMounted(() => handleSort());
+  onMounted(async () => {
+    setTimeout(() => handleSort(), 500);
+  });
 
   return { containerEl };
 };

@@ -282,7 +282,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
       },
       componentProps: ({ formActionType, formModel }) => {
         const { setFieldsValue } = formActionType;
-        const { codeType } = formModel || {};
+        const { codeType, deviceType, transportType } = formModel || {};
         return {
           // api: findDictItemByCode,
           api: async (params: Recordable) => {
@@ -293,6 +293,14 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
                   (item) => item.itemValue == CommandTypeEnum.ATTRIBUTE.toString()
                 );
               }
+
+              // TCP网关子 --> 不能要服务命令类型
+              if (deviceType == 'SENSOR' && transportType == 'TCP') {
+                return record.filter(
+                  (item) => item.itemValue == CommandTypeEnum.ATTRIBUTE.toString()
+                );
+              }
+
               if (codeType == TaskTypeEnum.MODBUS_RTU) {
                 // setFieldsValue({ [DataSourceField.COMMAND_TYPE]: undefined });
                 return record.filter(
@@ -304,7 +312,6 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
                 );
               }
             } catch (error) {
-              console.log(error);
               return [];
             }
           },