Merge branch 'main_dev' into ft

@@ -12,11 +12,11 @@ export const getDeviceProfile = (deviceType?: string) => {
 };
 
 // 获取历史数据
-export const getDeviceHistoryInfo = (params: Recordable, orderBy) => {
+export const getDeviceHistoryInfo = (params: Recordable, orderBy?: string) => {
   return defHttp.get<HistoryData>(
     {
       url: `/plugins/telemetry/DEVICE/${params.entityId}/values/timeseries`,
-      params: { ...params, entityId: null, orderBy },
+      params: { ...params, entityId: null, orderBy: orderBy || 'DESC' },
     },
     {
       joinPrefix: false,

-import { defHttp } from '/@/utils/http/axios';
-import {
-  TDeviceConfigParams,
-  IDeviceConfigAddOrEditModel,
-  ProfileRecord,
-  RuleChainRecord,
-} from '/@/api/device/model/deviceConfigModel';
-import { PaginationResult } from '/#/axios';
-
-enum EDeviceConfigApi {
-  /**
-   * 设备配置URL
-   */
-  DEVICE_CONFIG_GET_PAGE = '/device_profile',
-  DEVICE_CONFIG_POST_ADD_OR_EDIT = '/device_profile',
-  DEVICE_CONFIG_GET_DETAIL = '/device_profile/',
-  DEVICE_CONFIG_DELETE = '/device_profile',
-  DEVICE_CONFIG_GET_RULECHAIN = '/rule_chain/me/list',
-  ALARM_CONTACT_GET_PAGE = '/alarm_contact',
-  DEVICE_CONFIG_EXPORT = '/device_profile/export',
-  DEVICE_CONFIG_IMPORT = '/device_profile/import',
-  SET_DEVICE_ISDEFAULT = '/deviceProfile',
-  FRP_API = '/frp/',
-  GET_TB_DEVICE_ID = '/device/get_subset',
-  COMMODRECORD = '/rpc',
-}
-
-/**
- * 设备配置详情
- */
-export const deviceConfigGetDetail = (id: string) => {
-  return defHttp.get({
-    url: `${EDeviceConfigApi.DEVICE_CONFIG_GET_DETAIL}${id}`,
-  });
-};
-
-/**
- * 获取规则链
- */
-export const deviceConfigGetRuleChain = () => {
-  return defHttp.get<RuleChainRecord[]>({
-    url: EDeviceConfigApi.DEVICE_CONFIG_GET_RULECHAIN,
-  });
-};
-
-/**
- * 获取告警联系人
- */
-export const alarmContactGetPage = () => {
-  return defHttp.get({
-    url: `${EDeviceConfigApi.ALARM_CONTACT_GET_PAGE}?page=1&pageSize=10`,
-  });
-};
-
-/**
- * 分页查询设备配置页面
- */
-export const deviceConfigGetQuery = (params?: TDeviceConfigParams) => {
-  return defHttp.get<PaginationResult<ProfileRecord>>({
-    url: EDeviceConfigApi.DEVICE_CONFIG_GET_PAGE,
-    params,
-  });
-};
-
-/**
- * 新增或者编辑设备配置
-
- */
-export const deviceConfigAddOrEdit = (params: IDeviceConfigAddOrEditModel) => {
-  return defHttp.post<IDeviceConfigAddOrEditModel>({
-    url: EDeviceConfigApi.DEVICE_CONFIG_POST_ADD_OR_EDIT,
-    params,
-  });
-};
-
-/**
- * 删除设备配置
- */
-export const deviceConfigDelete = (ids: string[]) => {
-  return defHttp.delete({
-    url: EDeviceConfigApi.DEVICE_CONFIG_DELETE,
-    data: {
-      ids,
-    },
-  });
-};
-
-/**
- * 导出设备配置
- */
-export const deviceConfigExport = (params: IDeviceConfigAddOrEditModel) => {
-  return defHttp.post<IDeviceConfigAddOrEditModel>({
-    url: EDeviceConfigApi.DEVICE_CONFIG_EXPORT,
-    params,
-  });
-};
-
-/**
- * 导入设备配置
- */
-export const deviceConfigImport = (params: IDeviceConfigAddOrEditModel) => {
-  return defHttp.post<IDeviceConfigAddOrEditModel>({
-    url: EDeviceConfigApi.DEVICE_CONFIG_IMPORT,
-    params,
-  });
-};
-
-/**
- *
- * 设置该设备配置为默认
- */
-export const setDeviceProfileIsDefaultApi = (id: string, v, params?: {}) => {
-  return defHttp.post(
-    {
-      url: EDeviceConfigApi.SET_DEVICE_ISDEFAULT + '/' + id + '/' + v,
-      params,
-    },
-    {
-      joinPrefix: false,
-    }
-  );
-};
-
-/**
- * Frp内网穿透信息API
- */
-export const frpGetInfoApi = (proxyName: string) => {
-  return defHttp.get({
-    url: `${EDeviceConfigApi.FRP_API}${proxyName}`,
-  });
-};
-
-export const frpPutInfoApi = (proxyName: string, enableRemote: number) => {
-  return defHttp.put({
-    url: `${EDeviceConfigApi.FRP_API}${proxyName}/${enableRemote}`,
-  });
-};
-
-export const getTbDeviceId = (params: string) => {
-  return defHttp.get({
-    url: `${EDeviceConfigApi.GET_TB_DEVICE_ID}/${params}`,
-  });
-};
-
-/**
- * 命令下发记录
- */
-export const deviceCommandRecordGetQuery = (params?: TDeviceConfigParams) => {
-  return defHttp.get({
-    url: EDeviceConfigApi.COMMODRECORD,
-    params,
-  });
-};
+import { defHttp } from '/@/utils/http/axios';
+import {
+  TDeviceConfigParams,
+  IDeviceConfigAddOrEditModel,
+  ProfileRecord,
+  RuleChainRecord,
+  DeviceProfileDetail,
+} from '/@/api/device/model/deviceConfigModel';
+import { PaginationResult } from '/#/axios';
+
+enum EDeviceConfigApi {
+  /**
+   * 设备配置URL
+   */
+  DEVICE_CONFIG_GET_PAGE = '/device_profile',
+  DEVICE_CONFIG_POST_ADD_OR_EDIT = '/device_profile',
+  DEVICE_CONFIG_GET_DETAIL = '/device_profile/',
+  DEVICE_CONFIG_DELETE = '/device_profile',
+  DEVICE_CONFIG_GET_RULECHAIN = '/rule_chain/me/list',
+  ALARM_CONTACT_GET_PAGE = '/alarm_contact',
+  DEVICE_CONFIG_EXPORT = '/device_profile/export',
+  DEVICE_CONFIG_IMPORT = '/device_profile/import',
+  SET_DEVICE_ISDEFAULT = '/deviceProfile',
+  FRP_API = '/frp/',
+  GET_TB_DEVICE_ID = '/device/get_subset',
+  COMMODRECORD = '/rpc',
+}
+
+/**
+ * 设备配置详情
+ */
+export const deviceConfigGetDetail = (id: string) => {
+  return defHttp.get<DeviceProfileDetail>({
+    url: `${EDeviceConfigApi.DEVICE_CONFIG_GET_DETAIL}${id}`,
+  });
+};
+
+/**
+ * 获取规则链
+ */
+export const deviceConfigGetRuleChain = () => {
+  return defHttp.get<RuleChainRecord[]>({
+    url: EDeviceConfigApi.DEVICE_CONFIG_GET_RULECHAIN,
+  });
+};
+
+/**
+ * 获取告警联系人
+ */
+export const alarmContactGetPage = () => {
+  return defHttp.get({
+    url: `${EDeviceConfigApi.ALARM_CONTACT_GET_PAGE}?page=1&pageSize=10`,
+  });
+};
+
+/**
+ * 分页查询设备配置页面
+ */
+export const deviceConfigGetQuery = (params?: TDeviceConfigParams) => {
+  return defHttp.get<PaginationResult<ProfileRecord>>({
+    url: EDeviceConfigApi.DEVICE_CONFIG_GET_PAGE,
+    params,
+  });
+};
+
+/**
+ * 新增或者编辑设备配置
+
+ */
+export const deviceConfigAddOrEdit = (params: IDeviceConfigAddOrEditModel) => {
+  return defHttp.post<IDeviceConfigAddOrEditModel>({
+    url: EDeviceConfigApi.DEVICE_CONFIG_POST_ADD_OR_EDIT,
+    params,
+  });
+};
+
+/**
+ * 删除设备配置
+ */
+export const deviceConfigDelete = (ids: string[]) => {
+  return defHttp.delete({
+    url: EDeviceConfigApi.DEVICE_CONFIG_DELETE,
+    data: {
+      ids,
+    },
+  });
+};
+
+/**
+ * 导出设备配置
+ */
+export const deviceConfigExport = (params: IDeviceConfigAddOrEditModel) => {
+  return defHttp.post<IDeviceConfigAddOrEditModel>({
+    url: EDeviceConfigApi.DEVICE_CONFIG_EXPORT,
+    params,
+  });
+};
+
+/**
+ * 导入设备配置
+ */
+export const deviceConfigImport = (params: IDeviceConfigAddOrEditModel) => {
+  return defHttp.post<IDeviceConfigAddOrEditModel>({
+    url: EDeviceConfigApi.DEVICE_CONFIG_IMPORT,
+    params,
+  });
+};
+
+/**
+ *
+ * 设置该设备配置为默认
+ */
+export const setDeviceProfileIsDefaultApi = (id: string, v, params?: {}) => {
+  return defHttp.post(
+    {
+      url: EDeviceConfigApi.SET_DEVICE_ISDEFAULT + '/' + id + '/' + v,
+      params,
+    },
+    {
+      joinPrefix: false,
+    }
+  );
+};
+
+/**
+ * Frp内网穿透信息API
+ */
+export const frpGetInfoApi = (proxyName: string) => {
+  return defHttp.get({
+    url: `${EDeviceConfigApi.FRP_API}${proxyName}`,
+  });
+};
+
+export const frpPutInfoApi = (proxyName: string, enableRemote: number) => {
+  return defHttp.put({
+    url: `${EDeviceConfigApi.FRP_API}${proxyName}/${enableRemote}`,
+  });
+};
+
+export const getTbDeviceId = (params: string) => {
+  return defHttp.get({
+    url: `${EDeviceConfigApi.GET_TB_DEVICE_ID}/${params}`,
+  });
+};
+
+/**
+ * 命令下发记录
+ */
+export const deviceCommandRecordGetQuery = (params?: TDeviceConfigParams) => {
+  return defHttp.get({
+    url: EDeviceConfigApi.COMMODRECORD,
+    params,
+  });
+};

-import { BasicPageParams } from '/@/api/model/baseModel';
-
-export type TDeviceConfigPageQueryParam = BasicPageParams & TDeviceConfigParams;
-
-export type TDeviceConfigParams = {
-  page?: any;
-  pageSize?: any;
-  name?: string;
-  transportType?: string;
-  orderFiled?: string;
-  orderType?: string;
-  tbDeviceId?: string;
-};
-
-export interface IDeviceConfigAddOrEditModel {
-  defaultQueueName?: string; //处理队列
-  alarmProfile?: {
-    alarmContactId: string;
-    createTime: '2021-12-15T02:17:26.644Z';
-    creator: string;
-    defaultConfig: string;
-    description: string;
-    deviceProfileId: string;
-    enabled: true;
-    icon: string;
-    id: string;
-    messageMode: string;
-    name: string;
-    roleIds: [string];
-    tenantExpireTime: '2021-12-15T02:17:26.644Z';
-    tenantId: string;
-    tenantStatus: 'DISABLED';
-    updateTime: '2021-12-15T02:17:26.644Z';
-    updater: string;
-  };
-  convertJs?: string;
-  createTime?: '2021-12-15T02:17:26.644Z';
-  creator?: string;
-  defaultConfig?: string;
-  defaultRuleChainId?: string;
-  description?: string;
-  enabled?: true;
-  icon?: string;
-  id?: string;
-  name?: string;
-  profileData?: {
-    configuration: {};
-    transportConfiguration: {};
-    provisionConfiguration: {
-      provisionDeviceSecret: string;
-    };
-    //报警类型字段
-    alarms: [
-      {
-        id: 'highTemperatureAlarmID';
-        alarmType: 'High Temperature Alarm';
-        createRules: {
-          additionalProp1: {
-            condition: {
-              condition: [
-                {
-                  key: {
-                    type: 'TIME_SERIES';
-                    key: 'temp';
-                  };
-                  valueType: 'NUMERIC';
-                  value: {};
-                  predicate: {};
-                }
-              ];
-              spec: {};
-            };
-            schedule: {
-              type: 'ANY_TIME';
-            };
-            alarmDetails: string;
-            dashboardId: {
-              id: '784f394c-42b6-435a-983c-b7beff2784f9';
-              entityType: 'DASHBOARD';
-            };
-          };
-          additionalProp2: {
-            condition: {
-              condition: [
-                {
-                  key: {
-                    type: 'TIME_SERIES';
-                    key: 'temp';
-                  };
-                  valueType: 'NUMERIC';
-                  value: {};
-                  predicate: {};
-                }
-              ];
-              spec: {};
-            };
-            schedule: {
-              type: 'ANY_TIME';
-            };
-            alarmDetails: string;
-            dashboardId: {
-              id: '784f394c-42b6-435a-983c-b7beff2784f9';
-              entityType: 'DASHBOARD';
-            };
-          };
-          additionalProp3: {
-            condition: {
-              condition: [
-                {
-                  key: {
-                    type: 'TIME_SERIES';
-                    key: 'temp';
-                  };
-                  valueType: 'NUMERIC';
-                  value: {};
-                  predicate: {};
-                }
-              ];
-              spec: {};
-            };
-            schedule: {
-              type: 'ANY_TIME';
-            };
-            alarmDetails: string;
-            dashboardId: {
-              id: '784f394c-42b6-435a-983c-b7beff2784f9';
-              entityType: 'DASHBOARD';
-            };
-          };
-        };
-        clearRule: {
-          condition: {
-            condition: [
-              {
-                key: {
-                  type: 'TIME_SERIES';
-                  key: 'temp';
-                };
-                valueType: 'NUMERIC';
-                value: {};
-                predicate: {};
-              }
-            ];
-            spec: {};
-          };
-          schedule: {
-            type: 'ANY_TIME';
-          };
-          alarmDetails: string;
-          dashboardId: {
-            id: '784f394c-42b6-435a-983c-b7beff2784f9';
-            entityType: 'DASHBOARD';
-          };
-        };
-        propagate: true;
-        propagateRelationTypes: [string];
-      }
-    ];
-  };
-  roleIds?: [string];
-  tbProfileId?: string;
-  tenantExpireTime?: '2021-12-15T02:17:26.645Z';
-  tenantId?: string;
-  tenantStatus?: 'DISABLED';
-  transportType?: string;
-  updateTime?: '2021-12-15T02:17:26.645Z';
-  updater?: string;
-}
-
-export interface Data {
-  CO: number;
-}
-
-export interface Details {
-  data: Data;
-}
-
-export interface AlarmLogItem {
-  id: string;
-  tenantId: string;
-  creator?: any;
-  updater?: any;
-  createdTime: string;
-  updatedTime: string;
-  customerId: string;
-  tbDeviceId: string;
-  originatorType: number;
-  deviceId: string;
-  deviceName: string;
-  type: string;
-  severity: string;
-  status: string;
-  startTs: string;
-  endTs: string;
-  ackTs: string;
-  clearTs: string;
-  details: Details;
-  propagate: boolean;
-  propagateRelationTypes?: any;
-  organizationId: string;
-  organizationName: string;
-}
-
-export interface Configuration {
-  type: string;
-}
-
-export interface TransportConfiguration {
-  type: string;
-}
-
-export interface ProvisionConfiguration {
-  type: string;
-  provisionDeviceSecret?: any;
-}
-
-export interface ProfileData {
-  configuration: Configuration;
-  transportConfiguration: TransportConfiguration;
-  provisionConfiguration: ProvisionConfiguration;
-  alarms?: any;
-}
-
-export interface ProfileRecord {
-  id: string;
-  creator: string;
-  createTime: string;
-  updater: string;
-  updateTime: string;
-  name: string;
-  tenantId: string;
-  transportType: string;
-  provisionType: string;
-  deviceType: string;
-  tbProfileId: string;
-  profileData: ProfileData;
-  defaultRuleChainId: string;
-  defaultQueueName: string;
-  image: string;
-  type: string;
-  default: boolean;
-
-  checked?: boolean;
-}
-
-export interface IDRecord {
-  entityType: string;
-  id: string;
-}
-
-export interface RuleChainRecord {
-  id: IDRecord;
-  createdTime: number;
-  additionalInfo?: any;
-  tenantId: IDRecord;
-  name: string;
-  type: string;
-  firstRuleNodeId: IDRecord;
-  root: boolean;
-  debugMode: boolean;
-  configuration?: any;
-}
+import { BasicPageParams } from '/@/api/model/baseModel';
+
+export type TDeviceConfigPageQueryParam = BasicPageParams & TDeviceConfigParams;
+
+export type TDeviceConfigParams = {
+  page?: any;
+  pageSize?: any;
+  name?: string;
+  transportType?: string;
+  orderFiled?: string;
+  orderType?: string;
+  tbDeviceId?: string;
+};
+
+export interface IDeviceConfigAddOrEditModel {
+  defaultQueueName?: string; //处理队列
+  alarmProfile?: {
+    alarmContactId: string;
+    createTime: '2021-12-15T02:17:26.644Z';
+    creator: string;
+    defaultConfig: string;
+    description: string;
+    deviceProfileId: string;
+    enabled: true;
+    icon: string;
+    id: string;
+    messageMode: string;
+    name: string;
+    roleIds: [string];
+    tenantExpireTime: '2021-12-15T02:17:26.644Z';
+    tenantId: string;
+    tenantStatus: 'DISABLED';
+    updateTime: '2021-12-15T02:17:26.644Z';
+    updater: string;
+  };
+  convertJs?: string;
+  createTime?: '2021-12-15T02:17:26.644Z';
+  creator?: string;
+  defaultConfig?: string;
+  defaultRuleChainId?: string;
+  description?: string;
+  enabled?: true;
+  icon?: string;
+  id?: string;
+  name?: string;
+  profileData?: {
+    configuration: {};
+    transportConfiguration: {};
+    provisionConfiguration: {
+      provisionDeviceSecret: string;
+    };
+    //报警类型字段
+    alarms: [
+      {
+        id: 'highTemperatureAlarmID';
+        alarmType: 'High Temperature Alarm';
+        createRules: {
+          additionalProp1: {
+            condition: {
+              condition: [
+                {
+                  key: {
+                    type: 'TIME_SERIES';
+                    key: 'temp';
+                  };
+                  valueType: 'NUMERIC';
+                  value: {};
+                  predicate: {};
+                }
+              ];
+              spec: {};
+            };
+            schedule: {
+              type: 'ANY_TIME';
+            };
+            alarmDetails: string;
+            dashboardId: {
+              id: '784f394c-42b6-435a-983c-b7beff2784f9';
+              entityType: 'DASHBOARD';
+            };
+          };
+          additionalProp2: {
+            condition: {
+              condition: [
+                {
+                  key: {
+                    type: 'TIME_SERIES';
+                    key: 'temp';
+                  };
+                  valueType: 'NUMERIC';
+                  value: {};
+                  predicate: {};
+                }
+              ];
+              spec: {};
+            };
+            schedule: {
+              type: 'ANY_TIME';
+            };
+            alarmDetails: string;
+            dashboardId: {
+              id: '784f394c-42b6-435a-983c-b7beff2784f9';
+              entityType: 'DASHBOARD';
+            };
+          };
+          additionalProp3: {
+            condition: {
+              condition: [
+                {
+                  key: {
+                    type: 'TIME_SERIES';
+                    key: 'temp';
+                  };
+                  valueType: 'NUMERIC';
+                  value: {};
+                  predicate: {};
+                }
+              ];
+              spec: {};
+            };
+            schedule: {
+              type: 'ANY_TIME';
+            };
+            alarmDetails: string;
+            dashboardId: {
+              id: '784f394c-42b6-435a-983c-b7beff2784f9';
+              entityType: 'DASHBOARD';
+            };
+          };
+        };
+        clearRule: {
+          condition: {
+            condition: [
+              {
+                key: {
+                  type: 'TIME_SERIES';
+                  key: 'temp';
+                };
+                valueType: 'NUMERIC';
+                value: {};
+                predicate: {};
+              }
+            ];
+            spec: {};
+          };
+          schedule: {
+            type: 'ANY_TIME';
+          };
+          alarmDetails: string;
+          dashboardId: {
+            id: '784f394c-42b6-435a-983c-b7beff2784f9';
+            entityType: 'DASHBOARD';
+          };
+        };
+        propagate: true;
+        propagateRelationTypes: [string];
+      }
+    ];
+  };
+  roleIds?: [string];
+  tbProfileId?: string;
+  tenantExpireTime?: '2021-12-15T02:17:26.645Z';
+  tenantId?: string;
+  tenantStatus?: 'DISABLED';
+  transportType?: string;
+  updateTime?: '2021-12-15T02:17:26.645Z';
+  updater?: string;
+}
+
+export interface Data {
+  CO: number;
+}
+
+export interface Details {
+  data: Data;
+}
+
+export interface AlarmLogItem {
+  id: string;
+  tenantId: string;
+  creator?: any;
+  updater?: any;
+  createdTime: string;
+  updatedTime: string;
+  customerId: string;
+  tbDeviceId: string;
+  originatorType: number;
+  deviceId: string;
+  deviceName: string;
+  type: string;
+  severity: string;
+  status: string;
+  startTs: string;
+  endTs: string;
+  ackTs: string;
+  clearTs: string;
+  details: Details;
+  propagate: boolean;
+  propagateRelationTypes?: any;
+  organizationId: string;
+  organizationName: string;
+}
+
+export interface Configuration {
+  type: string;
+}
+
+export interface TransportConfiguration {
+  type: string;
+}
+
+export interface ProvisionConfiguration {
+  type: string;
+  provisionDeviceSecret?: any;
+}
+
+export interface ProfileData {
+  configuration: Configuration;
+  transportConfiguration: TransportConfiguration;
+  provisionConfiguration: ProvisionConfiguration;
+  alarms?: any;
+}
+
+export interface ProfileRecord {
+  id: string;
+  creator: string;
+  createTime: string;
+  updater: string;
+  updateTime: string;
+  name: string;
+  tenantId: string;
+  transportType: string;
+  provisionType: string;
+  deviceType: string;
+  tbProfileId: string;
+  profileData: ProfileData;
+  defaultRuleChainId: string;
+  defaultQueueName: string;
+  image: string;
+  type: string;
+  default: boolean;
+
+  checked?: boolean;
+}
+
+export interface IDRecord {
+  entityType: string;
+  id: string;
+}
+
+export interface RuleChainRecord {
+  id: IDRecord;
+  createdTime: number;
+  additionalInfo?: any;
+  tenantId: IDRecord;
+  name: string;
+  type: string;
+  firstRuleNodeId: IDRecord;
+  root: boolean;
+  debugMode: boolean;
+  configuration?: any;
+}
+
+export interface DeviceProfileDetail {
+  id: string;
+  creator: string;
+  createTime: string;
+  updater: string;
+  updateTime: string;
+  name: string;
+  description: string;
+  tenantId: string;
+  transportType: string;
+  provisionType: string;
+  deviceType: string;
+  tbProfileId: string;
+  profileData: ProfileData;
+  defaultQueueName: string;
+  type: string;
+  deviceCount: number;
+  default: boolean;
+}
+
+export interface ProfileData {
+  configuration: Configuration;
+  transportConfiguration: TransportConfiguration;
+  provisionConfiguration: ProvisionConfiguration;
+  alarms: any;
+  thingsModel: any;
+}
+
+export interface Configuration {
+  type: string;
+}
+
+export interface TransportConfiguration {
+  type: string;
+}
+
+export interface ProvisionConfiguration {
+  type: string;
+  provisionDeviceSecret: any;
+}

@@ -230,10 +230,10 @@
 
       function setFormModel(key: string, value: any) {
         formModel[key] = value;
-        // const { validateTrigger } = unref(getBindValue);
-        // if (!validateTrigger || validateTrigger === 'change') {
-        //   validateFields([key]).catch((_) => {});
-        // }
+        const { validateTrigger } = unref(getBindValue);
+        if (!validateTrigger || validateTrigger === 'change') {
+          validateFields([key]).catch((_) => {});
+        }
       }
 
       function handleEnterPress(e: KeyboardEvent) {

@@ -242,7 +242,7 @@
             const value = target ? (isCheck ? target.checked : target.value) : e;
             props.setFormModel(field, value);
           },
-          onBlur: (...args) => {
+          onBlur: (...args: any[]) => {
             unref(getComponentsProps)?.onBlur?.(...args);
             props.validateFields([field], { triggerName: 'blur' }).catch((_) => {});
           },

@@ -38,7 +38,7 @@ export const basicProps = {
   },
   autoSetPlaceHolder: propTypes.bool.def(true),
   // 在INPUT组件上单击回车时，是否自动提交
-  autoSubmitOnEnter: propTypes.bool.def(false),
+  autoSubmitOnEnter: propTypes.bool.def(true),
   submitOnReset: propTypes.bool,
   size: propTypes.oneOf(['default', 'small', 'large']).def('default'),
   // 禁用表单

@@ -52,6 +52,7 @@ export function useBatchDelete(
       if (record) {
         await deleteFn([record.id]);
         createMessage.success('删除成功');
+        selectedRowIds.value = [];
       } else {
         await deleteFn(selectedRowIds.value);
         createMessage.success('批量删除成功');

@@ -116,7 +116,7 @@
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerModal, { openModal }] = useModal();
       // 表格hooks
-      const [registerTable, { reload, setProps }] = useTable({
+      const [registerTable, { reload, setProps, clearSelectedRowKeys }] = useTable({
         title: '视频列表',
         api: cameraPage,
         columns,
@@ -145,6 +145,7 @@
       // 刷新
       const handleSuccess = () => {
         reload();
+        clearSelectedRowKeys();
       };
       const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
         deleteCameraManage,

@@ -2,9 +2,10 @@
   <div ref="chartRef" :style="{ height, width }"></div>
 </template>
 <script lang="ts" setup>
-  import { ref, Ref, withDefaults, onMounted, watch } from 'vue';
+  import { ref, Ref, onMounted, watch } from 'vue';
   import { useECharts } from '/@/hooks/web/useECharts';
   import { getTrendData } from '/@/api/dashboard';
+  import { getDateByShortcutQueryKey, ShortcutQueryKeyEnum } from '../hooks/useDate';
 
   interface Props {
     width?: string;
@@ -77,11 +78,8 @@
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
   onMounted(async () => {
-    const endTs = Date.now();
     const res = await getTrendData({
-      startTs: endTs - 2592000000,
-      endTs,
-      interval: 86400000,
+      ...getDateByShortcutQueryKey(ShortcutQueryKeyEnum.LATEST_30_DAY),
       trend: 'CUSTOMER_TREND',
     });
 

@@ -95,6 +95,20 @@
     >
       <template #extra>
         <div class="extra-date">
+          <Tooltip :overlayStyle="{ maxWidth: '340px' }">
+            <template #title>
+              <section>
+                <div>30天: 查询最近30天的数据,间隔时间为1天.</div>
+                <div>最近三个月: 查询最近三个月的数据,间隔时间为1天.</div>
+                <div>最近一年: 查询最近一年的数据,间隔时间为30天.</div>
+                <div>
+                  间隔时间:
+                  以当前时间作为结束时间,往前推移对应天数或小时的时间作为开始时间,然后在此时间区间内进行分组聚合查询.
+                </div>
+              </section>
+            </template>
+            <QuestionCircleOutlined class="!mr-2 cursor-pointer" />
+          </Tooltip>
           <template v-for="(item, index) in TenantOrCustomerDateList" :key="item.value">
             <span
               @click="quickQueryTenantOrCustomerTime(index, item.value)"

@@ -80,6 +80,20 @@
     >
       <template #extra>
         <div class="extra-date">
+          <Tooltip :overlayStyle="{ maxWidth: '340px' }">
+            <template #title>
+              <section>
+                <div>30天: 查询最近30天的数据,间隔时间为1天.</div>
+                <div>最近三个月: 查询最近三个月的数据,间隔时间为1天.</div>
+                <div>最近一年: 查询最近一年的数据,间隔时间为30天.</div>
+                <div>
+                  间隔时间:
+                  以当前时间作为结束时间,往前推移对应天数或小时的时间作为开始时间,然后在此时间区间内进行分组聚合查询.
+                </div>
+              </section>
+            </template>
+            <QuestionCircleOutlined class="!mr-2 cursor-pointer" />
+          </Tooltip>
           <template v-for="(item, index) in TenantOrCustomerDateList" :key="item.value">
             <span
               @click="quickQueryTenantOrCustomerTime(index, item.value, 'tenant')"
@@ -445,7 +459,7 @@
     if (activeIndex.value === index) return;
     activeIndex.value = index;
     dateValue.value = '';
-    console.log(interval);
+
     if (isCustomer) {
       if (activeKey.value === '1') {
         const data = await getTrendData({

@@ -2,9 +2,10 @@
   <div ref="chartRef" :style="{ height, width }"></div>
 </template>
 <script lang="ts" setup>
-  import { ref, Ref, withDefaults, onMounted, watch } from 'vue';
+  import { ref, Ref, onMounted, watch } from 'vue';
   import { useECharts } from '/@/hooks/web/useECharts';
   import { getTrendData } from '/@/api/dashboard/index';
+  import { getDateByShortcutQueryKey, ShortcutQueryKeyEnum } from '../hooks/useDate';
   interface Props {
     width?: string;
     height?: string;
@@ -77,11 +78,8 @@
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
   onMounted(async () => {
-    const endTs = Date.now();
     const res = await getTrendData({
-      startTs: endTs - 2592000000,
-      endTs,
-      interval: 86400000,
+      ...getDateByShortcutQueryKey(ShortcutQueryKeyEnum.LATEST_30_DAY),
       trend: 'TENANT_TREND',
     });
     const transferResult = res.map((item) => [item.ts, item.value]);

-import { formatToDateTime } from '/@/utils/dateUtil';
+import { dateUtil, formatToDateTime } from '/@/utils/dateUtil';
 import { ref } from 'vue';
 import { getTrendData } from '/@/api/dashboard';
 
+export enum ShortcutQueryKeyEnum {
+  LATEST_30_DAY = 'LATEST_30_DAY',
+  LATEST_3_MONTH = 'LATEST_3_MONTH',
+  LATEST_1_YEAR = 'LATEST_1_YEAR',
+}
+
+export function getDateByShortcutQueryKey(value: ShortcutQueryKeyEnum) {
+  const mapping = {
+    [ShortcutQueryKeyEnum.LATEST_30_DAY]: () => {
+      return {
+        startTs: dateUtil().subtract(30, 'day').startOf('day').valueOf(),
+        interval: 24 * 60 * 60 * 1000,
+      };
+    },
+    [ShortcutQueryKeyEnum.LATEST_3_MONTH]: () => {
+      return {
+        startTs: dateUtil().subtract(3, 'month').startOf('day').valueOf(),
+        interval: 24 * 60 * 60 * 1000,
+      };
+    },
+    [ShortcutQueryKeyEnum.LATEST_1_YEAR]: () => {
+      return {
+        startTs: dateUtil().subtract(1, 'year').startOf('day').valueOf(),
+        interval: 30 * 24 * 60 * 60 * 1000,
+      };
+    },
+  };
+
+  const result = mapping?.[value]?.();
+
+  return {
+    ...result,
+    endTs: dateUtil().add(1, 'day').startOf('day').valueOf(),
+  };
+}
+
 export function useDate() {
   const tenantDateValue = ref([]);
   const customerDateValue = ref([]);
@@ -10,26 +46,23 @@ export function useDate() {
   const activeTenantIndex = ref(0);
   const activeCustomerIndex = ref(0);
   const TenantOrCustomerDateList = ref([
-    { label: '30天', value: 2592000000 },
-    { label: '最近三个月', value: 7776000000 },
-    { label: '最近一年', value: 31536000000 },
+    { label: '30天', value: ShortcutQueryKeyEnum.LATEST_30_DAY },
+    { label: '最近三个月', value: ShortcutQueryKeyEnum.LATEST_3_MONTH },
+    { label: '最近一年', value: ShortcutQueryKeyEnum.LATEST_1_YEAR },
   ]);
 
   // 租户趋势和客户趋势快速选择时间
   async function quickQueryTenantOrCustomerTime(
     index: number,
-    value: number,
+    value: ShortcutQueryKeyEnum,
     flag: 'tenant' | 'customer'
   ) {
-    const endTs = Date.now();
     if (flag === 'tenant') {
       if (activeTenantIndex.value === index) return;
       activeTenantIndex.value = index;
       tenantDateValue.value = [];
       const res = await getTrendData({
-        startTs: endTs - value,
-        endTs,
-        interval: value === 2592000000 ? 86400000 : value === 7776000000 ? 172800000 : 2592000000,
+        ...getDateByShortcutQueryKey(value),
         trend: 'TENANT_TREND',
       });
       tenantTrendList.value = res.map((item) => [item.ts, item.value]);
@@ -38,9 +71,7 @@ export function useDate() {
       activeCustomerIndex.value = index;
       customerDateValue.value = [];
       const res = await getTrendData({
-        startTs: endTs - value,
-        endTs,
-        interval: value === 2592000000 ? 86400000 : value === 7776000000 ? 172800000 : 2592000000,
+        ...getDateByShortcutQueryKey(value),
         trend: 'CUSTOMER_TREND',
       });
       customerTrendList.value = res.map((item) => [item.ts, item.value]);

@@ -7,7 +7,7 @@ import { JSONEditor } from '/@/components/CodeEditor';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-import { toRaw, unref } from 'vue';
+import { nextTick, toRaw, unref } from 'vue';
 import ObjectModelValidateForm from '/@/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
 import { CommandDeliveryWayEnum, ServiceCallTypeEnum } from '/@/enums/toolEnum';
 import { TaskTypeEnum } from '/@/views/task/center/config';
@@ -246,8 +246,9 @@ export const step1Schemas: FormSchema[] = [
     required: true,
     component: 'ApiSelect',
     ifShow: ({ values }) => values.deviceType === 'SENSOR' && values.organizationId,
-    componentProps: ({ formModel }) => {
+    componentProps: ({ formModel, formActionType }) => {
       const { organizationId, transportType } = formModel;
+      const { validateFields } = formActionType;
       if (![organizationId, transportType].every(Boolean)) return {};
       return {
         api: async (params: Recordable) => {
@@ -266,6 +267,10 @@ export const step1Schemas: FormSchema[] = [
         },
         valueField: 'tbDeviceId',
         labelField: 'alias',
+        onChange: async () => {
+          await nextTick();
+          validateFields(['gatewayId']);
+        },
       };
     },
   },

 <script lang="ts" setup>
   import { Upload, Button } from 'ant-design-vue';
   import { InboxOutlined } from '@ant-design/icons-vue';
-  import { computed, ref } from 'vue';
+  import { computed } from 'vue';
   import StepContainer from './StepContainer.vue';
   import XLSX, { CellObject } from 'xlsx';
   import { basicProps } from './props';
   import { UploadFileParseValue } from './type';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
   const props = defineProps({
     ...basicProps,
+    fileList: {
+      required: true,
+      type: Array as PropType<(Record<'uid' | 'name', string> & File)[]>,
+    },
     value: {
       require: true,
       type: Object as PropType<UploadFileParseValue>,
     },
   });
 
-  const emit = defineEmits(['update:value']);
-
-  const fileList = ref<Record<'uid' | 'name', string>[]>([]);
+  const emit = defineEmits(['update:value', 'update:fileList']);
 
   interface FileRequestParams {
     file: File & { uid: string };
@@ -48,23 +51,30 @@
     return new Promise((resolve, reject) => {
       const fileReader = new FileReader();
       fileReader.onload = (event: ProgressEvent) => {
-        const data = (event.target as FileReader).result as string;
-
-        const result = XLSX.read(data, { type: 'string' });
-
-        const sheetName = result.SheetNames.at(0);
-        const workbook = result.Sheets;
-        const sheet = workbook[sheetName as string];
-        const sheetRange = sheet['!ref'];
-
-        const {
-          s: { c: startColumn },
-          e: { c: endColumn },
-        } = XLSX.utils.decode_range(sheetRange!);
-
-        const header = getTableHeader(sheet, [startColumn, endColumn]);
-        const content = XLSX.utils.sheet_to_json(sheet, { range: sheetRange }) as Recordable[];
-        resolve({ header, content });
+        try {
+          const data = (event.target as FileReader).result as string;
+
+          const result = XLSX.read(data, { type: 'string' });
+
+          const sheetName = result.SheetNames.at(0);
+          const workbook = result.Sheets;
+          const sheet = workbook[sheetName as string];
+          const sheetRange = sheet['!ref'];
+
+          const {
+            s: { c: startColumn },
+            e: { c: endColumn },
+          } = XLSX.utils.decode_range(sheetRange!);
+
+          const header = getTableHeader(sheet, [startColumn, endColumn]);
+          const content = XLSX.utils.sheet_to_json(sheet, { range: sheetRange }) as Recordable[];
+
+          resolve({ header, content });
+        } catch (error) {
+          const { createMessage } = useMessage();
+          createMessage.error('请检查csv文件是否正确');
+          throw error;
+        }
       };
 
       fileReader.onerror = () => {
@@ -75,19 +85,19 @@
   };
 
   const handleParseFile = async ({ file, onSuccess, onError }: FileRequestParams) => {
-    fileList.value = [];
     const value = await readFile(file);
     if (!value) {
       onError();
       return;
     }
-    fileList.value = [file];
+
+    emit('update:fileList', [file]);
     emit('update:value', value);
     onSuccess({}, file);
   };
 
   const canGoNextStep = computed(() => {
-    return !!fileList.value.length;
+    return !!props.fileList.length;
   });
 
   const handlePreviousStep = () => {
@@ -97,16 +107,22 @@
   const handleNextStep = () => {
     props.goNextStep?.();
   };
+
+  const handleRemove = () => {
+    emit('update:fileList', []);
+    return true;
+  };
 </script>
 
 <template>
   <StepContainer>
     <div class="">设备文件</div>
     <Upload.Dragger
-      v-model:fileList="fileList"
+      :fileList="fileList"
       :customRequest="handleParseFile"
       accept=".csv"
       name="file"
+      :remove="handleRemove"
     >
       <section class="cursor-pointer flex flex-col justify-center items-center">
         <InboxOutlined class="text-[4rem] !text-blue-400" />

@@ -17,6 +17,8 @@
 
   const basicInfo = ref({});
 
+  const fileList = ref<(File & Record<'uid' | 'name', string>)[]>([]);
+
   const fileParseValue = ref<UploadFileParseValue>({ header: [], content: [] });
 
   const columnConfiguration = ref<Record<'type', string>[]>([]);
@@ -61,6 +63,7 @@
 
   const reset = () => {
     basicInfo.value = {};
+    fileList.value = [];
     fileParseValue.value = { header: [], content: [] };
     columnConfiguration.value = [];
     importResult.value = {} as unknown as ImportDeviceResponse;
@@ -109,6 +112,7 @@
             />
             <ImportCsv
               v-if="StepsEnum[item] === StepsEnum.IMPORT_FILE && StepsEnum[item] === currentStep"
+              v-model:fileList="fileList"
               v-model:value="fileParseValue"
               :go-next-step="goNextStep"
               :go-previous-step="goPreviousStep"

@@ -11,7 +11,7 @@
   import { ColEx } from '/@/components/Form/src/types';
   import { useHistoryData } from '../../hook/useHistoryData';
   import { formatToDateTime } from '/@/utils/dateUtil';
-  import { useTable, BasicTable } from '/@/components/Table';
+  import { useTable, BasicTable, BasicColumn } from '/@/components/Table';
   import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
   import {
     ModeSwitchButton,
@@ -60,13 +60,9 @@
     }
   }
 
-  const [registerTable] = useTable({
-    showIndexColumn: false,
-    showTableSetting: false,
-    dataSource: historyData,
-    maxHeight: 300,
-    size: 'small',
-    columns: [
+  const sortOrder = ref<any>('descend');
+  const columns: BasicColumn[] | any = computed(() => {
+    return [
       {
         title: '属性',
         dataIndex: 'name',
@@ -84,18 +80,50 @@
         format: (val) => {
           return formatToDateTime(val, 'YYYY-MM-DD HH:mm:ss');
         },
-        sorter: 'descend',
+        sorter: true,
+        sortOrder: unref(sortOrder),
+        sortDirections: ['descend', 'ascend', 'descend'],
       },
-    ],
+    ];
+  });
+
+  const [registerTable, { setColumns }] = useTable({
+    showIndexColumn: false,
+    showTableSetting: false,
+    dataSource: historyData,
+    maxHeight: 300,
+    columns: unref(columns),
+    size: 'small',
   });
 
-  const handleTableChange = async (pag, filters, sorter: any) => {
-    console.log(pag, filters, sorter, 'pag, filters, sorter');
+  const getTableList = async (orderBy?: string) => {
+    // 表单验证
+    await method.validate();
+    const value = method.getFieldsValue();
+    const searchParams = getSearchParams(value);
+
+    if (!hasDeviceAttr()) return;
+    // 发送请求
+    loading.value = true;
+    const res = await getDeviceHistoryInfo(
+      {
+        ...searchParams,
+        entityId: props.deviceDetail.tbDeviceId,
+      },
+      orderBy
+    );
+    historyData.value = getTableHistoryData(res);
+    loading.value = false;
+  };
+
+  const handleTableChange = async (_pag, _filters, sorter: any) => {
+    sortOrder.value = sorter.order;
+    await setColumns(unref(columns));
     if (sorter.field == 'ts') {
       if (sorter.order == 'descend') {
-        openHistoryPanel('ASC');
+        getTableList('DESC');
       } else {
-        openHistoryPanel('DESC');
+        getTableList('ASC');
       }
     }
   };
@@ -214,7 +242,7 @@
     setOptions(setChartOptions(res, selectedKeys));
   };
 
-  const switchMode = (flag: EnumTableChartMode) => {
+  const switchMode = async (flag: EnumTableChartMode) => {
     mode.value = flag;
   };
 

@@ -12,6 +12,23 @@ export interface BasicCreateFormParams {
 
 useComponentRegister('JSONEditor', JSONEditor);
 
+const validateDouble = (
+  value: number,
+  type: DataTypeEnum,
+  min?: number | string,
+  max?: number | string
+) => {
+  min =
+    Number(min) || type === DataTypeEnum.IS_NUMBER_INT ? Number.MIN_SAFE_INTEGER : Number.MIN_VALUE;
+  max =
+    Number(max) || type === DataTypeEnum.IS_NUMBER_INT ? Number.MAX_SAFE_INTEGER : Number.MAX_VALUE;
+
+  return {
+    flag: value < min || value > max,
+    message: `取值范围在${min}~${max}之间`,
+  };
+};
+
 export const useGenDynamicForm = () => {
   const createInputNumber = ({
     identifier,
@@ -30,19 +47,19 @@ export const useGenDynamicForm = () => {
           type: 'number',
           trigger: 'change',
           validator: (_rule, value) => {
-            if (
-              value < (min ?? Number.MIN_SAFE_INTEGER) ||
-              value > (max || Number.MAX_SAFE_INTEGER)
-            ) {
-              return Promise.reject(`${functionName}取值范围在${min}~${max}之间`);
+            const { flag, message } = validateDouble(value, type, min, max);
+            if (flag) {
+              return Promise.reject(`${functionName}${message}`);
             }
             return Promise.resolve(value);
           },
         },
       ],
       componentProps: {
-        max: max ?? Number.MAX_SAFE_INTEGER,
-        min: min ?? Number.MIN_SAFE_INTEGER,
+        max:
+          max ?? type === DataTypeEnum.IS_NUMBER_INT ? Number.MAX_SAFE_INTEGER : Number.MAX_VALUE,
+        min:
+          min ?? type === DataTypeEnum.IS_NUMBER_INT ? Number.MIN_SAFE_INTEGER : Number.MIN_VALUE,
         step,
         placeholder: `请输入${functionName}`,
         precision: type === DataTypeEnum.IS_NUMBER_INT ? 0 : 2,
@@ -136,7 +153,7 @@ export const useGenDynamicForm = () => {
     fieldTypeMap.clear();
     const formSchema = schemas.map((item) => {
       const { functionName, identifier, dataType } = item;
-      console.log(item, 'item');
+
       const { type } = dataType || {};
 
       fieldTypeMap.set(identifier!, dataType!.type);

@@ -84,6 +84,7 @@
   import DeviceConfigurationStep from './step/DeviceConfigurationStep.vue';
   import TransportConfigurationStep from './step/TransportConfigurationStep.vue';
   import PhysicalModelManagementStep from './step/PhysicalModelManagementStep.vue';
+  import { DeviceProfileDetail } from '/@/api/device/model/deviceConfigModel';
 
   const emits = defineEmits(['success', 'register']);
   const activeKey = ref('1');
@@ -105,15 +106,22 @@
   });
   const transportTypeStr = ref('');
   const dynamicWidth = ref('55rem');
+
+  const isDefault = ref(false);
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
     setModalProps({ confirmLoading: false });
     current.value = 0;
     isUpdate.value = data.isUpdate;
     isViewDetail.value = data.isView;
-    const res = data.record !== undefined ? await deviceConfigGetDetail(data.record.id) : {};
+    const res =
+      data.record !== undefined
+        ? await deviceConfigGetDetail(data.record.id)
+        : ({} as DeviceProfileDetail);
     isEditId.value = data.record !== undefined ? data.record.id : null;
     isEditCreatTime.value = data.record !== undefined ? data.record.createTime : null;
 
+    isDefault.value = res.default;
+
     const title = unref(isUpdate) ? '编辑产品' : '新增产品';
     setModalProps({ title, showOkBtn: true, showCancelBtn: true });
     if (unref(isUpdate)) {
@@ -183,6 +191,7 @@
       ...{ profileData: !isEmptyObj ? transportConfData.profileData : null },
       ...{ id: isUpdate.value ? isEditId.value : null },
       ...{ createTime: isUpdate.value ? isEditCreatTime.value : null },
+      default: !!unref(isDefault),
     });
     createMessage.success(isUpdate.value ? `编辑成功` : `新增成功`);
     handleCancel();

@@ -70,7 +70,7 @@
         formConfig: {
           labelWidth: 120,
           schemas: searchFormSchema,
-          fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
+          fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'x']],
         },
         useSearchForm: true,
         showTableSetting: true,

@@ -67,7 +67,7 @@
         formConfig: {
           labelWidth: 120,
           schemas: searchFormSchema,
-          fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
+          fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'x']],
         },
         useSearchForm: true,
         showTableSetting: true,

@@ -79,7 +79,6 @@
         debugMode,
         name,
       };
-      console.log(value, 'value');
       await createRuleChine(value);
       createMessage.success('编辑成功');
     }

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { transformTime } from '/@/hooks/web/useDateToLocaleString';
+import { isObject, isString } from '/@/utils/is';
 
 export const columns: BasicColumn[] = [
   {
@@ -55,6 +56,18 @@ export const exportJSONFile = (value: Recordable, name: string) => {
   URL.revokeObjectURL(objectURL);
 };
 
+export const paseJSON = (string: string) => {
+  let data = null;
+  let flag = false;
+  try {
+    if (!isString(string)) return { flag: false, data };
+    data = JSON.parse(string);
+    flag = true;
+    if (!isObject(data)) flag = false;
+  } catch (error) {}
+  return { flag, data };
+};
+
 export enum RuleChainPermisssion {
   DETAIL = 'rule:chain:detail',
 }

@@ -8,7 +8,7 @@
         <Upload :show-upload-list="false" :customRequest="handleImport">
           <Button type="primary" :loading="importLoading"> 导入规则链 </Button>
         </Upload>
-        <!-- <Authority>
+        <Authority>
           <Popconfirm
             title="您确定要批量删除数据"
             ok-text="确定"
@@ -17,7 +17,7 @@
           >
             <a-button color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
           </Popconfirm>
-        </Authority> -->
+        </Authority>
       </template>
       <template #root="{ record }">
         <Tag :color="record.root ? 'green' : 'red'"> {{ record.root ? '是' : '否' }}</Tag>
@@ -84,6 +84,7 @@
     encode,
     exportJSONFile,
     searchFormSchema,
+    paseJSON,
   } from './config/config.data';
   import {
     deleteRuleChine,
@@ -95,17 +96,45 @@
   } from '/@/api/ruleengine/ruleengineApi';
   import { useModal } from '/@/components/Modal';
   import { Authority } from '/@/components/Authority';
-  import { Tag, Button, Upload } from 'ant-design-vue';
+  import { Tag, Button, Upload, Popconfirm } from 'ant-design-vue';
   import { RuleChainModal } from './component/index';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { usePermission } from '/@/hooks/web/usePermission';
   import { useRouter } from 'vue-router';
   import { ref } from 'vue';
-  import { isObject, isString } from '/@/utils/is';
+  import { isObject } from '/@/utils/is';
   // import { ChainDetailDrawer } from './chainDetail/index';
   // import { useDrawer } from '/@/components/Drawer';
 
-  const [registerTable, { reload, setProps }] = useTable({
+  const [registerModal, { openModal }] = useModal();
+  const { createMessage } = useMessage();
+  const { hasPermission } = usePermission();
+  const router = useRouter();
+
+  const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
+  const importLoading = ref<boolean>(false);
+  const hasBatchDelete = ref<boolean>(false);
+
+  const beforeFetch = (params) => {
+    Reflect.set(params, 'page', params.page - 1);
+    Reflect.set(params, 'sortProperty', 'createdTime');
+    Reflect.set(params, 'sortOrder', 'DESC');
+    return params;
+  };
+
+  const rowSelection = () => {
+    return {
+      type: 'checkbox',
+      getCheckboxProps: (record: Recordable) => {
+        return { disabled: record.root };
+      },
+      onChange(rowKeys: string[]) {
+        hasBatchDelete.value = rowKeys.length <= 0;
+      },
+    };
+  };
+
+  const [registerTable, { reload, setProps, getSelectRowKeys, clearSelectedRowKeys }] = useTable({
     title: '规则链库',
     api: getRuleChinsList,
     rowKey: (record) => record.id.id,
@@ -123,19 +152,8 @@
       pageField: 'page',
       listField: 'data',
     },
-    beforeFetch(params) {
-      Reflect.set(params, 'page', params.page - 1);
-      Reflect.set(params, 'sortProperty', 'createdTime');
-      Reflect.set(params, 'sortOrder', 'DESC');
-      return params;
-    },
-    rowSelection: {
-      type: 'checkbox',
-      getCheckboxProps: (record: Recordable) => {
-        console.log(record, 'record');
-        return { disabled: record.root };
-      },
-    },
+    beforeFetch: (params) => beforeFetch(params),
+    rowSelection: rowSelection() as any,
     actionColumn: {
       width: 220,
       title: '操作',
@@ -145,10 +163,6 @@
     },
   });
 
-  const [registerModal, { openModal }] = useModal();
-
-  // const [registerDrawer, { openDrawer }] = useDrawer();
-
   const handleSuccess = () => {
     reload();
   };
@@ -166,10 +180,6 @@
     });
   };
 
-  const { createMessage } = useMessage();
-  const { hasPermission } = usePermission();
-  const router = useRouter();
-
   const handleView = (record: Recordable) => {
     const hasDetailPermission = hasPermission(RuleChainPermisssion.DETAIL);
     if (hasDetailPermission) {
@@ -178,30 +188,6 @@
     } else createMessage.warning('没有权限');
   };
 
-  // const handleRowClick = (record) => {
-  //   openDrawer(true, { record });
-  //   console.log('点击行', record);
-  // };
-
-  // const handleDetail = (record) => {
-  //   console.log(record, '详情');
-  // };
-
-  const paseJSON = (string: string) => {
-    let data = null;
-    let flag = false;
-    try {
-      if (!isString(string)) return { flag: false, data };
-      data = JSON.parse(string);
-      flag = true;
-      if (!isObject(data)) flag = false;
-    } catch (error) {}
-    return { flag, data };
-  };
-
-  const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
-
-  const importLoading = ref<boolean>(false);
   const handleImport = (data: { file: File }) => {
     const fileReader = new FileReader();
 
@@ -275,18 +261,25 @@
     reload();
   };
 
-  const handleDeleteOrBatchDelete = async (record: Recordable) => {
+  const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
     setProps({
       loading: true,
     });
     try {
+      if (!record) {
+        const ids = getSelectRowKeys();
+        await Promise.all(ids.map((item) => deleteRuleChine(item)));
+        return;
+      }
       await deleteRuleChine(record.id.id);
-      createMessage.success('删除成功');
     } finally {
       setProps({
         loading: false,
       });
+
+      createMessage.success('删除成功');
+      clearSelectedRowKeys();
+      reload();
     }
-    reload();
   };
 </script>

@@ -126,7 +126,10 @@
                 password: getDataFlowParams.password ? getDataFlowParams.password : undefined,
               }
             : undefined,
+          appendClientIdSuffix: getDataFlowParams.appendClientIdSuffix || undefined,
+          type: undefined,
         };
+
         const rest = isRabbitmq(getDataFlowMethod?.type)
           ? await postAddConvertApi({ ...restData.data, ...data })
           : await postAddConvertApi({ ...restData.data, ...data, configuration });

 import { Ref, toRaw, unref } from 'vue';
-import { BasicNodeBindData, NodeData } from '../types/node';
-import { Elements, GraphNode } from '@vue-flow/core';
-import { RuleChainType } from '../types/ruleNode';
+import { BasicNodeBindData, EdgeData, NodeData } from '../types/node';
+import { Elements, GraphEdge, GraphNode } from '@vue-flow/core';
+import { ConnectionItemType, RuleChainType } from '../types/ruleNode';
 import { allComponents } from '../packages';
 import { RuleNodeTypeEnum } from '../packages/index.type';
 import { buildUUID } from '/@/utils/uuid';
@@ -9,6 +9,9 @@ import { isNullOrUnDef } from '/@/utils/is';
 import { useAddNodes } from './useAddNodes';
 import { useAddEdges } from './useAddEdges';
 import { RuleChainEntityType } from '../enum/entity';
+import { EntryCategoryComponentEnum } from '../enum/category';
+
+const ignoreNodeKeys: string[] = [EntryCategoryComponentEnum.INPUT];
 
 export function useBasicDataTransform() {
   const nodeConfigMap = new Map<string, NodeData>();
@@ -24,7 +27,7 @@ export function useBasicDataTransform() {
   }
 
   function mergeData(data: NodeData['data'], nodeData: NodeData, node: GraphNode) {
-    const { x: layoutX, y: layoutY } = node.computedPosition;
+    const { x: layoutX, y: layoutY } = node.position;
 
     return {
       debugMode: !!data?.debugMode,
@@ -172,8 +175,126 @@ export function useBasicDataTransform() {
 
   initNodeConfigMap();
 
+  /**
+   * @description 保存连接信息
+   */
+  function getConnections(
+    nodesRef: Ref<GraphNode[]> | GraphNode[],
+    edges: Ref<GraphEdge[]> | GraphEdge[]
+  ) {
+    const nodeIndexMap = new Map();
+
+    const connections: ConnectionItemType[] = [];
+
+    unref(nodesRef).forEach((item, index) => {
+      nodeIndexMap.set(item.id, index);
+    });
+
+    for (const item of unref(edges)) {
+      const { data, target, source } = item;
+      const { data: bindData } = data as EdgeData;
+      const { type } = bindData || {};
+      const fromIndex = nodeIndexMap.get(source);
+      const toIndex = nodeIndexMap.get(target);
+      type?.forEach((key) => {
+        connections.push({ fromIndex, toIndex, type: key });
+      });
+    }
+
+    return connections;
+  }
+
+  function getNodes(nodesRef: Ref<GraphNode[]> | GraphNode[], removeId: boolean) {
+    const nodes: BasicNodeBindData[] = [];
+
+    for (const node of unref(nodesRef)) {
+      const nodeData = node.data as NodeData;
+
+      if (ignoreNodeKeys.includes(nodeData.config?.key as string)) continue;
+
+      const data = nodeData.data;
+
+      nodes.push(
+        Object.assign(
+          mergeData(data, nodeData, node),
+          nodeData.created && !removeId
+            ? ({
+                id: { id: node.id, entityType: RuleChainEntityType.RULE_NODE },
+              } as BasicNodeBindData)
+            : {}
+        )
+      );
+    }
+
+    return nodes;
+  }
+
+  function getFirsetNodeIndex(
+    nodesRef: Ref<GraphNode[]> | GraphNode[],
+    edges: Ref<GraphEdge[]> | GraphEdge[]
+  ) {
+    const inputNode = unref(edges).find(
+      (item) => (item.sourceNode.data as NodeData).config?.key === EntryCategoryComponentEnum.INPUT
+    );
+
+    if (inputNode) {
+      const targetId = inputNode.target;
+      const index = unref(nodesRef).findIndex((item) => item.id === targetId);
+      return index;
+    }
+  }
+
+  function combineData(
+    nodesRef: Ref<GraphNode[]> | GraphNode[] = [],
+    edgesRef: Ref<GraphEdge[]> | GraphEdge[] = [],
+    removeId = false
+  ) {
+    const extraIgnoreNodeRef = unref(nodesRef).filter(
+      (item) => !ignoreNodeKeys.includes((item.data as NodeData).config?.key as string)
+    );
+
+    const connections = getConnections(extraIgnoreNodeRef, edgesRef);
+
+    const nodes = getNodes(extraIgnoreNodeRef, removeId);
+
+    const firstNodeIndex = getFirsetNodeIndex(extraIgnoreNodeRef, edgesRef);
+
+    return { connections, nodes, firstNodeIndex };
+  }
+
+  function validateCanCreateRuleChain(
+    nodes: Ref<GraphNode[]> | GraphNode[] = [],
+    edges: Ref<GraphEdge[]> | GraphEdge[] = []
+  ) {
+    const rootNode: GraphNode[] = [];
+
+    let flag = true;
+    for (const node of unref(nodes)) {
+      const list = unref(edges).filter(
+        (edge) => edge.source === node.id || edge.target === node.id
+      );
+
+      if (!list.length) {
+        flag = false;
+        break;
+      }
+
+      if (!list.filter((edge) => edge.target === node.id).length) {
+        if (!rootNode.length) rootNode.push(node);
+        else {
+          flag = false;
+          break;
+        }
+      }
+    }
+
+    return { flag, firstNode: rootNode[0] || null };
+  }
+
   return {
     mergeData,
+    combineData,
     deconstructionData,
+    validateCanCreateRuleChain,
   };
 }

@@ -3,11 +3,19 @@ import { getRuleNodeCache, setRuleNodeCache } from './useRuleChainCache';
 import { RuleContextMenuEnum } from './useRuleChainContextMenu';
 import { useAddNodes } from './useAddNodes';
 import { buildUUID } from '/@/utils/uuid';
-import { toRaw, unref } from 'vue';
+import { Ref, toRaw, unref } from 'vue';
 import { useSaveAndRedo } from './useSaveAndRedo';
 import { isUnDef } from '/@/utils/is';
 import { useAddEdges } from './useAddEdges';
 import { EdgeData } from '../types/node';
+import { CreateNodeModal } from '../src/components/CreateNodeModal';
+import { CreateEdgeModal } from '../src/components/CreateEdgeModal';
+import { UpdateNodeDrawer } from '../src/components/UpdateNodeDrawer';
+import { UpdateEdgeDrawer } from '../src/components/UpdateEdgeDrawer';
+import { CreateRuleChainModal } from '../src/components/CreateRuleChainModal';
+import { useBasicDataTransform } from './useBasicDataTransform';
+import { cloneDeep } from 'lodash-es';
+import { useNewNode } from './useNewNode';
 
 interface HandleContextMenuActionParamsType {
   menuType: RuleContextMenuEnum;
@@ -16,18 +24,58 @@ interface HandleContextMenuActionParamsType {
   node?: GraphNode;
   edge?: GraphEdge;
   useSaveAndRedoActionType?: ReturnType<typeof useSaveAndRedo>;
+  modalActionType: {
+    createNodeModalActionType: Ref<Nullable<InstanceType<typeof CreateNodeModal>>>;
+    createEdgeModalActionType: Ref<Nullable<InstanceType<typeof CreateEdgeModal>>>;
+    updateNodeDrawerActionType: Ref<Nullable<InstanceType<typeof UpdateNodeDrawer>>>;
+    updateEdgeDrawerActionType: Ref<Nullable<InstanceType<typeof UpdateEdgeDrawer>>>;
+    createRuleChainModalActionType: Ref<Nullable<InstanceType<typeof CreateRuleChainModal>>>;
+  };
+}
+
+export function transformToRuleChain(
+  nodesRef: Ref<GraphNode[]> | GraphNode[] = [],
+  edgesRef: Ref<GraphEdge[]> | GraphEdge[] = []
+) {
+  const nodeMap = new Map<string, GraphNode>();
+  const { combineData, validateCanCreateRuleChain } = useBasicDataTransform();
+
+  nodesRef = cloneDeep(unref(nodesRef));
+  edgesRef = cloneDeep(unref(edgesRef));
+
+  unref(nodesRef).forEach((node) => nodeMap.set(node.id, node));
+  const outputEdges = unref(edgesRef).filter((edge) => !nodeMap.has(edge.target));
+  const outputEdgesId = outputEdges.map((edge) => edge.id);
+
+  const { getOutputNodeConfig } = useNewNode();
+  const outputNode = outputEdges.map((edge) => {
+    const id = buildUUID();
+    const name = (edge.data as EdgeData).data?.type?.join(' / ') || '';
+    edge.target = id;
+    return getOutputNodeConfig(name, edge.targetNode.position, id);
+  });
+
+  nodesRef = [...nodesRef, ...(outputNode as GraphNode[])];
+
+  const { connections, nodes } = combineData(nodesRef, edgesRef, true);
+
+  const { firstNode } = validateCanCreateRuleChain(nodesRef, edgesRef);
+
+  const firstNodeIndex = nodesRef.findIndex((node) => node.id === firstNode.id);
+
+  return { connections, nodes, firstNodeIndex, outputEdgesId };
 }
 
 export const NODE_WIDTH = 176;
 export const NODE_HEIGHT = 48;
 
-function getElementsCenter(nodes: GraphNode[]) {
+function getElementsCenter(nodes: Ref<GraphNode[]> | GraphNode[] = []) {
   let leftTopX: number | undefined;
   let leftTopY: number | undefined;
   let rightBottomX: number | undefined;
   let rightBottomY: number | undefined;
 
-  for (const node of nodes) {
+  for (const node of unref(nodes)) {
     const { position } = node;
     const { x, y } = position;
     if (isUnDef(leftTopX)) {
@@ -200,6 +248,37 @@ export function useContextMenuAction() {
     useSaveAndRedoActionType?.handleRedoChange(flowActionType!);
   };
 
+  const createRuleChain = async (_params: HandleContextMenuActionParamsType) => {
+    // const { useSaveAndRedoActionType, modalActionType, flowActionType } = params;
+    // const { createRuleChainModalActionType } = modalActionType;
+    // const result = (await unref(createRuleChainModalActionType)?.openCreateRuleChainModal()) as {
+    //   name: string;
+    //   additionalInfo: { description: string };
+    // };
+    // const ruleChainDetail = await saveRuleChainDetail(
+    //   Object.assign(result, { debugger: false, type: 'CORE' }) as Partial<RuleChainDetail>
+    // );
+    // const selectedNodes = unref(flowActionType?.getSelectedNodes);
+    // const selectedEdges = unref(flowActionType?.getSelectedEdges);
+    // const { firstNodeIndex, connections, nodes, outputEdgesId } = transformToRuleChain(
+    //   selectedNodes,
+    //   selectedEdges
+    // );
+    // await saveRuleChainData({
+    //   firstNodeIndex,
+    //   connections,
+    //   nodes,
+    //   ruleChainId: ruleChainDetail.id,
+    // });
+    // const outputEdges = outputEdgesId.map((id) => flowActionType?.findEdge(id));
+    // console.log(getElementsCenter(unref(selectedNodes)));
+    // const { originX, originY } = getElementsCenter(unref(selectedNodes));
+    // const {} = useNewNode();
+    // flowActionType?.removeNodes(selectedNodes || []);
+    // flowActionType?.removeEdges(selectedEdges || []);
+    // useSaveAndRedoActionType?.triggerChange();
+  };
+
   const handleContextMenuAction = (params: HandleContextMenuActionParamsType) => {
     const { menuType } = params;
 
@@ -213,6 +292,7 @@ export function useContextMenuAction() {
       [RuleContextMenuEnum.SELECT_COPY]: selectCopy,
       [RuleContextMenuEnum.APPLY_CHANGE]: applyChange,
       [RuleContextMenuEnum.UNDO_CHANGE]: undoChange,
+      [RuleContextMenuEnum.CREATE_RULE_CHAIN]: createRuleChain,
     };
 
     if (handlerMapping[menuType]) {

@@ -5,6 +5,7 @@ import type { CreateNodeModal } from '../src/components/CreateNodeModal';
 import type { CreateEdgeModal } from '../src/components/CreateEdgeModal';
 import { UpdateNodeDrawer } from '../src/components/UpdateNodeDrawer';
 import { UpdateEdgeDrawer } from '../src/components/UpdateEdgeDrawer';
+import { CreateRuleChainModal } from '../src/components/CreateRuleChainModal';
 
 const SYMBOL = Symbol('flow-context');
 
@@ -30,6 +31,11 @@ interface FlowContextOptionsType {
   updateEdgeDrawerActionType: Ref<Nullable<InstanceType<typeof UpdateEdgeDrawer>>>;
 
   /**
+   * @description 创建规则链 actions
+   */
+  createRuleChainModalActionType: Ref<Nullable<InstanceType<typeof CreateRuleChainModal>>>;
+
+  /**
    * @description vue flow store
    */
   flowActionType: VueFlowStore;

+import { XYPosition } from '@vue-flow/core';
 import { Config as InputConfig } from '../packages/Entry/Input/config';
+import { Config as OutputConfig } from '../packages/Flow/Output/config';
+import { Config as RuleChainConfig } from '../packages/Flow/RuleChain/config';
 import { useAddNodes } from './useAddNodes';
 
-export function useInputNode() {
+export function useNewNode() {
   const getInputNodeConfig = (id?: string) => {
     const { getAddNodesParams } = useAddNodes();
 
@@ -20,5 +23,38 @@ export function useInputNode() {
     return newNode;
   };
 
-  return { getInputNodeConfig };
+  const getOutputNodeConfig = (name: string, position: XYPosition, id?: string) => {
+    const { getAddNodesParams } = useAddNodes();
+
+    const newNode = getAddNodesParams(
+      position,
+      {
+        ...new OutputConfig(),
+        data: {
+          name,
+        },
+      },
+      { id, draggable: false, selectable: false }
+    );
+
+    return newNode;
+  };
+
+  const getRuleChainNodeConfig = (name: string, position: XYPosition, id?: string) => {
+    const { getAddNodesParams } = useAddNodes();
+    const newNode = getAddNodesParams(
+      position,
+      {
+        ...new RuleChainConfig(),
+        data: { name },
+      },
+      {
+        id,
+      }
+    );
+
+    return newNode;
+  };
+
+  return { getInputNodeConfig, getOutputNodeConfig, getRuleChainNodeConfig };
 }

@@ -27,14 +27,19 @@ import { RuleChainDetail } from '../types/ruleNode';
 import { useContextMenuAction } from './useContextMenuAction';
 import { useSaveAndRedo } from './useSaveAndRedo';
 import { EntryCategoryComponentEnum } from '../enum/category';
+import { CreateRuleChainModal } from '../src/components/CreateRuleChainModal';
+import { useBasicDataTransform } from './useBasicDataTransform';
 
 interface UseRuleFlowOptionsType {
   id: string;
   ruleChainDetail: Ref<RuleChainDetail | undefined>;
-  createNodeModalActionType: Ref<Nullable<InstanceType<typeof CreateNodeModal>>>;
-  createEdgeModalActionType: Ref<Nullable<InstanceType<typeof CreateEdgeModal>>>;
-  updateNodeDrawerActionType: Ref<Nullable<InstanceType<typeof UpdateNodeDrawer>>>;
-  updateEdgeDrawerActionType: Ref<Nullable<InstanceType<typeof UpdateEdgeDrawer>>>;
+  modalActionType: {
+    createNodeModalActionType: Ref<Nullable<InstanceType<typeof CreateNodeModal>>>;
+    createEdgeModalActionType: Ref<Nullable<InstanceType<typeof CreateEdgeModal>>>;
+    updateNodeDrawerActionType: Ref<Nullable<InstanceType<typeof UpdateNodeDrawer>>>;
+    updateEdgeDrawerActionType: Ref<Nullable<InstanceType<typeof UpdateEdgeDrawer>>>;
+    createRuleChainModalActionType: Ref<Nullable<InstanceType<typeof CreateRuleChainModal>>>;
+  };
   useSaveAndRedoActionType: ReturnType<typeof useSaveAndRedo>;
 }
 
@@ -47,14 +52,10 @@ const validateInputAndOutput: ValidConnectionFunc = (connection: Connection) =>
 };
 
 export function useRuleFlow(options: UseRuleFlowOptionsType) {
-  const {
-    id,
-    ruleChainDetail,
-    createEdgeModalActionType,
-    updateEdgeDrawerActionType,
-    updateNodeDrawerActionType,
-    useSaveAndRedoActionType,
-  } = options;
+  const { id, ruleChainDetail, modalActionType, useSaveAndRedoActionType } = options;
+
+  const { createEdgeModalActionType, updateEdgeDrawerActionType, updateNodeDrawerActionType } =
+    modalActionType;
 
   const { triggerChange } = useSaveAndRedoActionType;
 
@@ -162,29 +163,35 @@ export function useRuleFlow(options: UseRuleFlowOptionsType) {
 
   const { handleContextMenuAction } = useContextMenuAction();
 
+  const { validateCanCreateRuleChain } = useBasicDataTransform();
+
   onNodeContextMenu(async (params) => {
     const menuType = params.node.selected
       ? await createElementsSelectedContextMenu(
           params,
           unref(useSaveAndRedoActionType.changeMarker),
-          validateSelectionElementsCanCreateRuleChain()
+          validateCanCreateRuleChain(
+            flowActionType.getSelectedNodes,
+            flowActionType.getSelectedEdges
+          ).flag
         )
       : await createNodeContextMenu(params);
 
-    if (menuType) {
-      if (menuType === RuleContextMenuEnum.DETAIL) {
-        handleUpdateNode(params.node);
-        return;
-      }
+    if (!menuType) return;
 
-      handleContextMenuAction({
-        menuType,
-        flowActionType,
-        event: params.event,
-        node: params.node,
-        useSaveAndRedoActionType,
-      });
+    if (menuType === RuleContextMenuEnum.DETAIL) {
+      handleUpdateNode(params.node);
+      return;
     }
+
+    handleContextMenuAction({
+      menuType,
+      flowActionType,
+      event: params.event,
+      node: params.node,
+      useSaveAndRedoActionType,
+      modalActionType,
+    });
   });
 
   onEdgeContextMenu(async (params) => {
@@ -207,6 +214,7 @@ export function useRuleFlow(options: UseRuleFlowOptionsType) {
         event: params.event,
         useSaveAndRedoActionType,
         edge: params.edge,
+        modalActionType,
       });
     }
   });
@@ -216,21 +224,25 @@ export function useRuleFlow(options: UseRuleFlowOptionsType) {
       ? await createElementsSelectedContextMenu(
           getCreatePanelContextMenuParams(params),
           unref(useSaveAndRedoActionType.changeMarker),
-          validateSelectionElementsCanCreateRuleChain()
+          validateCanCreateRuleChain(
+            flowActionType.getSelectedNodes,
+            flowActionType.getSelectedEdges
+          ).flag
         )
       : await createPanelContextMenu(
           getCreatePanelContextMenuParams(params),
           unref(useSaveAndRedoActionType.changeMarker)
         );
 
-    if (menuType) {
-      handleContextMenuAction({
-        menuType,
-        flowActionType,
-        event: params,
-        useSaveAndRedoActionType,
-      });
-    }
+    if (!menuType) return;
+
+    handleContextMenuAction({
+      menuType,
+      flowActionType,
+      event: params,
+      useSaveAndRedoActionType,
+      modalActionType,
+    });
   });
 
   /**
@@ -382,17 +394,5 @@ export function useRuleFlow(options: UseRuleFlowOptionsType) {
     } as NodeMouseEvent;
   }
 
-  function validateSelectionElementsCanCreateRuleChain() {
-    const nodes = unref(flowActionType.getSelectedNodes);
-    const edges = unref(flowActionType.getSelectedEdges);
-
-    for (const node of nodes) {
-      const index = edges.findIndex((edge) => edge.target === node.id || edge.source === node.id);
-      if (!~index) return false;
-    }
-
-    return true;
-  }
-
   return { flowActionType };
 }

-import type { VueFlowStore, Getters, Elements } from '@vue-flow/core';
-import { ComputedRef, computed, ref, unref } from 'vue';
-import { BasicNodeBindData, EdgeData, NodeData } from '../types/node';
-import { EntryCategoryComponentEnum } from '../enum/category';
+import type { VueFlowStore, Elements } from '@vue-flow/core';
+import { computed, ref, unref } from 'vue';
+import { BasicNodeBindData, NodeData } from '../types/node';
 import { useBasicDataTransform } from './useBasicDataTransform';
 import {
   getRuleChainData,
@@ -10,15 +9,13 @@ import {
   saveRuleChainDetail,
 } from '/@/api/ruleDesigner';
 import { ConnectionItemType, RuleChainDetail, RuleChainType } from '../types/ruleNode';
-import { useInputNode } from './useInputNode';
+import { useNewNode } from './useNewNode';
 import { buildUUID } from '/@/utils/uuid';
 import { useRoute, useRouter } from 'vue-router';
 import { RuleChainEntityType } from '../enum/entity';
 import { PageEnum } from '/@/enums/pageEnum';
 import { clearRuleChainImportCache, getRuleChainImportCache } from './useRuleChainCache';
 
-const ignoreNodeKeys: string[] = [EntryCategoryComponentEnum.INPUT];
-
 export function useSaveAndRedo() {
   const changeMarker = ref(false);
 
@@ -38,7 +35,7 @@ export function useSaveAndRedo() {
 
   const ruleChainDetail = ref<RuleChainDetail>();
 
-  const { mergeData, deconstructionData } = useBasicDataTransform();
+  const { combineData, deconstructionData } = useBasicDataTransform();
 
   const triggerChange = () => {
     changeMarker.value = true;
@@ -48,90 +45,14 @@ export function useSaveAndRedo() {
     changeMarker.value = false;
   };
 
-  /**
-   * @description 保存连接信息
-   */
-  function getConnections(
-    nodesRef: ComputedRef<Getters['getNodes']> | Getters['getNodes'],
-    edges: ComputedRef<Getters['getEdges']>
-  ) {
-    const nodeIndexMap = new Map();
-
-    const connections: ConnectionItemType[] = [];
-
-    unref(nodesRef).forEach((item, index) => {
-      nodeIndexMap.set(item.id, index);
-    });
-
-    for (const item of unref(edges)) {
-      const { data, target, source } = item;
-      const { data: bindData } = data as EdgeData;
-      const { type } = bindData || {};
-      const fromIndex = nodeIndexMap.get(source);
-      const toIndex = nodeIndexMap.get(target);
-      type?.forEach((key) => {
-        connections.push({ fromIndex, toIndex, type: key });
-      });
-    }
-
-    return connections;
-  }
-
-  function getNodes(nodesRef: ComputedRef<Getters['getNodes']> | Getters['getNodes']) {
-    const nodes: BasicNodeBindData[] = [];
-
-    for (const node of unref(nodesRef)) {
-      const nodeData = node.data as NodeData;
-
-      if (ignoreNodeKeys.includes(nodeData.config?.key as string)) continue;
-
-      const data = nodeData.data;
-
-      nodes.push(
-        Object.assign(
-          mergeData(data, nodeData, node),
-          nodeData.created
-            ? ({
-                id: { id: node.id, entityType: RuleChainEntityType.RULE_NODE },
-              } as BasicNodeBindData)
-            : {}
-        )
-      );
-    }
-
-    return nodes;
-  }
-
-  function getFirsetNodeIndex(
-    nodesRef: ComputedRef<Getters['getNodes']> | Getters['getNodes'],
-    edges: ComputedRef<Getters['getEdges']>
-  ) {
-    const inputNode = unref(edges).find(
-      (item) => (item.sourceNode.data as NodeData).config?.key === EntryCategoryComponentEnum.INPUT
-    );
-
-    if (inputNode) {
-      const targetId = inputNode.target;
-      const index = unref(nodesRef).findIndex((item) => item.id === targetId);
-      return index;
-    }
-  }
-
   const handleApplyChange = (flowActionType: VueFlowStore) => {
     if (!unref(changeMarker)) return;
 
-    const edgesRef = flowActionType.getEdges;
-
-    const extraIgnoreNodeRef = unref(flowActionType.getNodes).filter(
-      (item) => !ignoreNodeKeys.includes((item.data as NodeData).config?.key as string)
+    const { connections, nodes, firstNodeIndex } = combineData(
+      flowActionType.getNodes,
+      flowActionType.getEdges
     );
 
-    const connections = getConnections(extraIgnoreNodeRef, edgesRef);
-
-    const nodes = getNodes(extraIgnoreNodeRef);
-
-    const firstNodeIndex = getFirsetNodeIndex(extraIgnoreNodeRef, edgesRef);
-
     handleSaveRuleChain(connections, nodes, firstNodeIndex);
   };
 
@@ -211,7 +132,7 @@ export function useSaveAndRedo() {
   function parseRuleChain(ruleChain: RuleChainType) {
     const inputId = buildUUID();
 
-    const { getInputNodeConfig } = useInputNode();
+    const { getInputNodeConfig } = useNewNode();
 
     const value = deconstructionData(ruleChain, inputId);
 

@@ -19,10 +19,11 @@
   import { CreateEdgeModal } from './src/components/CreateEdgeModal';
   import { useFullScreen } from './hook/useFullScreen';
   import { useSaveAndRedo } from './hook/useSaveAndRedo';
+  import { NodeData } from './types/node';
   import { Icon } from '/@/components/Icon';
   import { UpdateNodeDrawer } from './src/components/UpdateNodeDrawer';
   import { UpdateEdgeDrawer } from './src/components/UpdateEdgeDrawer';
-  import { NodeData } from './types/node';
+  import { CreateRuleChainModal } from './src/components/CreateRuleChainModal';
 
   const getId = Number(Math.random().toString().substring(2)).toString(16);
 
@@ -36,6 +37,9 @@
 
   const updateEdgeDrawerActionType = ref<Nullable<InstanceType<typeof UpdateEdgeDrawer>>>(null);
 
+  const createRuleChainModalActionType =
+    ref<Nullable<InstanceType<typeof CreateRuleChainModal>>>(null);
+
   const flowElRef = ref<Nullable<FlowElRef>>(null);
 
   const elements = ref([]);
@@ -57,11 +61,14 @@
   const { flowActionType } = useRuleFlow({
     id: getId,
     ruleChainDetail,
-    createNodeModalActionType,
-    createEdgeModalActionType,
-    updateEdgeDrawerActionType,
-    updateNodeDrawerActionType,
     useSaveAndRedoActionType,
+    modalActionType: {
+      createNodeModalActionType,
+      createEdgeModalActionType,
+      updateEdgeDrawerActionType,
+      updateNodeDrawerActionType,
+      createRuleChainModalActionType,
+    },
   });
 
   const { handleOnDragOver, handleOnDrop } = useDragCreate({
@@ -85,6 +92,8 @@
 
   const handleDeleteSelectionElements = () => {
     flowActionType.removeNodes(unref(flowActionType.getSelectedNodes));
+    flowActionType.removeEdges(unref(flowActionType.getSelectedEdges));
+    useSaveAndRedoActionType.triggerChange?.();
   };
 
   onMounted(() => {
@@ -97,6 +106,7 @@
     createNodeModalActionType,
     updateEdgeDrawerActionType,
     updateNodeDrawerActionType,
+    createRuleChainModalActionType,
     flowActionType,
     triggerChange,
   });
@@ -177,6 +187,8 @@
 
     <UpdateEdgeDrawer ref="updateEdgeDrawerActionType" />
     <UpdateNodeDrawer ref="updateNodeDrawerActionType" />
+
+    <CreateRuleChainModal ref="createRuleChainModalActionType" />
   </main>
 </template>
 

+import { FormSchema } from '/@/components/Form';
+
+export enum FormFieldsEnum {
+  NAME = 'name',
+  DESCRIPTION = 'description',
+  ADDITIONAL_INFO = 'additionalInfo',
+}
+
+export enum FormFieldsNameEnum {
+  NAME = '名称',
+  DESCRIPTION = '说明',
+}
+
+export const formSchemas: FormSchema[] = [
+  {
+    field: FormFieldsEnum.NAME,
+    label: FormFieldsNameEnum.NAME,
+    component: 'Input',
+    required: true,
+    componentProps: {
+      placeholder: `请输入${FormFieldsNameEnum.NAME}`,
+    },
+  },
+  {
+    field: FormFieldsEnum.DESCRIPTION,
+    label: FormFieldsNameEnum.DESCRIPTION,
+    component: 'InputTextArea',
+    componentProps: {
+      placeholder: `请输入${FormFieldsNameEnum.DESCRIPTION}`,
+    },
+  },
+];

+export { default as CreateRuleChainModal } from './index.vue';

+<script setup lang="ts">
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { formSchemas, FormFieldsEnum } from './config';
+  import { ref } from 'vue';
+
+  interface SaveParamsType {
+    name: string;
+    additional: { description: string };
+  }
+
+  const visible = ref(false);
+
+  const [register, { closeModal }] = useModalInner();
+
+  const [registerForm, { getFieldsValue, validate }] = useForm({
+    schemas: formSchemas,
+    showActionButtonGroup: false,
+    layout: 'vertical',
+  });
+
+  let resolveFn: undefined | ((value: SaveParamsType) => any);
+
+  const openCreateRuleChainModal = async (): Promise<{
+    name: string;
+    additionalInfo: { description: string };
+  }> => {
+    visible.value = true;
+    return new Promise((resolve) => {
+      resolveFn = resolve;
+    });
+  };
+
+  const handleSave = async () => {
+    await validate();
+    const value = getFieldsValue();
+    resolveFn?.({
+      name: value[FormFieldsEnum.NAME],
+      additional: { description: value[FormFieldsEnum.DESCRIPTION] || '' },
+    });
+    closeModal();
+  };
+
+  defineExpose({ openCreateRuleChainModal });
+</script>
+
+<template>
+  <BasicModal
+    v-model:visible="visible"
+    @register="register"
+    @ok="handleSave"
+    title="Create nested rule chain"
+  >
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>

@@ -24,7 +24,7 @@ export interface RuleChainDetail {
   createdTime: number;
   additionalInfo: AdditionalInfo;
   tenantId: Id;
-  name: Id;
+  name: string;
   type: string;
   firstRuleNodeId: Id;
   root: boolean;

@@ -35,6 +35,7 @@
       const { proxy } = getCurrentInstance() as any;
       const getChildData = ref(null);
       const editGetId: any = ref('');
+      const createTime = ref<string>('');
       const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm({
         schemas: formSchema,
         showActionButtonGroup: false,
@@ -57,6 +58,7 @@
           await setFieldsValue({
             ...data.record,
           });
+          createTime.value = data.record.createdTime;
           updateStatusSchema(true);
         }
       });
@@ -79,7 +81,7 @@
         ]);
       };
 
-      const getAllFieldsFunc = async () => {
+      const getAllFieldsFunc = async (isUpdate?: boolean) => {
         getValuesFormData = await validate();
         if (!getValuesFormData) return;
         let getChildValues = proxy.$refs.getChildData.getAllFields();
@@ -90,10 +92,9 @@
           id: unref(isUpdate) ? editGetId.value : '',
         };
 
-        const createTime = {
-          createdTime: Date.now(),
+        const createTime1 = {
+          createdTime: isUpdate ? unref(createTime) : Date.now(),
         };
-
         Object.assign(
           postAllData,
           {
@@ -101,7 +102,7 @@
           },
           getValuesFormData,
           id,
-          createTime
+          createTime1
         );
         if (!unref(isUpdate)) {
           delete postAllData.id;
@@ -119,7 +120,7 @@
             emit('success');
             resetFields();
           } else {
-            await getAllFieldsFunc();
+            await getAllFieldsFunc(true);
             await saveTenantProfileApi(postAllData);
             createMessage.success('租户配置编辑成功');
             closeDrawer();

@@ -173,10 +173,12 @@
       const { codeType, customCommand } = unref(getDesign) || {};
       const { transportType } = customCommand || {};
       const sendValue = ref<any>(unref(sliderValue));
+      const isModbusCommand = ref<boolean>(false);
       if (transportType == 'TCP' && codeType == TaskTypeEnum.MODBUS_RTU) {
         sendValue.value = await getSendValue(unref(sliderValue));
+        isModbusCommand.value = true;
       }
-      const flag = await sendCommand(props.config.option, unref(sendValue), true);
+      const flag = await sendCommand(props.config.option, unref(sendValue), unref(isModbusCommand));
       flag
         ? ((sliderValue.value = unref(sliderValue)),
           (oldSliderValue.value = sliderValue.value),

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

@@ -12,7 +12,7 @@
   import { useModalInner } from '/@/components/Modal';
   import { getAllDeviceByOrg } from '/@/api/dataBoard';
   import { useHistoryData } from '/@/views/device/list/hook/useHistoryData';
-  import { BasicTable, useTable } from '/@/components/Table';
+  import { BasicColumn, BasicTable, useTable } from '/@/components/Table';
   import { formatToDateTime } from '/@/utils/dateUtil';
   import {
     ModeSwitchButton,
@@ -112,18 +112,14 @@
     return mapping;
   });
 
-  const [registerTable] = useTable({
-    showIndexColumn: false,
-    showTableSetting: false,
-    dataSource: historyData,
-    maxHeight: 300,
-    size: 'small',
-    columns: [
+  const sortOrder = ref<any>('descend');
+  const columns: BasicColumn[] | any = computed(() => {
+    return [
       {
         title: '属性',
         dataIndex: 'name',
-        format: (value) => {
-          return unref(getIdentifierNameMapping)[value];
+        format: (text) => {
+          return unref(getIdentifierNameMapping)[text];
         },
       },
       {
@@ -136,10 +132,47 @@
         format: (val) => {
           return formatToDateTime(val, 'YYYY-MM-DD HH:mm:ss');
         },
+        sorter: true,
+        sortOrder: unref(sortOrder),
+        sortDirections: ['descend', 'ascend', 'descend'],
       },
-    ],
+    ];
   });
 
+  const [registerTable, { setColumns }] = useTable({
+    showIndexColumn: false,
+    showTableSetting: false,
+    dataSource: historyData,
+    maxHeight: 300,
+    size: 'small',
+    columns: unref(columns),
+  });
+
+  const getTableList = async (orderBy?: string) => {
+    // 表单验证
+    await method.validate();
+    const value = method.getFieldsValue();
+    const searchParams = getSearchParams(value);
+    if (!hasDeviceAttr()) return;
+    // 发送请求
+    loading.value = true;
+    const res = await getDeviceHistoryInfo(searchParams, orderBy);
+    historyData.value = getTableHistoryData(res);
+    loading.value = false;
+  };
+
+  const handleTableChange = async (_pag, _filters, sorter: any) => {
+    sortOrder.value = sorter.order;
+    await setColumns(unref(columns));
+    if (sorter.field == 'ts') {
+      if (sorter.order == 'descend') {
+        getTableList('DESC');
+      } else {
+        getTableList('ASC');
+      }
+    }
+  };
+
   const getDeviceDataKey = async (record: DeviceOption) => {
     const { organizationId, value } = record;
     try {
@@ -260,7 +293,7 @@
     :show-ok-btn="false"
     cancel-text="关闭"
     width="70%"
-    title="选择时间"
+    title="历史趋势"
   >
     <section
       class="flex flex-col p-4 h-full w-full min-w-7/10"
@@ -295,7 +328,11 @@
             v-show="!isNull"
           />
 
-          <BasicTable v-show="mode === EnumTableChartMode.TABLE" @register="registerTable">
+          <BasicTable
+            v-show="mode === EnumTableChartMode.TABLE"
+            @change="handleTableChange"
+            @register="registerTable"
+          >
             <template #toolbar>
               <div class="flex h-70px items-center justify-end p-2">
                 <ModeSwitchButton