Merge branch 'main_dev' into ft

@@ -52,7 +52,7 @@ VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 500000
 VITE_GLOB_ALARM_NOTIFY_DURATION = 5
 
 # Should Disabled Task Center Execute Interval Unit (Second)
-VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND = true
+VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND = false
 
 # Software version number
 VITE_GLOB_SOFTWARE_VERSION_NUMBER = ThingsKit v1.2.0_release

@@ -25,7 +25,7 @@ module.exports = defineConfig({
     'plugin:jest/recommended',
   ],
   rules: {
-    'no-console': 'off',
+    'no-console': 'error',
     'vue/script-setup-uses-vars': 'error',
     '@typescript-eslint/ban-ts-ignore': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',

-版本：v1.1.2_release
+版本：v1.2.0_release
 
 ## 准备
 

 import { DataType } from '../../device/model/modelOfMatterModel';
-import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
 import { DataSource } from '/@/views/visual/palette/types';
 
 export interface AddDataBoardParams {

+import { defHttp } from '/@/utils/http/axios';
+// import { PaginationResult } from '/#/axios';
+
+enum Api {
+  DEVICE_PROFILE_CATEGORY = '/device_profile/category',
+}
+
+/**
+ * 新增产品分类
+ */
+export const deviceProfileCategory = (params) => {
+  return defHttp.post<any>({
+    url: `${Api.DEVICE_PROFILE_CATEGORY}`,
+    params,
+  });
+};
+
+/**
+ * 获取列表
+ */
+export const getDeviceClassList = (params) => {
+  return defHttp.get<any>({
+    url: Api.DEVICE_PROFILE_CATEGORY,
+    params,
+  });
+};
+
+/**
+ * 删除产品分类
+ */
+export const deleteDeviceClass = (params) => {
+  return defHttp.delete<any>({
+    url: Api.DEVICE_PROFILE_CATEGORY,
+    params,
+  });
+};

@@ -194,6 +194,7 @@ export interface DeviceRecord {
   customerAdditionalInfo?: {
     isPublic?: boolean;
   };
+  ifShowClass?: Boolean;
 }
 
 export interface DeviceModelOfMatterAttrs {

-import {
-  DataTypeEnum,
-  FunctionType,
-} from '/@/views/device/profiles/step/cpns/physical/cpns/config';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
+import { FunctionType } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
 
 export interface Specs {
   min: string;
@@ -26,7 +24,7 @@ export interface DataType {
 
 export interface StructJSON {
   functionName?: string;
-  identifier?: string;
+  identifier: string;
   remark?: string;
   dataType?: DataType;
   serviceCommand?: string;
@@ -41,13 +39,14 @@ export interface FunctionJson {
 }
 
 export interface ModelOfMatterParams {
-  deviceProfileId: string;
+  deviceProfileId?: string;
   functionJson: FunctionJson;
   functionName: string;
   functionType: FunctionType;
   identifier: string;
   remark: string;
   id?: string;
+  categoryId?: string;
   callType?: string;
   eventType?: string;
   accessMode?: string;
@@ -57,10 +56,12 @@ export interface ModelOfMatterParams {
 export interface GetModelTslParams {
   functionType: FunctionType;
   deviceProfileId: string;
+  ifShowClass?: string | Boolean;
 }
 
 export interface ImportModelOfMatterType {
   data: Recordable;
   functionType: string;
-  tkDeviceProfileId: string;
+  tkDeviceProfileId?: string;
+  categoryId?: string;
 }

@@ -18,13 +18,21 @@ enum ModelOfMatter {
   IMPORT = '/things_model/import',
 
   GET_MODEL_SERVICE = '/things_model/get_services',
+  CATEGORY = '/things_model/category',
+  CATEGORY_IMPORT = '/things_model/categoryImport',
+
+  CATEGORY_EXPORT = '/things_model/categoryGetExport',
+
+  IMPORT_CSV = '/things_model/csvImport',
 }
 
 export const getModelList = (
   params: BasicPageParams & {
-    deviceProfileId: string;
+    deviceProfileId?: string;
     functionTyp?: FunctionType;
     nameOrIdentifier?: string;
+    selectType?: string | undefined;
+    id?: string;
   }
 ) => {
   return defHttp.get({
@@ -82,3 +90,82 @@ export const importModelOfMatter = (data: ImportModelOfMatterType) => {
     data,
   });
 };
+
+// 产品品类接口
+
+// 新增
+export const createModelCategory = (params: Partial<ModelOfMatterParams>) => {
+  return defHttp.post({
+    url: ModelOfMatter.CATEGORY,
+    params,
+  });
+};
+
+// 修改
+export const updateModelCategory = (params: Partial<ModelOfMatterParams>) => {
+  return defHttp.put({
+    url: ModelOfMatter.CATEGORY,
+    params,
+  });
+};
+
+// 删除
+export const deleteModelCategory = (params: string[]) => {
+  return defHttp.delete({
+    url: ModelOfMatter.CATEGORY,
+    params: {
+      ids: params,
+    },
+  });
+};
+
+// 导入
+export const importModelCategory = (data: ImportModelOfMatterType) => {
+  return defHttp.post({
+    url: ModelOfMatter.CATEGORY_IMPORT,
+    data,
+  });
+};
+
+// 导出
+export const ExportModelCategory = (params: any) => {
+  const { functionType, deviceProfileId } = params;
+  return defHttp.get({
+    url: `${ModelOfMatter.CATEGORY_EXPORT}/${functionType}/${deviceProfileId}`,
+    params,
+  });
+};
+
+/**
+ * 物模型产品品类界面excel导入
+ */
+
+export const importCsvCategory = (params: {
+  categoryId?: string;
+  deviceProfileId?: string;
+  file: FormData;
+}) => {
+  const { categoryId } = params || {};
+
+  return defHttp.post<any>({
+    url: `${ModelOfMatter.IMPORT_CSV}?categoryId=${categoryId}`,
+    params: params.file,
+  });
+};
+
+/**
+ * 物模型产品物模型界面excel导入
+ */
+
+export const importCsvDeviceProfileId = (params: {
+  categoryId?: string;
+  deviceProfileId?: string;
+  file: FormData;
+}) => {
+  const { deviceProfileId } = params || {};
+
+  return defHttp.post<any>({
+    url: `${ModelOfMatter.IMPORT_CSV}?deviceProfileId=${deviceProfileId}`,
+    params: params.file,
+  });
+};

 import { BasicPageParams } from '/@/api/model/baseModel';
+import { SceneLinkageDataType } from '/@/views/rule/linkedge/components/SceneLinkageDrawer/type';
 
 export type ScreenLinkPageQueryParam = BasicPageParams & ScreenParams;
 
@@ -14,97 +15,7 @@ export type ScreenByDeptIdParams = {
   // organizationId: '2f5c8f2a-196c-4941-8771-290f9da76219';
 };
 
-export interface ScreenAddModel {
-  createTime?: string;
-  creator?: string;
-  defaultConfig?: string;
-  description?: string;
-  doAction?: [
-    {
-      command: string;
-      createTime: string;
-      creator: string;
-      defaultConfig: string;
-      description: string;
-      deviceId: string;
-      enabled: true;
-      icon: string;
-      id: string;
-      name: string;
-      outPut: string;
-      outTarget: string;
-      roleIds: [];
-      tenantCode: string;
-      tenantExpireTime: string;
-      tenantId: string;
-      tenantStatus: 'DISABLED';
-      updateTime: string;
-      updater: string;
-    }
-  ];
-  doCondition?: [
-    {
-      compare: 0;
-      createTime: string;
-      creator: string;
-      defaultConfig: string;
-      description: string;
-      deviceId: string;
-      enabled: true;
-      icon: string;
-      id: string;
-      name: string;
-      property: string;
-      roleIds: [];
-      status: string;
-      tenantCode: string;
-      tenantExpireTime: string;
-      tenantId: string;
-      tenantStatus: 'DISABLED';
-      updateTime: string;
-      updater: string;
-      value: string;
-    }
-  ];
-  enabled?: true;
-  icon?: string;
-  id?: string;
-  name?: string;
-  organizationId?: string;
-  roleIds?: [string];
-  status?: string;
-  tenantCode?: string;
-  tenantExpireTime?: string;
-  tenantId?: string;
-  tenantStatus?: 'DISABLED';
-  triggers?: [
-    {
-      attributeChoose?: string;
-      compare?: 0;
-      createTime?: string;
-      creator?: string;
-      defaultConfig?: string;
-      description?: string;
-      deviceId?: string;
-      enabled?: true;
-      icon?: string;
-      id?: string;
-      name?: string;
-      roleIds?: [];
-      tenantCode?: string;
-      tenantExpireTime?: string;
-      tenantId?: string;
-      tenantStatus?: 'DISABLED';
-      tiggerEvent?: string;
-      touchWay?: string;
-      updateTime?: string;
-      updater?: string;
-      value?: string;
-    }
-  ];
-  updateTime?: string;
-  updater?: string;
-}
+export type ScreenAddModel = SceneLinkageDataType;
 
 export interface IChangeStatus {
   status?: number;

@@ -6,6 +6,7 @@ import {
   ScreenByDeptIdParams,
   IChangeStatus,
 } from '/@/api/ruleengine/model/ruleengineModel';
+import { DeviceModel } from '../device/model/deviceModel';
 
 enum ScreenManagerApi {
   /**
@@ -126,7 +127,7 @@ export const byOrganizationIdGetMasterDevice = (params: {
   deviceProfileId?: string;
 }) => {
   const { organizationId, deviceProfileId } = params;
-  return defHttp.get({
+  return defHttp.get<DeviceModel[]>({
     url: `${ScreenManagerApi.MASTER_GET_DEVICE}`,
     params: { deviceProfileId, organizationId },
   });

@@ -37,10 +37,11 @@ export interface AccountListItem {
 }
 
 export interface OrganizationListItem {
-  id: string;
-  name: string;
+  id?: string;
+  name?: string;
   parentId?: string;
-  remark: string;
+  remark?: string;
+  organizationId?: string;
 }
 
 export interface MenuListItem {

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1699588251601" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1411" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M145.621959 0c-44.79888 0-79.998 36.81188-79.998 81.61076v860.77848c0 44.79888 35.19912 81.61076 79.998 81.61076h732.781681a81.969151 81.969151 0 0 0 81.61076-81.61076V324.80468L657.60916 0h-511.987201z" fill="#F17F53" p-id="1412"></path><path d="M657.60916 0v233.59416c0 25.59936 17.61236 92.79768 97.61036 92.79768h204.79488L657.60916 0z" fill="#FFFFFF" p-id="1413"></path><path d="M109.117272 659.874703c1.61276 0 2.867128 0.614385 3.814305 1.868753s1.663958 2.764731 2.175945 4.582286 0.81918 3.737507 0.972776 5.862253 0.230394 4.044699 0.230394 5.862254v5.708657c2.099148 3.302317 4.78708 6.886228 8.0126 10.726132s6.963026 7.449414 11.18692 10.80293 8.78058 6.143846 13.721257 8.39659 10.214145 3.379116 15.820405 3.379115c5.99025 0 11.622109-1.407965 16.869978-4.198295s10.137347-6.527837 14.617235-11.18692 8.652584-9.98375 12.441288-15.974001 7.21902-12.236494 10.265344-18.661933 5.759856-12.876478 8.089398-19.276318 4.377491-12.287693 6.067048-17.689158 3.046324-10.086148 4.044699-14.028449 1.689558-6.681433 2.099147-8.166196c2.611135-10.598135 4.81268-20.761081 6.681433-30.437639s2.764731-19.250719 2.764731-28.645684c0-2.303942-0.691183-3.60951-2.099147-3.891103l-37.19587 10.495738a19.916302 19.916302 0 0 1-5.094273 0.895978c-3.788705 0-6.963026-1.20317-9.522962-3.60951s-3.814305-5.862253-3.814305-10.342142 0.435189-8.114997 1.279968-10.879728 2.201545-4.81268 4.044699-6.220644 4.275093-2.329542 7.270218-2.764731 6.655834-0.665583 10.956527-0.665583h2.099147c2.40634-0.511987 5.478263-1.20317 9.21577-2.099148s7.935802-1.919952 12.518087-3.071923l14.694032-3.737507 15.743607-4.044699c5.299068-1.356766 10.572536-2.662333 15.820404-3.9679a1637.283868 1637.283868 0 0 1 23.474613-5.63186l5.990251-1.279968a22.01545 22.01545 0 0 1 3.737506-0.588785c1.20317 0 2.303942 0.358391 3.302318 1.049574s1.817555 1.58716 2.483138 2.636734a14.514837 14.514837 0 0 1 2.175945 7.423814c0 2.995125-1.151971 5.60626-3.455913 7.807805s-5.19667 4.121497-8.703783 5.785456-7.321417 3.097523-11.468513 4.351891l-11.62211 3.532711c-3.60951 1.100772-6.681433 2.175946-9.215769 3.22552s-3.967901 2.227144-4.275093 3.532711c-0.511987 4.40309-0.998375 9.292568-1.510363 14.694033s-1.049574 10.546936-1.638359 15.462014c-0.204795 1.20317-0.614385 4.095898-1.279968 8.703782s-1.561561 10.188545-2.687932 16.79318-2.559936 13.823654-4.198295 21.682658-3.532712 15.564411-5.63186 23.167421c-2.303942 8.294193-5.324667 17.151571-9.062173 26.546536s-8.191795 18.559536-13.337267 27.442514-10.982125 17.228369-17.484363 24.984976-13.542061 14.130847-21.145071 19.122721a58.929727 58.929727 0 0 1-23.19302 8.089398 61.336067 61.336067 0 0 1-9.369366 0.742382c-5.19667 0-10.828529-0.691183-16.869978-2.099148s-12.134097-3.404715-18.226744-5.99025-11.9805-5.734257-17.61236-9.369366-10.674933-7.705407-15.078023-12.159696-7.910202-9.21577-10.495738-14.335641-3.891103-10.444539-3.891102-16.050799c0-4.300692 0.435189-8.0126 1.279968-11.110122s2.227144-5.60626 4.121496-7.500613 4.428689-3.302317 7.577411-4.198295 7.014225-1.484763 11.519712-1.484763zM305.61796 693.333067c3.404715 1.20317 6.886228 2.611135 10.418939 4.198295s7.21902 3.123122 11.033324 4.582285 7.782205 2.662333 11.929302 3.686308 8.575786 1.510362 13.286068 1.510362c5.503862 0 11.058924-0.639984 16.639584-1.945551s11.084523-3.225519 16.434789-5.785455 10.470138-5.657459 15.385215-9.292568 9.394965-7.884603 13.490863-12.671683c4.505487-5.094273 8.242994-9.727757 11.238119-13.874854s5.427064-7.859004 7.270218-11.110122 3.174321-6.041449 3.967901-8.39659 1.20317-4.377491 1.20317-6.067048c0-2.508737-0.844779-4.684683-2.559936-6.527837s-3.967901-3.379116-6.835029-4.582285-6.067048-2.073548-9.676558-2.636734-7.347016-0.81918-11.238119-0.81918c-2.303942 0-4.991875 0.076798-8.089398 0.230394l-9.446164 0.460789-9.292567 0.38399a150.39624 150.39624 0 0 1-7.807805 0.153596c-3.302317 0-6.732632-0.38399-10.265344-1.126372s-7.014225-1.971151-10.418939-3.686307-6.553436-3.9935-9.446164-6.911828a35.403915 35.403915 0 0 1-8.831779-15.743606 24.626584 24.626584 0 0 1-0.742382-6.143846c0-2.40634 0.179196-4.684683 0.537587-6.83503s0.767981-4.223894 1.279968-6.220644c1.407965-4.991875 3.737507-10.086148 6.963026-15.231619s7.142221-10.162946 11.698907-15.078023 9.497363-9.650959 14.847629-14.258844 10.854129-8.934177 16.511587-12.978875 11.21252-7.705407 16.639584-10.956526 10.521337-6.01585 15.23162-8.319792c6.604635-3.19992 13.337267-5.529462 20.172295-6.963026s13.61886-2.175946 20.325892-2.175946c3.9935 0 7.807805 0.537587 11.391715 1.58716s6.78383 2.585535 9.522962 4.582286 4.915077 4.479888 6.527837 7.423814 2.40634 6.323042 2.40634 10.137347c0 2.201545-0.255994 4.044699-0.742381 5.555061s-1.151971 2.713532-1.945552 3.686308-1.663958 1.61276-2.636734 2.022349-1.919952 0.588785-2.918327 0.588785c-2.687933 0-5.171071-0.307192-7.423814-0.895977s-4.428689-1.279968-6.527837-2.02235-4.198295-1.459164-6.297443-2.099147-4.40309-0.972776-6.911827-0.972776c-7.398215 0-14.924427 1.484763-22.578635 4.428689s-15.103622 6.707032-22.348242 11.23812-14.105247 9.625359-20.556286 15.231619-12.236494 11.058924-17.330767 16.357991c-2.687933 2.79033-4.684683 5.60626-5.913452 8.39659s-1.868753 5.452664-1.868753 7.961401c0 3.711907 1.61276 6.604635 4.81268 8.703782s7.091023 3.148721 11.698907 3.148722c2.687933 0 5.759856-0.051199 9.138972-0.153597a796.140096 796.140096 0 0 0 20.761081-0.844779c3.353516-0.153596 6.323042-0.230394 8.934176-0.230394 6.195045 0 12.159696 0.870378 17.842754 2.636734s10.751731 4.326292 15.154821 7.731007 7.935802 7.628609 10.572536 12.671683 3.967901 10.828529 3.967901 17.330767c0 3.9935-0.588785 8.038199-1.791955 12.159696s-2.841529 8.217395-4.940677 12.364491-4.505487 8.242994-7.19342 12.287693-5.555061 8.0126-8.550186 11.929301c-5.401465 6.988625-11.417315 13.59326-18.073148 19.788306s-13.721257 11.59651-21.22187 16.204395-15.436414 8.242994-23.781805 10.956526-16.921177 4.044699-25.727357 4.044699a74.724532 74.724532 0 0 1-23.551411-4.121497c-3.891103-1.356766-7.577411-3.046324-11.033325-5.094273s-6.476638-4.377491-9.062173-6.963026-4.684683-5.478263-6.220644-8.626984-2.329542-6.579036-2.329542-10.265344c0-1.791955 0.281593-3.532712 0.819179-5.17107s1.868753-2.559936 4.070299-2.559936zM497.152371 651.631709c1.791955-7.500612 4.40309-15.18042 7.807805-23.013824s7.398215-15.718007 12.0061-23.62821 9.727757-15.666808 15.385215-23.321017a316.868878 316.868878 0 0 1 57.982551-59.928102c3.19992-2.201545 6.143846-3.660708 8.857378-4.351891s5.555061-1.049574 8.550186-1.049573c3.19992 0 6.041449 0.486388 8.550187 1.433564s4.991875 2.662333 7.500612 5.17107c0.79358 0.895978 1.638359 1.689558 2.559936 2.40634s1.740756 1.049574 2.559936 1.049574c0.204795 0 0.460788-0.230394 0.742382-0.665583l0.972775-1.587161c0.358391-0.614385 0.767981-1.228769 1.279968-1.868753s1.100772-1.126372 1.791956-1.433564c1.689558-0.79358 3.737507-1.331167 6.067048-1.58716s4.735882-0.38399 7.116622-0.383991c4.505487 0 8.857379 0.81918 13.055674 2.483138s7.910202 3.967901 11.110122 6.963026c7.60301 7.091023 13.362866 15.59001 17.330767 25.496963s5.913452 20.556286 5.913452 31.948001c0 10.188545-1.510362 21.19627-4.505488 32.997575-2.611135 10.39334-6.323042 20.505087-11.18692 30.309642s-10.546936 18.994725-17.100373 27.59611-13.849254 16.460388-21.887452 23.551412-16.613985 13.20927-25.727357 18.303542-18.610735 9.062173-28.492088 11.929302-19.941901 4.275093-30.156046 4.275093c-9.497363 0-18.021949-1.459164-25.573761-4.351891s-13.951651-6.988625-19.19952-12.287693-9.241369-11.59651-12.006099-18.892328-4.121497-15.410815-4.121497-24.293793c0-3.788705 0.230394-7.628609 0.665583-11.468513s1.151971-7.807805 2.150346-11.801305z m25.343367 10.060549a63.230419 63.230419 0 0 0-1.638359 13.490862c0 5.60626 0.972776 10.521337 2.918327 14.770831s4.710282 7.807805 8.242994 10.649334 7.807805 4.991875 12.748481 6.451039 10.367741 2.175946 16.281193 2.175945c6.988625 0 14.130847-1.100772 21.375465-3.302317s14.335642-5.401465 21.22187-9.59976 13.542061-9.241369 19.941901-15.154821 12.313292-12.594885 17.765956-20.095498 10.290943-15.641209 14.540437-24.447389 7.679808-18.149946 10.265343-28.056898c0.998375-3.60951 1.715157-7.347016 2.175946-11.238119s0.665583-7.654209 0.665583-11.238119c0-5.811055-0.639984-11.340516-1.945551-16.639584s-3.455914-10.00935-6.451039-14.105248-6.937427-7.372616-11.852504-9.830154-10.905327-3.686308-17.99635-3.686308c-0.998375 0-1.766356 0.435189-2.329542 1.279968s-1.126372 1.919952-1.715157 3.225519c-0.511987 1.100772-1.075173 2.252744-1.715157 3.455914a11.878103 11.878103 0 0 1-6.451039 5.555061 15.794805 15.794805 0 0 1-5.785455 0.895978c-1.689558 0-3.19992-0.38399-4.505487-1.126372s-2.611135-1.766356-3.891103-3.071923l-1.510362-1.433564a1.971151 1.971151 0 0 0-1.356766-0.537587c-0.895978 0-2.073548 0.40959-3.532712 1.20317s-2.943926 1.740756-4.505487 2.841529-3.046324 2.252744-4.505488 3.455914-2.585535 2.252744-3.379115 3.148721c-6.80943 6.988625-13.567661 14.617235-20.325892 22.885828s-12.978876 16.767581-18.661934 25.57376-10.674933 17.663558-14.924427 26.623335-7.270218 17.561161-9.16457 25.880953zM760.083398 546.495138c0.588785-2.611135 1.356766-5.375866 2.252744-8.319792s2.099148-5.657459 3.609509-8.089398 3.455914-4.505487 5.862254-6.143847 5.452664-2.483138 9.138971-2.483137c3.507112 0 6.630234 0.972776 9.369366 2.918327s5.222269 3.916702 7.423814 5.913452c2.611135 1.689558 5.094273 5.145471 7.500613 10.342141s4.863878 11.59651 7.423814 19.19952 5.299068 16.204395 8.242994 25.804155 6.195045 19.660308 9.753356 30.156046 7.526212 21.221869 11.929302 32.178396 9.394965 21.631459 15.001225 32.024799l3.148721 5.631859a95.076023 95.076023 0 0 0 7.142222 10.879728c1.049574 1.305567 1.817555 1.945551 2.329542 1.945552 0.307192 0 0.639984-0.742381 1.049573-2.252744s0.844779-3.302317 1.356767-5.401465l1.58716-6.451039a59.902502 59.902502 0 0 1 1.58716-5.401465 476.736882 476.736882 0 0 0 13.721257-37.426264c2.739132-8.447789 5.785455-18.482738 9.062174-30.079248a1560.127397 1560.127397 0 0 0 14.182045-54.526637c1.151971-4.966276 2.252744-10.00935 3.302317-15.154821s1.971151-10.162946 2.764731-15.078023 1.356766-9.138972 1.638359-12.748481a77.540461 77.540461 0 0 1 0.691183-8.242994c0.255994-1.894353 0.563186-3.865503 0.972776-5.913452s0.921577-3.916702 1.58716-5.63186 1.484763-3.097523 2.483138-4.198295 2.201545-1.638359 3.60951-1.638359 3.123122 0.204795 5.171071 0.588786 3.916702 0.998375 5.631859 1.791955c1.894353 2.611135 3.635109 5.734257 5.17107 9.369366s2.329542 8.575786 2.329542 14.77083c0 3.891103-0.40959 8.575786-1.20317 14.02845s-1.817555 11.289318-3.071923 17.561161a634.864128 634.864128 0 0 1-8.934177 38.245443c-1.61276 6.041449-3.123122 11.59651-4.582285 16.639584s-2.662333 9.21577-3.686308 12.518087c-1.791955 5.811055-3.686308 11.775706-5.631859 17.919552s-4.095898 12.594885-6.451039 19.353117-4.889478 13.900452-7.654208 21.452263-5.836654 15.61561-9.21577 24.216995c-1.510362 3.891103-3.225519 7.807805-5.171071 11.698907s-4.172696 7.423814-6.681433 10.572536-5.324667 5.708657-8.473388 7.654209-6.681433 2.918327-10.572536 2.918327c-2.303942 0-4.684683-0.332792-7.116622-0.972776s-4.531087-1.971151-6.220644-3.967901c-8.191795-9.497363-15.487613-20.274693-21.887453-32.331991s-12.134097-24.652184-17.17717-37.810255-9.522962-26.444139-13.414065-39.909402-7.449414-26.316142-10.649334-38.629435l-0.895978-3.455913c-0.40959-1.407965-0.767981-2.81593-1.126371-4.275093s-0.691183-2.764731-1.049574-3.967901-0.742381-2.175946-1.20317-2.918327-0.972776-1.126372-1.58716-1.126372-1.356766 1.100772-2.252744 3.302317-1.791955 4.684683-2.687933 7.423815-1.715157 5.427064-2.483138 8.012599l-1.433564 4.940677c-0.691183 2.611135-1.740756 6.323042-3.148721 11.18692l-4.735882 16.434789c-1.766356 6.118247-3.660708 12.543686-5.708657 19.353117l-5.913452 19.737106a1165.026874 1165.026874 0 0 1-12.902078 40.728582l-3.891102 12.364491c-1.279968 4.147096-2.508737 7.935802-3.60951 11.314917s-1.791955 5.657459-2.099148 6.758231c-1.20317 3.788705-2.969526 6.681433-5.324667 8.626984s-4.735882 2.918327-7.116622 2.918327c-1.510362 0-2.995125-0.537587-4.505487-1.58716s-2.81593-2.329542-3.967901-3.814305-2.099148-3.123122-2.841529-4.863878-1.126372-3.327917-1.126372-4.735882c0-0.79358 0.255994-2.073548 0.742382-3.814304s1.305567-4.735882 2.40634-8.934177l3.891102-15.462013 44.338092-143.638009z" fill="#FFFFFF" p-id="1414"></path></svg>
\ No newline at end of file

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1699933658783" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1443" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M145.621959 0c-44.79888 0-79.998 36.81188-79.998 81.61076v860.77848c0 44.79888 35.19912 81.61076 79.998 81.61076h732.781681a81.969151 81.969151 0 0 0 81.61076-81.61076V324.80468L657.60916 0h-511.987201z" fill="#25B39E" p-id="1444"></path><path d="M657.60916 0v233.59416c0 25.59936 17.61236 92.79768 97.61036 92.79768h204.79488L657.60916 0z" fill="#FFFFFF" p-id="1445"></path><path d="M158.498438 694.485038c0-3.507112 0.511987-7.19342 1.510362-11.110122 3.404715-13.59326 7.372616-26.930527 11.929302-39.986201s8.678183-26.034549 12.36449-38.936626 6.78383-23.781805 9.21577-32.613585 4.633484-16.460388 6.527837-22.80903 3.660708-11.826904 5.247869-16.434789 3.353516-9.138972 5.247868-13.644459c1.20317-2.687933 2.534337-5.503862 3.967901-8.39659s3.020724-5.58066 4.735882-8.0126 3.481513-4.454289 5.324667-5.99025 3.763106-2.329542 5.785455-2.329542c4.095898 0 7.21902 0.665583 9.369366 2.02235s3.481513 2.585535 3.9935 3.686308l1.356766 6.143846c1.510362-0.102397 3.455914-0.38399 5.862254-0.819179s4.81268-0.921577 7.270218-1.433565 4.735882-0.998375 6.835029-1.510362 3.711907-0.947176 4.81268-1.356766c6.604635-1.791955 12.697283-3.353516 18.303542-4.659083s10.930927-2.38074 15.974001-3.22552 9.881353-1.484763 14.463638-1.868753 9.241369-0.588785 13.951651-0.588785c4.607885 0 8.345391 0.255994 11.238119 0.742381s5.19667 1.177571 6.911828 2.02235 2.867128 1.843154 3.532711 2.995125 0.972776 2.38074 0.972776 3.686308c0 1.20317-0.332792 2.483138-0.972776 3.814304s-1.715157 2.636734-3.225519 3.814305-3.455914 2.252744-5.862254 3.148721-5.401465 1.510362-9.010974 1.791955c-0.895978 0.204795-2.969526 0.563186-6.220645 1.126372l-10.572535 1.791955-10.80293 1.868754a129.60956 129.60956 0 0 0-7.039824 1.356766h0.153596c-0.588785 0.102397-2.022349 0.486388-4.275093 1.126372s-4.966276 1.407965-8.166196 2.252743-6.681433 1.817555-10.41894 2.918327l-11.110122 3.22552a687.163621 687.163621 0 0 0-17.637959 5.324667c-6.092648 2.40634-10.879728 5.58066-14.335642 9.522961s-6.169446 8.370991-8.166195 13.286068c-0.40959 0.895978-0.998375 2.431939-1.791956 4.582286l-2.636734 7.347016-3.071923 8.780581-3.148721 8.857378c-0.998375 2.81593-1.868753 5.350266-2.636734 7.654209s-1.279968 3.9935-1.587161 5.094272c-0.307192 0.998375-0.511987 1.894353-0.588785 2.687933s-0.153596 1.407965-0.153596 1.791955c0 0.588785 0.153596 0.895978 0.460788 0.895978 1.510362 0 4.633484-0.665583 9.369366-2.022349s10.290943-3.020724 16.639584-5.017475l20.40269-6.451039c7.244619-2.303942 14.207645-4.454289 20.837879-6.451038s12.569286-3.686308 17.765956-5.017475 8.959776-2.022349 11.238119-2.022349c3.507112 0 5.862253 0.563186 7.039824 1.715157s1.791955 2.431939 1.791955 3.814304c0 3.60951-1.279968 6.758231-3.814304 9.446164s-5.734257 5.043074-9.522962 7.039824c-1.20317 0.588785-3.430314 1.484763-6.681433 2.636734s-6.758231 2.329542-10.495738 3.532712l-10.726132 3.455914-7.347016 2.406339c-9.804555 3.788705-17.765956 6.937427-23.935402 9.369366s-11.135722 4.454289-14.924427 5.99025l-8.78058 3.532712c-2.047949 0.81918-3.942301 1.484763-5.708657 2.02235s-3.686308 1.075173-5.785456 1.58716-4.940676 1.254369-8.652583 2.150346c-0.895978 2.099148-1.945551 5.273468-3.148722 9.522962s-2.355141 8.652584-3.455913 13.20927-2.022349 8.78058-2.764731 12.671683-1.126372 6.604635-1.126372 8.089398c0 1.791955 0.255994 3.123122 0.742381 3.967901s1.100772 1.433564 1.791956 1.715157 1.407965 0.460788 2.099147 0.460788h1.638359c4.81268 0 10.572536-0.691183 17.330767-2.099147s13.414065-3.251119 20.018699-5.555061c6.297443-2.201545 11.801305-4.607885 16.511588-7.193421s9.113372-5.017475 13.286068-7.270218 8.191795-4.147096 12.159696-5.708657 8.268593-2.38074 12.978875-2.483138c0.998375 0 2.175946 0.102397 3.532712 0.307192s2.636734 0.563186 3.814304 1.126372 2.175946 1.279968 2.918327 2.175946 1.023974 2.047949 0.81918 3.455913c-0.40959 2.892728-1.843154 5.759856-4.351891 8.550186s-5.657459 5.503862-9.446164 8.089398-8.038199 5.094273-12.748481 7.500613-9.497363 4.684683-14.41244 6.835029-9.702157 4.095898-14.41244 5.862253-8.908577 3.276718-12.594885 4.582286c-9.19017 3.19992-18.149946 5.555061-26.853729 7.039824s-16.460388 2.252744-23.372215 2.252743c-7.60301 0-13.414065-1.433564-17.484363-4.275093s-6.067048-7.577411-6.067048-14.182045zM336.541986 699.579311a14.489238 14.489238 0 0 1-13.721257 1.638359c-1.356766-0.691183-2.508737-1.61276-3.455913-2.764731a12.902077 12.902077 0 0 1-2.918327-8.319792c0-2.099148 0.435189-3.865503 1.279968-5.324667s1.894353-2.687933 3.148721-3.737507 2.611135-1.919952 4.044699-2.636734 2.764731-1.305567 3.967901-1.791955c3.9935-2.611135 8.498988-5.811055 13.490863-9.59976s10.137347-7.884603 15.462013-12.236494 10.572536-8.78058 15.820404-13.286068l14.924427-12.902077 6.758231-5.990251a121.59696 121.59696 0 0 0-13.59326-31.128821l-5.017474-8.166196-3.686308-5.990251a7.782205 7.782205 0 0 1-1.279968-4.198295 14.258844 14.258844 0 0 1 7.116622-11.340516 11.417315 11.417315 0 0 1 5.785455-1.433564c3.19992 0 6.01585 0.665583 8.473388 2.022349s4.633484 3.071923 6.527837 5.171071 3.558311 4.377491 4.940677 6.835029 2.662333 4.78708 3.737506 6.963026c0.588785 1.20317 1.254369 2.79033 1.945552 4.81268s1.382365 4.121497 2.022349 6.37424l1.868753 6.604635 1.510363 5.631859c4.40309-4.198295 8.678183-8.601385 12.825279-13.209269a587.556511 587.556511 0 0 0 18.892328-22.194646c1.740756-2.201545 3.58391-4.223894 5.478263-6.067048s3.839904-3.379116 5.862253-4.582285 4.147096-1.791955 6.451039-1.791955c3.891103 0 6.681433 0.998375 8.319792 2.995125s2.483138 4.607885 2.483138 7.807804c0 3.404715-0.614385 6.527837-1.868753 9.369366s-2.867128 5.068673-4.863879 6.681433c-2.892728 2.303942-6.067048 5.068673-9.522962 8.319792s-6.937427 6.681433-10.495737 10.265344l-10.572536 10.649333c-3.507112 3.507112-6.707032 6.655834-9.59976 9.446164-1.20317 1.100772-2.227144 2.201545-3.071923 3.302318s-1.279968 2.508737-1.279968 4.198295c0 0.998375 0.281593 2.252744 0.819179 3.737506s1.254369 3.097523 2.099148 4.81268l2.559936 5.171071c0.870378 1.740756 1.58716 3.327917 2.175945 4.735881 1.20317 2.687933 2.867128 5.887853 5.017475 9.59976s4.300692 7.577411 6.451039 11.62211 4.0191 8.166196 5.631859 12.364491 2.40634 8.191795 2.40634 12.006099a20.761081 20.761081 0 0 1-3.737507 12.082898c-1.075173 1.561561-2.329542 2.764731-3.686308 3.686308s-2.636734 1.356766-3.814304 1.356766c-2.611135 0-4.684683-0.307192-6.220645-0.895977s-2.867128-1.510362-3.967901-2.687933-2.022349-2.662333-2.764731-4.428689-1.58716-3.763106-2.483137-6.067049c-1.305567-3.711907-2.995125-7.961401-5.094273-12.748481s-4.275093-9.548561-6.527837-14.258844-4.377491-9.062173-6.374241-13.132471-3.558311-7.116622-4.659083-9.21577l-8.626984 6.835029-11.468514 9.062174-17.919552 14.105247c-7.244619 5.708657-16.588385 12.953276-28.0057 21.861854zM490.752531 646.921427a158.588035 158.588035 0 0 1 22.041049-48.510787c5.299068-7.833404 11.314917-15.103622 18.073148-21.759456s14.130847-12.082898 22.117847-16.281193c2.611135-1.407965 5.452664-2.457539 8.550187-3.148722s6.246244-1.049574 9.446163-1.049573c3.302317 0 6.374241 0.307192 9.21577 0.895977s5.299068 1.61276 7.347016 2.995125 3.686308 3.19992 4.863879 5.401465 1.791955 4.889478 1.791955 8.089398c0 2.40634-0.358391 4.81268-1.049574 7.270218s-1.740756 4.659084-3.148721 6.604635-3.148721 3.532712-5.247869 4.735882-4.556686 1.791955-7.347016 1.791955c-2.201545 0-4.223894-0.40959-6.067048-1.20317a47.102822 47.102822 0 0 1-7.884603-4.275093 19.916302 19.916302 0 0 0-2.841529-1.279968c-3.9935 1.791955-7.782205 4.172696-11.314917 7.116622s-6.860628 6.220644-9.906953 9.830154-5.862253 7.449414-8.39659 11.545312-4.838279 8.191795-6.911827 12.287693-3.788705 8.114997-5.247869 12.082897-2.636734 7.577411-3.532712 10.879728c-0.691183 2.40634-1.331167 5.119872-1.868753 8.166196s-0.81918 6.01585-0.819179 8.934177c0 1.99675 0.179196 3.891103 0.537586 5.708657s0.972776 3.404715 1.868753 4.81268 2.099148 2.508737 3.60951 3.302317 3.353516 1.20317 5.555061 1.20317c3.507112 0 6.963026-0.460788 10.41894-1.356766s6.835029-2.047949 10.137346-3.455913 6.527837-3.020724 9.676559-4.863879a314.129747 314.129747 0 0 0 14.924426-9.369366c1.919952-1.279968 3.711907-2.457539 5.401465-3.455913s3.276718-1.817555 4.735882-2.483138 2.713532-0.972776 3.814305-0.972776c1.510362 0 2.892728 0.38399 4.198295 1.126372s1.945551 2.022349 1.945551 3.814305a12.79968 12.79968 0 0 1-0.895978 4.351891c-1.407965 3.891103-3.302317 7.398215-5.708657 10.495738s-5.068673 5.862253-8.0126 8.319792-6.092648 4.633484-9.446163 6.527836-6.681433 3.660708-9.983751 5.247869c-6.195045 3.302317-12.466888 5.785455-18.815529 7.423815s-11.673308 2.483138-15.974001 2.483137c-1.407965 0-3.046324-0.153596-4.940677-0.460788s-3.558311-0.742381-4.940676-1.356766c-8.089398-3.507112-14.00285-8.191795-17.689158-14.105247s-5.555061-12.902077-5.555061-20.991476c0-3.507112 0.281593-7.167821 0.81918-11.033324s1.356766-7.807805 2.457538-12.031699zM618.698133 647.689408c0-4.300692 1.151971-7.961401 3.455913-10.956526s5.350266-4.991875 9.138972-5.990251a138.287743 138.287743 0 0 1 13.644459-21.17067c3.404715-4.40309 7.270218-8.831779 11.622109-13.286068s9.138972-8.498988 14.41244-12.159696 10.905327-6.630234 16.946776-8.934177 12.466888-3.455914 19.276318-3.455913c5.811055 0 10.854129 0.691183 15.154821 2.099147s7.859004 3.353516 10.649334 5.862254 4.889478 5.478263 6.297443 8.934176 2.099148 7.167821 2.099147 11.186921c0 3.404715-0.460788 6.655834-1.356766 9.753356-1.407965 5.60626-3.9935 10.495738-7.807805 14.694032s-8.268593 7.884603-13.414064 11.033325-10.751731 5.785455-16.793181 7.884602-12.108497 3.839904-18.149946 5.247869-11.878103 2.483138-17.484363 3.22552-10.444539 1.331167-14.540436 1.715157c-0.895978 1.791955-1.663958 4.070298-2.329542 6.835029s-0.972776 5.427064-0.972776 8.012599c0 5.811055 2.303942 10.290943 6.911828 13.490863s10.956526 4.81268 19.045923 4.81268c4.710282 0 9.19017-0.537587 13.490863-1.58716s8.370991-2.40634 12.236494-4.044699 7.475013-3.455914 10.879728-5.401465 6.502237-3.865503 9.292568-5.785456c3.60951-2.40634 7.014225-4.428689 10.265343-6.067048s6.118247-2.483138 8.626985-2.483138 4.095898 0.614385 4.812679 1.868753 1.049574 2.585535 1.049574 3.967901a34.251944 34.251944 0 0 1-0.307192 4.198295 25.804155 25.804155 0 0 1-8.703783 14.566036c-10.39334 8.191795-21.068273 14.054049-32.024799 17.561161s-22.629834 5.247869-35.019925 5.247869c-2.40634 0-5.222269-0.153596-8.473388-0.460789s-6.630234-0.895978-10.137346-1.791955-6.937427-2.201545-10.342142-3.891103a31.538412 31.538412 0 0 1-15.513212-17.100372 40.037399 40.037399 0 0 1-2.483138-14.847629c0-4.710282 0.639984-9.958151 1.945552-15.743606-1.305567-0.204795-2.534337-0.870378-3.686308-2.02235s-1.715157-2.81593-1.715157-5.017474z m93.898452-41.547762c0.204795-0.511987 0.307192-0.947176 0.307192-1.356766v-1.356766c0-2.687933-0.998375-4.735882-2.995125-6.067048s-4.40309-2.022349-7.19342-2.022349c-4.40309 0-8.729382 1.151971-12.978875 3.455913s-8.242994 5.171071-12.0061 8.626984-7.065423 7.142221-9.983751 11.110123-5.145471 7.526212-6.758231 10.726132c7.19342-0.588785 13.798055-1.58716 19.788306-2.918327s11.21252-3.046324 15.666808-5.094273 8.038199-4.351891 10.80293-6.911827 4.556686-5.299068 5.350266-8.191796zM818.347541 499.929902c0.511987-3.9935 1.305567-7.705407 2.40634-11.110122s2.585535-6.220644 4.428689-8.473389 4.223894-3.379116 7.116623-3.379115c1.61276 0 3.379116 0.307192 5.324666 0.895977s3.788705 1.433564 5.555062 2.483138 3.225519 2.329542 4.428689 3.814305 1.791955 3.148721 1.791955 4.940676c0 0.79358-0.153596 1.715157-0.460788 2.764731s-0.537587 2.073548-0.742382 3.071924l-37.503062 150.293842c-1.510362 5.99025-2.739132 11.724507-3.737507 17.177171s-1.740756 9.932552-2.252744 13.414064v3.60951c0 2.995125-0.204795 6.271843-0.588785 9.830154s-1.151971 6.860628-2.252744 9.906953-2.636734 5.60626-4.582285 7.654208-4.479888 3.071923-7.577411 3.071924c-2.687933 0-5.043074-0.563186-7.039824-1.715158s-3.660708-2.636734-4.940676-4.428689-2.252744-3.737507-2.841529-5.785455-0.895978-3.967901-0.895978-5.785456c0-1.61276 0.153596-3.58391 0.460789-5.913452s0.665583-4.81268 1.126372-7.347016 0.921577-5.094273 1.433564-7.654209 0.998375-4.78708 1.510362-6.681433l38.706232-153.59616a193.275168 193.275168 0 0 1 1.126372-11.058923z" fill="#FFFFFF" p-id="1446"></path></svg>
\ No newline at end of file

@@ -191,6 +191,10 @@
         <slot name="afterFullScreen"></slot>
       </div>
     </div>
-    <div ref="jsonEditorElRef" class="flex-auto"></div>
+    <div
+      ref="jsonEditorElRef"
+      class="flex-auto"
+      :style="{ backgroundColor: disabled ? '#f0f0f0' : '' }"
+    ></div>
   </div>
 </template>

@@ -47,6 +47,7 @@
     isClose: { type: Boolean, default: true },
     title: { type: String, default: '' },
     loading: { type: Boolean },
+    defaultExpand: { type: Boolean, default: true },
     /**
      *  Can it be expanded
      */
@@ -75,7 +76,7 @@
 
   const emit = defineEmits(['expand', 'change', 'hchange']);
 
-  const show = ref(true);
+  const show = ref(props.defaultExpand);
 
   const { prefixCls } = useDesign('collapse-container');
 

@@ -15,6 +15,8 @@ export { default as ApiUpload } from './src/components/ApiUpload.vue';
 export { default as StructForm } from './src/externalCompns/components/StructForm/StructForm.vue';
 export { default as JavaScriptFunctionEditor } from './src/components/JavaScriptFunctionEditor.vue';
 
+export { ThingsModelForm } from './src/externalCompns/components/ThingsModelForm';
+
 //注册自定义组件
 export {
   JEasyCron,

@@ -69,7 +69,7 @@
     name: 'BasicForm',
     components: { FormItem, Form, Row, FormAction },
     props: basicProps,
-    emits: ['advanced-change', 'reset', 'submit', 'register'],
+    emits: ['advanced-change', 'reset', 'submit', 'register', 'fieldValueChange'],
     setup(props, { emit, attrs }) {
       const formModel = reactive<Recordable>({});
       const modalFn = useModalContext();
@@ -230,6 +230,7 @@
 
       function setFormModel(key: string, value: any) {
         formModel[key] = value;
+        emit('fieldValueChange', key, value);
         const { validateTrigger } = unref(getBindValue);
         if (!validateTrigger || validateTrigger === 'change') {
           validateFields([key]).catch((_) => {});

@@ -4,77 +4,102 @@
     <!-- 待完善封装InputGroup -->
     <InputGroup compact>
       <Select
-        v-if="type !== '2'"
+        v-if="type !== RequestMethodTypeEnum.WEBSOCKET"
         placeholder="请求类型"
-        :style="{ width: type !== '2' ? 15 + '%' : 0 + '%' }"
-        v-model:value="valueObj.requestHttpType"
+        :style="{ width: type !== RequestMethodTypeEnum.WEBSOCKET ? 15 + '%' : 0 + '%' }"
+        v-model:value="requestTypeUrlValue.requestHttpType"
         :options="selectOptions"
         allowClear
         @change="emitChange"
       />
       <Input
-        @change="emitChange"
         placeholder="请输入接口地址"
-        v-model:value="valueObj.requestUrl"
-        :style="{ width: type !== '2' ? 85 + '%' : 100 + '%' }"
+        v-model:value="requestTypeUrlValue.requestUrl"
+        :style="{ width: type !== RequestMethodTypeEnum.WEBSOCKET ? 85 + '%' : 100 + '%' }"
+        @change="emitChange"
       />
     </InputGroup>
   </div>
 </template>
 <script lang="ts" setup>
-  import { reactive, ref, watchEffect } from 'vue';
+  import { reactive, ref, PropType, watch } from 'vue';
   import { InputGroup, Select, Input } from 'ant-design-vue';
-  import type { SelectValue } from 'ant-design-vue/lib/select';
   import { findDictItemByCode } from '/@/api/system/dict';
-  import { propTypes } from '/@/utils/propTypes';
+  import { RequestMethodTypeEnum } from '/@/views/dataview/publicApi/config/enum';
 
-  type TypeInputGroup = {
-    requestHttpType: SelectValue | undefined;
+  interface requestTypeUrlConfig {
+    requestHttpType: undefined;
     requestUrl?: string;
     disabled?: boolean;
-  };
+  }
 
-  type selectType = { label: string; value: string; disabled?: boolean };
+  type selectType = {
+    label: string;
+    value: string;
+  };
 
   const props = defineProps({
     type: {
       type: String,
+      default: RequestMethodTypeEnum.COMMOM,
     },
-    value: propTypes.object.def({}),
+    value: Object as PropType<requestTypeUrlConfig>,
   });
 
   const emits = defineEmits(['change', 'update:value']);
 
   const selectOptions = ref<selectType[]>([]);
 
-  const getOptions = async (e) => {
-    const res = await findDictItemByCode({
-      dictCode: e === '1' ? 'dataview_select_sql_request' : 'dataview_select_request',
+  const getOptions = async (requestType) => {
+    // 暂且排除SQL和WEBSOCKET
+    const resItem = await findDictItemByCode({
+      dictCode: 'dataview_select_request',
     });
-    if (e === '1' || e === '0') {
-      selectOptions.value = res.map((m) => ({ label: m.itemText, value: m.itemValue }));
+    if (requestType === RequestMethodTypeEnum.COMMOM) {
+      selectOptions.value = resItem.map((m) => ({ label: m.itemText, value: m.itemValue }));
     } else {
       selectOptions.value = [];
     }
   };
 
-  const valueObj = reactive<TypeInputGroup>({
+  const requestTypeUrlValue = reactive<requestTypeUrlConfig>({
     requestHttpType: undefined,
     requestUrl: '',
   });
 
-  watchEffect(() => {
-    initVal();
-  });
+  watch(
+    () => props.type,
+    () => {
+      initOption();
+    },
+    {
+      immediate: true,
+    }
+  );
+
+  watch(
+    () => props.value,
+    () => {
+      initConfig();
+    },
+    {
+      immediate: true,
+    }
+  );
+
+  function initOption() {
+    if (props.type) {
+      getOptions(props.type);
+    }
+  }
 
-  async function initVal() {
-    if (props?.type) await getOptions(props?.type);
-    if (props?.value) for (let i in props.value) Reflect.set(valueObj, i, props.value[i]);
+  function initConfig() {
+    if (props?.value)
+      for (let i in props.value) Reflect.set(requestTypeUrlValue, i, props.value[i]);
   }
 
   function emitChange() {
-    emits('change', valueObj);
-    emits('update:value', valueObj);
+    emits('change', requestTypeUrlValue);
+    emits('update:value', requestTypeUrlValue);
   }
 </script>
-<style scoped></style>

 <script lang="ts" setup>
-  import { Button, Transfer, Tag } from 'ant-design-vue';
+  import { Transfer, Select } from 'ant-design-vue';
   import { cloneDeep, get } from 'lodash-es';
   import { computed, CSSProperties, ExtractPropTypes, onMounted, ref, unref, watch } from 'vue';
   import { BasicModal, useModal } from '/@/components/Modal';
@@ -29,7 +29,7 @@
       buttonName?: string;
       modalProps?: ExtractPropTypes<InstanceType<typeof BasicModal>['$props']>;
       transferProps?: ExtractPropTypes<TransferType['$props']>;
-      buttonProps?: ExtractPropTypes<InstanceType<typeof Button>['$props']>;
+      selectProps?: ExtractPropTypes<InstanceType<typeof Select>['$props']>;
       disabled?: any;
     }>(),
     {
@@ -52,24 +52,15 @@
     return unref(getOptions).filter((item) => unref(targetKeys).includes(item[valueField]));
   });
 
-  const getShowTagOptions = computed(() => {
-    const { maxTagLength } = props;
-    return unref(targetOptions).slice(0, maxTagLength);
+  const getSelectOptions = computed(() => {
+    return unref(targetOptions).map((item) => ({ ...item, label: item.title, value: item.key }));
   });
 
-  const getSurplusOptionsLength = computed(() => {
-    const { maxTagLength } = props;
-    const surplusValue = unref(targetKeys).length - maxTagLength;
-    return surplusValue < 0 ? 0 : surplusValue;
-  });
-
-  const count = computed(() => {
-    return unref(targetKeys).length;
-  });
+  const getSelectValue = computed(() => unref(getSelectOptions).map((item) => item.value));
 
   const targetKeys = ref<string[]>(props.value || []);
 
-  const getOptions = computed<Recordable[]>(() => {
+  const getOptions = computed<Record<'key' | 'title', string>[]>(() => {
     const { labelField, valueField } = props;
     return unref(options).map((item) => ({
       ...item,
@@ -99,13 +90,14 @@
     };
   });
 
-  const getBindButtonProps = computed(() => {
-    const { buttonProps = {} } = props;
+  const getBindSelectProps = computed(() => {
+    const { selectProps = {} } = props;
     return {
-      ...buttonProps,
-      type: 'link',
-      onClick: handleOpenModal,
-    } as ExtractPropTypes<InstanceType<typeof Button>['$props']>;
+      maxTagCount: 3,
+      ...selectProps,
+      open: false,
+      onDropdownVisibleChange: handleOpenModal,
+    } as ExtractPropTypes<InstanceType<typeof Select>['$props']>;
   });
 
   const handleChange = (_targetKeys: string[], direction: 'left' | 'right', moveKeys: string[]) => {
@@ -165,22 +157,11 @@
         <Transfer v-bind="getBindProps" />
       </section>
     </BasicModal>
-    <Button v-bind="getBindButtonProps" class="!flex !justify-center !items-center min-h-8">
-      <span v-if="!count">{{ $props.buttonName }}</span>
-      <div v-if="!!count">
-        <Tag
-          class="!px-2 !py-1 !bg-gray-50 !border-gray-100"
-          v-for="item in getShowTagOptions"
-          :key="item.key"
-        >
-          <span>
-            {{ item.title }}
-          </span>
-        </Tag>
-        <Tag class="!px-2 !py-1 !bg-gray-50 !border-gray-100" v-if="getSurplusOptionsLength">
-          <span> +{{ getSurplusOptionsLength }}... </span>
-        </Tag>
-      </div>
-    </Button>
+    <Select
+      v-bind="getBindSelectProps"
+      :options="getSelectOptions"
+      :value="getSelectValue"
+      mode="multiple"
+    />
   </div>
 </template>

-<script lang="ts" setup>
-  import { Button, Tabs, Badge, ButtonProps, Tag } from 'ant-design-vue';
-  import { get, isFunction, set, uniqBy } from 'lodash-es';
-  import { ExtractPropTypes, computed, unref, ref, nextTick, onMounted, watch } from 'vue';
-  import { DynamicProps } from '/#/utils';
-  import { BasicModal, useModal } from '/@/components/Modal';
-  import { BasicTable, BasicTableProps, TableRowSelection, useTable } from '/@/components/Table';
-  import { FETCH_SETTING } from '/@/components/Table/src/const';
-  import { useDesign } from '/@/hooks/web/useDesign';
-
-  interface Options extends Recordable {
-    primaryKey?: string;
-    disabled?: boolean;
-  }
-
-  enum Active {
-    PENDING = 'pending',
-    SELECTED = 'selected',
-  }
-
-  interface ActionType {
-    setSelectedOptions: (options: Recordable[]) => void;
-  }
-
-  const emit = defineEmits(['change', 'update:value']);
-
-  const props = withDefaults(
-    defineProps<{
-      value?: string[];
-      labelField?: string;
-      valueField?: string;
-      primaryKey?: string;
-      params?: Recordable;
-      buttonName?: string;
-      pendingTableProps?: BasicTableProps;
-      selectedTableProps?: BasicTableProps;
-      maxTagLength?: number;
-      modalProps?: ExtractPropTypes<InstanceType<typeof BasicModal>['$props']>;
-      buttonProps?: ExtractPropTypes<InstanceType<typeof Button>['$props']>;
-      initSelectedOptions?: (actionType: ActionType) => Promise<Recordable[]>;
-      transformValue?: (selectedRowKeys: string[], selectedRows: Options[]) => any[];
-      onValueChange?: (selectedRowkeys: string[]) => any[];
-      onRemoveAfter?: (actionType: ActionType) => Promise<any>;
-      onSelectedAfter?: (actionType: ActionType) => Promise<any>;
-      disabled?: any;
-    }>(),
-    {
-      buttonName: '选择设备',
-      primaryKey: 'id',
-      maxTagLength: 2,
-      labelField: 'label',
-      valueField: 'value',
-      disabled: false,
-    }
-  );
-
-  const { prefixCls } = useDesign('transfer-table-modal');
-
-  const activeKey = ref<Active>(Active.PENDING);
-
-  const selectedRows = ref<Options[]>([]);
-
-  const selectedRowKeys = ref<string[]>(props.value || []);
-
-  const pendingOptions = ref<Options[]>([]);
-
-  const selectedConfirmQueue = ref<Options[]>([]);
-
-  const pendingConfirmQueue = ref<Options[]>([]);
-
-  const selectedTotal = ref(0);
-
-  const pendingTotal = ref(0);
-
-  const getFetchSetting = computed(() => {
-    const { pendingTableProps } = props;
-    return pendingTableProps?.fetchSetting || FETCH_SETTING;
-  });
-
-  const getPendingRowSelection = computed<TableRowSelection>(() => {
-    const rowKeys = unref(selectedRowKeys);
-    return {
-      type: 'checkbox',
-      getCheckboxProps: (record: Recordable) => {
-        const { primaryKey } = props;
-        return {
-          ...record,
-          disabled: rowKeys.includes(record[primaryKey]),
-        };
-      },
-      onSelect: (_record: Recordable, _selected: boolean, selectedRows: Object[]) => {
-        pendingConfirmQueue.value = selectedRows;
-      },
-      onSelectAll: (_selected: boolean, selectedRows: Recordable[]) => {
-        pendingConfirmQueue.value = selectedRows;
-      },
-    };
-  });
-
-  const getPendingTableBindProps = computed<Partial<DynamicProps<BasicTableProps>>>(() => {
-    const { pendingTableProps, primaryKey } = props;
-    return {
-      ...pendingTableProps,
-      rowKey: primaryKey,
-      api: handlePendingApiIntercept,
-      clickToRowSelect: false,
-      rowSelection: getPendingRowSelection,
-    };
-  });
-
-  const getSelectedTableBindProps = computed<Partial<DynamicProps<BasicTableProps>>>(() => {
-    const { selectedTableProps, primaryKey } = props;
-    return {
-      ...selectedTableProps,
-      dataSource: selectedRows,
-      clickToRowSelect: false,
-      rowKey: primaryKey,
-      api: selectedTableProps!.api ? handleSelectedApiIntercept : undefined,
-      rowSelection: {
-        type: 'checkbox',
-        onSelect: (_record: Recordable, _selected: boolean, selectedRows: Object[]) => {
-          selectedConfirmQueue.value = selectedRows;
-        },
-        onSelectAll: (_selected: boolean, selectedRows: Recordable[]) => {
-          selectedConfirmQueue.value = selectedRows;
-        },
-      },
-    };
-  });
-
-  const getModalBindProps = computed(() => {
-    const { modalProps = {} } = props;
-    return {
-      width: '60%',
-      title: '穿梭表格',
-      wrapClassName: prefixCls,
-      ...modalProps,
-      showOkBtn: false,
-    };
-  });
-
-  const getBindButtonProps = computed<ButtonProps>(() => {
-    const { buttonProps = {} } = props;
-    return {
-      type: 'link',
-      ...buttonProps,
-    };
-  });
-
-  const getShowTagOptions = computed(() => {
-    const { maxTagLength } = props;
-    return unref(selectedRows).slice(0, maxTagLength);
-  });
-
-  const getSurplusOptionsLength = computed(() => {
-    const { maxTagLength } = props;
-    const surplusValue = unref(selectedRows).length - maxTagLength;
-    return surplusValue < 0 ? 0 : surplusValue;
-  });
-
-  const [registerModal, { openModal }] = useModal();
-
-  const [
-    regsterPendingTable,
-    {
-      getSelectRows: getPendingSelectRows,
-      getSelectRowKeys: getPendingSelectRowKeys,
-      reload: reloadPending,
-      clearSelectedRowKeys: clearPendingSelectedRowKeys,
-    },
-  ] = useTable(unref(getPendingTableBindProps));
-
-  const [
-    registerSelectedTable,
-    { getSelectRowKeys, setProps, clearSelectedRowKeys, reload: reloadSelected },
-  ] = useTable(unref(getSelectedTableBindProps));
-
-  async function handlePendingApiIntercept(params?: Recordable) {
-    try {
-      const { api } = props.pendingTableProps || {};
-      if (api && isFunction(api)) {
-        let options = await api(params);
-        pendingOptions.value = options;
-        const { totalField, listField } = unref(getFetchSetting);
-        const total = get(options, totalField!);
-        if (unref(selectedTotal) + unref(pendingTotal) !== total) {
-          pendingTotal.value = total;
-        }
-        let list: Recordable[] = get(options, listField!);
-        list = getSelectedRows(list);
-        options = set(options, listField!, list);
-        return options;
-      }
-    } catch (error) {
-      console.error(error);
-      return [];
-    }
-    return [];
-  }
-
-  async function handleSelectedApiIntercept(params?: Recordable) {
-    try {
-      const { api } = props.selectedTableProps || {};
-      if (api && isFunction(api)) {
-        let options = await api(params);
-        pendingOptions.value = options;
-        const { totalField, listField } = unref(getFetchSetting);
-        selectedTotal.value = get(options, totalField!);
-        let list: Recordable[] = get(options, listField!);
-        list = getSelectedRows(list);
-        options = set(options, listField!, list);
-        return options;
-      }
-    } catch (error) {
-      console.error(error);
-      return [];
-    }
-    return [];
-  }
-
-  const handleOpenModal = async () => {
-    const { disabled } = props;
-    if (disabled) return;
-    openModal(true);
-    await nextTick();
-    if (props.value && !props.value.length) {
-      activeKey.value = Active.PENDING;
-      reloadPending();
-    }
-  };
-
-  const handleTriggerEmit = (selectedRowKeys: string[], selectedRows: Options[]) => {
-    const { transformValue } = props;
-    let value = selectedRowKeys;
-    if (transformValue && isFunction(transformValue)) {
-      value = transformValue(selectedRowKeys, selectedRows);
-    }
-    emit('change', unref(selectedRowKeys), unref(selectedRows));
-    emit('update:value', unref(value));
-  };
-
-  const handleSelected = async () => {
-    const { onSelectedAfter } = props;
-    const currentPageSelectRows = getPendingSelectRows();
-    const currentPageSelectRowKeys = getPendingSelectRowKeys();
-    const { primaryKey } = props;
-    selectedRows.value = uniqBy([...unref(selectedRows), ...currentPageSelectRows], primaryKey);
-    selectedRowKeys.value = [...new Set([...unref(selectedRowKeys), ...currentPageSelectRowKeys])];
-    pendingConfirmQueue.value = [];
-    // selectedTotal.value = unref(selectedRowKeys).length;
-    pendingTotal.value = unref(pendingTotal) - currentPageSelectRows.length;
-    selectedTotal.value = unref(selectedTotal) + currentPageSelectRows.length;
-
-    clearPendingSelectedRowKeys();
-    handleTriggerEmit(unref(selectedRowKeys), unref(selectedRows));
-
-    if (onSelectedAfter && isFunction(onSelectedAfter)) {
-      await onSelectedAfter(actionType);
-    }
-    reloadPending();
-  };
-
-  const handleRemoveSelected = async () => {
-    const { onRemoveAfter } = props;
-    const removeRowKeys = getSelectRowKeys();
-    selectedRowKeys.value = unref(selectedRowKeys).filter((key) => !removeRowKeys.includes(key));
-    selectedRows.value = unref(selectedRows).filter((item) => {
-      const { primaryKey } = props;
-      return unref(selectedRowKeys).includes(item[primaryKey]);
-    });
-    pendingTotal.value = unref(pendingTotal) + removeRowKeys.length;
-    selectedTotal.value = unref(selectedTotal) - removeRowKeys.length;
-
-    clearSelectedRowKeys();
-    selectedConfirmQueue.value = [];
-    setProps({ dataSource: unref(selectedRows) });
-    handleTriggerEmit(unref(selectedRowKeys), unref(selectedRows));
-
-    if (onRemoveAfter && isFunction(onRemoveAfter)) {
-      await onRemoveAfter(actionType);
-    }
-  };
-
-  const actionType = {
-    setSelectedOptions,
-    setSelectedTotal,
-    reloadPending,
-    reloadSelected,
-  };
-
-  const getSelectedRows = (options: Recordable[]) => {
-    const { labelField, valueField } = props;
-    return options.map((item) => ({ ...item, label: item[labelField], value: item[valueField] }));
-  };
-
-  const getSelectedKeys = (options: Recordable[]) => {
-    const { primaryKey } = props;
-    return options.map((item) => item[primaryKey]);
-  };
-
-  function setSelectedOptions(options: Recordable[]) {
-    selectedRows.value = getSelectedRows(options);
-    selectedRowKeys.value = getSelectedKeys(options);
-  }
-
-  function setSelectedTotal(number: number) {
-    selectedTotal.value = number;
-  }
-
-  const handleCheckoutPanel = async (keys: Active) => {
-    await nextTick();
-    if (keys === Active.PENDING) {
-      reloadPending();
-    } else {
-      reloadSelected();
-      setProps({
-        dataSource: unref(selectedRows),
-      });
-    }
-  };
-
-  watch(
-    () => props.value,
-    () => {
-      if (props.value && !props.value.length) {
-        selectedRowKeys.value = [];
-        selectedRows.value = [];
-        // pendingTotal.value = 0;
-        selectedTotal.value = 0;
-      }
-    }
-  );
-
-  onMounted(async () => {
-    const { initSelectedOptions } = props;
-    if (initSelectedOptions && isFunction(initSelectedOptions)) {
-      const options = await initSelectedOptions(actionType);
-      setSelectedOptions(options);
-    }
-  });
-</script>
-
-<template>
-  <section>
-    <BasicModal @register="registerModal" v-bind="getModalBindProps">
-      <section class="bg-gray-100">
-        <Tabs v-model:active-key="activeKey" type="card" @change="handleCheckoutPanel">
-          <Tabs.TabPane :key="Active.PENDING">
-            <template #tab>
-              <div class="flex items-center justify-center">
-                <span>待选设备</span>
-                <Badge show-zero :count="pendingTotal" />
-              </div>
-            </template>
-            <BasicTable @register="regsterPendingTable">
-              <template #toolbar>
-                <section class="flex w-full justify-end items-center">
-                  <!-- <Button type="primary">全选</Button> -->
-                  <div class="text-blue-400">
-                    <span class="mr-2">选择设备:</span>
-                    <span>{{ pendingConfirmQueue.length }}</span>
-                  </div>
-                </section>
-              </template>
-            </BasicTable>
-            <section class="flex justify-end px-4 pb-4">
-              <Button
-                type="primary"
-                @click="handleSelected"
-                :disabled="!pendingConfirmQueue.length"
-              >
-                <span>确定已选</span>
-              </Button>
-            </section>
-          </Tabs.TabPane>
-          <Tabs.TabPane :key="Active.SELECTED">
-            <template #tab>
-              <div class="flex items-center justify-center">
-                <span>已选设备</span>
-                <Badge show-zero :count="selectedTotal" />
-              </div>
-            </template>
-            <BasicTable @register="registerSelectedTable">
-              <template #toolbar>
-                <section class="flex w-full justify-end items-center">
-                  <!-- <Button type="primary">全选</Button> -->
-                  <div class="text-blue-400">
-                    <span class="mr-2">选择设备:</span>
-                    <span>{{ selectedConfirmQueue.length }}</span>
-                  </div>
-                </section>
-              </template>
-            </BasicTable>
-            <section class="flex justify-end px-4 pb-4">
-              <Button
-                type="primary"
-                :disabled="!selectedConfirmQueue.length"
-                @click="handleRemoveSelected"
-              >
-                <span>移除已选</span>
-              </Button>
-            </section>
-          </Tabs.TabPane>
-        </Tabs>
-      </section>
-    </BasicModal>
-    <Button @click="handleOpenModal" v-bind="getBindButtonProps">
-      <span v-if="!selectedRowKeys.length">选择设备</span>
-      <div v-if="selectedRowKeys.length">
-        <Tag
-          class="!px-2 !py-1 !bg-gray-50 !border-gray-100"
-          v-for="item in getShowTagOptions"
-          :key="item.value"
-        >
-          <span>
-            {{ item.alias || item.name }}
-          </span>
-        </Tag>
-        <Tag class="!px-2 !py-1 !bg-gray-50 !border-gray-100" v-if="getSurplusOptionsLength">
-          <span> +{{ getSurplusOptionsLength }}... </span>
-        </Tag>
-      </div>
-    </Button>
-  </section>
-</template>
-
-<style lang="less">
-  @prefix-cls: ~'@{namespace}-transfer-table-modal';
-
-  .@{prefix-cls} {
-    .vben-basic-table {
-      padding-top: 0;
-    }
-
-    .vben-basic-form > .ant-row {
-      width: 100%;
-    }
-
-    .ant-tabs-top-bar {
-      background-color: #fff;
-    }
-  }
-</style>

@@ -5,7 +5,8 @@
   import { BasicModal } from '/@/components/Modal';
   import { PlusCircleOutlined } from '@ant-design/icons-vue';
   import { FormFieldsEnum, formSchemas } from './config';
-  import { DataTypeEnum } from '../StructForm/config';
+  import { DataTypeEnum } from '/@/enums/objectModelEnum';
+
   const show = ref(false);
 
   const props = withDefaults(
@@ -50,7 +51,7 @@
       updateSchema([
         {
           field: FormFieldsEnum.ZOOM_FACTOR,
-          ifShow: props.dataType == DataTypeEnum.IS_BOOL ? false : true,
+          ifShow: props.dataType == DataTypeEnum.BOOL ? false : true,
         },
       ]);
     }

 <script lang="ts" setup>
   import { Card } from 'ant-design-vue';
   import { computed, nextTick, onMounted, onUpdated, unref, watch } from 'vue';
-  import { DataTypeEnum } from '../StructForm/config';
   import { BasicCreateFormParams } from './type';
   import { DynamicProps } from '/#/utils';
   import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { BasicForm, FormProps, FormSchema, useForm } from '/@/components/Form';
+  import { DataTypeEnum } from '/@/enums/objectModelEnum';
   import { ReadAndWriteEnum } from '/@/enums/toolEnum';
 
   const props = withDefaults(
@@ -86,7 +86,7 @@
         // step: step,
         // formatter: (value: string) => value,
         // parser: (string: string) => {
-        //   if (dataType === DataTypeEnum.IS_NUMBER_INT) {
+        // if (dataType === DataTypeEnum.NUMBER_INT) {
         //     return Number(Number(string).toFixed());
         //   }
         //   return Number(string);
@@ -188,19 +188,19 @@
         dataType: dataType! as unknown as DataTypeEnum,
         specs: specs as Partial<Specs>,
       };
-      if (type === DataTypeEnum.IS_NUMBER_INT || type === DataTypeEnum.IS_NUMBER_DOUBLE) {
+      if (type === DataTypeEnum.NUMBER_INT || type === DataTypeEnum.NUMBER_DOUBLE) {
         schemas.push(createInputNumber(params));
       }
 
-      if (type === DataTypeEnum.IS_BOOL) {
+      if (type === DataTypeEnum.BOOL) {
         schemas.push(createSelect(params));
       }
 
-      if (type === DataTypeEnum.IS_STRING) {
+      if (type === DataTypeEnum.STRING) {
         schemas.push(createInput(params));
       }
 
-      if (type === DataTypeEnum.IS_STRUCT) {
+      if (type === DataTypeEnum.STRUCT) {
         schemas.push(createInputJson(params));
       }
     }

-import { DataTypeEnum } from '../StructForm/config';
 import { Specs } from '/@/api/device/model/modelOfMatterModel';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
 export interface BasicCreateFormParams {
   identifier: string;

 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { FormSchema } from '/@/components/Table';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
 import { isNullOrUnDef } from '/@/utils/is';
 import { FormField } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
 
-export enum DataTypeEnum {
-  IS_NUMBER_INT = 'INT',
-  IS_NUMBER_DOUBLE = 'DOUBLE',
-  IS_STRING = 'TEXT',
-  IS_STRUCT = 'STRUCT',
-  IS_BOOL = 'BOOL',
-}
-
 export const validateValueRange = (_rule, value: Record<'min' | 'max', number>, _callback) => {
   value = value || {};
   const { min, max } = value;
@@ -77,10 +70,9 @@ export const formSchemas = (
             try {
               const record = await findDictItemByCode(params);
               return hasStructForm
-                ? record.filter((item) => item.itemValue !== DataTypeEnum.IS_STRUCT)
+                ? record.filter((item) => item.itemValue !== DataTypeEnum.STRUCT)
                 : record;
             } catch (error) {
-              console.log(error);
               return [];
             }
           },
@@ -91,7 +83,7 @@ export const formSchemas = (
           valueField: 'itemValue',
           getPopupContainer: () => document.body,
           onChange: (value: string) => {
-            if (value == DataTypeEnum.IS_STRUCT) {
+            if (value == DataTypeEnum.STRUCT) {
               updateSchema({
                 field: FormField.SPECS_LIST,
                 componentProps: {
@@ -114,8 +106,8 @@ export const formSchemas = (
         span: 18,
       },
       ifShow: ({ values }) =>
-        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
-        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
+        values[FormField.TYPE] === DataTypeEnum.NUMBER_INT ||
+        values[FormField.TYPE] === DataTypeEnum.NUMBER_DOUBLE,
       rules: [{ validator: validateValueRange }],
     },
     {
@@ -134,8 +126,8 @@ export const formSchemas = (
         },
       },
       ifShow: ({ values }) =>
-        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
-        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
+        values[FormField.TYPE] === DataTypeEnum.NUMBER_INT ||
+        values[FormField.TYPE] === DataTypeEnum.NUMBER_DOUBLE,
       dynamicRules: ({ model }) => {
         const valueRange = model[FormField.VALUE_RANGE] || {};
         const { min, max } = valueRange;
@@ -199,8 +191,8 @@ export const formSchemas = (
         };
       },
       ifShow: ({ values }) =>
-        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_INT ||
-        values[FormField.TYPE] === DataTypeEnum.IS_NUMBER_DOUBLE,
+        values[FormField.TYPE] === DataTypeEnum.NUMBER_INT ||
+        values[FormField.TYPE] === DataTypeEnum.NUMBER_DOUBLE,
     },
     {
       field: FormField.BOOL_CLOSE,
@@ -214,7 +206,7 @@ export const formSchemas = (
         placeholder: '如：关',
       },
       defaultValue: '关',
-      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
+      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.BOOL,
       dynamicRules: ({ model }) => {
         const close = model[FormField.BOOL_CLOSE];
         const open = model[FormField.BOOL_OPEN];
@@ -243,7 +235,7 @@ export const formSchemas = (
         placeholder: '如：开',
       },
       defaultValue: '开',
-      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
+      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.BOOL,
       dynamicRules: ({ model }) => {
         const close = model[FormField.BOOL_CLOSE];
         const open = model[FormField.BOOL_OPEN];
@@ -277,7 +269,7 @@ export const formSchemas = (
           suffix: () => '字节',
         };
       },
-      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_STRING,
+      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.STRING,
     },
     {
       field: FormField.EXTENSION_DESC,
@@ -322,7 +314,7 @@ export const formSchemas = (
       valueField: 'value',
       changeEvent: 'update:value',
       colProps: { span: 24 },
-      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_STRUCT,
+      ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.STRUCT,
       rules: [{ required: true, validator: validateJSON }],
     },
     {

-import { DataTypeEnum } from './config';
 import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
 import { FormField } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
 
 export enum OpenModalMode {

 import { cloneDeep } from 'lodash-es';
-import { DataTypeEnum } from './config';
 import { StructFormValue } from './type';
 import { DataType, ModelOfMatterParams, StructJSON } from '/@/api/device/model/modelOfMatterModel';
 import { isArray } from '/@/utils/is';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
 export function transfromToStructJSON(value: StructFormValue): StructJSON {
   const {
@@ -24,21 +24,21 @@ export function transfromToStructJSON(value: StructFormValue): StructJSON {
   let dataType = {} as unknown as DataType;
 
   switch (type) {
-    case DataTypeEnum.IS_NUMBER_INT:
+    case DataTypeEnum.NUMBER_INT:
       dataType = {
         type,
         specs: { valueRange, step, unit, unitName },
       };
       break;
 
-    case DataTypeEnum.IS_NUMBER_DOUBLE:
+    case DataTypeEnum.NUMBER_DOUBLE:
       dataType = {
         type,
         specs: { valueRange, step, unit, unitName },
       };
       break;
 
-    case DataTypeEnum.IS_BOOL:
+    case DataTypeEnum.BOOL:
       dataType = {
         type,
         specs: {
@@ -48,14 +48,14 @@ export function transfromToStructJSON(value: StructFormValue): StructJSON {
       };
       break;
 
-    case DataTypeEnum.IS_STRING:
+    case DataTypeEnum.STRING:
       dataType = {
         type,
         specs: { length },
       };
       break;
 
-    case DataTypeEnum.IS_STRUCT:
+    case DataTypeEnum.STRUCT:
       dataType = {
         type,
         specs: specs! as unknown as ModelOfMatterParams[],

+<script setup lang="ts">
+  import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
+  import { JsonPreview } from '/@/components/CodeEditor';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+
+  defineProps<{
+    inputData?: StructJSON[];
+  }>();
+
+  defineEmits(['register']);
+
+  const data = {};
+
+  const [register] = useModalInner();
+</script>
+
+<template>
+  <BasicModal @register="register" title="">
+    <!--  -->
+    <JsonPreview :data="data" />
+  </BasicModal>
+</template>

+import { FormSchema } from '../../../types/form';
+import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
+import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+
+export const getFormSchemas = ({
+  structJSON: structJson,
+  required,
+  transportType,
+}: {
+  structJSON: StructJSON[];
+  required?: boolean;
+  transportType?: string;
+}): FormSchema[] => {
+  const createInputNumber = ({ identifier, functionName, dataType }: StructJSON): FormSchema => {
+    const { specs } = dataType || {};
+    const { valueRange } = specs! as Specs;
+    const { max = 2147483647, min = -2147483648 } = valueRange || {};
+    return {
+      field: identifier,
+      label: functionName,
+      component: 'InputNumber',
+      rules: [
+        {
+          required,
+          message: `${functionName}是必填项`,
+        },
+        {
+          type: 'number',
+          trigger: 'change',
+          validator: (_rule, value) => {
+            const reg = /^[0-9]*$/;
+            if (!reg.test(value))
+              return Promise.reject(new Error(`${functionName}不是一个有效的数字`));
+            if (value < min || value > max)
+              return Promise.reject(new Error(`${functionName}取值范围在${min}~${max}之间`));
+
+            return Promise.resolve(value);
+          },
+        },
+      ],
+      componentProps: {
+        max,
+        min,
+        placeholder: `请输入${functionName}`,
+      },
+    } as FormSchema;
+  };
+
+  const createInput = ({ identifier, functionName, dataType }: StructJSON): FormSchema => {
+    const { specs } = dataType || {};
+    const { length = 10240 } = specs! as Partial<Specs>;
+    return {
+      field: identifier,
+      label: functionName,
+      component: 'Input',
+      rules: [
+        {
+          required,
+          message: `${functionName}是必填项`,
+        },
+        {
+          type: 'string',
+          trigger: 'change',
+          validator: (_rule, value) => {
+            if ((value?.length || 0) > length)
+              return Promise.reject(new Error(`${functionName}数据长度应该小于${length}`));
+
+            return Promise.resolve(value);
+          },
+        },
+      ],
+      componentProps: {
+        maxLength: length,
+        placeholder: `请输入${functionName}`,
+      },
+    } as FormSchema;
+  };
+
+  const createSelect = ({ identifier, functionName, dataType }: StructJSON): FormSchema => {
+    const { specs } = dataType || {};
+    const { boolClose, boolOpen } = specs! as Partial<Specs>;
+    return {
+      field: identifier,
+      label: functionName!,
+      component: 'Select',
+      rules: [
+        {
+          required,
+          message: `${functionName}是必填项`,
+          type: 'number',
+        },
+      ],
+      componentProps: {
+        options: [
+          { label: `${boolClose}-0`, value: 0 },
+          { label: `${boolOpen}-1`, value: 1 },
+        ],
+        placeholder: `请选择${functionName}`,
+      },
+    };
+  };
+
+  const createStructJson = ({ identifier, functionName, dataType }: StructJSON): FormSchema => {
+    return {
+      field: identifier,
+      label: functionName!,
+      component: 'Input',
+      changeEvent: 'update:value',
+      componentProps: () => {
+        return {
+          inputData: dataType?.specs || [],
+        };
+      },
+      colSlot: identifier,
+    };
+  };
+
+  const createTCPServiceCommandInput = ({ serviceCommand }: StructJSON): FormSchema => {
+    return {
+      field: 'serviceCommand',
+      label: '服务命令',
+      component: 'Input',
+      required,
+      defaultValue: serviceCommand,
+      componentProps: {
+        placeholder: `请输入服务命令`,
+      },
+    };
+  };
+
+  const schemas: FormSchema[] = [];
+
+  for (const item of structJson) {
+    const { dataType } = item;
+    const { type } = dataType || {};
+    if (transportType === TransportTypeEnum.TCP) {
+      item.serviceCommand && schemas.push(createTCPServiceCommandInput(item));
+      break;
+    }
+
+    if (type === DataTypeEnum.BOOL) schemas.push(createSelect(item));
+    else if (type === DataTypeEnum.NUMBER_INT) schemas.push(createInputNumber(item));
+    else if (type === DataTypeEnum.NUMBER_DOUBLE) schemas.push(createInputNumber(item));
+    else if (type === DataTypeEnum.STRING) schemas.push(createInput(item));
+    else if (type === DataTypeEnum.STRUCT) schemas.push(createStructJson(item));
+  }
+
+  return schemas;
+};

+import { ValidatorRule } from 'ant-design-vue/lib/form/interface';
+export { default as ThingsModelForm } from './index.vue';
+
+export const validateTCPCustomCommand: ValidatorRule['validator'] = (_rule, value) => {
+  const reg = /^[\s0-9a-fA-F]+$/;
+  if (reg.test(value)) return Promise.resolve();
+  return Promise.reject('请输入ASCII或HEX服务命令(0~9/A~F)');
+};
+
+export const trimBlankSpace = (string: string) => string.replace(/(?!^)(?=(\w{2})+$)/g, '');
+
+export const formatCommandString = (string = '') => string.replace(/(?!^)(?=(\w{2})+$)/g, ' ');

+<script setup lang="ts">
+  import { Card } from 'ant-design-vue';
+  import { ComponentPublicInstance, computed, nextTick, reactive, unref, watch } from 'vue';
+  import { getFormSchemas } from './config';
+  import { ThingsModelForm } from '.';
+  import { DefineComponentsBasicExpose } from '/#/utils';
+  import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
+  import { useForm } from '../../../hooks/useForm';
+  import { DataTypeEnum } from '/@/enums/objectModelEnum';
+  import { BasicForm } from '/@/components/Form';
+
+  const props = withDefaults(
+    defineProps<{
+      value?: Recordable;
+      inputData?: StructJSON[];
+      required?: boolean;
+      title?: string;
+      transportType?: string;
+      disabled?: boolean;
+      identifier?: string;
+    }>(),
+    {
+      inputData: () => [],
+      required: true,
+    }
+  );
+
+  const thingsModelFormListElMap = reactive<
+    Record<string, { el: InstanceType<typeof ThingsModelForm>; structJSON: StructJSON }>
+  >({});
+
+  const [register, formActionType] = useForm({
+    schemas: getFormSchemas({
+      structJSON: props.inputData || [],
+      required: props.required,
+      transportType: props.transportType,
+    }),
+    showActionButtonGroup: false,
+    layout: 'inline',
+    labelWidth: 100,
+  });
+
+  const getStructFormItem = computed(() => {
+    const { inputData } = props;
+    return inputData.filter((item) => item.dataType?.type === DataTypeEnum.STRUCT);
+  });
+
+  const setFormElRef = (
+    el: Nullable<Element | ComponentPublicInstance>,
+    structJSON: StructJSON
+  ) => {
+    const _structJSON = unref(getStructFormItem).find(
+      (item) => item.identifier === structJSON.identifier
+    );
+
+    if (_structJSON)
+      thingsModelFormListElMap[structJSON.identifier!] = {
+        el: el as InstanceType<typeof ThingsModelForm>,
+        structJSON,
+      };
+  };
+
+  const getFieldsValue = () => {
+    const basicValue = formActionType.getFieldsValue();
+
+    const structValue: Recordable = {};
+    for (const key of Object.keys(thingsModelFormListElMap)) {
+      const item = thingsModelFormListElMap[key];
+      const { el } = item;
+      structValue[key] = el.getFieldsValue() || {};
+    }
+
+    return {
+      ...basicValue,
+      ...structValue,
+    };
+  };
+
+  const setFieldsValue = (value: Recordable) => {
+    formActionType.setFieldsValue(value);
+  };
+
+  const validate = async () => {
+    await formActionType.validate();
+    for (const key of Object.keys(thingsModelFormListElMap))
+      await thingsModelFormListElMap[key]?.el?.validate?.();
+  };
+
+  watch(
+    () => props.value,
+    async (value) => {
+      await nextTick();
+      formActionType.resetFields();
+      formActionType.setFieldsValue(value || {});
+    },
+    { immediate: true }
+  );
+
+  watch(
+    () => [props.inputData, props.identifier],
+    (value) => {
+      if (value && value.length) {
+        const schemas = getFormSchemas({
+          structJSON: props.inputData || [],
+          required: props.required,
+          transportType: props.transportType,
+        });
+        formActionType.setProps({ schemas });
+      }
+    }
+  );
+
+  watch(
+    () => props.disabled,
+    (value) => {
+      formActionType.setProps({ disabled: value });
+    }
+  );
+
+  defineExpose<DefineComponentsBasicExpose>({
+    getFieldsValue,
+    setFieldsValue,
+    validate,
+  });
+</script>
+
+<template>
+  <Card
+    class="!border-2 !border-dashed"
+    :title="title"
+    :style="{ backgroundColor: disabled ? '#f0f0f0' : '', borderColor: disabled ? '#e3e3e3' : '' }"
+  >
+    <BasicForm class="things-model-form" @register="register" :disabled="disabled">
+      <template
+        v-for="item in getStructFormItem"
+        #[item.identifier!]="{ model, field }"
+        :key="item.identifier"
+      >
+        <ThingsModelForm
+          class="!ml-10"
+          :ref="(el) => setFormElRef(el, item)"
+          v-model:value="model[field]"
+          :input-data="(item.dataType?.specs as StructJSON[]) || []"
+          :title="item.functionName"
+          :disabled="disabled"
+        />
+      </template>
+    </BasicForm>
+  </Card>
+</template>
+
+<style lang="less" scoped>
+  .things-model-form {
+    > :deep(.ant-row) {
+      width: 100%;
+    }
+
+    :deep(.ant-input-number) {
+      width: 100%;
+    }
+
+    :deep(.ant-form-item-label) {
+      label {
+        width: 100%;
+        display: block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    }
+  }
+
+  :deep(.ant-form-item-control) {
+    margin-left: 6px;
+  }
+</style>

@@ -123,6 +123,7 @@ export type ComponentType =
   | 'TransferModal'
   | 'TransferTableModal'
   | 'ObjectModelValidateForm'
+  | 'ThingsModelForm'
   | 'DevicePicker'
   | 'ProductPicker'
   | 'PollCommandInput'
@@ -138,4 +139,8 @@ export type ComponentType =
   | 'RelationsQuery'
   | 'CredentialsCard'
   | 'ApiComplete'
-  | 'DeviceProfileForm';
+  | 'DeviceProfileForm'
+  | 'ConditionFilter'
+  | 'TimeRangePicker'
+  | 'TriggerDurationInput'
+  | 'AlarmProfileSelect';

@@ -398,8 +398,6 @@
         display: flex;
         align-items: center;
         justify-content: center;
-        height: 670px;
-        max-height: 670px;
       }
     }
 

@@ -25,19 +25,18 @@ export function usePagination(refProps: ComputedRef<BasicTableProps>) {
   const { t } = useI18n();
 
   const configRef = ref<PaginationProps>({
-    hideOnSinglePage:true
+    hideOnSinglePage: true,
   });
   const show = ref(true);
 
   watchEffect(() => {
     const { pagination } = unref(refProps);
-    
+
     if (!isBoolean(pagination) && pagination) {
       configRef.value = {
         ...unref(configRef),
         ...(pagination ?? {}),
-       };
-  
+      };
     }
   });
 

@@ -88,7 +88,7 @@ export function useTableScroll(
 
     bodyEl!.style.height = 'unset';
 
-    if (!unref(getCanResize) || tableData.length === 0) return;
+    if (!unref(getCanResize)) return;
 
     await nextTick();
     //Add a delay to get the correct bottomIncludeBody paginationHeight footerHeight headerHeight
@@ -143,7 +143,12 @@ export function useTableScroll(
     height = (height > maxHeight! ? (maxHeight as number) : height) ?? height;
     setHeight(height);
 
-    bodyEl!.style.height = `${height}px`;
+    if (tableData.length) {
+      bodyEl!.style.height = `${height}px`;
+    } else {
+      const emptyPlaceholder: HTMLDivElement = tableEl.querySelector('.ant-table-placeholder')!;
+      emptyPlaceholder && (emptyPlaceholder.style.height = `${height}px`);
+    }
   }
   useWindowSizeFn(calcTableHeight, 280);
   onMountedOrActivated(() => {

@@ -11,3 +11,19 @@ export enum AlarmStatusMean {
   CLEARED_ACK = '清除已确认',
   ACTIVE_ACK = '激活已确认',
 }
+
+export enum AlarmLevelEnum {
+  CRITICAL = 'CRITICAL',
+  MAJOR = 'MAJOR',
+  MINOR = 'MINOR',
+  WARNING = 'WARNING',
+  INDETERMINATE = 'INDETERMINATE',
+}
+
+export enum AlarmLevelNameEnum {
+  CRITICAL = '紧急',
+  MAJOR = '重要',
+  MINOR = '次要',
+  WARNING = '警告',
+  INDETERMINATE = '不确定',
+}

@@ -23,4 +23,7 @@ export enum DictEnum {
   MESSAGE_TYPES_FILTER = 'message_types_filter',
   // 实体类型 规则节点 Filter originator types switch
   ORIGINATOR_TYPES = 'originator_types',
+
+  // 产品品类领域
+  CATEGORY_FIELD = 'category_field',
 }

+/**
+ * 运算符枚举值
+ */
+
+// 数字运算符或者时间运算符
+export enum NumberOperationEnum {
+  EQUAL = 'EQUAL',
+  NOT_EQUAL = 'NOT_EQUAL',
+  LESS = 'LESS',
+  LESS_OR_EQUAL = 'LESS_OR_EQUAL',
+  GREATER = 'GREATER',
+  GREATER_OR_EQUAL = 'GREATER_OR_EQUAL',
+}
+
+export enum NumberOperationNameEnum {
+  EQUAL = '等于',
+  NOT_EQUAL = '不等于',
+  LESS = '小于',
+  LESS_OR_EQUAL = '小于等于',
+  GREATER = '大于',
+  GREATER_OR_EQUAL = '大于等于',
+}
+
+export enum StringOperationEnum {
+  EQUAL = 'EQUAL',
+  NOT_EQUAL = 'NOT_EQUAL',
+  STARTS_WITH = 'STARTS_WITH',
+  ENDS_WITH = 'ENDS_WITH',
+  CONTAINS = 'CONTAINS',
+  NOT_CONTAINS = 'NOT_CONTAINS',
+}
+
+export enum StringOperationNameEnum {
+  EQUAL = '等于',
+  NOT_EQUAL = '不等于',
+  STARTS_WITH = '开始于',
+  ENDS_WITH = '结束于',
+  CONTAINS = '包含',
+  NOT_CONTAINS = '不包含',
+}
+
+export enum BooleanOperationEnum {
+  EQUAL = 'EQUAL',
+  NOT_EQUAL = 'NOT_EQUAL',
+}
+
+export enum BooleanOperationNameEnum {
+  EQUAL = '等于',
+  NOT_EQUAL = '不等于',
+}
+
+export enum BooleanOperationValueEnum {
+  TRUE = 'true',
+  FALSE = 'false',
+}
+
+export enum BooleanOperationValueNameEnum {
+  TRUE = '真',
+  FALSE = '假',
+}
+
+export enum FlipFlopTypeEnum {
+  SIMPLE = 'SIMPLE',
+  DURATION = 'DURATION',
+  REPEATING = 'REPEATING',
+}
+
+export enum ScheduleTypeEnum {
+  ANY_TIME = 'ANY_TIME',
+  SPECIFIC_TIME = 'SPECIFIC_TIME',
+  CUSTOM = 'CUSTOM',
+}
+
+export enum ScheduleTypeNameEnum {
+  ANY_TIME = '始终启用',
+  SPECIFIC_TIME = '定时启用',
+  CUSTOM = '自定义启用',
+}
+
+export enum FlipFlopTypeNameEnum {
+  SIMPLE = '简单',
+  DURATION = '持续时长',
+  REPEATING = '重复次数',
+}
+
+export enum TriggerTypeEnum {
+  DEVICE_TRIGGER = 'DEVICE_TRIGGER',
+  SCHEDULE_TRIGGER = 'SCHEDULE_TRIGGER',
+  SCENE_TRIGGER = 'SCENE_TRIGGER',
+  HAND_ACT = 'HAND_ACT',
+}
+
+export enum TriggerTypeNameEnum {
+  DEVICE_TRIGGER = '设备触发',
+  SCHEDULE_TRIGGER = '定时触发',
+  SCENE_TRIGGER = '场景触发',
+  HAND_ACT = '手动触发',
+}
+
+export enum DeviceTriggerTypeEum {
+  TIME_SERIES = 'TIME_SERIES',
+}
+
+export enum DeviceTriggerTypeNameEum {
+  TIME_SERIES = '属性触发',
+}
+
+export enum TriggerEntityTypeEnum {
+  ALL = 'ALL',
+  PART = 'PART',
+}
+
+export enum TriggerEntityTypeNameEnum {
+  ALL = '全部',
+  PART = '部分',
+}
+
+export enum TriggerValueTypeEnum {
+  NUMERIC = 'NUMERIC',
+  BOOLEAN = 'BOOLEAN',
+  STRING = 'STRING',
+  DATE_TIME = 'DATE_TIME',
+}
+
+export enum TriggerValueTypeNameEnum {
+  NUMERIC = '数字',
+  BOOLEAN = '布尔值',
+  STRING = '字符串',
+  DATE_TIME = '时间',
+}
+
+export enum TriggerUnitEnum {
+  SECONDS = 'SECONDS',
+  MINUTES = 'MINUTES',
+  HOURS = 'HOURS',
+  DAYS = 'DAYS',
+}
+
+export enum TriggerUnitNameEnum {
+  SECONDS = '秒',
+  MINUTES = '分',
+  HOURS = '时',
+  DAYS = '天',
+}
+
+export enum ExecutionActionEnum {
+  DEVICE_OUT = 'DEVICE_OUT',
+  MSG_NOTIFY = 'MSG_NOTIFY',
+}
+
+export enum ExecutionActionNameEnum {
+  DEVICE_OUT = '设备输出',
+  MSG_NOTIFY = '告警输出',
+}
+
+export enum CommandTypeEnum {
+  CUSTOM = 0,
+  SERVICE = 1,
+  ATTRIBUTE = 2,
+  API = 'api',
+}
+
+export enum CommandTypeNameEnum {
+  CUSTOM = '自定义',
+  SERVICE = '服务',
+  ATTRIBUTE = '属性',
+}

+export enum DataTypeEnum {
+  NUMBER_INT = 'INT',
+  NUMBER_DOUBLE = 'DOUBLE',
+  STRING = 'TEXT',
+  STRUCT = 'STRUCT',
+  BOOL = 'BOOL',
+}

-/**
- * 运算符枚举值
- */
-
-// 数字运算符或者时间运算符
-export enum Number_Operation {
-  EQUAL = 'EQUAL',
-  NOT_EQUAL = 'NOT_EQUAL',
-  LESS = 'LESS',
-  LESS_OR_EQUAL = 'LESS_OR_EQUAL',
-  GREATER = 'GREATER',
-  GREATER_OR_EQUAL = 'GREATER_OR_EQUAL',
-}
-
-export enum String_Operation {
-  EQUAL = 'EQUAL',
-  NOT_EQUAL = 'NOT_EQUAL',
-  BEGAN_IN = 'STARTS_WITH',
-  END_IN = 'ENDS_WITH',
-  INCLUDE = 'CONTAINS',
-  NOT_INCLUDE = 'NOT_CONTAINS',
-}
-
-export enum Boolean_Operation {
-  EQUAL = 'EQUAL',
-  NOT_EQUAL = 'NOT_EQUAL',
-}

@@ -7,7 +7,7 @@ export enum DataActionModeEnum {
 }
 
 export enum DataActionModeNameEnum {
-  CREATE = '创建',
+  CREATE = '新增',
   READ = '查看',
   UPDATE = '编辑',
   DELETE = '删除',
@@ -40,6 +40,11 @@ export enum ServiceCallTypeEnum {
   SYNC = 'SYNC',
 }
 
+export enum ServiceCallTypeNameEnum {
+  ASYNC = '异步',
+  SYNC = '同步',
+}
+
 export enum CommandDeliveryWayEnum {
   ONE_WAY = 'oneway',
   TWO_WAY = 'twoway',

@@ -5,4 +5,5 @@
 export const enum UserDropDownItemEnum {
   FORGOT_PASSWORD = 'system:password:view', //忘记密码权限标识key
   ABOUT_SOFTWARE = 'system:about_software:view', //关于软件权限标识key
+  PERSONAL_CENTER = 'system:personal_center:view', //个人中心权限标识key
 }

@@ -12,6 +12,7 @@
     <template #overlay>
       <Menu @click="handleMenuClick">
         <MenuItem
+          v-if="hasPermission(UserDropDownItemEnum.PERSONAL_CENTER)"
           key="personal"
           :text="t('layout.header.dropdownItemPersonal')"
           icon="ion:document-text-outline"

 export const createPickerSearch = (searchValue = false) => {
   return {
     showSearch: true,
+    getPopupContainer: (triggerNode) => triggerNode.parentNode,
     filterOption: (inputValue: string, option: Record<'label' | 'value', string>) => {
       let { label, value } = option;
       label = label.toLowerCase();

@@ -120,6 +120,22 @@ export const emailRule: Rule[] = [
   },
 ];
 
+// 钉钉验证
+export const dingRule: Rule[] = [
+  {
+    validator: (_, value: string) => {
+      const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+      if (!value) {
+        return Promise.resolve();
+      } else if (!reg.test(value)) {
+        return Promise.reject('手机号格式不正确');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
 // 中文正则
 export const ChineseRegexp = /[\u4E00-\u9FA5]/;
 

 import { BasicColumn, FormSchema } from '/@/components/Table';
-import { emailRule, phoneRule } from '/@/utils/rules';
+import { dingRule, emailRule, phoneRule } from '/@/utils/rules';
 import { useComponentRegister } from '/@/components/Form';
 import { OrgTreeSelect } from '../../common/OrgTreeSelect';
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
@@ -31,6 +31,11 @@ export const columns: BasicColumn[] = [
     width: 180,
   },
   {
+    title: '钉钉',
+    dataIndex: 'dingtalk',
+    width: 160,
+  },
+  {
     title: '备注',
     dataIndex: 'remark',
     width: 120,
@@ -109,6 +114,17 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
+    field: 'dingtalk',
+    label: '钉钉',
+    component: 'Input',
+    helpMessage: '请输入与钉钉相关联的手机号',
+    rules: dingRule,
+    componentProps: {
+      placeholder: '不填默认为手机号码',
+      maxLength: 11,
+    },
+  },
+  {
     field: 'remark',
     label: '备注',
     component: 'InputTextArea',

@@ -127,10 +127,19 @@ export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
     clearInterval(timeout as NodeJS.Timer);
     timeout = null;
   };
+
   onMounted(() => {
     if (getRoleHasNotifyFlag()) polling();
   });
 
+  document.addEventListener('visibilitychange', () => {
+    if (document.hidden) {
+      clearTimeout();
+    } else {
+      polling();
+    }
+  });
+
   onUnmounted(() => {
     clearTimeout();
   });

@@ -16,15 +16,17 @@
       value?: string | string[];
       apiTreeSelectProps?: Recordable;
       showCreate?: boolean;
+      disabled?: boolean;
     }>(),
     {
       showCreate: true,
+      disabled: false,
     }
   );
 
   const needReload = ref(true);
 
-  const emit = defineEmits(['change']);
+  const emit = defineEmits(['change', 'optionsChange']);
 
   const handleOpenCreate = () => {
     openDrawer(true, { isUpdate: false });
@@ -35,13 +37,14 @@
   const orgList = ref<Recordable[]>([]);
 
   const getBindProps = computed<Recordable>(() => {
-    const { value, apiTreeSelectProps = {} } = props;
+    const { value, apiTreeSelectProps = {}, disabled } = props;
     const { params = {} } = apiTreeSelectProps;
     return {
       replaceFields: { children: 'children', key: 'id', title: 'name', value: 'id' },
       getPopupContainer: () => document.body,
       placeholder: '请选择所属组织',
       maxLength: 250,
+      disabled,
       ...apiTreeSelectProps,
       value,
       dropdownStyle: { maxHeight: '300px' },
@@ -63,6 +66,7 @@
       onChange: (...args: any[]) => {
         emit('change', ...args);
       },
+      onOptionsChange: (...args: any[]) => emit('optionsChange', ...args),
     };
   });
 
@@ -80,7 +84,9 @@
 <template>
   <section class="flex">
     <ApiTreeSelect v-bind="getBindProps" />
-    <Button v-if="getShowCreate" type="link" @click="handleOpenCreate">新增组织</Button>
+    <Button v-if="getShowCreate" type="link" @click="handleOpenCreate" :disabled="disabled"
+      >新增组织</Button
+    >
     <OrganizationDrawer v-if="getShowCreate" @register="registerDrawer" @success="handleReload" />
   </section>
 </template>

@@ -222,6 +222,14 @@
                 </div>
               </template>
               <template class="ant-card-actions" #actions>
+                <Tooltip title="预览">
+                  <AuthIcon
+                    :auth="ConfigurationTemplatePermission.PREVIEW"
+                    class="!text-lg"
+                    icon="ant-design:eye-outlined"
+                    @click="handlePreview(item)"
+                  />
+                </Tooltip>
                 <Tooltip v-if="!isCustomerUser" title="设计">
                   <AuthIcon
                     :auth="ConfigurationTemplatePermission.DESIGN"

@@ -96,6 +96,10 @@
                 top: '48%',
                 z: 10,
                 style: {
+                  width: 35,
+                  textAlign: 'left',
+                  overflow: 'truncate',
+                  textVerticalAlign: 'middle',
                   fill: '#1a1a1a',
                   text: value + '个',
                   font: '0.85rem Microsoft YaHei',

@@ -232,12 +232,6 @@ export const schemas = (): FormSchema[] => {
       component: 'InputGroup',
       required: true,
       colProps: { span: 24 },
-      componentProps: ({ formActionType }) => {
-        const { getFieldsValue } = formActionType;
-        return {
-          type: getFieldsValue().requestContentType,
-        };
-      },
     },
     {
       field: 'fillAddress',

@@ -127,6 +127,15 @@
     showActionButtonGroup: false,
   });
 
+  const updatePartFormScheme = (requestType: string) => {
+    updateSchema({
+      field: 'requestHttpTypeAndUrl',
+      componentProps: {
+        type: requestType,
+      },
+    });
+  };
+
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     await resetFields();
     await nextTick();
@@ -152,13 +161,12 @@
           requestUrl: data.record?.requestUrl,
         },
       });
-      await nextTick(() => simpleRequestRef.value?.setValue(data.record, false, []));
-      updateSchema({
-        field: 'requestHttpTypeAndUrl',
-        componentProps: {
-          type: String(data.record?.requestContentType),
-        },
+      await nextTick(() => {
+        simpleRequestRef.value?.setValue(data.record, false, []);
+        updatePartFormScheme(String(data.record?.requestContentType));
       });
+    } else {
+      await updatePartFormScheme(RequestMethodTypeEnum.COMMOM);
     }
   });
 

+<script setup lang="ts">
+  import { computed, unref } from 'vue';
+  import { ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { schemas } from '../index';
+  import { useForm, BasicForm } from '/@/components/Form';
+
+  import { deviceProfileCategory } from '/@/api/device/classModal';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const emit = defineEmits(['handleReload', 'register']);
+
+  const isUpdate = ref<Boolean>(false);
+  const getTitle = computed(() => (!unref(isUpdate) ? '新增品类' : '编辑品类'));
+  const { createMessage } = useMessage();
+
+  const [registerForm, { getFieldsValue, setFieldsValue, validate }] = useForm({
+    labelWidth: 140,
+    schemas,
+    actionColOptions: {
+      span: 14,
+    },
+    showActionButtonGroup: false,
+  });
+  const recordInfo = ref<any>({});
+
+  const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
+    console.log(123131, data);
+    setModalProps({ confirmLoading: false, loading: true });
+    isUpdate.value = data?.isUpdate;
+    recordInfo.value = data?.record;
+    if (data?.record) {
+      setFieldsValue(data?.record);
+    }
+    setModalProps({ loading: false });
+  });
+
+  const handleCancel = () => {
+    closeModal();
+  };
+
+  const handleOk = async () => {
+    await validate();
+    let values = getFieldsValue();
+    if (unref(isUpdate)) {
+      values = { ...values, id: unref(recordInfo).id };
+    }
+    await deviceProfileCategory(values);
+    createMessage.success('操作成功');
+    emit('handleReload');
+    handleCancel();
+  };
+</script>
+
+<template>
+  <div>
+    <BasicModal
+      v-bind="$attrs"
+      width="30rem"
+      :title="getTitle"
+      @register="register"
+      @cancel="handleCancel"
+      @ok="handleOk"
+      destroyOnClose
+    >
+      <div>
+        <BasicForm @register="registerForm" />
+      </div>
+    </BasicModal>
+  </div>
+</template>

+import classModal from './classModal.vue';
+
+export { classModal };

+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { findDictItemByCode } from '/@/api/system/dict';
+
+import { DictEnum } from '/@/enums/dictEnum';
+
+export const columns: BasicColumn[] = [
+  {
+    title: '名称',
+    dataIndex: 'name',
+  },
+  {
+    title: '领域',
+    dataIndex: 'dictItemName',
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    slots: { customRender: 'status' },
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'name',
+    label: '名称',
+    component: 'Input',
+    colProps: { span: 6 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入品类名称',
+    },
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'Select',
+    colProps: { span: 6 },
+    componentProps: {
+      options: [
+        { label: '启用', value: '1' },
+        { label: '禁用', value: '0' },
+      ],
+      placeholder: '请选择品类状态',
+    },
+  },
+  {
+    field: 'dictItemId',
+    label: '领域',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    componentProps() {
+      return {
+        api: findDictItemByCode,
+        params: {
+          dictCode: DictEnum.CATEGORY_FIELD,
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        placeholder: '请选择领域',
+        getPopupContainer: () => document.body,
+      };
+    },
+  },
+];
+
+export const schemas: FormSchema[] = [
+  {
+    field: 'name',
+    label: '品类名称',
+    component: 'Input',
+    colProps: { span: 21 },
+    required: true,
+    componentProps: {
+      maxLength: 20,
+    },
+  },
+  {
+    field: 'dictItemId',
+    label: '领域',
+    component: 'ApiSelect',
+    colProps: { span: 21 },
+    required: true,
+    componentProps({ formActionType }) {
+      return {
+        api: findDictItemByCode,
+        params: {
+          dictCode: DictEnum.CATEGORY_FIELD,
+        },
+        onChange(value, options) {
+          formActionType.setFieldsValue({ dictItemName: value ? options.label : '' });
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        placeholder: '请选择领域',
+        getPopupContainer: () => document.body,
+      };
+    },
+  },
+  {
+    field: 'dictItemName',
+    label: '领域名称',
+    ifShow: false,
+    component: 'Input',
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'RadioButtonGroup',
+    defaultValue: 1,
+    componentProps: {
+      options: [
+        { label: '启用', value: 1 },
+        { label: '禁用', value: 0 },
+      ],
+    },
+  },
+];

+<script setup lang="ts">
+  import { ref } from 'vue';
+  import { columns, searchFormSchema } from '.';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { Button, Popconfirm, Switch } from 'ant-design-vue';
+  import { useBatchOperation } from '/@/utils/useBatchOperation';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { Authority } from '/@/components/Authority';
+  import { useModal } from '/@/components/Modal';
+  import { classModal } from './components/index';
+  import { useDrawer } from '/@/components/Drawer';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { authBtn } from '/@/enums/roleEnum';
+  import {
+    getDeviceClassList,
+    deleteDeviceClass,
+    deviceProfileCategory,
+  } from '/@/api/device/classModal';
+
+  import { BasicDrawer } from '/@/components/Drawer';
+  import PhysicalModelManagementStep from '/@/views/device/profiles/step/PhysicalModelManagementStep.vue';
+  const [
+    registerTable,
+    { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
+  ] = useTable({
+    title: '产品品类列表',
+    api: getDeviceClassList,
+    columns,
+    formConfig: {
+      labelWidth: 100,
+      schemas: searchFormSchema,
+    },
+    immediate: true,
+    useSearchForm: true,
+    showTableSetting: true,
+    bordered: true,
+    showIndexColumn: false,
+    clickToRowSelect: false,
+    rowKey: 'id',
+    // searchInfo: searchInfo,
+    actionColumn: {
+      width: 230,
+      title: '操作',
+      slots: { customRender: 'action' },
+      fixed: 'right',
+    },
+    rowSelection: {
+      type: 'checkbox',
+      getCheckboxProps: (record: any) => {
+        return { disabled: !!record.status };
+      },
+    },
+  });
+
+  const [registerModal, { openModal }] = useModal();
+  const [registerDetailDrawer, { openDrawer }] = useDrawer();
+
+  const { createMessage } = useMessage();
+  const { isExistOption } = useBatchOperation(getRowSelection, setSelectedRowKeys);
+
+  const switchLoading = ref<boolean>(false);
+
+  const userInfo: any = getAuthCache(USER_INFO_KEY);
+  const role: string = userInfo.roles[0];
+
+  const handleReload = () => {
+    setSelectedRowKeys([]);
+    reload();
+  };
+
+  // 新增
+  const handleCreate = () => {
+    openModal(true, {
+      isUpdate: false,
+    });
+  };
+
+  // 编辑
+  const handleEdit = (record?: any) => {
+    openModal(true, {
+      isUpdate: true,
+      record,
+    });
+  };
+
+  // 详情
+  const registerDetailRecord = ref<any>({});
+  const handleDetail = (record?: any) => {
+    openDrawer(true);
+    registerDetailRecord.value = {
+      ...record,
+      ifShowClass: true,
+    };
+  };
+
+  // 状态->编辑
+  const handleSwitch = async (e: any, record: any) => {
+    switchLoading.value = true;
+    console.log(e, record);
+    await deviceProfileCategory({ ...record, status: e });
+    switchLoading.value = false;
+    createMessage.success('操作成功');
+    handleReload();
+  };
+
+  // 删除
+  const handleDelete = async (record?: any) => {
+    let ids: string[] = [];
+    if (record) {
+      ids = [record.id];
+    } else {
+      ids = getSelectRowKeys();
+    }
+    try {
+      setLoading(true);
+      await deleteDeviceClass({ ids });
+      createMessage.success('删除成功');
+      handleReload();
+    } catch (error) {
+      throw error;
+    } finally {
+      setLoading(false);
+    }
+  };
+</script>
+<template>
+  <div>
+    <BasicTable style="flex: auto" @register="registerTable">
+      <template #toolbar>
+        <Authority value="api:yt:product:category:post">
+          <Button type="primary" @click="handleCreate"> 新增品类 </Button>
+        </Authority>
+        <Authority value="api:yt:product:category:delete">
+          <Popconfirm
+            title="您确定要批量删除数据"
+            ok-text="确定"
+            cancel-text="取消"
+            @confirm="handleDelete()"
+          >
+            <a-button color="error" :disabled="!isExistOption"> 批量删除 </a-button>
+          </Popconfirm>
+        </Authority>
+      </template>
+      <template #status="{ record }">
+        <Switch
+          @click="(e) => handleSwitch(e, record)"
+          :loading="switchLoading"
+          v-model:checked="record.status"
+          checked-children="启用"
+          un-checked-children="禁用"
+          :checkedValue="1"
+          :unCheckedValue="0"
+        />
+      </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label: '详情',
+              icon: 'ant-design:eye-outlined',
+              auth: 'api:yt:product:category:get',
+              onClick: handleDetail.bind(null, record),
+            },
+            {
+              label: '编辑',
+              auth: 'api:yt:product:category:update',
+              icon: 'clarity:note-edit-line',
+              ifShow: authBtn(role),
+              onClick: handleEdit.bind(null, record),
+            },
+            {
+              label: '删除',
+              auth: 'api:yt:product:category:delete',
+              icon: 'ant-design:delete-outlined',
+              ifShow: authBtn(role) && !record.status,
+              color: 'error',
+              popConfirm: {
+                title: '是否确认删除',
+                confirm: handleDelete.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
+    </BasicTable>
+    <classModal @register="registerModal" @handleReload="handleReload" />
+    <!-- <physicalModel @register="registerDetailDrawer" :record /> -->
+    <BasicDrawer title="物模型" @register="registerDetailDrawer" width="60%" destroy-on-close>
+      <PhysicalModelManagementStep :record="registerDetailRecord" />
+    </BasicDrawer>
+  </div>
+</template>

@@ -16,6 +16,9 @@ import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
 import { createImgPreview } from '/@/components/Preview';
 import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter';
 
+import { getOrganizationList } from '/@/api/system/system';
+import { copyTransFun } from '/@/utils/fnUtils';
+
 useComponentRegister('JSONEditor', JSONEditor);
 useComponentRegister('ObjectModelValidateForm', ObjectModelValidateForm);
 
@@ -263,22 +266,15 @@ export const step1Schemas: FormSchema[] = [
     ifShow: ({ values }) => isGateWay(values.deviceType),
   },
   {
-    field: 'organizationId',
-    label: '所属组织',
-    component: 'Input',
-    required: true,
-    slot: 'addOrg',
-  },
-  {
     field: 'gatewayId',
     label: '网关设备',
     required: true,
     component: 'ApiSelect',
-    ifShow: ({ values }) => values.deviceType === 'SENSOR' && values.organizationId,
+    ifShow: ({ values }) => values.deviceType === 'SENSOR',
     componentProps: ({ formModel, formActionType }) => {
-      const { organizationId, transportType } = formModel;
+      const { transportType } = formModel;
       const { validateFields } = formActionType;
-      if (![organizationId, transportType].every(Boolean)) return {};
+      if (!transportType) return {};
       return {
         api: async (params: Recordable) => {
           try {
@@ -291,19 +287,36 @@ export const step1Schemas: FormSchema[] = [
         },
         showSearch: true,
         params: {
-          organizationId,
           transportType,
         },
         valueField: 'tbDeviceId',
         labelField: 'alias',
-        onChange: async () => {
+        onChange: async (value, options) => {
           await nextTick();
+          if (value) {
+            const data = await getOrganizationList({ organizationId: options?.organizationId });
+            copyTransFun(data as any as any[]);
+            formModel.organizationList = data;
+          }
           validateFields(['gatewayId']);
         },
       };
     },
   },
   {
+    field: 'organizationList',
+    label: '依据网关设备请求的组织数组',
+    component: 'Input',
+    ifShow: false,
+  },
+  {
+    field: 'organizationId',
+    label: '所属组织',
+    component: 'Select',
+    required: true,
+    slot: 'addOrg',
+  },
+  {
     field: 'label',
     label: '设备标签',
     component: 'Input',

@@ -14,7 +14,7 @@
                 placeholder="请选择组织"
                 allow-clear
                 tree-default-expand-all
-                :tree-data="treeData"
+                :tree-data="model?.['organizationList'] || treeData"
               />
             </div>
             <div>
@@ -49,44 +49,46 @@
       centered
     >
       <div>
-        <Form :label-col="labelCol" :colon="false" :rules="rules" :model="positionState">
-          <Row :gutter="20" class="mt-4">
-            <Col :span="20">
-              <FormItem label="搜索位置">
-                <AutoComplete
-                  v-model:value="positionState.address"
-                  :options="dataSource"
-                  style="width: 100%"
-                  placeholder="搜索位置"
-                  @search="debounceSearch"
-                  @select="handleSelect"
-                  backfill
-                />
-              </FormItem>
-            </Col>
-          </Row>
-          <Row :gutter="20" class="">
-            <Col :span="10">
-              <FormItem label="经度" name="longitude">
-                <Input
-                  @blur="redirectPosition"
-                  @change="redirectPosition"
-                  v-model:value="positionState.longitude"
-                />
-              </FormItem>
-            </Col>
-            <Col :span="10">
-              <FormItem label="纬度" name="latitude">
-                <Input
-                  @blur="redirectPosition"
-                  @change="redirectPosition"
-                  v-model:value="positionState.latitude"
-                />
-              </FormItem>
-            </Col>
-          </Row>
-        </Form>
-        <div ref="wrapRef" style="height: 300px; width: 90%" class="ml-6"></div>
+        <Spin :spinning="spinning">
+          <Form :label-col="labelCol" :colon="false" :rules="rules" :model="positionState">
+            <Row :gutter="20" class="mt-4">
+              <Col :span="20">
+                <FormItem label="搜索位置">
+                  <AutoComplete
+                    v-model:value="positionState.address"
+                    :options="dataSource"
+                    style="width: 100%"
+                    placeholder="搜索位置"
+                    @search="debounceSearch"
+                    @select="handleSelect"
+                    backfill
+                  />
+                </FormItem>
+              </Col>
+            </Row>
+            <Row :gutter="20" class="">
+              <Col :span="10">
+                <FormItem label="经度" name="longitude">
+                  <Input
+                    @blur="redirectPosition"
+                    @change="redirectPosition"
+                    v-model:value="positionState.longitude"
+                  />
+                </FormItem>
+              </Col>
+              <Col :span="10">
+                <FormItem label="纬度" name="latitude">
+                  <Input
+                    @blur="redirectPosition"
+                    @change="redirectPosition"
+                    v-model:value="positionState.latitude"
+                  />
+                </FormItem>
+              </Col>
+            </Row>
+          </Form>
+          <div ref="wrapRef" style="height: 300px; width: 90%" class="ml-6"></div>
+        </Spin>
       </div>
     </Modal>
     <DeptDrawer @register="registerModal" @success="handleSuccess" />
@@ -97,7 +99,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { step1Schemas } from '../../config/data';
   import { useScript } from '/@/hooks/web/useScript';
-  import { Input, message, Modal, Form, Row, Col, AutoComplete } from 'ant-design-vue';
+  import { Input, message, Modal, Form, Row, Col, AutoComplete, Spin } from 'ant-design-vue';
   import { EnvironmentTwoTone } from '@ant-design/icons-vue';
   import { upload } from '/@/api/oss/ossFileUploader';
   import { BAI_DU_MAP_URL } from '/@/utils/fnUtils';
@@ -113,6 +115,8 @@
   import { toRaw } from 'vue';
   import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
   import { buildUUID } from '/@/utils/uuid';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { computed } from 'vue';
 
   export default defineComponent({
     components: {
@@ -126,6 +130,7 @@
       Row,
       Col,
       DeptDrawer,
+      Spin,
     },
     props: {
       isUpdate: {
@@ -134,9 +139,14 @@
     },
     emits: ['next'],
     setup(props, { emit }) {
+      const { createMessage } = useMessage();
       const orgData: any = reactive({
         treeData: [],
       });
+      const isUpdate1 = computed(() => {
+        const { isUpdate } = props;
+        return isUpdate;
+      });
       const getOrganizationListFunc = async () => {
         const data = await getOrganizationList();
         copyTransFun(data as any as any[]);
@@ -168,17 +178,27 @@
       const devicePic = ref('');
       const loading = ref(false);
 
-      const [register, { validate, resetFields, setFieldsValue, getFieldsValue, updateSchema }] =
-        useForm({
-          labelWidth: 140,
-          schemas: step1Schemas,
-          actionColOptions: {
-            span: 14,
-          },
-          labelAlign: 'right',
-          showResetButton: false,
-          showSubmitButton: false,
-        });
+      const [
+        register,
+        {
+          validate,
+          resetFields,
+          setFieldsValue,
+          getFieldsValue,
+          updateSchema,
+          clearValidate,
+          validateFields,
+        },
+      ] = useForm({
+        labelWidth: 140,
+        schemas: step1Schemas,
+        actionColOptions: {
+          span: 14,
+        },
+        labelAlign: 'right',
+        showResetButton: false,
+        showSubmitButton: false,
+      });
       async function nextStep() {
         try {
           let values = await validate();
@@ -220,21 +240,53 @@
       };
 
       // 地图的弹框
+      const spinning = ref<boolean>(false);
       const visible = ref(false);
-      const selectPosition = () => {
+      const selectPosition = async () => {
         visible.value = true;
-        if (!positionState.longitude) {
-          positionState.longitude = '104.05326410962411';
-          positionState.latitude = '30.54855093076791';
-
-          // 根据经纬度获取详细位置
-          if (positionState.longitude && positionState.latitude) {
-            var pt = new BMap.Point(positionState.longitude, positionState.latitude);
-            getAddrByPoint(pt);
+        if (
+          !unref(isUpdate1) &&
+          unref(devicePositionState).longitude &&
+          unref(devicePositionState).latitude
+        ) {
+          positionState.longitude = unref(devicePositionState).longitude;
+          positionState.latitude = unref(devicePositionState).latitude;
+        }
+        if (!positionState.longitude || !positionState.latitude) {
+          let getLocalCity = new BMap.LocalCity();
+          let getLocation = new BMap.Geolocation();
+          const userAgent = navigator.userAgent;
+          try {
+            spinning.value = true;
+            if (
+              (userAgent.indexOf('Chrome') > -1 || userAgent.indexOf('WebKit') > -1) &&
+              userAgent.indexOf('Edg') == -1
+            ) {
+              //判断是否是谷歌 或则是谷歌的内核  '104.05326410962411'; '30.54855093076791';
+              await getLocalCity.get(function (res) {
+                positionState.longitude = res?.center.lng || '104.05326410962411';
+                positionState.latitude = res?.center.lat || '30.54855093076791';
+                var pt = new BMap.Point(positionState.longitude, positionState.latitude);
+                getAddrByPoint(pt);
+                spinning.value = false;
+              });
+            } else {
+              await getLocation.getCurrentPosition(function (res) {
+                positionState.longitude = res?.longitude || '104.05326410962411';
+                positionState.latitude = res?.latitude || '30.54855093076791';
+                var pt = new BMap.Point(positionState.longitude, positionState.latitude);
+                getAddrByPoint(pt);
+                spinning.value = false;
+              });
+            }
+          } catch (err) {
+            createMessage.error('获取定位失败');
           }
           initMap(positionState.longitude, positionState.latitude);
         } else {
           initMap(positionState.longitude, positionState.latitude);
+          var pt = new BMap.Point(positionState.longitude, positionState.latitude);
+          getAddrByPoint(pt);
         }
       };
 
@@ -447,11 +499,11 @@
         });
       }
 
-      const handleTreeOrg = () => {
-        const clearGatewayId = {
-          gatewayId: '',
-        };
-        setFieldsValue(clearGatewayId);
+      const handleTreeOrg = (option: string) => {
+        if (option) clearValidate('organizationId');
+        else {
+          validateFields(['organizationId']);
+        }
       };
 
       return {
@@ -488,6 +540,7 @@
         handleSuccess,
         handleTreeOrg,
         devicePositionState,
+        spinning,
       };
     },
   });

@@ -15,13 +15,13 @@
   import { useHistoryData } from '../../hook/useHistoryData';
   import { formatToDateTime } from '/@/utils/dateUtil';
   import { useTable, BasicTable, BasicColumn } from '/@/components/Table';
-  import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
   import {
     ModeSwitchButton,
     TABLE_CHART_MODE_LIST,
     EnumTableChartMode,
   } from '/@/components/Widget';
   import { SchemaFiled } from '/@/views/visual/palette/components/HistoryTrendModal/config';
+  import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
   interface DeviceDetail {
     tbDeviceId: string;
@@ -188,7 +188,7 @@
         method.setFieldsValue({ keys: props.attr });
         const attrInfo = unref(deviceAttrs).find((item) => item.identifier === props.attr);
         if (
-          [DataTypeEnum.IS_STRING, DataTypeEnum.IS_STRUCT].includes(
+          [DataTypeEnum.STRING, DataTypeEnum.STRUCT].includes(
             attrInfo?.detail.dataType.type as unknown as DataTypeEnum
           )
         ) {

@@ -16,7 +16,6 @@
   import { DeviceModelOfMatterAttrs, DeviceRecord } from '/@/api/device/model/deviceModel';
   import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { isArray, isNull, isObject } from '/@/utils/is';
-  import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
   import { useGlobSetting } from '/@/hooks/setting';
   import { ModeSwitchButton, EnumTableCardMode } from '/@/components/Widget';
   import { toRaw } from 'vue';
@@ -25,6 +24,7 @@
   import { ModalParamsType } from '/#/utils';
   import { AreaChartOutlined } from '@ant-design/icons-vue';
   import { SvgIcon } from '/@/components/Icon';
+  import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
   interface ReceiveMessage {
     data: {
@@ -220,7 +220,7 @@
   };
 
   const isStructAndTextType = (type: DataTypeEnum) => {
-    return [DataTypeEnum.IS_STRUCT, DataTypeEnum.IS_STRING].includes(type);
+    return [DataTypeEnum.STRUCT, DataTypeEnum.STRING].includes(type);
   };
 
   const setDataSource = () => {
@@ -311,7 +311,7 @@
   });
 
   const formatValue = (item: DataSource) => {
-    return item.type === DataTypeEnum.IS_BOOL
+    return item.type === DataTypeEnum.BOOL
       ? !isNull(item.value)
         ? !!Number(item.value)
           ? item.boolOpen

@@ -6,7 +6,6 @@
   import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { DataTypeEnum } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
   import { sendCommandOneway } from '/@/api/dataBoard';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { unref } from 'vue';
@@ -14,6 +13,7 @@
   import { TaskTypeEnum } from '/@/views/task/center/config';
   import { SingleToHex, formSchemasConfig } from './config';
   import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+  import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
   defineEmits(['register']);
   const props = defineProps<{ deviceId: string; deviceName: string }>();
@@ -51,7 +51,7 @@
 
     let schemas = [{ dataType: dataType, identifier, functionName: name } as StructJSON];
 
-    if (type === DataTypeEnum.IS_STRUCT) {
+    if (type === DataTypeEnum.STRUCT) {
       schemas = dataType?.specs as StructJSON[];
     }
 

 import { DataType, Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
 import { JSONEditor } from '/@/components/CodeEditor';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
 import { useJsonParse } from '/@/hooks/business/useJsonParse';
-import { DataTypeEnum } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
 
 export interface BasicCreateFormParams {
   identifier: string;
@@ -19,9 +19,9 @@ const validateDouble = (
   max?: number | string
 ) => {
   min =
-    Number(min) || type === DataTypeEnum.IS_NUMBER_INT ? Number.MIN_SAFE_INTEGER : Number.MIN_VALUE;
+    Number(min) || type === DataTypeEnum.NUMBER_INT ? Number.MIN_SAFE_INTEGER : Number.MIN_VALUE;
   max =
-    Number(max) || type === DataTypeEnum.IS_NUMBER_INT ? Number.MAX_SAFE_INTEGER : Number.MAX_VALUE;
+    Number(max) || type === DataTypeEnum.NUMBER_INT ? Number.MAX_SAFE_INTEGER : Number.MAX_VALUE;
 
   return {
     flag: value < min || value > max,
@@ -56,13 +56,11 @@ export const useGenDynamicForm = () => {
         },
       ],
       componentProps: {
-        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,
+        max: max ?? type === DataTypeEnum.NUMBER_INT ? Number.MAX_SAFE_INTEGER : Number.MAX_VALUE,
+        min: min ?? type === DataTypeEnum.NUMBER_INT ? Number.MIN_SAFE_INTEGER : Number.MIN_VALUE,
         step,
         placeholder: `请输入${functionName}`,
-        precision: type === DataTypeEnum.IS_NUMBER_INT ? 0 : 2,
+        precision: type === DataTypeEnum.NUMBER_INT ? 0 : 2,
       },
     } as FormSchema;
   };
@@ -141,11 +139,11 @@ export const useGenDynamicForm = () => {
   };
 
   const schemaMethod = {
-    [DataTypeEnum.IS_BOOL]: createSelect,
-    [DataTypeEnum.IS_NUMBER_DOUBLE]: createInputNumber,
-    [DataTypeEnum.IS_NUMBER_INT]: createInputNumber,
-    [DataTypeEnum.IS_STRING]: createInput,
-    [DataTypeEnum.IS_STRUCT]: createInputJson,
+    [DataTypeEnum.BOOL]: createSelect,
+    [DataTypeEnum.NUMBER_DOUBLE]: createInputNumber,
+    [DataTypeEnum.NUMBER_INT]: createInputNumber,
+    [DataTypeEnum.STRING]: createInput,
+    [DataTypeEnum.STRUCT]: createInputJson,
   };
 
   const fieldTypeMap = new Map<string, DataTypeEnum>();
@@ -176,7 +174,7 @@ export const useGenDynamicForm = () => {
       const dataType = fieldTypeMap.get(next)!;
 
       let itemValue = value[next];
-      if (dataType === DataTypeEnum.IS_STRUCT) {
+      if (dataType === DataTypeEnum.STRUCT) {
         const { value } = useJsonParse(itemValue);
         itemValue = value;
       }

@@ -322,4 +322,8 @@
   .profile-list:deep(.ant-card-body) {
     @apply !p-4;
   }
+
+  :deep(.ant-spin-nested-loading) {
+    height: 40rem;
+  }
 </style>

@@ -4,6 +4,7 @@
       :maskClosable="false"
       v-bind="$attrs"
       :width="dynamicWidth"
+      :destroy-on-close="true"
       @register="register"
       @ok="handleSubmit"
       @cancel="handleCancel"
@@ -125,6 +126,8 @@
     const title = unref(isUpdate) ? '编辑产品' : '新增产品';
     setModalProps({ title, showOkBtn: true, showCancelBtn: true });
     if (unref(isUpdate)) {
+      const { deviceType } = res || {};
+      deviceTypeStr.value = deviceType;
       await setDeviceConfEditFormData(res);
       await setTransConfEditFormData(res);
       handleStepNext(false, res);
@@ -157,7 +160,6 @@
   };
   const deviceTypeStr = ref('');
   const handleGetDeviceType = async (e) => {
-    console.log(e);
     deviceTypeStr.value = e;
     await nextTick();
     TransConStRef.value?.updateDisabled(e);

+<script lang="ts" setup>
+  import { columns, searchFormSchema } from './config';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { BasicTable } from '/@/components/Table';
+  import { useTable } from '/@/components/Table';
+  import { Button } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import { getDeviceClassList } from '/@/api/device/classModal';
+  import { ref } from 'vue';
+  const emits = defineEmits([
+    'handleOpenListDrawer',
+    'handleSelectCategory',
+    'handleClose',
+    'register',
+  ]);
+
+  const categoryId = ref<string | undefined | null>();
+  const [registerDrawer] = useDrawerInner((data) => {
+    categoryId.value = data.categoryId || {};
+  });
+  const [registerTable] = useTable({
+    title: '',
+    api: getDeviceClassList,
+    columns,
+    formConfig: {
+      schemas: searchFormSchema,
+    },
+    searchInfo: {
+      status: 1,
+    },
+    resizeHeightOffset: 50,
+    useSearchForm: true,
+    showTableSetting: false,
+    bordered: true,
+    showIndexColumn: false,
+    clickToRowSelect: false,
+    rowKey: 'id',
+    actionColumn: {
+      width: 100,
+      title: '操作',
+      slots: { customRender: 'action' },
+      fixed: 'right',
+    },
+  });
+
+  const closeDrawer = () => {
+    emits('handleClose');
+  };
+
+  const handleChecked = (item?: any) => {
+    emits('handleSelectCategory', item);
+  };
+
+  const handleOpenListDrawer = (record?: any) => {
+    emits('handleOpenListDrawer', record);
+  };
+</script>
+
+<template>
+  <BasicDrawer
+    :zIndex="1100"
+    v-bind="$attrs"
+    @register="registerDrawer"
+    :showFooter="true"
+    destroyOnClose
+    @close="closeDrawer"
+    title="选择品类"
+    width="32%"
+  >
+    <BasicTable @register="registerTable">
+      <template #name="{ record }">
+        <span>{{ record.name }}</span>
+        <ExclamationCircleOutlined
+          style="color: #377dff"
+          @click.stop="handleOpenListDrawer(record)"
+          class="ml-1"
+        />
+      </template>
+      <template #action="{ record }">
+        <Button type="link" :disabled="categoryId === record.id" @click="handleChecked(record)">{{
+          categoryId === record.id ? '已选择' : '选择'
+        }}</Button>
+      </template>
+    </BasicTable>
+  </BasicDrawer>
+</template>

+<script lang="ts" setup>
+  import { columnsDrawer } from './config';
+  import { unref, ref, watch, nextTick } from 'vue';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { BasicTable } from '/@/components/Table';
+  import { useTable } from '/@/components/Table';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import { getModelList } from '/@/api/device/modelOfMatter';
+
+  defineEmits(['register']);
+
+  const props = defineProps<{ cateforyListInfo: any }>();
+
+  const recordInfo = ref<any>({});
+  const secondVisible = ref<Boolean>(false);
+
+  watch(
+    () => props.cateforyListInfo,
+    async () => {
+      recordInfo.value = props.cateforyListInfo.record || {};
+      secondVisible.value = props.cateforyListInfo.isRight || false;
+      await nextTick();
+      reload();
+    }
+  );
+  const [registerListDrawer, { closeDrawer }] = useDrawerInner();
+  const [registerTable, { reload }] = useTable({
+    title: '',
+    api: async (params: Record<'page' | 'pageSize', number>) => {
+      return await getModelList({
+        ...params,
+        id: unref(recordInfo).id,
+        selectType: 'category',
+      });
+    },
+    columns: columnsDrawer,
+    useSearchForm: false,
+    showTableSetting: false,
+    bordered: true,
+    showIndexColumn: false,
+    clickToRowSelect: false,
+    rowKey: 'id',
+  });
+
+  const handleClose = () => {
+    closeDrawer();
+  };
+</script>
+
+<template>
+  <BasicDrawer
+    :zIndex="1100"
+    @register="registerListDrawer"
+    wrap-class-name="secondDrawer"
+    :wrap-style="{
+      right: secondVisible ? '32%' : 0,
+      transition: 'none',
+    }"
+    v-bind="$attrs"
+    destroyOnClose
+    @close="handleClose"
+    title="物模型"
+    width="36%"
+  >
+    <BasicTable @register="registerTable">
+      <template #name="{ record }">
+        <span>{{ record.name }}</span>
+        <ExclamationCircleOutlined class="ml-1" />
+      </template>
+    </BasicTable>
+  </BasicDrawer>
+</template>

+<template>
+  <BasicModal
+    title="导入物模型"
+    :maskClosable="false"
+    destroyOnClose
+    v-bind="$attrs"
+    width="25rem"
+    @register="register"
+    @cancel="handleCancel"
+    :showOkBtn="false"
+  >
+    <div class="w-full h-full" ref="loadingRef">
+      <!-- <div class="flex justify-end">
+        <Button @click="handleTemplateDownload" type="link">EXCEL模板下载</Button>
+      </div> -->
+      <div class="flex justify-evenly items-center h-50 !w-full">
+        <Upload
+          accept=".json,"
+          :show-upload-list="false"
+          :customRequest="handleImportModel"
+          class="flex justify-center items-center"
+        >
+          <div class="flex flex-col justify-center items-center">
+            <img :src="JSONImage" alt="avatar" class="w-20 h-20" />
+          </div>
+        </Upload>
+        <Upload
+          accept=".csv,.xls,.xlsx"
+          :show-upload-list="false"
+          :customRequest="handleCSVImport"
+          class="flex justify-center items-center"
+        >
+          <div class="flex flex-col justify-center items-center">
+            <img :src="CSVImage" alt="avatar" class="w-20 h-20" />
+          </div>
+        </Upload>
+      </div>
+    </div>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { ref, unref } from 'vue';
+  import { Upload } from 'ant-design-vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { DeviceRecord } from '/@/api/device/model/deviceModel';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { isObject, isString } from '/@/utils/is';
+  import {
+    importCsvCategory,
+    importModelCategory,
+    importModelOfMatter,
+    importCsvDeviceProfileId,
+  } from '/@/api/device/modelOfMatter';
+  // import XLSX, { CellObject } from 'xlsx';
+  import { useLoading } from '/@/components/Loading';
+  import JSONImage from '/@/assets/svg/JSON.svg';
+  import CSVImage from '/@/assets/svg/excel.svg';
+
+  const emits = defineEmits(['register', 'handleImportCSV', 'handleReload']);
+
+  defineProps<{
+    record: DeviceRecord;
+  }>();
+
+  const { createMessage } = useMessage();
+  const loadingRef = ref();
+  const [openLoading, closeLoading] = useLoading({
+    target: loadingRef,
+    props: {
+      tip: '加载中',
+      absolute: true,
+    },
+  });
+
+  const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
+
+  const ImportInfo = ref<{ id?: string; isCateGory?: string | Boolean }>({});
+
+  const [register, { closeModal }] = useModalInner(async (data) => {
+    ImportInfo.value = data;
+  });
+  // 导入loading
+  const importLoading = ref(false);
+
+  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 };
+  };
+
+  // JSON导入
+  const handleImportModel = async (data: { file: File }) => {
+    const fileReader = new FileReader();
+    const { isCateGory, id } = unref(ImportInfo);
+
+    fileReader.onload = async () => {
+      const { flag, data } = paseJSON(fileReader.result as string);
+      if (!flag) {
+        createMessage.warning('JSON解析失败,请导入正确的JSON');
+        return;
+      }
+      openLoading();
+      try {
+        importLoading.value = true;
+
+        Object.keys(data || {}).forEach((key) => {
+          const value = (data || {})[key];
+          if (value && isEmptyObject(value)) {
+            (data || {})[key] = [];
+          }
+        });
+
+        const result = isCateGory
+          ? await importModelCategory({
+              categoryId: id,
+              data: data!,
+              functionType: 'all',
+            })
+          : await importModelOfMatter({
+              tkDeviceProfileId: id,
+              data: data!,
+              functionType: 'all',
+            });
+
+        result
+          ? createMessage.success('导入成功~')
+          : createMessage.error('JSON解析失败,请导入正确的JSON');
+
+        result && emits('handleReload');
+      } catch (error) {
+        throw error;
+      } finally {
+        importLoading.value = false;
+        closeLoading();
+        closeModal();
+      }
+    };
+
+    fileReader.readAsText(data.file, 'utf-8');
+  };
+
+  // CSV导入
+  const handleCSVImport = async ({ file }) => {
+    const { isCateGory, id } = unref(ImportInfo);
+
+    try {
+      openLoading();
+      const formData = new FormData();
+      formData.set('file', file);
+      const flag = isCateGory
+        ? await importCsvCategory({ categoryId: id, deviceProfileId: undefined, file: formData })
+        : await importCsvDeviceProfileId({
+            categoryId: undefined,
+            deviceProfileId: id,
+            file: formData,
+          });
+      flag && createMessage.info(flag?.message);
+    } catch (msg) {
+      console.log(msg, 'msg');
+    } finally {
+      closeLoading();
+      closeModal();
+      emits('handleReload');
+    }
+  };
+
+  // const downloadFile = (data: string, fileName: string, type: string, ext: string) => {
+  //   const blob = new Blob([data], { type: type });
+  //   const objectURL = URL.createObjectURL(blob);
+  //   const element = document.createElement('a');
+  //   element.href = objectURL;
+  //   element.download = `${fileName}.${ext}`;
+  //   element.style.display = 'none';
+  //   document.body.appendChild(element);
+  //   element.click();
+  //   element.remove();
+  //   URL.revokeObjectURL(objectURL);
+  // };
+
+  // 模板下载
+  // const handleTemplateDownload = () => {
+
+  // };
+
+  const handleCancel = () => {
+    closeModal();
+  };
+</script>
+
+<style lang="less" scope></style>

+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { findDictItemByCode } from '/@/api/system/dict';
+import { h, unref } from 'vue';
+import { Tooltip } from 'ant-design-vue';
+
+import { FunctionType } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { useClipboard } from '@vueuse/core';
+import { DictEnum } from '/@/enums/dictEnum';
+
+// import {
+//   EventType,
+//   EventTypeColor,
+//   EventTypeName,
+// } from '/@/views/device/list/cpns/tabs/EventManage/config';
+
+export const columns: BasicColumn[] = [
+  {
+    title: '品类名称',
+    dataIndex: 'name',
+    slots: { customRender: 'name' },
+  },
+  {
+    title: '领域',
+    dataIndex: 'dictItemName',
+  },
+];
+
+export const formatFunctionType: Record<FunctionType, string> = {
+  [FunctionType.PROPERTIES]: '属性',
+  [FunctionType.EVENTS]: '事件',
+  [FunctionType.SERVICE]: '服务',
+};
+
+const handleCopy = async (value: string) => {
+  const { createMessage } = useMessage();
+  const { copied, copy } = useClipboard({ legacy: true });
+  await copy(value);
+  if (unref(copied)) createMessage.success('复制成功~');
+  else createMessage.error('复制失败～');
+};
+
+export const columnsDrawer: BasicColumn[] = [
+  {
+    title: '功能类型',
+    dataIndex: 'functionType',
+    width: 90,
+    format: (text: FunctionType) => {
+      return formatFunctionType[text];
+    },
+  },
+  {
+    title: '功能名称',
+    dataIndex: 'functionName',
+    width: 90,
+    ellipsis: true,
+  },
+  {
+    title: '标识符',
+    dataIndex: 'identifier',
+    width: 90,
+    ellipsis: true,
+    customRender: ({ text }: Record<'text', string>) => {
+      return h(Tooltip, { title: text }, () =>
+        h('span', { class: 'cursor-pointer', onClick: () => handleCopy(text) }, text)
+      );
+    },
+  },
+  {
+    title: '数据类型',
+    dataIndex: 'functionJson.dataType.type',
+    width: 100,
+    format: (text: string) => {
+      return text || '--';
+    },
+    ellipsis: true,
+  },
+  // {
+  //   title: '事件类型',
+  //   dataIndex: 'eventType',
+  //   customRender({ text }) {
+  //     return h(
+  //       Tag,
+  //       {
+  //         color: EventTypeColor[text as EventType],
+  //       },
+  //       () => EventTypeName[text as EventType]
+  //     );
+  //   },
+  //   ellipsis: true,
+  // },
+  // {
+  //   title: '状态',
+  //   dataIndex: 'status',
+  //   width: 100,
+  //   customRender: (value: Record<'text', number>) => {
+  //     const { text } = value;
+  //     return h(
+  //       Tag,
+  //       {
+  //         color: text ? 'green' : 'red',
+  //       },
+  //       () => (text ? '已发布' : '待发布')
+  //     );
+  //   },
+  // },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'dictItemId',
+    label: '',
+    component: 'ApiSelect',
+    colProps: { span: 7 },
+    componentProps() {
+      return {
+        api: findDictItemByCode,
+        params: {
+          dictCode: DictEnum.CATEGORY_FIELD,
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        placeholder: '请选择领域',
+        // getPopupContainer: () => document.body,
+      };
+    },
+  },
+  {
+    field: 'name',
+    label: '',
+    component: 'Input',
+    colProps: { span: 9 },
+    componentProps: {
+      placeholder: '请输入品类名称',
+    },
+  },
+];

@@ -42,6 +42,12 @@ export enum ModelOfMatterPermission {
   DELETE = 'api:yt:things_model:delete',
   RELEASE = 'api:yt:things_model:release',
 }
+export enum ModelCategoryPermission {
+  CREATE = 'api:yt:things_model:category:post',
+  UPDATE = 'api:yt:things_model:category:put',
+  DELETE = 'api:yt:things_model:category:delete',
+  RELEASE = 'api:yt:things_model:category:release',
+}
 
 const handleCopy = async (value: string) => {
   const { createMessage } = useMessage();
@@ -212,6 +218,41 @@ export const step1Schemas: FormSchema[] = [
     },
   },
   {
+    field: 'category',
+    label: '产品品类',
+    component: 'RadioGroup',
+    defaultValue: 2,
+    required: true,
+    componentProps({ formModel }) {
+      return {
+        options: [
+          { label: '自定义品类', value: 2 },
+          { label: '标准品类', value: 1 },
+        ],
+        onChange() {
+          formModel.categoryId = null;
+          formModel.categoryName = undefined;
+        },
+      };
+    },
+  },
+  {
+    field: 'categoryId',
+    label: '产品品类',
+    component: 'Input',
+    defaultValue: undefined,
+    ifShow: false,
+  },
+  {
+    field: 'categoryName',
+    label: ' ',
+    component: 'ApiSelect',
+    colProps: { span: 14 },
+    slot: 'categoryName',
+    required: true,
+    ifShow: ({ model }) => model.category === 1,
+  },
+  {
     field: 'name',
     label: '产品名称',
     required: true,
@@ -325,6 +366,14 @@ export const columns: BasicColumn[] = [
     width: 120,
   },
   {
+    title: '产品品类',
+    dataIndex: 'categoryName',
+    width: 120,
+    format: (text) => {
+      return text ? text : '自定义品类';
+    },
+  },
+  {
     title: '设备类型',
     dataIndex: 'deviceType',
     width: 90,

 <template>
   <div class="step1">
-    <BasicForm @register="register" />
+    <BasicForm @register="register">
+      <template #categoryName="{ model }">
+        <div class="flex">
+          <Input
+            v-model:value="model.categoryName"
+            placeholder="请选择所属品类"
+            style="width: 300px"
+            :disabled="cateGoryDisabled"
+            @focus="handleFocus"
+          />
+          <Button type="link" :disabled="!model.categoryName" @click="handleCategoryId"
+            >查看功能</Button
+          >
+        </div>
+      </template>
+    </BasicForm>
+    <CategoryList
+      @register="registerDrawer"
+      @handleOpenListDrawer="handleOpenListDrawer"
+      @handleSelectCategory="handleSelectCategory"
+      @handleClose="handleClose"
+    />
+    <CategoryListDrawer @register="registerListDrawer" :cateforyListInfo="cateforyListInfo" />
   </div>
 </template>
 <script lang="ts" setup>
-  import { nextTick } from 'vue';
+  import { nextTick, ref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { step1Schemas } from '../device.profile.data';
   import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
   import { buildUUID } from '/@/utils/uuid';
+  import { Input, Button } from 'ant-design-vue';
+  import { useDrawer } from '/@/components/Drawer';
+  import CategoryList from '../components/CategoryList.vue';
+  import CategoryListDrawer from '../components/CategoryListDrawer.vue';
 
   const emits = defineEmits(['next', 'emitDeviceType']);
   const props = defineProps({
     ifShowBtn: { type: Boolean, default: true },
   });
+  const [registerDrawer, { openDrawer, closeDrawer }] = useDrawer();
+  const [registerListDrawer, { openDrawer: openListDrawer, closeDrawer: closeListDrawer }] =
+    useDrawer();
 
   const [register, { validate, setFieldsValue, resetFields, updateSchema, getFieldsValue }] =
     useForm({
@@ -29,6 +58,9 @@
       },
       submitFunc: customSubmitFunc,
     });
+
+  const cateGoryDisabled = ref<boolean>(false);
+
   const editOrAddNameStatus = (nameStatus) =>
     updateSchema({
       field: 'name',
@@ -48,19 +80,20 @@
     emits('emitDeviceType', values?.deviceType);
   }
   //回显数据
-  const setFormData = (v) => {
+  const setFormData = async (v) => {
     if (v.image) {
       setFieldsValue({
         image: [{ uid: buildUUID(), name: 'name', url: v.image } as FileItem],
       });
     }
     const { image, ...params } = v;
-    console.log(image);
-    setFieldsValue({ ...params });
+    console.log(image, props.isUpdate);
+    setFieldsValue({ ...params, category: params?.categoryId ? 1 : 2 });
   };
   //获取数据
   async function getFormData() {
-    const values = await validate();
+    await validate();
+    const values = getFieldsValue();
     if (!values) return;
     if (Reflect.has(values, 'image')) {
       const file = (values.image || []).at(0) || {};
@@ -74,12 +107,65 @@
   };
 
   const editOrAddDeviceTypeStatus = (status: boolean) => {
-    updateSchema({
-      field: 'deviceType',
-      componentProps: {
-        disabled: status,
+    updateSchema([
+      {
+        field: 'deviceType',
+        componentProps: {
+          disabled: status,
+        },
       },
-    });
+      {
+        field: 'category',
+        componentProps({ formModel }) {
+          return {
+            options: [
+              { label: '自定义品类', value: 2 },
+              { label: '标准品类', value: 1 },
+            ],
+            onChange() {
+              formModel.categoryId = null;
+              formModel.categoryName = undefined;
+            },
+            disabled: status,
+          };
+        },
+      },
+    ]);
+
+    cateGoryDisabled.value = status;
+  };
+
+  // 查看功能
+  const handleCategoryId = () => {
+    const { categoryId } = getFieldsValue() || {};
+    if (!categoryId) return;
+    cateforyListInfo.value = { record: { id: categoryId }, isRight: false };
+    openListDrawer(true);
+  };
+
+  // 获取焦点
+  const handleFocus = () => {
+    const { categoryId } = getFieldsValue() || {};
+    openDrawer(true, { categoryId });
+  };
+
+  //打开品类名称
+  const cateforyListInfo = ref<any>({});
+  const handleOpenListDrawer = (record?: any) => {
+    cateforyListInfo.value = { record, isRight: true };
+    openListDrawer(true);
+  };
+
+  // 选择产品品类
+  const handleSelectCategory = (item) => {
+    closeDrawer();
+    closeListDrawer();
+    item.id && setFieldsValue({ categoryId: item.id, categoryName: item?.name });
+  };
+
+  // 关闭抽屉
+  const handleClose = () => {
+    closeListDrawer();
   };
 
   defineExpose({

@@ -27,25 +27,33 @@
           </div>
           <div class="flex justify-between items-end">
             <div class="flex gap-2">
-              <Authority :value="ModelOfMatterPermission.CREATE">
+              <Authority :value="[ModelOfMatterPermission.CREATE, ModelCategoryPermission.CREATE]">
                 <Button v-if="isShowBtn" type="primary" @click="handleCreateOrEdit()">
                   新增物模型
                 </Button>
               </Authority>
-              <Button type="primary" @click="handleOpenTsl"> 物模型TSL </Button>
-              <Authority value="api:yt:things_model:import">
-                <Upload
+              <Button v-if="!record.ifShowClass" type="primary" @click="handleOpenTsl">
+                物模型TSL</Button
+              >
+              <Button v-else type="primary" @click="handleExport" :loading="loading"
+                >导出物模型</Button
+              >
+              <Authority
+                :value="['api:yt:things_model:import', 'api:yt:things_model:category:import']"
+              >
+                <!-- <Upload
                   v-if="isShowBtn"
                   accept=".json,"
                   :show-upload-list="false"
                   :customRequest="handleImportModel"
                 >
                   <Button type="primary" :loading="importLoading"> 导入物模型 </Button>
-                </Upload>
+                </Upload> -->
+                <Button type="primary" @click="handleSelectImport">导入物模型</Button>
               </Authority>
             </div>
             <div class="flex gap-2">
-              <Authority :value="ModelOfMatterPermission.RELEASE">
+              <Authority :value="[ModelOfMatterPermission.RELEASE]">
                 <Popconfirm
                   title="是否需要发布上线？"
                   ok-text="确定"
@@ -61,7 +69,7 @@
               <Button v-if="isShowBtn" class="!bg-gray-200" type="text" @click="handleReturn">
                 返回
               </Button>
-              <Authority :value="ModelOfMatterPermission.DELETE">
+              <Authority :value="[ModelOfMatterPermission.DELETE, ModelCategoryPermission.DELETE]">
                 <Popconfirm
                   title="您确定要批量删除数据"
                   ok-text="确定"
@@ -94,14 +102,14 @@
             {
               label: '编辑',
               icon: 'clarity:note-edit-line',
-              auth: ModelOfMatterPermission.UPDATE,
+              auth: [ModelOfMatterPermission.UPDATE, ModelCategoryPermission.UPDATE],
               onClick: handleCreateOrEdit.bind(null, record),
               ifShow: !isShowBtn ? false : true,
             },
             {
               label: '删除',
               icon: 'ant-design:delete-outlined',
-              auth: ModelOfMatterPermission.DELETE,
+              auth: [ModelOfMatterPermission.DELETE, ModelCategoryPermission.DELETE],
               color: 'error',
               ifShow: !isShowBtn ? false : true,
               popConfirm: {
@@ -119,6 +127,11 @@
       @success="handleSuccess"
     />
     <PhysicalModelTsl :record="$props.record" @register="registerModalTsl" />
+    <SelectImport
+      :record="$props.record"
+      @register="registerModalSelect"
+      @handleReload="handleReload"
+    />
   </div>
 </template>
 <script lang="ts" setup>
@@ -127,25 +140,32 @@
   import {
     modelOfMatterForm,
     ModelOfMatterPermission,
+    ModelCategoryPermission,
     physicalColumn,
   } from '../device.profile.data';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Authority } from '/@/components/Authority';
   import PhysicalModelModal from './cpns/physical/PhysicalModelModal.vue';
   import PhysicalModelTsl from './cpns/physical/PhysicalModelTsl.vue';
-  import { Popconfirm, Button, Alert, Upload } from 'ant-design-vue';
+  import { Popconfirm, Button, Alert } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import {
     deleteModel,
+    deleteModelCategory,
     getModelList,
-    importModelOfMatter,
     releaseModel,
   } from '/@/api/device/modelOfMatter';
   import { OpenModelOfMatterModelParams, OpenModelMode } from './cpns/physical/types';
   import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-  import { ref } from 'vue';
-  import { isObject, isString } from '/@/utils/is';
+  import { ref, unref } from 'vue';
+  import { isObject } from '/@/utils/is';
+  import { useRole } from '/@/hooks/business/useRole';
+  import { ExportModelCategory } from '/@/api/device/modelOfMatter';
+  import { FunctionType } from './cpns/physical/cpns/config';
+  import SelectImport from '../components/SelectImport.vue';
+
+  const { isPlatformAdmin, isSysadmin } = useRole();
   defineEmits(['register']);
 
   const props = defineProps<{
@@ -156,10 +176,15 @@
   const isShowBtn = ref(false);
   const [registerModal, { openModal }] = useModal();
   const [registerModalTsl, { openModal: openModalTsl }] = useModal();
+  const [registerModalSelect, { openModal: openModalSelect }] = useModal();
 
   const [registerTable, { reload, setProps }] = useTable({
     api: async (params: Record<'page' | 'pageSize', number>) => {
-      return await getModelList({ ...params, deviceProfileId: props.record.id });
+      return await getModelList({
+        ...params,
+        id: props.record.id,
+        selectType: props.record.ifShowClass ? 'category' : undefined,
+      });
     },
     columns: physicalColumn,
     showIndexColumn: false,
@@ -184,9 +209,10 @@
   const handleSuccess = () => {
     reload();
   };
-
   const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    deleteModel,
+    props.record.ifShowClass && (unref(isPlatformAdmin) || unref(isSysadmin))
+      ? deleteModelCategory
+      : deleteModel,
     handleSuccess,
     setProps
   );
@@ -242,59 +268,76 @@
     }
   };
 
-  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(false);
-  const handleImportModel = async (data: { file: File }) => {
-    const fileReader = new FileReader();
-
-    fileReader.onload = async () => {
-      const { flag, data } = paseJSON(fileReader.result as string);
-      if (!flag) {
-        createMessage.warning('JSON解析失败,请导入正确的JSON~');
-        return;
-      }
-      try {
-        importLoading.value = true;
+  // 选择导入物模型的方式
+  const handleSelectImport = () => {
+    openModalSelect(true, {
+      id: props.record.id,
+      isCateGory: (unref(isPlatformAdmin) || unref(isSysadmin)) && props.record.ifShowClass,
+    });
+  };
 
-        Object.keys(data || {}).forEach((key) => {
-          const value = (data || {})[key];
-          if (value && isEmptyObject(value)) {
-            (data || {})[key] = [];
-          }
-        });
+  const handleReload = () => {
+    reload();
+  };
 
-        const result = await importModelOfMatter({
-          tkDeviceProfileId: props.record.id,
-          data: data!,
-          functionType: 'all',
-        });
+  // 导出物模型
+  const loading = ref<boolean>(false);
 
-        result
-          ? createMessage.success('导入成功~')
-          : createMessage.error('JSON解析失败,请导入正确的JSON~');
+  const getAllCategory = () => {
+    const { id: deviceProfileId } = props.record;
+    return Promise.all([
+      ExportModelCategory({
+        deviceProfileId,
+        functionType: FunctionType.EVENTS,
+      }),
+      ExportModelCategory({
+        deviceProfileId,
+        functionType: FunctionType.PROPERTIES,
+      }),
+      ExportModelCategory({
+        deviceProfileId,
+        functionType: FunctionType.SERVICE,
+      }),
+    ]);
+  };
+  const exportJSONFile = (value: Recordable) => {
+    const blob = new Blob([JSON.stringify(value, null, 2)], { type: 'text/json' });
+    const objectURL = URL.createObjectURL(blob);
+    const element = document.createElement('a');
+    element.href = objectURL;
+    element.download = `${props.record.name}-model.json`;
+    element.style.display = 'none';
+    document.body.appendChild(element);
+    element.click();
+    element.remove();
+    URL.revokeObjectURL(objectURL);
+  };
 
-        result && reload();
-      } catch (error) {
-        throw error;
-      } finally {
-        importLoading.value = false;
-      }
-    };
+  const isEmptyStr = (s: any) => {
+    if (s == undefined || s == null || s == '') {
+      return true;
+    }
+    return false;
+  };
 
-    fileReader.readAsText(data.file, 'utf-8');
+  //产品品类物模型导出
+  const handleExport = async () => {
+    loading.value = true;
+    try {
+      const [events, properties, services] = await getAllCategory();
+      const value = {
+        properties: isEmptyObject(properties) || isEmptyStr(properties) ? [] : properties,
+        services: isEmptyObject(services) || isEmptyStr(services) ? [] : services,
+        events: isEmptyObject(events) || isEmptyStr(events) ? [] : events,
+      };
+      exportJSONFile(value);
+    } catch (error) {
+      throw error;
+    } finally {
+      loading.value = false;
+    }
   };
 
   defineExpose({});

@@ -60,11 +60,19 @@
   import Service from './cpns/Service.vue';
   import Events from './cpns/Events.vue';
   import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-  import { createModel, updateModel } from '/@/api/device/modelOfMatter';
+  import {
+    createModel,
+    updateModel,
+    createModelCategory,
+    updateModelCategory,
+  } from '/@/api/device/modelOfMatter';
   import { DeviceRecord, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { OpenModelMode, OpenModelOfMatterModelParams } from './types/index';
   import { FunctionType } from './cpns/config';
+  import { useRole } from '/@/hooks/business/useRole';
+
+  const { isPlatformAdmin, isSysadmin } = useRole();
 
   const emit = defineEmits(['register', 'success']);
 
@@ -158,14 +166,28 @@
         params = (await EventsRef.value?.getFormData()) || {};
       }
       params.deviceProfileId = props.record.id;
+
       if (unref(openModalMode) === OpenModelMode.CREATE) {
-        await createModel(params);
+        (unref(isSysadmin) || unref(isPlatformAdmin)) && props.record.ifShowClass
+          ? await createModelCategory({
+              ...params,
+              deviceProfileId: undefined,
+              categoryId: props.record.id,
+            })
+          : await createModel(params);
         createMessage.success('创建成功');
       } else {
         params.id = unref(openModalParams)?.record.id;
-        await updateModel(params);
+        (unref(isSysadmin) || unref(isPlatformAdmin)) && props.record.ifShowClass
+          ? await updateModelCategory({
+              ...params,
+              deviceProfileId: undefined,
+              categoryId: props.record.id,
+            })
+          : await updateModel(params);
         createMessage.success('修改成功');
       }
+
       closeModal();
       emit('success');
     } catch (error) {

@@ -73,9 +73,18 @@
   const getAllModel = () => {
     const { id: deviceProfileId } = props.record;
     return Promise.all([
-      getModelTsl({ deviceProfileId, functionType: FunctionType.EVENTS }),
-      getModelTsl({ deviceProfileId, functionType: FunctionType.PROPERTIES }),
-      getModelTsl({ deviceProfileId, functionType: FunctionType.SERVICE }),
+      getModelTsl({
+        deviceProfileId,
+        functionType: FunctionType.EVENTS,
+      }),
+      getModelTsl({
+        deviceProfileId,
+        functionType: FunctionType.PROPERTIES,
+      }),
+      getModelTsl({
+        deviceProfileId,
+        functionType: FunctionType.SERVICE,
+      }),
     ]);
   };
 

@@ -84,7 +84,10 @@
   const handleSwitchTsl = async (functionType: FunctionType) => {
     try {
       loading.value = true;
-      const record = await getModelTsl({ deviceProfileId: props.record.id, functionType });
+      const record = await getModelTsl({
+        deviceProfileId: props.record.id,
+        functionType,
+      });
       jsonValue.value = JSON.stringify(
         {
           [functionType]: record,

 import { FormSchema } from '/@/components/Table';
 import { findDictItemByCode } from '/@/api/system/dict';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
 export enum FormField {
   FUNCTION_NAME = 'functionName',
@@ -40,30 +41,19 @@ export enum AssessMode {
   WRITE = 'w',
 }
 
-/**
- * 新增参数 动态显示表单
- */
-export enum DataTypeEnum {
-  IS_NUMBER_INT = 'INT',
-  IS_NUMBER_DOUBLE = 'DOUBLE',
-  IS_STRING = 'TEXT',
-  IS_STRUCT = 'STRUCT',
-  IS_BOOL = 'BOOL',
-}
-
 const isNumber = (type: string) => {
-  return type === DataTypeEnum.IS_NUMBER_INT || type === DataTypeEnum.IS_NUMBER_DOUBLE;
+  return type === DataTypeEnum.NUMBER_INT || type === DataTypeEnum.NUMBER_DOUBLE;
 };
 
 const isString = (type: string) => {
-  return type === DataTypeEnum.IS_STRING;
+  return type === DataTypeEnum.STRING;
 };
 const isStruct = (type: string) => {
-  return type === DataTypeEnum.IS_STRUCT;
+  return type === DataTypeEnum.STRUCT;
 };
 
 const isBool = (type: string) => {
-  return type === DataTypeEnum.IS_BOOL;
+  return type === DataTypeEnum.BOOL;
 };
 
 export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => {

@@ -138,13 +138,90 @@
         });
       }
 
+      const cipherLength = 7;
+
+      //字符串星号替代
+      function parseStringToStar(originalStr: string, startLength: number, endLength: number) {
+        //字符串大于7位，前3后4明文，其他以星号替代
+        //字符串小于7位，前1后1明文，其他以星号替代
+        return originalStr?.length > startLength
+          ? originalStr?.substr(0, startLength) +
+              new Array(originalStr?.length - endLength)?.join('*') +
+              originalStr?.substr(-endLength)
+          : originalStr;
+      }
+
+      //长度 都大于或者小于7或者其中一个大于7，一个小于7个字符的处理
+      //二维数组优化if else if else
+      const mapConditionConfig = [
+        [
+          (startParam, endParam) =>
+            String(startParam)?.length > cipherLength && String(endParam)?.length > cipherLength,
+          (startParam) => parseStringToStar(startParam, 3, 4),
+          (endParam) => parseStringToStar(endParam, 3, 4),
+        ],
+        [
+          (startParam, endParam) =>
+            String(startParam)?.length < cipherLength && String(endParam)?.length < cipherLength,
+          (startParam) => parseStringToStar(startParam, 1, 1),
+          (endParam) => parseStringToStar(endParam, 1, 1),
+        ],
+        [
+          (startParam, endParam) =>
+            String(startParam)?.length > cipherLength || String(endParam)?.length < cipherLength,
+          (startParam) => parseStringToStar(startParam, 3, 4),
+          (endParam) => parseStringToStar(endParam, 1, 1),
+        ],
+        [
+          (startParam, endParam) =>
+            String(startParam)?.length < cipherLength || String(endParam)?.length > cipherLength,
+          (startParam) => parseStringToStar(startParam, 1, 1),
+          (endParam) => parseStringToStar(endParam, 3, 4),
+        ],
+      ];
+
+      const handleStandardLength = (
+        startKey: string,
+        endKey: string,
+        startParam: string,
+        endParam: string
+      ) => {
+        const findDateFlow: any = mapConditionConfig.find((item: Function[]) =>
+          item[0](startParam, endParam)
+        );
+        if (!findDateFlow) return;
+        const cipherData: Recordable = {};
+        cipherData[startKey] = findDateFlow[1](startParam);
+        cipherData[endKey] = findDateFlow[2](endParam);
+        return cipherData;
+      };
+
+      const handleCipherTextConfig = (e) => {
+        /**
+         * username和password 存在则是邮件配置
+         * secretId和secretKey 存在则是腾讯云配置信息
+         * accessKeyId和accessKeySecret 存在则是阿里云配置信息
+         */
+        const { username, password, secretId, secretKey, accessKeyId, accessKeySecret } = e;
+        return JSON.parse(
+          JSON.stringify({
+            ...e,
+            ...handleStandardLength('username', 'password', username, password),
+            ...handleStandardLength('secretId', 'secretKey', secretId, secretKey),
+            ...handleStandardLength('accessKeyId', 'accessKeySecret', accessKeyId, accessKeySecret),
+          })
+        );
+      };
+
       function showData(record: Recordable) {
         Modal.info({
           title: '当前配置',
           width: 600,
           centered: true,
           maskClosable: true,
-          content: h(JsonPreview, { data: JSON.parse(JSON.stringify(record.config)) }),
+          content: h(JsonPreview, {
+            data: handleCipherTextConfig(record.config),
+          }),
         });
       }
       const statusChange = async (checked, record) => {

@@ -184,10 +184,12 @@
       businessText.value === BusinessReportConfigTextEnum.BUSINESS_ADD_TEXT
         ? await createOrEditReportManage(data)
         : putReportConfigManage({ ...restData.data, ...data });
-      emits('success');
       createMessage.success(`${businessText.value}成功`);
       closeDrawer();
       handleClose();
+      setTimeout(() => {
+        emits('success');
+      }, 500);
     } finally {
       setDrawerProps({ confirmLoading: false });
     }

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

@@ -166,6 +166,8 @@ export const useHooks = () => {
         dataRange: [value?.startTs, value?.endTs],
         dateGroupGap: value?.interval,
       };
+      Reflect.deleteProperty(value, 'startTs');
+      Reflect.deleteProperty(value, 'interval');
     }
     const spanDisance = executeContent?.split(' ');
     const cronTime =

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

 <script lang="ts" setup>
-  import { Button, Tabs, Tag } from 'ant-design-vue';
+  import { Button, Tabs, Select } from 'ant-design-vue';
   import { remove, uniqBy, cloneDeep } from 'lodash';
-  import { computed, nextTick, onMounted, ref, unref, toRaw } from 'vue';
+  import { nextTick, onMounted, ref, unref, toRaw, watch } from 'vue';
   import {
     deviceTableColumn,
     deviceTableFormSchema,
@@ -21,8 +21,7 @@
 
   const props = withDefaults(
     defineProps<{
-      getPendingTableParams: (params: Recordable) => any;
-      getSelectedTableParams: (params: Recordable) => any;
+      params?: Recordable;
       value?: (Recordable & DeviceModel)[];
       maxTagLength?: number;
       openModalValidate?: () => boolean;
@@ -34,6 +33,7 @@
       value: () => [],
       maxTagLength: 2,
       primaryKey: 'tbDeviceId',
+      params: () => ({}),
     }
   );
 
@@ -56,23 +56,6 @@
 
   const selectedConfirmQueue = ref<DeviceModel[]>([]);
 
-  const getShowTagOptions = computed(() => {
-    const { maxTagLength } = props;
-    return unref(selectedTotalList).slice(0, maxTagLength);
-  });
-
-  const getSurplusOptionsLength = computed(() => {
-    const { maxTagLength } = props;
-    const surplusValue = unref(selectedTotalList).length - maxTagLength;
-    return surplusValue < 0 ? 0 : surplusValue;
-  });
-
-  // const pendingListCount = computed(() => {
-  //   const { value } = props;
-  //   const selectedList = unref(pendingTotalList).filter((item) => value.includes(item.id));
-  //   return unref(pendingTotalList).length - selectedList.length;
-  // });
-
   const [registerModal, { openModal }] = useModal();
 
   const [regsterPendingTable, pendingTableActionType] = useTable({
@@ -82,9 +65,8 @@
     immediate: false,
     clickToRowSelect: false,
     beforeFetch: (params) => {
-      const { getPendingTableParams } = props;
-      const data = getPendingTableParams?.(params) || {};
-      Object.assign(params, { ...data, selected: false });
+      const { params: otherParams } = props;
+      Object.assign(params, { ...otherParams, selected: false });
       return params;
     },
     afterFetch: (list: DeviceModel[]) => {
@@ -150,9 +132,8 @@
     dataSource: selectedTotalList,
     clickToRowSelect: false,
     beforeFetch: (params) => {
-      const { getSelectedTableParams } = props;
-      const data = getSelectedTableParams?.(params) || {};
-      Object.assign(params, { ...data, selected: false });
+      const { params: otherParams } = props;
+      Object.assign(params, { ...otherParams, selected: false });
       return params;
     },
     rowSelection: {
@@ -219,18 +200,31 @@
 
     if (openModalValidate && isFunction(openModalValidate) && !openModalValidate()) return;
 
+    activeKey.value = Active.PENDING;
     openModal(true);
     await nextTick();
     pendingTableActionType.reload();
   };
 
+  watch(
+    () => props.params,
+    () => {
+      selectedTotalList.value = [];
+      selectedConfirmQueue.value = [];
+      pendingConfirmQueue.value = [];
+      try {
+        pendingTableActionType.clearSelectedRowKeys();
+        selectedTableActionType.clearSelectedRowKeys();
+      } catch (error) {}
+    }
+  );
+
   onMounted(async () => {
-    const { getSelectedTableParams } = props;
-    const data = getSelectedTableParams?.({}) || {};
-    if (!data?.convertConfigId || !data?.deviceProfileIds) {
+    const { params } = props;
+    if (!params?.convertConfigId || !params?.deviceProfileIds) {
       return;
     }
-    const { items } = await devicePage({ page: 1, pageSize: 10, ...data, selected: true });
+    const { items } = await devicePage({ page: 1, pageSize: 10, ...params, selected: true });
     selectedTotalList.value = items;
   });
 </script>
@@ -239,7 +233,7 @@
   <section>
     <BasicModal
       @register="registerModal"
-      title="穿梭表格"
+      title="设备选择"
       width="60%"
       :wrapClassName="prefixCls"
       :showOkBtn="false"
@@ -251,13 +245,11 @@
             <template #tab>
               <div class="flex items-center justify-center">
                 <span>待选设备</span>
-                <!-- <Badge show-zero :count="pendingListCount" /> -->
               </div>
             </template>
             <BasicTable @register="regsterPendingTable">
               <template #toolbar>
                 <section class="flex w-full justify-end items-center">
-                  <!-- <Button type="primary">全选</Button> -->
                   <div class="text-blue-400">
                     <span class="mr-2">选择设备:</span>
                     <span>{{ pendingConfirmQueue.length }}</span>
@@ -279,7 +271,6 @@
             <template #tab>
               <div class="flex items-center justify-center">
                 <span>已选设备</span>
-                <!-- <Badge show-zero :count="selectedTotalList.length" /> -->
               </div>
             </template>
             <BasicTable @register="registerSelectedTable">
@@ -305,23 +296,22 @@
         </Tabs>
       </section>
     </BasicModal>
-    <Button @click="handleOpenModal" type="link" :disabled="disabled">
-      <span v-if="!selectedTotalList.length">选择设备</span>
-      <div v-if="selectedTotalList.length">
-        <Tag
-          class="!px-2 !py-1 !bg-gray-50 !border-gray-100"
-          v-for="item in getShowTagOptions"
-          :key="item[primaryKey]"
-        >
-          <span>
-            {{ item.alias || item.name }}
-          </span>
-        </Tag>
-        <Tag class="!px-2 !py-1 !bg-gray-50 !border-gray-100" v-if="getSurplusOptionsLength">
-          <span> +{{ getSurplusOptionsLength }}... </span>
-        </Tag>
-      </div>
-    </Button>
+    <Select
+      placeholder="请选择设备"
+      :disabled="disabled"
+      :value="selectedTotalList.map((item) => item[primaryKey])"
+      mode="multiple"
+      :maxTagCount="3"
+      :open="false"
+      @dropdownVisibleChange="handleOpenModal"
+      :options="
+        selectedTotalList.map((item) => ({
+          ...item,
+          label: item.alias || item.name,
+          value: item[primaryKey],
+        }))
+      "
+    />
   </section>
 </template>
 

@@ -73,6 +73,10 @@ export const modeForm = (disabled: boolean): FormSchema[] => {
           labelField: 'name',
           valueField: 'tbProfileId',
           disabled,
+          selectProps: {
+            disabled,
+            placeholder: '请选择产品',
+          },
           transferProps: {
             listStyle: { height: '400px' },
             showSearch: true,
@@ -98,26 +102,14 @@ export const modeForm = (disabled: boolean): FormSchema[] => {
       valueField: 'value',
       changeEvent: 'update:value',
       rules: [{ required: true, message: '数据源设备为必选项', type: 'array' }],
-      componentProps: ({ formActionType }) => {
-        const { getFieldsValue } = formActionType;
+      componentProps: ({ formModel }) => {
+        const convertConfigId = formModel[BasicInfoFormField.CONVERT_CONFIG_ID];
+        const deviceProfileIds = formModel[BasicInfoFormField.DATA_SOURCE_PRODUCT];
         return {
           disabled,
-          getPendingTableParams: () => {
-            const values = getFieldsValue();
-            const convertConfigId = Reflect.get(values, BasicInfoFormField.CONVERT_CONFIG_ID);
-            const deviceProfileIds = Reflect.get(values, BasicInfoFormField.DATA_SOURCE_PRODUCT);
-            return { convertConfigId, deviceProfileIds };
-          },
-          getSelectedTableParams: () => {
-            const values = getFieldsValue();
-            const convertConfigId = Reflect.get(values, BasicInfoFormField.CONVERT_CONFIG_ID);
-            const deviceProfileIds = Reflect.get(values, BasicInfoFormField.DATA_SOURCE_PRODUCT);
-            return { convertConfigId, deviceProfileIds };
-          },
+          params: { convertConfigId, deviceProfileIds },
           transformValue: handleGroupDevice,
           openModalValidate: () => {
-            const values = getFieldsValue();
-            const deviceProfileIds = Reflect.get(values, BasicInfoFormField.DATA_SOURCE_PRODUCT);
             if (!deviceProfileIds || !deviceProfileIds?.length) {
               createMessage.warning('请选择数据源设备');
             }

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

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

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

-<template>
-  <div>
-    <BasicDrawer
-      v-bind="$attrs"
-      @register="registerDrawer"
-      @ok="handleSubmit"
-      destroy-on-close
-      width="50%"
-      showFooter
-      @close="handleClose"
-      :title="title"
-    >
-      <div>
-        <!-- 基础表单 -->
-        <BasicForm @register="registerForm" />
-        <!-- 基础表单 -->
-        <!-- 触发器-begin -->
-        <!-- <Divider orientation="left">触发器</Divider> -->
-        <Divider orientation="left">
-          <a-tooltip>
-            <template #title>触发器不可为空，消息只要满足触发条件中任意一个即可触发。</template>
-            <label class="validate-dot"></label> 触发器
-            <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
-          </a-tooltip>
-        </Divider>
-        <div>
-          <template v-for="(item, index) in triggerData" :key="item">
-            <TriggerOrCondition
-              class="mt-4"
-              title="触发器"
-              :index="index"
-              :provideOrgid="provideOrgid"
-              :ref="skipUnwrap.triggerItemRefs"
-              @delete="deleteTriggerOrCondition"
-            />
-          </template>
-          <!-- 按钮 -->
-          <a-button type="primary" class="mt-4" @click="addTrigger" v-if="isView">
-            <PlusOutlined />
-            触发器（OR）<span style="visibility: hidden">发</span>
-          </a-button>
-          <!-- 按钮 -->
-        </div>
-        <!-- 触发器-end -->
-
-        <!-- 执行条件-begin -->
-        <Divider orientation="left">
-          <a-tooltip>
-            <template #title>执行条件可为空，消息需要满足所有执行条件才会被处理。</template>
-            执行条件
-            <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
-          </a-tooltip>
-        </Divider>
-        <div>
-          <template v-for="(item, index) in conditionData" :key="item">
-            <TriggerOrCondition
-              class="mt-4"
-              title="执行条件"
-              :index="index"
-              :provideOrgid="provideOrgid"
-              :ref="skipUnwrap.conditionItemRefs"
-              @delete="deleteTriggerOrCondition"
-            />
-          </template>
-          <!-- 按钮 -->
-          <a-button type="primary" class="mt-4" @click="addCondition" v-if="isView">
-            <PlusOutlined />
-            执行条件（AND）
-          </a-button>
-          <!-- 按钮 -->
-        </div>
-        <!-- 执行条件-end -->
-
-        <!-- 执行动作-begin -->
-        <Divider orientation="left">
-          <a-tooltip>
-            <template #title
-              >触发器和执行条件都满足时，场景联动会做什么，例如：设备联动、告警通知等。</template
-            >
-            <label class="validate-dot"></label> 执行动作
-            <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
-          </a-tooltip>
-        </Divider>
-        <div>
-          <template v-for="(item, index) in actionData" :key="item">
-            <Action
-              class="mt-4"
-              :actionIndex="index"
-              :actionData="actionData"
-              :triggerData="triggerData"
-              :ref="skipUnwrap.actionItemRefs"
-              :provideOrgid="provideOrgid"
-              :deviceList="getMasterDeviceList"
-              :arr="arr"
-              @deleteAction="deleteAction"
-              @getActionFormArr="getActionFormArr"
-              @dynamicChangeAlarmConfig="handleDynamicChangeAlarmConfig"
-            />
-          </template>
-          <!-- 按钮 -->
-          <a-button type="primary" class="mt-4" @click="addAction" v-if="isView">
-            <PlusOutlined />
-            新增执行动作
-          </a-button>
-          <!-- 按钮 -->
-        </div>
-        <!-- 执行动作-end -->
-      </div>
-    </BasicDrawer>
-  </div>
-</template>
-<script lang="ts" setup>
-  import { ref, watch, unref, computed, nextTick } from 'vue';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { formSchema, organizationId as organizationIdRef } from './config/config.data';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import { genTriggerOrConditionData, genActionData } from './config/formatData';
-  import { Divider } from 'ant-design-vue';
-  import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons-vue';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import {
-    screenLinkPageAddApi,
-    screenLinkPageByDeptIdGetDevice,
-    getOrganizationAlarmConfig,
-  } from '/@/api/ruleengine/ruleengineApi';
-  import TriggerOrCondition from './cpns/Trigger-Condition.vue';
-  import Action from './cpns/Action.vue';
-  import { findOperation } from './config/formatData';
-  import { formatToDateTime } from '/@/utils/dateUtil';
-  import ObjectModelValidateForm from '/@/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
-  import { isEmpty } from '/@/utils/is';
-  import { add } from '/@/components/Form/src/componentMap';
-
-  add('ObjectModelValidateForm', ObjectModelValidateForm);
-
-  const emit = defineEmits(['register', 'success']);
-  const provideOrgid = ref('');
-
-  const { createMessage } = useMessage();
-  const triggerData = ref<number[]>([]);
-  const conditionData = ref<number[]>([]);
-  const actionData = ref<number[]>([]);
-  const skipUnwrap = {
-    triggerItemRefs: ref<InstanceType<typeof TriggerOrCondition>[]>([]),
-    conditionItemRefs: ref<InstanceType<typeof TriggerOrCondition>[]>([]),
-    actionItemRefs: ref<InstanceType<typeof Action>[]>([]),
-  };
-  const title = computed(
-    () => `${isUpdate.value === 3 ? '查看' : isUpdate.value ? '编辑' : '新增'}场景联动`
-  );
-  let getTriggerFormValue = ref([]);
-  let getConditionFormValue = ref([]);
-  let getActionFormValue = ref([]);
-  const editEntryIdData = ref([]);
-  const editAlarmConfigData = ref([]);
-  const isUpdate = ref<boolean | number>(false);
-  const id = ref(undefined);
-  const tenantId = ref(undefined);
-  const isView = ref(true);
-  const [
-    registerForm,
-    { resetFields, validate, setFieldsValue, getFieldsValue, setProps, updateSchema },
-  ] = useForm({
-    labelWidth: 120,
-    schemas: formSchema,
-    showActionButtonGroup: false,
-  });
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ confirmLoading: false, loading: true });
-    isUpdate.value = data.isUpdate;
-    getActionFormArr();
-    if (!unref(isUpdate)) {
-      resetFields();
-      //初始化执行动作
-      actionData.value = [Date.now()];
-    } else {
-      // 取值
-      const {
-        id: recordId,
-        tenantId: recordTenantId,
-        organizationId,
-        triggers,
-        doConditions,
-        doActions,
-      } = data.record;
-      organizationIdRef.value = organizationId;
-      // 赋值
-      await setFieldsValue(data.record);
-      id.value = recordId;
-      tenantId.value = recordTenantId;
-      //TODO-fengtao-把组织id传给子组件
-      provideOrgid.value = organizationId;
-      //TODO-fengtao获取当前执行动作下的设备(master那个接口)
-      // getMasterDeviceList.value = await byOrganizationIdGetMasterDevice(organizationId);
-      //TODO-fengtao
-      // 获取当前组织下的设备列表
-      const options = await screenLinkPageByDeptIdGetDevice({
-        organizationId,
-      });
-      // 获取当前组织下的告警配置
-      const alarmConfig = await getOrganizationAlarmConfig({ organizationId });
-
-      // 生成回显时对应得组件数量
-      triggerData.value = [...new Array(triggers.length).keys()];
-      conditionData.value = [...new Array(doConditions.length).keys()];
-      actionData.value = [...new Array(doActions.length).keys()];
-      // 回显设备列表
-      editEntryIdData.value = options.items.map((item) => {
-        return {
-          value: item.tbDeviceId,
-          label: item.name,
-        };
-      });
-      editAlarmConfigData.value = alarmConfig.map((item) => {
-        return {
-          value: item.id,
-          label: item.name,
-          status: item.status,
-        };
-      });
-      deviceList.value = editEntryIdData.value;
-      nextTick(() => {
-        setEditFields(skipUnwrap.triggerItemRefs, editEntryIdData);
-        setEditFields(skipUnwrap.conditionItemRefs, editEntryIdData);
-        setEditFields(skipUnwrap.actionItemRefs, getMasterDeviceList);
-        setEditAlarmConfig(skipUnwrap.actionItemRefs, editAlarmConfigData);
-      });
-
-      const map = {
-        ANY_TIME: 0,
-        SPECIFIC_TIME: 1,
-        CUSTOM: 2,
-      };
-      // 回显触发器数据---此处是个闭包!
-      triggers.forEach((trigger, index) => {
-        nextTick(async () => {
-          const selectProductId = ref('');
-          // 回显启用规则
-          unref(skipUnwrap.triggerItemRefs)[index].currentIndex =
-            map[trigger.triggerCondition.schedule.type];
-          unref(skipUnwrap.triggerItemRefs)[index].scheduleData = trigger.triggerCondition.schedule;
-          unref(skipUnwrap.triggerItemRefs)[index].isUpdate = true;
-          unref(skipUnwrap.triggerItemRefs)[index].alarmScheduleRef.scheduleData =
-            trigger.triggerCondition.schedule;
-          unref(skipUnwrap.triggerItemRefs)[index].setFieldsFormValueFun({
-            triggered: trigger?.triggerCondition?.condition?.spec?.type,
-            device: trigger?.entityType,
-            deviceType: trigger?.deviceType,
-            triggerType: trigger?.triggerType,
-            type1: trigger?.triggerCondition?.condition?.condition[0]?.key?.type,
-            type2: trigger?.triggerCondition?.condition?.condition[0]?.key?.key,
-            operationType: trigger?.triggerCondition?.condition?.condition[0]?.valueType,
-            detail: trigger?.triggerCondition?.alarmDetails,
-            entityId: trigger?.entityId,
-            deviceProfileId: trigger?.deviceProfileId,
-            replaceValue: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
-            time: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
-            timeUnit: trigger?.triggerCondition?.condition?.spec?.unit,
-          });
-          if (trigger.deviceProfileId != undefined) {
-            selectProductId.value = trigger?.deviceProfileId;
-          }
-          //fengtao-把设备id回传给子组件
-          unref(skipUnwrap.triggerItemRefs)[index].updateFieldAttributeFunc(selectProductId.value);
-          //fengtao
-          // 设置值operationType
-          unref(skipUnwrap.triggerItemRefs)[index].operationType =
-            trigger.triggerCondition?.condition.condition[0].valueType;
-
-          const ConditionScreeningForm = await unref(skipUnwrap.triggerItemRefs)[
-            index
-          ].getRefItemConditionScreeningRefs();
-
-          // 设置对应条件筛选的个数
-          unref(skipUnwrap.triggerItemRefs)[index].setConditionScreeningList([
-            ...new Array(trigger.triggerCondition.condition.condition.length).keys(),
-          ]);
-          // 操作符类型 NUMERIC|String|Boolean|DATE_TIME
-          const valueType = trigger.triggerCondition?.condition.condition[0].valueType;
-
-          // 循环设置条件筛选值。TODO:此处设置顺序有问题
-          nextTick(() => {
-            const richTextList = [];
-            trigger.triggerCondition.condition.condition.forEach((item, index) => {
-              const formItem = {
-                operation: item.predicate.operation,
-                value:
-                  valueType === 'DATE_TIME'
-                    ? formatToDateTime(
-                        Number(item.predicate.value.defaultValue),
-                        'YYYY-MM-DD HH:mm:ss'
-                      )
-                    : String(item.predicate.value.defaultValue),
-                ignoreCase: item.valueType === 'STRING' ? item.predicate.ignoreCase : undefined,
-              };
-              richTextList.push({
-                // 查询中文操作符
-                operation: findOperation(valueType, item.predicate.operation).label,
-                value:
-                  valueType === 'DATE_TIME'
-                    ? formatToDateTime(
-                        Number(item.predicate.value.defaultValue),
-                        'YYYY-MM-DD HH:mm:ss'
-                      )
-                    : String(item.predicate.value.defaultValue),
-                attribute: trigger.triggerCondition?.condition.condition[0]?.key?.key,
-              });
-              ConditionScreeningForm.value[index].setFieldsValue(formItem);
-            });
-            unref(skipUnwrap.triggerItemRefs)[index].setRichText(richTextList);
-          });
-        });
-      });
-
-      doConditions.forEach((condition, index) => {
-        nextTick(async () => {
-          const selectProductId = ref('');
-          // 回显启用规则
-          unref(skipUnwrap.conditionItemRefs)[index].currentIndex =
-            map[condition.triggerCondition.schedule.type];
-          unref(skipUnwrap.conditionItemRefs)[index].scheduleData =
-            condition.triggerCondition.schedule;
-          unref(skipUnwrap.conditionItemRefs)[index].isUpdate = true;
-          unref(skipUnwrap.conditionItemRefs)[index].alarmScheduleRef.scheduleData =
-            condition.triggerCondition.schedule;
-          unref(skipUnwrap.conditionItemRefs)[index].setFieldsFormValueFun({
-            triggered: condition?.triggerCondition?.condition?.spec?.type,
-            device: condition?.entityType,
-            triggerType: condition?.triggerType,
-            type1: condition?.triggerCondition?.condition?.condition[0]?.key?.type,
-            type2: condition?.triggerCondition?.condition?.condition[0]?.key?.key,
-            operationType: condition?.triggerCondition?.condition?.condition[0]?.valueType,
-            detail: condition?.triggerCondition?.alarmDetails,
-            entityId: condition?.entityId,
-            deviceProfileId: condition?.deviceProfileId,
-            deviceType: condition?.deviceType,
-            replaceValue: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
-            time: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
-            timeUnit: condition?.triggerCondition?.condition?.spec?.unit,
-          });
-          if (condition?.deviceProfileId != undefined) {
-            selectProductId.value = condition?.deviceProfileId;
-          }
-          //fengtao-把设备id回传给子组件
-          unref(skipUnwrap.conditionItemRefs)[index].updateFieldAttributeFunc(
-            selectProductId.value
-          );
-          //fengtao
-          // 设置值operationType
-          unref(skipUnwrap.conditionItemRefs)[index].operationType =
-            condition.triggerCondition?.condition.condition[0].valueType;
-
-          const ConditionScreeningForm = await unref(skipUnwrap.conditionItemRefs)[
-            index
-          ].getRefItemConditionScreeningRefs();
-
-          // 设置对应条件筛选的个数
-          unref(skipUnwrap.conditionItemRefs)[index].setConditionScreeningList([
-            ...new Array(condition.triggerCondition.condition.condition.length).keys(),
-          ]);
-          // 操作符类型 NUMERIC|String|Boolean|DATorganizeImportsE_TIME
-          const valueType = condition.triggerCondition?.condition.condition[0].valueType;
-
-          // 循环设置条件筛选值。TODO:此处设置顺序有问题
-          nextTick(() => {
-            const richTextList = [];
-            condition.triggerCondition.condition.condition.forEach((item, index) => {
-              const formItem = {
-                operation: item.predicate.operation,
-                value:
-                  valueType === 'DATE_TIME'
-                    ? formatToDateTime(
-                        Number(item.predicate.value.defaultValue),
-                        'YYYY-MM-DD HH:mm:ss'
-                      )
-                    : String(item.predicate.value.defaultValue),
-                ignoreCase: item.valueType === 'STRING' ? item.predicate.ignoreCase : undefined,
-              };
-              richTextList.push({
-                // 查询中文操作符
-                operation: findOperation(valueType, item.predicate.operation).label,
-                value:
-                  valueType === 'DATE_TIME'
-                    ? formatToDateTime(
-                        Number(item.predicate.value.defaultValue),
-                        'YYYY-MM-DD HH:mm:ss'
-                      )
-                    : String(item.predicate.value.defaultValue),
-                attribute: condition.triggerCondition?.condition.condition[0]?.key?.key,
-              });
-              ConditionScreeningForm.value[index].setFieldsValue(formItem);
-            });
-            unref(skipUnwrap.conditionItemRefs)[index].setRichText(richTextList);
-          });
-        });
-      });
-      doActions.forEach((action, index) => {
-        nextTick(() => {
-          const selectProductId = ref('');
-          // 设置执行动作外层值
-          unref(skipUnwrap.actionItemRefs)[index].setFieldsFormValueFun({
-            ...action,
-            outTarget: action.outTarget,
-            device: action.entityType,
-            deviceId: action.deviceId,
-            alarm_config: action.alarmProfileId,
-            alarm_level: action.doContext.alarmLevel,
-          });
-          // 如果是设备输出设置脚本值
-          if (action.outTarget === 'DEVICE_OUT') {
-            if (action.commandType.toString() === '0') {
-              unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params);
-            }
-          }
-          // 清除告警有值?{数组}
-          if (action?.doContext?.clearRule?.length) {
-            unref(skipUnwrap.actionItemRefs)[index].checked = true;
-            // 生成对应清除告警的数组长度
-            unref(skipUnwrap.actionItemRefs)[index].clearRuleList = [
-              ...new Array(action?.doContext?.clearRule?.length).keys(),
-            ];
-            // 推迟执行时机-DOM渲染完毕在执行
-            nextTick(async () => {
-              unref(skipUnwrap.actionItemRefs)[index].refItem.clearRuleRefs.value.map(
-                (item, index) => {
-                  // 回显启用规则
-                  item.currentIndex =
-                    map[action.doContext.clearRule[index].triggerCondition.schedule.type];
-                  item.scheduleData = action.doContext.clearRule[index].triggerCondition.schedule;
-                  item.isUpdate = true;
-                  item.alarmScheduleRef.scheduleData =
-                    action.doContext.clearRule[index].triggerCondition.schedule;
-                  item.setFieldsFormValueFun({
-                    triggered:
-                      action.doContext.clearRule[index].triggerCondition.condition.spec.type,
-                    device: action.doContext.clearRule[index].entityType,
-                    deviceType: action.doContext.clearRule[index].deviceType,
-                    triggerType: action.doContext.clearRule[index].triggerType,
-                    type1:
-                      action.doContext.clearRule[index].triggerCondition.condition.condition[0].key
-                        .type,
-                    type2:
-                      action.doContext.clearRule[index].triggerCondition.condition.condition[0].key
-                        .key,
-                    operationType:
-                      action.doContext.clearRule[index].triggerCondition.condition.condition[0]
-                        .valueType,
-                    detail: action.doContext.clearRule[index].triggerCondition.alarmDetails,
-                    entityId: action.doContext.clearRule[index].entityId,
-                    deviceProfileId: action.doContext.clearRule[index]?.deviceProfileId,
-                    replaceValue:
-                      action.doContext.clearRule[index].triggerCondition.condition.spec.predicate
-                        .defaultValue,
-                    time: action.doContext.clearRule[index].triggerCondition.condition.spec
-                      .predicate.defaultValue,
-                    timeUnit:
-                      action.doContext.clearRule[index].triggerCondition.condition.spec.unit,
-                  });
-                  if (action.doContext.clearRule[index]?.deviceProfileId != undefined) {
-                    selectProductId.value = action.doContext.clearRule[index]?.deviceProfileId;
-                  }
-                  //fengtao-把设备id回传给子组件
-                  item.updateFieldAttributeFunc(selectProductId.value);
-                  item.updateFieldDeviceId(deviceList.value, provideOrgid.value, isUpdate.value);
-                  //fengtao
-                  // 单独设置operationType值 操作符类型 NUMERIC|String|Boolean|DATE_TIME
-                  item.operationType =
-                    action.doContext.clearRule[
-                      index
-                    ].triggerCondition.condition.condition[0].valueType;
-                }
-              );
-
-              const ConditionScreeningForm = await unref(skipUnwrap.actionItemRefs)[
-                index
-              ].getRefItemConditionScreeningRefs();
-
-              // 循环设置条件筛选值。TODO:此处设置顺序有问题
-              action.doContext.clearRule.map((rule, ruleIndex) => {
-                // 生成对应条件筛选的数组个数
-                unref(skipUnwrap.actionItemRefs)[index].setConditionScreeningList([
-                  ...new Array(
-                    action.doContext.clearRule[
-                      ruleIndex
-                    ].triggerCondition.condition.condition.length
-                  ).keys(),
-                ]);
-                nextTick(() => {
-                  const richTextList = [];
-                  rule.triggerCondition.condition.condition.forEach((item, conditionIndex) => {
-                    //TODO-fengtao之前是Number( item.predicate.value.defaultValue)-发现回显是Invalide Time
-                    const formItem = {
-                      operation: item.predicate.operation,
-                      value:
-                        item.valueType === 'DATE_TIME'
-                          ? formatToDateTime(
-                              Number(item.predicate.value.defaultValue),
-                              'YYYY-MM-DD HH:mm:ss'
-                            )
-                          : String(item.predicate.value.defaultValue),
-                      ignoreCase:
-                        item.valueType === 'STRING' ? item.predicate.ignoreCase : undefined,
-                    };
-                    //TODO-fengtao之前是Number( item.predicate.value.defaultValue)-发现回显是Invalide Time
-                    richTextList.push({
-                      // 查询中文操作符
-                      operation: findOperation(item.valueType, item.predicate.operation).label,
-                      value:
-                        item.valueType === 'DATE_TIME'
-                          ? formatToDateTime(
-                              item.predicate.value.defaultValue,
-                              'YYYY-MM-DD HH:mm:ss'
-                            )
-                          : String(item.predicate.value.defaultValue),
-                      attribute: item?.key?.key,
-                    });
-                    //TODO-fengtao之前是Number( item.predicate.value.defaultValue)-发现回显是Invalide Time
-                    ConditionScreeningForm[ruleIndex].value[conditionIndex].setFieldsValue(
-                      formItem
-                    );
-                  });
-                  unref(skipUnwrap.actionItemRefs)[index].setRichText(richTextList, ruleIndex);
-                });
-              });
-            });
-          }
-          nextTick(() => {
-            setEditFields(skipUnwrap.actionItemRefs, editEntryIdData);
-          });
-        });
-      });
-    }
-    if (unref(isUpdate) === 3) isView.value = false;
-    setDrawerProps({
-      showFooter: unref(isView),
-      loading: false,
-    });
-
-    if (isUpdate.value == 3) {
-      setProps({ disabled: true });
-      updateSchema({
-        field: 'organizationId',
-        componentProps: { apiTreeSelectProps: { disabled: true } },
-      });
-      await nextTick();
-      unref(skipUnwrap.triggerItemRefs)?.forEach((item) => {
-        item.setDisabledProps({ disabled: true });
-      });
-
-      unref(skipUnwrap.conditionItemRefs)?.forEach((item) => {
-        item.setDisabledProps({ disabled: true });
-      });
-
-      unref(skipUnwrap.actionItemRefs)?.forEach((item) => {
-        item.setDisabledProps({ disabled: true });
-      });
-    } else {
-      updateSchema({
-        field: 'organizationId',
-        componentProps: { apiTreeSelectProps: { disabled: false } },
-      });
-      unref(skipUnwrap.triggerItemRefs)?.forEach((item) => {
-        item.setCancelDisabled();
-      });
-      unref(skipUnwrap.conditionItemRefs)?.forEach((item) => {
-        item.setCancelDisabled();
-      });
-    }
-  });
-
-  // 设置设备的options
-  const setEditFields = (linkAge, deviceList) => {
-    unref(linkAge).map((item) => {
-      // TODO-fengtao
-      item.updateFieldDeviceId(deviceList, orgId, isUpdate);
-      // TODO-fengtao
-    });
-  };
-  // 设置告警配置options
-  const setEditAlarmConfig = (linkAge, alarmConfigList) => {
-    unref(linkAge).map((item) => {
-      item.updateEditFieldAlarmConfig(alarmConfigList);
-    });
-  };
-  // 监听组织变化更新设备列表
-  const deviceList = ref([]);
-  const getMasterDeviceList = ref([]);
-  const orgId = ref('');
-  const alarmConfigList = ref([]);
-  //FT add 2022-10-27
-  const addOrgId = ref('');
-  //FT add 2022-10-27
-  watch(organizationIdRef, async (newValue: string) => {
-    if (!newValue) return;
-    //FT add 2022-10-27
-    addOrgId.value = newValue;
-    //FT add 2022-10-27
-    const { items = [] } = await screenLinkPageByDeptIdGetDevice({ organizationId: newValue });
-    //TODO fengtao
-    // getMasterDeviceList.value = await byOrganizationIdGetMasterDevice(newValue);
-    //TODO fengtao
-    deviceList.value = (items || []).map((item) => ({
-      ...item,
-      label: item.name,
-      value: item.tbDeviceId,
-    }));
-    //TODO fengtao
-    orgId.value = newValue;
-    //TODO fengtao
-    setFields(skipUnwrap.triggerItemRefs, true);
-    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,
-      status: item.status,
-    }));
-    setEditAlarmConfig(skipUnwrap.actionItemRefs, alarmConfigList);
-    // setFields(skipUnwrap.actionItemRefs, true);
-    // console.log(unref(organizationIdRef));
-    // setAlarmConfig(skipUnwrap.actionItemRefs, true);
-  });
-  //FT add 2022-10-27
-  const handleDynamicChangeAlarmConfig = async () => {
-    const data = await getOrganizationAlarmConfig({
-      organizationId: isUpdate.value ? provideOrgid.value : addOrgId.value,
-    });
-    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) {
-        item.updateEditFieldAlarmConfig(editAlarmConfigData);
-      } else {
-        item.updateFieldAlarmConfig(alarmConfigList);
-      }
-    });
-  };
-  //FT add 2022-10-27
-  // 根据上面组织变化动态改变触发器，执行条件,执行动作的设备值
-  function setFields(linkAge, isOrganizationChange = false) {
-    unref(linkAge).map((item) => {
-      isOrganizationChange && item.resetFieldsValueFunc();
-      //TODO fengtao
-      item.updateFieldDeviceId(deviceList, orgId, isUpdate);
-      if (isUpdate.value) {
-        item.updateEditFieldAlarmConfig(editAlarmConfigData);
-      } else {
-        item.updateFieldAlarmConfig(alarmConfigList);
-      }
-      //TODO fengtao
-    });
-  }
-  // function setAlarmConfig(linkAge, isOrganizationChange = false) {
-  //   unref(linkAge).map((item) => {
-  //     isOrganizationChange && item.resetFieldsValueFunc();
-  //     item.updateFieldAlarmConfig(alarmConfigList);
-  //   });
-  // }
-
-  const isEmptyThrowError = (obj) => {
-    if (isEmpty(obj)) {
-      createMessage.error('请选择组织');
-      throw Error('请选择组织');
-    }
-    if (!Reflect.get(obj, 'organizationId')) {
-      createMessage.error('请选择组织');
-      throw Error('请选择组织');
-    }
-  };
-
-  // 添加触发器
-  const addTrigger = () => {
-    unref(triggerData).push(Date.now());
-    nextTick(() => {
-      setFields(skipUnwrap.triggerItemRefs);
-    });
-    isEmptyThrowError(getFieldsValue());
-  };
-  // 添加执行条件
-  const addCondition = () => {
-    unref(conditionData).push(Date.now());
-    nextTick(() => {
-      setFields(skipUnwrap.conditionItemRefs);
-    });
-    isEmptyThrowError(getFieldsValue());
-  };
-  // 添加执行动作
-  const addAction = () => {
-    unref(actionData).push(Date.now());
-    nextTick(() => {
-      setFields(skipUnwrap.actionItemRefs);
-    });
-    isEmptyThrowError(getFieldsValue());
-  };
-
-  /**
-   * 获取触发器、执行条件、执行动作表单值--多个
-   */
-  const getFormValueFunc = () => {
-    getTriggerFormValue.value = unref(skipUnwrap.triggerItemRefs)?.map((item) =>
-      genTriggerOrConditionData(item.getFieldsValueFunc())
-    );
-    getConditionFormValue.value = unref(skipUnwrap.conditionItemRefs)?.map((item) =>
-      genTriggerOrConditionData(item.getFieldsValueFunc())
-    );
-    getActionFormValue.value = unref(skipUnwrap.actionItemRefs)?.map((item) =>
-      genActionData(item.getFieldsValueFunc())
-    );
-  };
-  const handleSubmit = async () => {
-    let basicFormValue = await validate();
-    if (!basicFormValue) return;
-    for (const item of unref(skipUnwrap.actionItemRefs)) {
-      const valid = await item.validateForm();
-      if (!valid) return;
-    }
-    try {
-      setDrawerProps({ confirmLoading: true });
-      getFormValueFunc();
-      //新增的代码2022-11-22
-      if (unref(getTriggerFormValue).length === 0 && unref(getConditionFormValue).length === 0) {
-        createMessage.error('请添加触发器或者执行条件');
-        throw '请添加触发器或者执行条件';
-      }
-
-      // return;
-      //新增的代码2022-11-22
-      const postAddOrEditData = {
-        ...basicFormValue,
-        triggers: !unref(getTriggerFormValue).length ? null : unref(getTriggerFormValue),
-        doConditions: !unref(getConditionFormValue).length ? null : unref(getConditionFormValue),
-        doActions: unref(getActionFormValue).flat(),
-        id: unref(id),
-        tenantId: unref(tenantId),
-      };
-      //FT change
-      let mustTriggerCondition = false;
-      let mustCondition = false;
-      if (postAddOrEditData?.triggers !== null && postAddOrEditData?.triggers.length > 0) {
-        postAddOrEditData?.triggers.some((s) => {
-          if (s.triggerCondition?.condition?.condition == undefined) {
-            mustTriggerCondition = true;
-          }
-        });
-      } else {
-        mustTriggerCondition = false;
-      }
-      if (postAddOrEditData?.doConditions !== null && postAddOrEditData?.doConditions.length > 0) {
-        postAddOrEditData?.doConditions.some((s) => {
-          if (s.triggerCondition?.condition?.condition == undefined) {
-            mustCondition = true;
-          }
-        });
-      } else {
-        mustCondition = false;
-      }
-      if (mustTriggerCondition) return;
-      if (mustCondition) return;
-      //FT change
-      await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate));
-      createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
-      closeDrawer();
-      handleClose();
-      emit('success');
-    } finally {
-      setDrawerProps({ confirmLoading: false });
-    }
-  };
-  // 删除
-  const deleteTriggerOrCondition = ({ index, title }) => {
-    if (title === '触发器') {
-      unref(triggerData).splice(index, 1);
-    } else if (title === '执行条件') {
-      unref(conditionData).splice(index, 1);
-    }
-  };
-  const deleteAction = (actionIndex) => {
-    unref(actionData).splice(actionIndex, 1);
-    unref(arr).splice(actionIndex, 1);
-  };
-  const arr = ref([]);
-  const getActionFormArr = () => {
-    arr.value = unref(skipUnwrap.actionItemRefs).map((item) => item.getFieldsValue());
-  };
-  const handleClose = () => {
-    id.value = undefined;
-    tenantId.value = undefined;
-    organizationIdRef.value = undefined;
-    isView.value = true;
-    getTriggerFormValue.value = [];
-    getConditionFormValue.value = [];
-    getActionFormValue.value = [];
-    triggerData.value = [];
-    conditionData.value = [];
-    actionData.value = [];
-    unref(skipUnwrap.triggerItemRefs).map((item) => {
-      item.resetFieldsValueFunc();
-    });
-    unref(skipUnwrap.conditionItemRefs).map((item) => {
-      item.resetFieldsValueFunc();
-    });
-    unref(skipUnwrap.actionItemRefs).map((item) => {
-      item.resetFieldsValueFunc();
-    });
-    window.localStorage.removeItem('isViewDisabledBtn');
-    // window.localStorage.setItem('isViewDisabledBtn', 'no')
-  };
-</script>
-
-<style lang="less" scoped>
-  //TODO-fengtao
-  ///移除选择框默认样式（24px）否则超出默认宽度会造成页面样式错乱
-  :deep(.ant-select-selector) {
-    padding-right: 0 !important;
-  }
-
-  :deep(.ant-select-selection-overflow) {
-    max-width: 10vw !important;
-  }
-
-  //TODO-fengtao
-
-  label.validate-dot::before {
-    display: inline-block;
-    color: #ff4d4f;
-    font-size: 14px;
-    font-family: SimSun, sans-serif;
-    line-height: 1;
-    content: '*';
-  }
-</style>

+import { OperationType } from './type';
+import { FormSchema } from '/@/components/Form';
+import {
+  BooleanOperationEnum,
+  BooleanOperationNameEnum,
+  BooleanOperationValueEnum,
+  BooleanOperationValueNameEnum,
+  NumberOperationEnum,
+  NumberOperationNameEnum,
+  StringOperationEnum,
+  StringOperationNameEnum,
+  TriggerValueTypeEnum,
+} from '/@/enums/linkedgeEnum';
+
+export enum FormFieldsEnum {
+  CONDITION_OPERATION = 'operation',
+  CONDITION_VALUE = 'defaultValue',
+  CONDITION_VALUE_IGNORE_CASE = 'ignoreCase',
+}
+
+export enum FormFieldsNameEnum {
+  CONDITION_OPERATION = '执行操作',
+  CONDITION_VALUE = '操作值',
+  CONDITION_VALUE_IGNORE_CASE = '忽略大小写',
+}
+
+interface GetFormSchemasParamsType {
+  triggerType: TriggerValueTypeEnum;
+}
+
+export interface ConditionFormRecordType {
+  [FormFieldsEnum.CONDITION_OPERATION]: OperationType;
+  [FormFieldsEnum.CONDITION_VALUE]: any;
+  [FormFieldsEnum.CONDITION_VALUE_IGNORE_CASE]?: boolean;
+}
+
+export const getOperationMap = (type: TriggerValueTypeEnum) => {
+  const keyMap = {
+    [TriggerValueTypeEnum.NUMERIC]: { value: NumberOperationEnum, label: NumberOperationNameEnum },
+    [TriggerValueTypeEnum.BOOLEAN]: {
+      value: BooleanOperationEnum,
+      label: BooleanOperationNameEnum,
+    },
+    [TriggerValueTypeEnum.STRING]: { value: StringOperationEnum, label: StringOperationNameEnum },
+    [TriggerValueTypeEnum.DATE_TIME]: {
+      value: NumberOperationEnum,
+      label: NumberOperationNameEnum,
+    },
+  };
+
+  return keyMap[type];
+};
+
+const getOperation = (type: TriggerValueTypeEnum) => {
+  const res = getOperationMap(type);
+
+  const { label, value } = res;
+  return Object.keys(value).map((value) => ({ label: label[value], value }));
+};
+
+const getOperationValueFormSchemas = (triggerType: TriggerValueTypeEnum): FormSchema[] => {
+  const getNumberSchemas = (): FormSchema[] => {
+    return [
+      {
+        field: FormFieldsEnum.CONDITION_VALUE,
+        label: FormFieldsNameEnum.CONDITION_VALUE,
+        component: 'InputNumber',
+        required: true,
+        componentProps: () => {
+          return {
+            placeholder: `请输入${FormFieldsNameEnum.CONDITION_VALUE}`,
+          };
+        },
+      },
+    ];
+  };
+
+  const getBoolSchemas = (): FormSchema[] => {
+    return [
+      {
+        field: FormFieldsEnum.CONDITION_VALUE,
+        label: FormFieldsNameEnum.CONDITION_VALUE,
+        component: 'Select',
+        required: true,
+        componentProps: () => {
+          return {
+            options: [
+              { label: BooleanOperationValueNameEnum.TRUE, value: BooleanOperationValueEnum.TRUE },
+              {
+                label: BooleanOperationValueNameEnum.FALSE,
+                value: BooleanOperationValueEnum.FALSE,
+              },
+            ],
+            placeholder: `请输入${FormFieldsNameEnum.CONDITION_VALUE}`,
+          };
+        },
+      },
+    ];
+  };
+
+  const getStringSchemas = (): FormSchema[] => {
+    return [
+      {
+        field: FormFieldsEnum.CONDITION_VALUE,
+        label: FormFieldsNameEnum.CONDITION_VALUE,
+        component: 'Input',
+        required: true,
+        componentProps: () => {
+          return {
+            placeholder: `请输入${FormFieldsNameEnum.CONDITION_VALUE}`,
+          };
+        },
+      },
+      {
+        field: FormFieldsEnum.CONDITION_VALUE_IGNORE_CASE,
+        label: ' ',
+        component: 'Checkbox',
+        renderComponentContent: () => ({
+          default: () => FormFieldsNameEnum.CONDITION_VALUE_IGNORE_CASE,
+        }),
+      },
+    ];
+  };
+
+  const getDateSchemas = (): FormSchema[] => {
+    return [
+      {
+        field: FormFieldsEnum.CONDITION_VALUE,
+        label: FormFieldsNameEnum.CONDITION_VALUE,
+        component: 'DatePicker',
+        required: true,
+        componentProps: () => {
+          return {
+            showTime: true,
+            placeholder: `请输入${FormFieldsNameEnum.CONDITION_VALUE}`,
+          };
+        },
+      },
+    ];
+  };
+
+  const schemasMap = {
+    [TriggerValueTypeEnum.BOOLEAN]: getBoolSchemas,
+    [TriggerValueTypeEnum.DATE_TIME]: getDateSchemas,
+    [TriggerValueTypeEnum.NUMERIC]: getNumberSchemas,
+    [TriggerValueTypeEnum.STRING]: getStringSchemas,
+  };
+
+  return schemasMap[triggerType]?.() || [];
+};
+
+export const getFormSchemas = ({ triggerType }: GetFormSchemasParamsType): FormSchema[] => {
+  return [
+    {
+      field: FormFieldsEnum.CONDITION_OPERATION,
+      label: FormFieldsNameEnum.CONDITION_OPERATION,
+      component: 'Select',
+      required: true,
+      componentProps: () => {
+        return {
+          options: getOperation(triggerType),
+          placeholder: `请选择${FormFieldsNameEnum.CONDITION_OPERATION}`,
+        };
+      },
+    },
+    ...getOperationValueFormSchemas(triggerType),
+  ];
+};

+import { ConditionListItemType } from './type';
+import { buildUUID } from '/@/utils/uuid';
+
+export { default as ConditionFilter } from './index.vue';
+
+export enum CheckStatusEnum {
+  NO_VALIDATE = 'NO_VALIDATE',
+  VALIDATE_SUCCESS = 'VALIDATE_SUCCESS',
+  VALIDATE_FAILED = 'VALIDATE_FAILED',
+}
+
+export enum CheckStatusColorEnum {
+  NO_VALIDATE,
+  VALIDATE_SUCCESS = '!text-green-600',
+  VALIDATE_FAILED = '!text-red-600',
+}
+
+export enum CheckStatusIconEnum {
+  NO_VALIDATE = '',
+  VALIDATE_SUCCESS = 'ant-design:check-outlined',
+  VALIDATE_FAILED = 'ant-design:close-outlined',
+}
+
+export function getNewConditionFilterItem(
+  checkStatus = CheckStatusEnum.NO_VALIDATE
+): ConditionListItemType {
+  return {
+    key: buildUUID(),
+    checkStatus,
+  };
+}

+<script setup lang="ts">
+  import { ComponentPublicInstance, computed, ref, unref, watch } from 'vue';
+  import { Card, Tag, Button, Tooltip } from 'ant-design-vue';
+  import { Icon } from '/@/components/Icon';
+  import { getFormSchemas, FormFieldsEnum } from './config';
+  import { CollapseContainer } from '/@/components/Container';
+  import { BasicForm, FormActionType } from '/@/components/Form';
+  import { TriggerValueTypeEnum } from '/@/enums/linkedgeEnum';
+  import { ConditionFilterProps, ConditionListItemType } from './type';
+  import { ConditionMessageItemType, useConditionFilterMessage } from './useConditionFilterMessage';
+  import { useConditionData } from './useConditionData';
+  import {
+    CheckStatusEnum,
+    CheckStatusIconEnum,
+    CheckStatusColorEnum,
+    getNewConditionFilterItem,
+  } from '.';
+  import { useSceneLinkageDrawerContext } from '../SceneLinkageDrawer/sceneLinkageDrawerContext';
+
+  const { disabledDrawer } = useSceneLinkageDrawerContext();
+
+  const props = withDefaults(defineProps<ConditionFilterProps>(), {
+    triggerType: TriggerValueTypeEnum.BOOLEAN,
+  });
+
+  const getSchemas = computed(() => {
+    const { triggerType } = props;
+    return getFormSchemas({ triggerType });
+  });
+
+  const conditionListElRef = ref<ConditionListItemType[]>([getNewConditionFilterItem()]);
+
+  const getConditionFormValues = (): Record<FormFieldsEnum, string>[] => {
+    return unref(conditionListElRef).map(
+      (conditionForm) => conditionForm.ref?.getFieldsValue() as Record<FormFieldsEnum, string>
+    );
+  };
+
+  const conditionMessageList = ref<ConditionMessageItemType[]>([]);
+
+  const handleConditionFormValueChange = () => {
+    const condition = getConditionFormValues();
+    const { triggerType } = props;
+    const message = useConditionFilterMessage({ triggerType, condition });
+    conditionMessageList.value = message;
+  };
+
+  const setConditionRef = (
+    conditionItem: ConditionListItemType,
+    el: Element | ComponentPublicInstance | null
+  ) => {
+    conditionItem.ref = el as unknown as FormActionType;
+  };
+
+  const handleDelete = (conditionItem: ConditionListItemType) => {
+    const { key } = conditionItem;
+
+    const index = unref(conditionListElRef).findIndex((item) => item.key === key);
+
+    ~index && unref(conditionListElRef).splice(index, 1);
+
+    handleConditionFormValueChange();
+  };
+
+  const handleAdd = () => {
+    conditionListElRef.value.push(getNewConditionFilterItem());
+  };
+
+  watch(
+    () => props.triggerType,
+    () => {
+      conditionListElRef.value = [getNewConditionFilterItem()];
+      conditionMessageList.value = [];
+    }
+  );
+
+  const { getFieldsValue, setFieldsValue, validate } = useConditionData(
+    props,
+    conditionListElRef,
+    handleConditionFormValueChange
+  );
+
+  const handelValidate = async () => {
+    await validate?.();
+  };
+
+  defineExpose({ getFieldsValue, setFieldsValue, validate });
+</script>
+
+<template>
+  <Card class="condition-filter-card !border-dashed !border-2 !border-gray-200 !rounded-lg">
+    <CollapseContainer class="rounded-lg" :default-expand="!disabledDrawer">
+      <template #title>
+        <section class="flex !p-2">
+          <div class="w-20 flex-grow-0 flex-shrink-0"> 条件筛选 </div>
+          <div class="flex flex-wrap gap-1 mr-4">
+            <template v-for="(item, index) in conditionMessageList" :key="index">
+              <Tag class="!rounded-md !m-0 !text-sky-700"> {{ objectModel?.name }} </Tag>
+              <span>{{ item.operation }}</span>
+              <Tag class="!rounded-md !m-0 !text-orange-300">
+                {{ item.defaultValue }}
+              </Tag>
+              <span v-if="conditionMessageList.length - 1 !== index">和</span>
+            </template>
+          </div>
+        </section>
+      </template>
+      <!--  -->
+      <main
+        class="flex gap-4 items-center mb-2"
+        v-for="(conditionItem, index) in conditionListElRef"
+        :key="conditionItem.key"
+      >
+        <section
+          class="border-2 border-dashed border-gray-200 rounded-lg px-4 py-2 flex-1 flex items-center"
+        >
+          <BasicForm
+            class="flex-auto"
+            :ref="(el) => setConditionRef(conditionItem, el)"
+            :show-action-button-group="false"
+            layout="horizontal"
+            :disabled="disabledDrawer"
+            :label-width="80"
+            :schemas="getSchemas"
+            :base-col-props="{ span: 24 / getSchemas.length, xl: 8, lg: 12, sm: 24 }"
+            @field-value-change="handleConditionFormValueChange"
+          />
+          <Icon
+            :style="{
+              opacity: conditionItem.checkStatus !== CheckStatusEnum.NO_VALIDATE ? 100 : 0,
+            }"
+            :icon="CheckStatusIconEnum[conditionItem.checkStatus!]"
+            :size="20"
+            :class="CheckStatusColorEnum[conditionItem.checkStatus!]"
+            class="transition-opacity duration-500 ease-linear"
+          />
+        </section>
+        <span
+          class="w-5"
+          :style="{ visibility: conditionListElRef.length - 1 !== index ? 'visible' : 'hidden' }"
+        >
+          和
+        </span>
+        <Tooltip title="删除">
+          <Icon
+            v-if="!disabledDrawer"
+            icon="fluent:delete-off-20-regular"
+            size="24"
+            class="cursor-pointer"
+            @click="handleDelete(conditionItem)"
+          />
+        </Tooltip>
+      </main>
+      <section class="flex mt-4 items-center justify-between">
+        <Button v-if="!disabledDrawer" type="primary" @click="handleAdd">
+          <Icon icon="ant-design:plus-outlined" />
+          新增条件筛选
+        </Button>
+        <Button v-if="!disabledDrawer" type="primary" @click="handelValidate">添加</Button>
+      </section>
+    </CollapseContainer>
+  </Card>
+</template>
+
+<style lang="less" scoped>
+  .condition-filter-card {
+    :deep(.ant-card-body) {
+      @apply p-3;
+
+      .vben-collapse-container__header {
+        height: fit-content;
+      }
+
+      .ant-calendar-picker {
+        min-width: auto !important;
+        width: 100%;
+      }
+
+      .ant-input-number {
+        min-width: auto !important;
+      }
+    }
+  }
+</style>
+./type

+import { CheckStatusEnum } from '.';
+import { ScheduleType } from '../EnablingRule/type';
+import { DeviceModelOfMatterAttrs } from '/@/api/device/model/deviceModel';
+import { FormActionType } from '/@/components/Form';
+import {
+  BooleanOperationEnum,
+  DeviceTriggerTypeEum,
+  FlipFlopTypeEnum,
+  NumberOperationEnum,
+  StringOperationNameEnum,
+  TriggerTypeEnum,
+  TriggerValueTypeEnum,
+} from '/@/enums/linkedgeEnum';
+
+export interface ConditionListItemType {
+  key: string;
+  ref?: FormActionType;
+  checkStatus?: CheckStatusEnum;
+}
+
+export interface ConditionFilterProps {
+  triggerType?: TriggerValueTypeEnum;
+  objectModel?: DeviceModelOfMatterAttrs;
+  conditionType?: DeviceTriggerTypeEum;
+}
+
+export interface TriggerCondition {
+  condition: ConditionType;
+  alarmDetails?: Nullable<any>;
+  dashboardId?: Nullable<any>;
+  schedule: ScheduleType;
+  triggerType?: TriggerTypeEnum;
+}
+
+export interface ConditionType {
+  condition: ConditionItemType[];
+  spec: { type: FlipFlopTypeEnum; unit?: string; predicate?: { defaultValue: any } };
+}
+
+export type OperationType = NumberOperationEnum | StringOperationNameEnum | BooleanOperationEnum;
+
+export interface ConditionItemType {
+  key: { type: DeviceTriggerTypeEum; key: string };
+  predicate: {
+    type: TriggerValueTypeEnum;
+    operation: OperationType;
+    ignoreCase?: boolean;
+    value: {
+      defaultValue: number | string | boolean;
+      userValue?: Nullable<number | string | boolean>;
+      dynamicValue?: Nullable<number | string | boolean>;
+    };
+  };
+  valueType: TriggerValueTypeEnum;
+  value?: Nullable<any>;
+}

+import { Ref, nextTick, unref } from 'vue';
+import { ConditionFilterProps, ConditionItemType, ConditionListItemType } from './type';
+import { DefineComponentsBasicExpose } from '/#/utils';
+import { DeviceTriggerTypeEum, TriggerValueTypeEnum } from '/@/enums/linkedgeEnum';
+import { ConditionFormRecordType, FormFieldsEnum } from './config';
+import { CheckStatusEnum, getNewConditionFilterItem } from '.';
+import { dateUtil } from '/@/utils/dateUtil';
+
+function getPredicateType(triggerType: TriggerValueTypeEnum) {
+  const map = {
+    [TriggerValueTypeEnum.BOOLEAN]: TriggerValueTypeEnum.BOOLEAN,
+    [TriggerValueTypeEnum.STRING]: TriggerValueTypeEnum.STRING,
+    [TriggerValueTypeEnum.NUMERIC]: TriggerValueTypeEnum.NUMERIC,
+    [TriggerValueTypeEnum.DATE_TIME]: TriggerValueTypeEnum.NUMERIC,
+  };
+
+  return map[triggerType];
+}
+
+export function useConditionData(
+  props: ConditionFilterProps,
+  conditionItemRef: Ref<ConditionListItemType[]>,
+  handleConditionFormValueChange: Fn
+): DefineComponentsBasicExpose<ConditionItemType[]> {
+  const createConditionItem = ({
+    operation,
+    defaultValue,
+    ignoreCase,
+  }: ConditionFormRecordType): ConditionItemType => {
+    const { triggerType, objectModel } = props;
+    const { identifier } = objectModel || {};
+    return {
+      key: { key: identifier!, type: DeviceTriggerTypeEum.TIME_SERIES },
+      predicate: {
+        ...(ignoreCase ? { ignoreCase } : {}),
+        operation,
+        type: getPredicateType(triggerType!),
+        value: {
+          defaultValue:
+            triggerType === TriggerValueTypeEnum.DATE_TIME
+              ? Number(dateUtil(defaultValue).format('x'))
+              : defaultValue,
+        },
+      },
+      valueType: triggerType!,
+    };
+  };
+
+  const getFieldsValue = (): ConditionItemType[] => {
+    return unref(conditionItemRef).map((conditionItem) => {
+      const value = conditionItem.ref?.getFieldsValue() as ConditionFormRecordType;
+      return createConditionItem(value);
+    });
+  };
+
+  const setFieldsValue = (condition: ConditionItemType[]) => {
+    conditionItemRef.value = Array.from({ length: condition.length }, () =>
+      getNewConditionFilterItem(CheckStatusEnum.VALIDATE_SUCCESS)
+    );
+
+    nextTick(() => {
+      unref(conditionItemRef).forEach((conditionItem, index) => {
+        const result = condition[index] || {};
+
+        const { operation, value, ignoreCase, type } = result.predicate || {};
+
+        conditionItem.ref?.setFieldsValue({
+          [FormFieldsEnum.CONDITION_OPERATION]: operation,
+          [FormFieldsEnum.CONDITION_VALUE]:
+            type === TriggerValueTypeEnum.BOOLEAN
+              ? value.defaultValue.toString()
+              : value.defaultValue,
+          [FormFieldsEnum.CONDITION_VALUE_IGNORE_CASE]: ignoreCase,
+        });
+      });
+      handleConditionFormValueChange();
+    });
+  };
+
+  const validate = async () => {
+    for (const conditionItem of unref(conditionItemRef)) {
+      conditionItem.checkStatus = CheckStatusEnum.VALIDATE_FAILED;
+      await conditionItem.ref?.validate();
+      conditionItem.checkStatus = CheckStatusEnum.VALIDATE_SUCCESS;
+    }
+  };
+  return {
+    getFieldsValue,
+    setFieldsValue,
+    validate,
+  };
+}

+import { FormFieldsEnum, getOperationMap } from './config';
+import {
+  BooleanOperationValueEnum,
+  BooleanOperationValueNameEnum,
+  TriggerValueTypeEnum,
+} from '/@/enums/linkedgeEnum';
+
+export type ConditionMessageItemType = Record<
+  Exclude<FormFieldsEnum, FormFieldsEnum.CONDITION_VALUE_IGNORE_CASE>,
+  string
+>;
+
+interface UseConditionFilterMessageParamsType {
+  triggerType: TriggerValueTypeEnum;
+  condition: ConditionMessageItemType[];
+}
+
+export function useConditionFilterMessage({
+  triggerType,
+  condition,
+}: UseConditionFilterMessageParamsType) {
+  const { label } = getOperationMap(triggerType);
+  const list: ConditionMessageItemType[] = [];
+  for (const item of condition) {
+    let { defaultValue, operation } = item;
+    if (!defaultValue || !operation) continue;
+    operation = label[operation];
+    if (triggerType === TriggerValueTypeEnum.BOOLEAN)
+      defaultValue =
+        defaultValue === BooleanOperationValueEnum.TRUE
+          ? BooleanOperationValueNameEnum.TRUE
+          : BooleanOperationValueNameEnum.FALSE;
+    list.push({ operation, defaultValue });
+  }
+  return list;
+}

+import TimeRangePicker from './TimeRangePicker.vue';
+import { WeekName } from './config';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
+
+enum FormFieldsEnum {
+  DAY_OF_WEEK = 'dayOfWeek',
+  ENABLED = 'enabled',
+  ENDS_ON = 'endsOn',
+  STARTS_ON = 'startsOn',
+  TIME_RANGE = 'timeRange',
+}
+
+export interface RuleFormRecordItem {
+  [FormFieldsEnum.DAY_OF_WEEK]: number;
+  [FormFieldsEnum.ENABLED]: boolean;
+  [FormFieldsEnum.TIME_RANGE]: {
+    [FormFieldsEnum.STARTS_ON]: number;
+    [FormFieldsEnum.ENDS_ON]: number;
+  };
+}
+
+useComponentRegister('TimeRangePicker', TimeRangePicker);
+
+export const getFormSchemas = (index: number): FormSchema[] => {
+  return [
+    {
+      field: FormFieldsEnum.DAY_OF_WEEK,
+      label: '',
+      component: 'InputNumber',
+      defaultValue: index + 1,
+      ifShow: false,
+    },
+    {
+      field: FormFieldsEnum.ENABLED,
+      label: '',
+      component: 'Checkbox',
+      defaultValue: false,
+      renderComponentContent: () => ({
+        default: () => `星期${WeekName[index]}`,
+      }),
+      colProps: { span: 5 },
+    },
+    {
+      field: FormFieldsEnum.TIME_RANGE,
+      label: '',
+      changeEvent: 'update:value',
+      valueField: 'value',
+      component: 'TimeRangePicker',
+      dynamicDisabled: ({ model }) => !model[FormFieldsEnum.ENABLED],
+      colProps: { span: 16 },
+      defaultValue: { startsOn: 0, endsOn: 0 },
+      dynamicRules: ({ model }) => {
+        return [
+          {
+            required: model[FormFieldsEnum.ENABLED],
+            validator(_rule, value: Record<'startsOn' | 'endsOn', number>, _callback) {
+              if (!model[FormFieldsEnum.ENABLED]) return Promise.resolve();
+              if (!value?.endsOn) return Promise.reject('请选择结束时间');
+              if (!value?.startsOn) return Promise.reject('请选择开始时间');
+              return Promise.resolve();
+            },
+          },
+        ];
+      },
+    },
+  ];
+};

+<script setup lang="ts">
+  import { CustomRuleItemType } from './type';
+  import { ComponentPublicInstance, nextTick, ref, unref, watch } from 'vue';
+  import { BasicForm, FormActionType } from '/@/components/Form';
+  import { getFormSchemas, RuleFormRecordItem } from './CustomRule.config';
+  import { buildUUID } from '/@/utils/uuid';
+  import { DefineComponentsBasicExpose } from '/#/utils';
+
+  interface CustomRuleItemRefType {
+    key: string;
+    ref?: FormActionType;
+    value?: CustomRuleItemType;
+  }
+
+  const props = withDefaults(
+    defineProps<{
+      value?: CustomRuleItemType[];
+    }>(),
+    {
+      value: () => [],
+    }
+  );
+
+  const customRuleListRef = ref<CustomRuleItemRefType[]>(
+    Array.from({ length: 7 }, () => ({ key: buildUUID() }))
+  );
+
+  const setRuleItemRef = (
+    el: Nullable<Element | ComponentPublicInstance>,
+    ruleItem: CustomRuleItemRefType
+  ) => {
+    ruleItem.ref = el as unknown as FormActionType;
+  };
+
+  const validate = async () => {
+    for (const item of unref(customRuleListRef)) {
+      await item.ref?.validate?.();
+    }
+  };
+
+  const getFieldsValue = (): CustomRuleItemType[] => {
+    return unref(customRuleListRef).map((item) => {
+      const { dayOfWeek, enabled, timeRange } = item.ref?.getFieldsValue() as RuleFormRecordItem;
+      return {
+        dayOfWeek,
+        enabled,
+        ...timeRange,
+      };
+    });
+  };
+
+  const setFieldsValue = async (ruleList: CustomRuleItemType[]) => {
+    if (!ruleList.length) return;
+    await nextTick();
+
+    ruleList.forEach((value, index) => {
+      const refEl = unref(customRuleListRef)[index];
+      refEl.ref?.setFieldsValue({
+        ...value,
+        timeRange: {
+          startsOn: value.startsOn,
+          endsOn: value.endsOn,
+        },
+      } as RuleFormRecordItem);
+    });
+  };
+
+  watch(
+    () => props.value,
+    () => {
+      setFieldsValue(props.value);
+    },
+    { immediate: true }
+  );
+
+  defineExpose<DefineComponentsBasicExpose<CustomRuleItemType[]>>({
+    getFieldsValue,
+    setFieldsValue,
+    validate,
+  });
+</script>
+
+<template>
+  <section>
+    <template v-for="(item, index) in customRuleListRef" :key="index">
+      <BasicForm
+        :ref="(el) => setRuleItemRef(el, item)"
+        :show-action-button-group="false"
+        :schemas="getFormSchemas(index)"
+        class="h-14"
+      />
+    </template>
+  </section>
+</template>

+<script setup lang="ts">
+  import { TimePicker } from 'ant-design-vue';
+  import { Moment } from 'moment';
+  import { computed, unref } from 'vue';
+  import { dateUtil } from '/@/utils/dateUtil';
+
+  interface TimeRangePickerProps {
+    timestampToNumber?: boolean;
+    value?: Record<string, number>;
+    startValue?: number;
+    endValue?: number;
+    startField?: string;
+    endField?: string;
+    disabled?: boolean;
+  }
+
+  enum TimePickerTypeEnum {
+    START = 'START',
+    END = 'END',
+  }
+
+  const emit = defineEmits(['update:value', 'update:startValue', 'update:endValue', 'change']);
+
+  const props = withDefaults(defineProps<TimeRangePickerProps>(), {
+    value: () => ({}),
+    startField: 'startsOn',
+    endField: 'endsOn',
+  });
+
+  const getTimeMoment = (value: number) => {
+    value = value / 1000;
+    const hour = Math.floor(value / 60 / 60);
+    const minute = Math.floor((value - hour * 60 * 60) / 60);
+    const second = value - hour * 60 * 60 - minute * 60;
+
+    return dateUtil({ hour, minute, second });
+  };
+
+  const getRangeValue = computed(() => {
+    const { value, startValue, endValue, startField, endField } = props;
+
+    let startTs = startValue || value[startField];
+
+    let endTs = endValue || value[endField];
+
+    return {
+      startTs: startTs ? getTimeMoment(startTs) : null,
+      endTs: endTs ? getTimeMoment(endTs) : null,
+    };
+  });
+
+  const getTimestamp = (moment: Moment | null) => {
+    if (!moment) return null;
+    const { hours, minutes, seconds } = moment.toObject();
+    return (hours * 60 * 60 + minutes * 60 + seconds) * 1000;
+  };
+
+  const handleTimeChange = (time: Moment, type: TimePickerTypeEnum) => {
+    const { value, startField, endField } = props;
+    const { startTs, endTs } = unref(getRangeValue);
+
+    const rangeValue = {
+      [startField]: getTimestamp(startTs),
+      [endField]: getTimestamp(endTs),
+    };
+
+    Reflect.set(
+      rangeValue,
+      type === TimePickerTypeEnum.START ? startField : endField,
+      getTimestamp(time)
+    );
+
+    if (
+      rangeValue[startField] &&
+      rangeValue[endField] &&
+      rangeValue[startField]! > rangeValue[endField]!
+    ) {
+      Reflect.set(rangeValue, type === TimePickerTypeEnum.START ? startField : endField, null);
+    }
+
+    emit('update:startValue', rangeValue[startField]);
+    emit('update:endValue', rangeValue[endField]);
+    emit('update:value', rangeValue);
+    emit('change', value);
+  };
+
+  const handleBasicDisabledHours = (type: TimePickerTypeEnum) => {
+    return () => {
+      const { startTs, endTs } = unref(getRangeValue);
+
+      if (type === TimePickerTypeEnum.START && !endTs) return [];
+      if (type === TimePickerTypeEnum.END && !startTs) return [];
+
+      const selectedHour = type === TimePickerTypeEnum.END ? startTs!.hour() : endTs!.hour();
+
+      return type === TimePickerTypeEnum.START
+        ? Array.from({ length: 24 - selectedHour }, (_, index) => selectedHour + index + 1)
+        : Array.from({ length: selectedHour }, (_, index) => index);
+    };
+  };
+
+  const handleBasicDisabledMinutes = (type: TimePickerTypeEnum) => {
+    return (currentSelectedHour: number) => {
+      const { startTs, endTs } = unref(getRangeValue);
+
+      if (type === TimePickerTypeEnum.START && !endTs) return [];
+      if (type === TimePickerTypeEnum.END && !startTs) return [];
+
+      const selectedTime = type === TimePickerTypeEnum.END ? startTs : endTs;
+      const selectedHour = selectedTime!.hour();
+      const selectedMinute = selectedTime!.minute();
+
+      if (type == TimePickerTypeEnum.START) {
+        return selectedHour > currentSelectedHour
+          ? []
+          : Array.from({ length: 60 - selectedMinute }, (_, index) => selectedMinute + index + 1);
+      } else {
+        return selectedHour < currentSelectedHour
+          ? []
+          : Array.from({ length: selectedMinute }, (_, index) => index);
+      }
+    };
+  };
+
+  const handleBasicDisabledSeconds = (type: TimePickerTypeEnum) => {
+    return (currentSelectedHour: number, currentSelectedMinute: number) => {
+      const { startTs, endTs } = unref(getRangeValue);
+
+      if (type === TimePickerTypeEnum.START && !endTs) return [];
+      if (type === TimePickerTypeEnum.END && !startTs) return [];
+
+      const selectedTime = type === TimePickerTypeEnum.END ? startTs : endTs;
+      const selectedHour = selectedTime!.hour();
+      const selectedMinute = selectedTime!.minute();
+      const selectedSeconds = selectedTime!.seconds();
+
+      if (type === TimePickerTypeEnum.START) {
+        return selectedHour >= currentSelectedHour && selectedMinute > currentSelectedMinute
+          ? []
+          : Array.from({ length: 60 - selectedSeconds }, (_, index) => selectedSeconds + index + 1);
+      } else {
+        return selectedHour <= currentSelectedHour && selectedMinute < currentSelectedMinute
+          ? []
+          : Array.from({ length: selectedSeconds }, (_, index) => index);
+      }
+    };
+  };
+</script>
+
+<template>
+  <main class="time-range-picker flex items-center">
+    <TimePicker
+      :value="getRangeValue.startTs"
+      format="HH:mm"
+      :disabled="disabled"
+      @change="(time) => handleTimeChange(time, TimePickerTypeEnum.START)"
+      :disabled-hours="handleBasicDisabledHours(TimePickerTypeEnum.START)"
+      :disabled-minutes="handleBasicDisabledMinutes(TimePickerTypeEnum.START)"
+      :disabled-seconds="handleBasicDisabledSeconds(TimePickerTypeEnum.START)"
+    />
+    <slot v-if="$slots?.separator" name="separator"></slot>
+    <span v-else class="mx-4">~</span>
+    <TimePicker
+      :value="getRangeValue.endTs"
+      format="HH:mm"
+      :disabled="disabled"
+      @change="(time) => handleTimeChange(time, TimePickerTypeEnum.END)"
+      :disabled-hours="handleBasicDisabledHours(TimePickerTypeEnum.END)"
+      :disabled-minutes="handleBasicDisabledMinutes(TimePickerTypeEnum.END)"
+      :disabled-seconds="handleBasicDisabledSeconds(TimePickerTypeEnum.END)"
+    />
+  </main>
+</template>
+
+<style scoped lang="less">
+  .time-range-picker {
+    :deep(.ant-time-picker) {
+      width: auto;
+    }
+  }
+</style>

+import TimeRangePicker from './TimeRangePicker.vue';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
+import { ScheduleTypeEnum, ScheduleTypeNameEnum } from '/@/enums/linkedgeEnum';
+
+export enum FormFieldsEnum {
+  SCHEDULE_TYPE = 'type',
+  TIMEZONE = 'timezone',
+  STARTS_ON = 'startsOn',
+  ENDS_ON = 'endsOn',
+  DAYS_OF_WEEK = 'daysOfWeek',
+  SCHEDULE_ITEMS = 'items',
+  TIME_RANGE = 'timeRange',
+}
+
+export enum FormFieldsNameEnum {
+  SCHEDULE_TYPE = '启用类型',
+  TIMEZONE = '时区',
+  DAYS_OF_WEEK = '启用日',
+  TIME_RANGE = '启用时间',
+}
+
+export interface EnableRuleFormType {
+  [FormFieldsEnum.DAYS_OF_WEEK]: number[];
+  [FormFieldsEnum.SCHEDULE_TYPE]: ScheduleTypeEnum;
+  [FormFieldsEnum.TIMEZONE]: string;
+  [FormFieldsEnum.TIME_RANGE]: {
+    [FormFieldsEnum.STARTS_ON]: number;
+    [FormFieldsEnum.ENDS_ON]: number;
+  };
+}
+
+useComponentRegister('TimeRangePicker', TimeRangePicker);
+
+export const WeekName = ['一', '二', '三', '四', '五', '六', '日'];
+
+enum TimezoneEnum {
+  SHANG_HAI = 'Asia/Shanghai',
+}
+
+export const getFormSchemas = (): FormSchema[] => {
+  return [
+    {
+      field: FormFieldsEnum.SCHEDULE_TYPE,
+      label: FormFieldsNameEnum.SCHEDULE_TYPE,
+      component: 'Select',
+      required: true,
+      defaultValue: ScheduleTypeEnum.ANY_TIME,
+      componentProps: () => {
+        return {
+          options: Object.keys(ScheduleTypeEnum).map((value) => ({
+            label: ScheduleTypeNameEnum[value],
+            value,
+          })),
+          allowClear: false,
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.TIMEZONE,
+      label: FormFieldsNameEnum.TIMEZONE,
+      component: 'Select',
+      required: true,
+      defaultValue: TimezoneEnum.SHANG_HAI,
+      ifShow: ({ model }) => model[FormFieldsEnum.SCHEDULE_TYPE] !== ScheduleTypeEnum.ANY_TIME,
+      componentProps: () => {
+        return {
+          options: [{ label: TimezoneEnum.SHANG_HAI, value: TimezoneEnum.SHANG_HAI }],
+          allowClear: false,
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.SCHEDULE_ITEMS,
+      label: '规则',
+      component: 'Input',
+      ifShow: ({ model }) => model[FormFieldsEnum.SCHEDULE_TYPE] === ScheduleTypeEnum.CUSTOM,
+      slot: 'custom',
+    },
+    {
+      field: FormFieldsEnum.DAYS_OF_WEEK,
+      label: FormFieldsNameEnum.DAYS_OF_WEEK,
+      component: 'CheckboxGroup',
+      ifShow: ({ model }) => model[FormFieldsEnum.SCHEDULE_TYPE] === ScheduleTypeEnum.SPECIFIC_TIME,
+      rules: [{ required: true, type: 'array' }],
+      componentProps: () => {
+        return {
+          options: Array.from({ length: 7 }, (_, index) => ({
+            label: `星期${WeekName[index]}`,
+            value: index + 1,
+          })),
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.TIME_RANGE,
+      label: FormFieldsNameEnum.TIME_RANGE,
+      component: 'TimeRangePicker',
+      changeEvent: 'update:value',
+      valueField: 'value',
+      ifShow: ({ model }) => model[FormFieldsEnum.SCHEDULE_TYPE] === ScheduleTypeEnum.SPECIFIC_TIME,
+      rules: [
+        {
+          required: true,
+          validator(_rule, value: Record<'startsOn' | 'endsOn', number>, _callback) {
+            if (!value?.endsOn) return Promise.reject('请选择结束时间');
+            if (!value?.startsOn) return Promise.reject('请选择开始时间');
+            return Promise.resolve();
+          },
+        },
+      ],
+    },
+  ];
+};

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

+<script setup lang="ts">
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { EnableRuleFormType, getFormSchemas } from './config';
+  import { nextTick, ref, unref } from 'vue';
+  import CustomRule from './CustomRule.vue';
+  import { ScheduleTypeEnum } from '/@/enums/linkedgeEnum';
+  import { EnableRuleFormModalParamsType, ScheduleType } from './type';
+  import { useSceneLinkageDrawerContext } from '../SceneLinkageDrawer/sceneLinkageDrawerContext';
+
+  const { disabledDrawer } = useSceneLinkageDrawerContext();
+
+  const emit = defineEmits(['register', 'settingComplete']);
+
+  const scheduleItemKey = ref<string>();
+  const [registerModal, { closeModal }] = useModalInner(
+    ({ record }: EnableRuleFormModalParamsType) => {
+      resetFields();
+      const { type, schedule, key } = record;
+      scheduleItemKey.value = key;
+      handleSetFieldsValue({ ...schedule, type });
+      clearValidate();
+    }
+  );
+
+  const [register, { getFieldsValue, validate, setFieldsValue, resetFields, clearValidate }] =
+    useForm({
+      schemas: getFormSchemas(),
+      showActionButtonGroup: false,
+      layout: 'vertical',
+    });
+
+  const customRuleElRef = ref<Nullable<InstanceType<typeof CustomRule>>>();
+
+  const handleGetFieldsValue = async (): Promise<ScheduleType> => {
+    await unref(customRuleElRef)?.validate?.();
+    await validate();
+    const { type, timeRange, timezone, daysOfWeek } = getFieldsValue() as EnableRuleFormType;
+    const customValue = unref(customRuleElRef)?.getFieldsValue();
+
+    if (type === ScheduleTypeEnum.ANY_TIME) return { type };
+
+    if (type === ScheduleTypeEnum.SPECIFIC_TIME)
+      return {
+        type,
+        timezone,
+        daysOfWeek,
+        ...timeRange,
+      };
+
+    return {
+      type,
+      timezone,
+      items: customValue,
+    };
+  };
+
+  const handleSetFieldsValue = async (schedule: ScheduleType) => {
+    const { type, startsOn, endsOn, timezone, daysOfWeek } = schedule;
+
+    if (type === ScheduleTypeEnum.ANY_TIME) return setFieldsValue({ type });
+
+    if (type === ScheduleTypeEnum.SPECIFIC_TIME)
+      return setFieldsValue({ type, timezone, daysOfWeek, timeRange: { startsOn, endsOn } });
+
+    setFieldsValue(schedule);
+    await nextTick();
+    unref(customRuleElRef)?.setFieldsValue(schedule.items || []);
+  };
+
+  const handleOk = async () => {
+    const result = await handleGetFieldsValue();
+    emit('settingComplete', result, unref(scheduleItemKey));
+    closeModal();
+  };
+</script>
+
+<template>
+  <BasicModal
+    @register="registerModal"
+    title="启用规则"
+    :width="600"
+    @ok="handleOk"
+    :cancel-text="disabledDrawer ? '关闭' : '取消'"
+    :show-ok-btn="!disabledDrawer"
+  >
+    <BasicForm @register="register" :disabled="disabledDrawer">
+      <template #custom="{ model, field }">
+        <CustomRule ref="customRuleElRef" v-model:value="model[field]" />
+      </template>
+    </BasicForm>
+  </BasicModal>
+</template>

+import { ScheduleTypeEnum } from '/@/enums/linkedgeEnum';
+
+export interface CustomRuleItemType {
+  dayOfWeek: number;
+  enabled: boolean;
+  endsOn: number;
+  startsOn: number;
+}
+
+export interface ScheduleType {
+  type: ScheduleTypeEnum;
+  timezone?: string;
+  items?: CustomRuleItemType[];
+  daysOfWeek?: number[];
+  endsOn?: number;
+  startsOn?: number;
+}
+
+interface EnableRuleFormModalParams {
+  type: ScheduleTypeEnum;
+  schedule: ScheduleType;
+  key: string;
+}
+
+export type EnableRuleFormModalParamsType = ModalParamsType<EnableRuleFormModalParams>;

+<script setup lang="ts">
+  import { ApiSelect } from '/@/components/Form';
+  import { Divider } from 'ant-design-vue';
+  import { Icon } from '/@/components/Icon';
+  import { VNode } from 'vue';
+  import AlarmConfigDrawer from '/@/views/alarm/config/ContactDrawer.vue';
+  import { useDrawer } from '/@/components/Drawer';
+
+  const [registerAlarmContactDrawer, { openDrawer }] = useDrawer();
+
+  const Options = (props: { menuNode: VNode }) => {
+    return props.menuNode;
+  };
+
+  const handleOpenAlarmConfig = () => {
+    openDrawer();
+  };
+
+  const handleSuccess = () => {};
+</script>
+
+<template>
+  <section>
+    <ApiSelect v-bind="$attrs">
+      <template #dropdownRender="{ menuNode }">
+        <Options :menuNode="menuNode" />
+        <Divider class="!my-2" />
+        <div class="cursor-pointer text-gray-500" @click="handleOpenAlarmConfig">
+          <Icon icon="ant-design:plus-outlined" class="mx-2" />
+          <span>新增告警配置</span>
+        </div>
+      </template>
+    </ApiSelect>
+    <AlarmConfigDrawer
+      @register="registerAlarmContactDrawer"
+      default-enable
+      @success="handleSuccess"
+    />
+  </section>
+</template>

+import { FormSchema, useComponentRegister } from '/@/components/Form';
+import {
+  CommandTypeEnum,
+  CommandTypeNameEnum,
+  ExecutionActionEnum,
+  ExecutionActionNameEnum,
+  TriggerEntityTypeEnum,
+  TriggerEntityTypeNameEnum,
+} from '/@/enums/linkedgeEnum';
+import AlarmProfileSelect from './AlarmProfileSelect.vue';
+import {
+  byOrganizationIdGetMasterDevice,
+  getOrganizationAlarmConfig,
+} from '/@/api/ruleengine/ruleengineApi';
+import { useSceneLinkageDrawerContext } from '../SceneLinkageDrawer/sceneLinkageDrawerContext';
+import { Ref, h, toRaw, unref } from 'vue';
+import { AlarmLevelEnum, AlarmLevelNameEnum } from '/@/enums/alarmEnum';
+import Icon from '/@/components/Icon';
+import { Tooltip } from 'ant-design-vue';
+import { findDictItemByCode } from '/@/api/system/dict';
+import { DictEnum } from '/@/enums/dictEnum';
+import { getDeviceProfile } from '/@/api/alarm/position';
+import { createPickerSearch } from '/@/utils/pickerSearch';
+import { ServiceCallTypeEnum, ServiceCallTypeNameEnum } from '/@/enums/toolEnum';
+import { DeviceTypeEnum } from '../../../dataFlow/cpns/config';
+import { getModelServices } from '/@/api/device/modelOfMatter';
+import { ModelOfMatterParams, StructJSON } from '/@/api/device/model/modelOfMatterModel';
+import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
+import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+import { JSONEditor } from '/@/components/CodeEditor';
+import { useJsonParse } from '/@/hooks/business/useJsonParse';
+import { validateTCPCustomCommand } from '/@/components/Form/src/externalCompns/components/ThingsModelForm';
+
+export enum FormFieldsEnum {
+  OUT_TARGET = 'outTarget',
+  ALARM_PROFILED = 'alarmProfileId',
+  ALARM_LEVEL = 'alarmLevel',
+  DEVICE_TYPE = 'deviceType',
+  DEVICE_PROFILE_ID = 'deviceProfileId',
+  ENTITY_TYPE = 'entityType',
+  ENTITY_ID = 'entityId',
+  COMMAND_TYPE = 'commandType',
+  CALL_TYPE = 'callType',
+  CALL_SERVICE_IDENTIFIER = 'callServiceIdentifier',
+
+  TCP_CUSTOM_COMMAND = 'tcpCustomCommand',
+  CUSTOM_COMMAND = 'customCommand',
+  CALL_SERVICE = 'callService',
+  SERVICE_COMMAND = 'serviceCommand',
+  SERVICE_ID = 'serviceId',
+  TRANSPORT_TYPE = 'transportType',
+  ENABLE_CLEAR_RULE = 'enableClearRule',
+  CLEAR_RULE = 'clearRule',
+}
+
+export enum FormFieldsNameEnum {
+  OUT_TARGET = '执行动作',
+  ALARM_PROFILED = '告警配置',
+  ALARM_LEVEL = '告警等级',
+  DEVICE_TYPE = '设备类型',
+  DEVICE_PROFILE_ID = '产品',
+  ENTITY_TYPE = '触发设备类型',
+  ENTITY_ID = '设备',
+  COMMAND_TYPE = '类型',
+  CALL_TYPE = '命令下发类型',
+  CALL_SERVICE_IDENTIFIER = '服务',
+
+  ENABLE_CLEAR_RULE = '清除告警',
+  TCP_CUSTOM_COMMAND = '自定义命令',
+  CUSTOM_COMMAND = '自定义命令',
+}
+
+useComponentRegister('AlarmProfileSelect', AlarmProfileSelect);
+useComponentRegister('JSONEditor', JSONEditor);
+
+export const getFormSchemas = (hasAlarmNotify: Ref<boolean>): FormSchema[] => {
+  const { organizationId } = useSceneLinkageDrawerContext();
+  return [
+    {
+      field: FormFieldsEnum.OUT_TARGET,
+      label: '',
+      component: 'Select',
+      rules: [{ required: true, message: `请选择${FormFieldsNameEnum.OUT_TARGET}` }],
+      defaultValue: ExecutionActionEnum.DEVICE_OUT,
+      componentProps: () => {
+        return {
+          options: [
+            { label: ExecutionActionNameEnum.DEVICE_OUT, value: ExecutionActionEnum.DEVICE_OUT },
+            {
+              label: ExecutionActionNameEnum.MSG_NOTIFY,
+              value: ExecutionActionEnum.MSG_NOTIFY,
+              disabled: unref(hasAlarmNotify),
+            },
+          ],
+          labelField: 'name',
+          valueField: 'id',
+          placeholder: `请选择${FormFieldsNameEnum.OUT_TARGET}`,
+          onChange(value: ExecutionActionEnum) {
+            hasAlarmNotify.value = value === ExecutionActionEnum.MSG_NOTIFY;
+          },
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.ALARM_PROFILED,
+      label: '',
+      component: 'AlarmProfileSelect',
+      rules: [{ required: true, message: `请选择${FormFieldsEnum.ALARM_PROFILED}` }],
+      ifShow: ({ model }) => model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.MSG_NOTIFY,
+      componentProps: () => {
+        return {
+          api: async () => {
+            if (!unref(organizationId)) return [];
+            return await getOrganizationAlarmConfig({ organizationId: unref(organizationId) });
+          },
+          labelField: 'name',
+          valueField: 'id',
+          placeholder: `请选择${FormFieldsNameEnum.ALARM_PROFILED}`,
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.ALARM_LEVEL,
+      label: '',
+      component: 'Select',
+      ifShow: ({ model }) => model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.MSG_NOTIFY,
+      rules: [{ required: true, message: `请选择${FormFieldsEnum.ALARM_LEVEL}` }],
+      componentProps: () => {
+        return {
+          options: Object.keys(AlarmLevelEnum).map((value) => ({
+            label: AlarmLevelNameEnum[value],
+            value,
+          })),
+          placeholder: `请选择${FormFieldsNameEnum.ALARM_LEVEL}`,
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.ENABLE_CLEAR_RULE,
+      label: '',
+      component: 'Checkbox',
+      ifShow: ({ model }) => model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.MSG_NOTIFY,
+      renderComponentContent: () => ({
+        default: () => [
+          h('span', FormFieldsNameEnum.ENABLE_CLEAR_RULE),
+          h(Tooltip, { title: '清除告警与触发器一一对应' }, () =>
+            h(Icon, {
+              icon: 'ant-design:question-circle-outlined',
+              class: ' cursor-pointer ml-1',
+            })
+          ),
+        ],
+      }),
+    },
+    {
+      field: FormFieldsEnum.CLEAR_RULE,
+      label: '',
+      component: 'Input',
+      colProps: { span: 24, xxl: 24, xl: 24, lg: 24, md: 24, sm: 24, xs: 24 },
+      slot: 'alarmClearRule',
+      ifShow: ({ model }) =>
+        model[FormFieldsEnum.ENABLE_CLEAR_RULE] &&
+        model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.MSG_NOTIFY,
+    },
+    {
+      field: FormFieldsEnum.DEVICE_TYPE,
+      label: '',
+      component: 'ApiSelect',
+      rules: [{ required: true, message: `请选择${FormFieldsNameEnum.DEVICE_TYPE}` }],
+      ifShow: ({ model }) => model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.DEVICE_OUT,
+      defaultValue: DeviceTypeEnum.SENSOR,
+      componentProps: ({ formActionType }) => {
+        return {
+          api: findDictItemByCode,
+          params: {
+            dictCode: DictEnum.DEVICE_TYPE,
+          },
+          labelField: 'itemText',
+          valueField: 'itemValue',
+          placeholder: `请选择${FormFieldsNameEnum.DEVICE_TYPE}`,
+          onChange() {
+            const { setFieldsValue } = formActionType;
+            setFieldsValue({
+              [FormFieldsEnum.DEVICE_PROFILE_ID]: null,
+              [FormFieldsEnum.ENTITY_ID]: [],
+              [FormFieldsEnum.CALL_SERVICE_IDENTIFIER]: null,
+              [FormFieldsEnum.SERVICE_COMMAND]: null,
+              [FormFieldsEnum.CALL_SERVICE]: null,
+              [FormFieldsEnum.TRANSPORT_TYPE]: null,
+            });
+          },
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.TRANSPORT_TYPE,
+      label: '传输协议',
+      component: 'Input',
+      ifShow: false,
+    },
+    {
+      field: FormFieldsEnum.DEVICE_PROFILE_ID,
+      label: '',
+      component: 'ApiSelect',
+      rules: [{ required: true, message: `请选择${FormFieldsNameEnum.DEVICE_PROFILE_ID}` }],
+      ifShow: ({ model }) => model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.DEVICE_OUT,
+      componentProps: ({ formModel, formActionType }) => {
+        const deviceType = formModel[FormFieldsEnum.DEVICE_TYPE];
+        const { setFieldsValue } = formActionType;
+        return {
+          api: async () => {
+            return await getDeviceProfile(deviceType);
+          },
+          labelField: 'name',
+          valueField: 'id',
+          placeholder: `请选择${FormFieldsNameEnum.DEVICE_PROFILE_ID}`,
+          ...createPickerSearch(),
+          onChange(_value: string, option: DeviceProfileModel) {
+            setFieldsValue({
+              [FormFieldsEnum.ENTITY_ID]: [],
+              [FormFieldsEnum.TRANSPORT_TYPE]: option?.transportType,
+              [FormFieldsEnum.SERVICE_ID]: null,
+              [FormFieldsEnum.CALL_SERVICE]: null,
+              [FormFieldsEnum.CALL_SERVICE_IDENTIFIER]: null,
+              [FormFieldsEnum.SERVICE_COMMAND]: null,
+            });
+          },
+          onOptionsChange(options: (DeviceProfileModel & Record<'label' | 'value', string>)[]) {
+            const deviceProfileId = formModel[FormFieldsEnum.DEVICE_PROFILE_ID];
+            const res = options.find((item) => item.value === deviceProfileId);
+            res &&
+              setFieldsValue({
+                [FormFieldsEnum.TRANSPORT_TYPE]: res.transportType,
+              });
+          },
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.ENTITY_TYPE,
+      label: '',
+      component: 'Select',
+      rules: [{ required: true, message: `请选择${FormFieldsNameEnum.ENTITY_TYPE}` }],
+      ifShow: ({ model }) => model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.DEVICE_OUT,
+      componentProps: () => {
+        return {
+          options: Object.keys(TriggerEntityTypeEnum).map((value) => ({
+            label: TriggerEntityTypeNameEnum[value],
+            value,
+          })),
+          placeholder: `请选择${FormFieldsNameEnum.ENTITY_TYPE}`,
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.ENTITY_ID,
+      label: '',
+      component: 'ApiSelect',
+      rules: [{ required: true, type: 'array', message: `请选择${FormFieldsNameEnum.ENTITY_ID}` }],
+      ifShow: ({ model }) =>
+        model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.DEVICE_OUT &&
+        model[FormFieldsEnum.ENTITY_TYPE] === TriggerEntityTypeEnum.PART,
+      componentProps: ({ formModel }) => {
+        return {
+          api: async (params: Record<'organizationId' | 'deviceProfileId', string>) => {
+            if (params.deviceProfileId && params.organizationId) {
+              const result = await byOrganizationIdGetMasterDevice(params);
+              if (result) {
+                return result.map((item) => ({
+                  ...item,
+                  label: item.alias || item.name,
+                  value: item.tbDeviceId,
+                }));
+              }
+            }
+            return [];
+          },
+          mode: 'multiple',
+          maxTagCount: 3,
+          params: {
+            organizationId: unref(organizationId),
+            deviceProfileId: formModel[FormFieldsEnum.DEVICE_PROFILE_ID],
+          },
+          placeholder: `请选择${FormFieldsNameEnum.ENTITY_ID}`,
+          ...createPickerSearch(),
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.COMMAND_TYPE,
+      label: '',
+      component: 'Select',
+      rules: [
+        { required: true, message: `请选择${FormFieldsNameEnum.COMMAND_TYPE}`, type: 'number' },
+      ],
+      defaultValue: CommandTypeEnum.CUSTOM,
+      ifShow: ({ model }) => model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.DEVICE_OUT,
+      componentProps: ({ formActionType }) => {
+        return {
+          options: [
+            { label: CommandTypeNameEnum.CUSTOM, value: CommandTypeEnum.CUSTOM },
+            { label: CommandTypeNameEnum.SERVICE, value: CommandTypeEnum.SERVICE },
+          ],
+          placeholder: `请选择${FormFieldsNameEnum.COMMAND_TYPE}`,
+          onChange() {
+            const { setFieldsValue } = formActionType;
+            setFieldsValue({
+              [FormFieldsEnum.CUSTOM_COMMAND]: null,
+              [FormFieldsEnum.TCP_CUSTOM_COMMAND]: null,
+              [FormFieldsEnum.CALL_SERVICE]: null,
+              [FormFieldsEnum.CALL_SERVICE_IDENTIFIER]: null,
+              [FormFieldsEnum.SERVICE_COMMAND]: null,
+            });
+          },
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.CALL_TYPE,
+      label: '',
+      component: 'Select',
+      defaultValue: ServiceCallTypeEnum.ASYNC,
+      rules: [{ required: true, message: `请选择${FormFieldsNameEnum.CALL_TYPE}` }],
+      ifShow: ({ model }) =>
+        model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.DEVICE_OUT &&
+        model[FormFieldsEnum.COMMAND_TYPE] === CommandTypeEnum.CUSTOM,
+      componentProps: () => {
+        return {
+          options: [
+            { label: ServiceCallTypeNameEnum.ASYNC, value: ServiceCallTypeEnum.ASYNC },
+            { label: ServiceCallTypeNameEnum.SYNC, value: ServiceCallTypeEnum.SYNC },
+          ],
+          placeholder: `请选择${FormFieldsNameEnum.CALL_TYPE}`,
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.SERVICE_ID,
+      label: '',
+      component: 'ApiSelect',
+      rules: [{ required: true, message: `请选择${FormFieldsNameEnum.CALL_SERVICE_IDENTIFIER}` }],
+      ifShow: ({ model }) =>
+        model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.DEVICE_OUT &&
+        model[FormFieldsEnum.COMMAND_TYPE] === CommandTypeEnum.SERVICE,
+      componentProps: ({ formModel, formActionType }) => {
+        return {
+          api: async () => {
+            const deviceProfileId = formModel[FormFieldsEnum.DEVICE_PROFILE_ID];
+            if (!deviceProfileId) return [];
+            return await getModelServices({ deviceProfileId });
+          },
+          labelField: 'functionName',
+          valueField: 'id',
+          placeholder: `请选择${FormFieldsNameEnum.CALL_SERVICE_IDENTIFIER}`,
+          onChange(
+            value: string,
+            option: ModelOfMatterParams & Record<'label' | 'value' | 'id', string>
+          ) {
+            const { setFieldsValue } = formActionType;
+            setFieldsValue({
+              [FormFieldsEnum.CALL_TYPE]: value ? option.callType : null,
+              [FormFieldsEnum.CALL_SERVICE_IDENTIFIER]: value ? option.identifier : null,
+              [FormFieldsEnum.CALL_SERVICE]: value
+                ? { ...toRaw(option), id: option?.value, functionName: option?.label }
+                : null,
+              [FormFieldsEnum.SERVICE_COMMAND]: {},
+            });
+          },
+          onOptionsChange(options: (StructJSON & Record<'label' | 'value' | 'id', string>)[]) {
+            const { setFieldsValue } = formActionType;
+            const serviceId = formModel[FormFieldsEnum.SERVICE_ID];
+            const res = options.find((item) => item.value === serviceId);
+            res &&
+              setFieldsValue({
+                [FormFieldsEnum.CALL_SERVICE_IDENTIFIER]: res.identifier,
+                [FormFieldsEnum.CALL_SERVICE]: {
+                  ...toRaw(res),
+                  id: res?.value,
+                  functionName: res?.label,
+                },
+              });
+          },
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.CALL_SERVICE_IDENTIFIER,
+      label: '服务标识符',
+      component: 'Input',
+      ifShow: false,
+    },
+    {
+      field: FormFieldsEnum.CALL_SERVICE,
+      label: '服务详情',
+      component: 'Input',
+      ifShow: false,
+    },
+    {
+      field: FormFieldsEnum.SERVICE_COMMAND,
+      label: '',
+      component: 'Input',
+      colProps: { span: 24, xxl: 24, xl: 24, lg: 24, md: 24, sm: 24, xs: 24 },
+      ifShow: ({ model }) =>
+        model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.DEVICE_OUT &&
+        model[FormFieldsEnum.COMMAND_TYPE] === CommandTypeEnum.SERVICE &&
+        model[FormFieldsEnum.CALL_SERVICE],
+      colSlot: 'serviceCommand',
+    },
+    {
+      field: FormFieldsEnum.CUSTOM_COMMAND,
+      label: '',
+      component: 'JSONEditor',
+      valueField: 'value',
+      changeEvent: 'update:value',
+      colProps: { span: 24, xxl: 24, xl: 24, lg: 24, md: 24, sm: 24, xs: 24 },
+      rules: [
+        {
+          required: true,
+          validator(_rule, value: string) {
+            const { flag } = useJsonParse(value);
+            return flag ? Promise.resolve() : Promise.reject('请检查自定义命令');
+          },
+        },
+      ],
+      ifShow: ({ model }) =>
+        model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.DEVICE_OUT &&
+        model[FormFieldsEnum.TRANSPORT_TYPE] !== TransportTypeEnum.TCP &&
+        model[FormFieldsEnum.COMMAND_TYPE] === CommandTypeEnum.CUSTOM,
+      componentProps: () => {
+        return {
+          title: FormFieldsNameEnum.CUSTOM_COMMAND,
+        };
+      },
+    },
+    {
+      field: FormFieldsEnum.TCP_CUSTOM_COMMAND,
+      label: FormFieldsNameEnum.TCP_CUSTOM_COMMAND,
+      component: 'Input',
+      colProps: { span: 24, xxl: 24, xl: 24, lg: 24, md: 24, sm: 24, xs: 24 },
+      rules: [
+        { required: true, message: `请输入${FormFieldsNameEnum.TCP_CUSTOM_COMMAND}` },
+        { validator: validateTCPCustomCommand },
+      ],
+      ifShow: ({ model }) =>
+        model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.DEVICE_OUT &&
+        model[FormFieldsEnum.TRANSPORT_TYPE] === TransportTypeEnum.TCP &&
+        model[FormFieldsEnum.COMMAND_TYPE] === CommandTypeEnum.CUSTOM,
+      componentProps: () => {
+        return {
+          placeholder: `请输入${FormFieldsNameEnum.TCP_CUSTOM_COMMAND}`,
+        };
+      },
+      // labelWidth: 120,
+    },
+  ];
+};

+import { ExecutionActionListRefItemType } from './type';
+import { buildUUID } from '/@/utils/uuid';
+
+export { default as ExecutionAction } from './index.vue';
+
+export function createNewExecutionActionItem(): ExecutionActionListRefItemType {
+  return { key: buildUUID() };
+}

+<script setup lang="ts">
+  import { CollapseContainer } from '/@/components/Container';
+  import { Icon } from '/@/components/Icon';
+  import { Tooltip, Button } from 'ant-design-vue';
+  import { BasicForm, FormActionType, ThingsModelForm } from '/@/components/Form';
+  import { getFormSchemas, FormFieldsEnum } from './config';
+  import { FlipFlop } from '../FlipFlop';
+  import { ComponentPublicInstance, ref, unref } from 'vue';
+  import { ExecutionActionListRefItemType } from './type';
+  import { useExecutionActionData } from './useExecutionActionData';
+  import { createNewExecutionActionItem } from '.';
+  import { useSceneLinkageDrawerContext } from '../SceneLinkageDrawer/sceneLinkageDrawerContext';
+
+  const { disabledDrawer } = useSceneLinkageDrawerContext();
+
+  const hasAlarmNotify = ref(false);
+
+  const formSchemas = getFormSchemas(hasAlarmNotify);
+
+  const executionActionListRef = ref<ExecutionActionListRefItemType[]>([
+    createNewExecutionActionItem(),
+  ]);
+
+  const handleAdd = () => {
+    executionActionListRef.value.push(createNewExecutionActionItem());
+  };
+
+  const handleDelete = (executionActionItem: ExecutionActionListRefItemType) => {
+    const index = unref(executionActionListRef).findIndex(
+      (item) => item.key === executionActionItem.key
+    );
+    ~index && unref(executionActionListRef).splice(index, 1);
+  };
+
+  const setExecutionActionRef = (
+    el: Nullable<Element | ComponentPublicInstance>,
+    executionActionItem: ExecutionActionListRefItemType
+  ) => {
+    executionActionItem.ref = el as unknown as FormActionType;
+  };
+
+  const setAlarmClearRuleRef = (
+    el: Nullable<Element | ComponentPublicInstance>,
+    executionActionItem: ExecutionActionListRefItemType
+  ) => {
+    executionActionItem.alarmClearRuleElRef = el as unknown as InstanceType<typeof FlipFlop>;
+  };
+
+  const handleClearRuleDelete = (_executionActionItem: ExecutionActionListRefItemType) => {
+    //
+  };
+
+  const setThingsModelFormRef = (
+    el: Nullable<Element | ComponentPublicInstance>,
+    executionActionItem: ExecutionActionListRefItemType
+  ) => {
+    executionActionItem.thingsModelFormRefl = el as unknown as InstanceType<typeof ThingsModelForm>;
+  };
+
+  const { getFieldsValue, setFieldsValue, validate, resetFieldsValue } = useExecutionActionData(
+    executionActionListRef,
+    hasAlarmNotify
+  );
+
+  defineExpose({
+    getFieldsValue,
+    setFieldsValue,
+    validate,
+    resetFieldsValue,
+  });
+</script>
+
+<template>
+  <section>
+    <CollapseContainer
+      class="mb-4"
+      v-for="(executionActionItem, index) in executionActionListRef"
+      :title="`执行动作${index + 1}`"
+      :key="executionActionItem.key"
+    >
+      <template #action>
+        <Tooltip title="删除">
+          <Icon
+            v-if="!disabledDrawer"
+            class="ml-2 cursor-pointer"
+            icon="fluent:delete-off-20-regular"
+            size="20"
+            @click="handleDelete(executionActionItem)"
+          />
+        </Tooltip>
+      </template>
+      <BasicForm
+        :ref="(el) => setExecutionActionRef(el, executionActionItem)"
+        :disabled="disabledDrawer"
+        :show-action-button-group="false"
+        :baseColProps="{ span: 6, xxl: 6, xl: 8, lg: 12, sm: 24 }"
+        :schemas="formSchemas"
+      >
+        <template #alarmClearRule>
+          <FlipFlop
+            :ref="(el) => setAlarmClearRuleRef(el, executionActionItem)"
+            :panel-title="(index) => `清除告警${index}`"
+            :disabled="disabledDrawer"
+            addButtonName="新增清除告警"
+            @delete="handleClearRuleDelete(executionActionItem)"
+          />
+        </template>
+
+        <template #serviceCommand="{ field, model }">
+          <ThingsModelForm
+            :ref="(el) => setThingsModelFormRef(el, executionActionItem)"
+            :value="model[field]"
+            :identifier="model[FormFieldsEnum.CALL_SERVICE_IDENTIFIER]"
+            :input-data="model[FormFieldsEnum.CALL_SERVICE]?.functionJson?.inputData"
+            :title="model[FormFieldsEnum.CALL_SERVICE]?.functionName"
+            :disabled="disabledDrawer"
+            :transport-type="model[FormFieldsEnum.TRANSPORT_TYPE]"
+          />
+        </template>
+      </BasicForm>
+    </CollapseContainer>
+    <Button v-if="!disabledDrawer" class="w-full" type="primary" @click="handleAdd">
+      <Icon icon="ant-design:plus-outlined" />
+      执行动作
+    </Button>
+  </section>
+</template>

+export { default as ExecutionAction } from './index.vue';
+import { FlipFlop } from '../FlipFlop';
+import { FormFieldsEnum } from './config';
+import { FlipFlopConditionType } from '../FlipFlop/types';
+import { DeviceModelOfMatterAttrs, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
+import { FormActionType, ThingsModelForm } from '/@/components/Form';
+import { AlarmLevelEnum } from '/@/enums/alarmEnum';
+import { CommandTypeEnum, ExecutionActionEnum, TriggerEntityTypeEnum } from '/@/enums/linkedgeEnum';
+import { ServiceCallTypeEnum } from '/@/enums/toolEnum';
+import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+
+export interface ExecutionActionListRefItemType {
+  key: string;
+  alarmClearRuleElRef?: InstanceType<typeof FlipFlop>;
+  ref?: FormActionType;
+  thingsModelFormRefl?: InstanceType<typeof ThingsModelForm>;
+}
+
+export interface ExecutionActionDataItemType {
+  callType: ServiceCallTypeEnum;
+  commandType: CommandTypeEnum;
+  deviceProfileId: string;
+  deviceType: DeviceTypeEnum;
+  entityType: TriggerEntityTypeEnum;
+  outTarget: ExecutionActionEnum;
+  deviceId?: string[];
+  thingsModelId?: string;
+  doContext: DoContextType | DoContextAlarmType;
+  alarmProfileId: string;
+}
+
+export interface DoContextType {
+  method?: string;
+  additionalInfo?: { cmdType: string | number };
+  params?: string | Recordable;
+}
+
+export interface DoContextAlarmType {
+  alarmLevel: AlarmLevelEnum;
+  clearRule: FlipFlopConditionType[];
+}
+
+export interface ExecutionActionFormItemRecordType {
+  [FormFieldsEnum.ALARM_LEVEL]?: AlarmLevelEnum;
+  [FormFieldsEnum.ALARM_PROFILED]?: string;
+  [FormFieldsEnum.CALL_TYPE]?: ServiceCallTypeEnum;
+  [FormFieldsEnum.COMMAND_TYPE]?: CommandTypeEnum;
+  [FormFieldsEnum.DEVICE_TYPE]?: DeviceTypeEnum;
+  [FormFieldsEnum.DEVICE_PROFILE_ID]?: string;
+  [FormFieldsEnum.OUT_TARGET]?: ExecutionActionEnum;
+  [FormFieldsEnum.TCP_CUSTOM_COMMAND]?: string;
+  [FormFieldsEnum.CUSTOM_COMMAND]?: string;
+  [FormFieldsEnum.TRANSPORT_TYPE]?: TransportTypeEnum;
+  [FormFieldsEnum.ENTITY_TYPE]?: TriggerEntityTypeEnum;
+  [FormFieldsEnum.ENTITY_ID]?: string[];
+  [FormFieldsEnum.CALL_SERVICE_IDENTIFIER]?: string;
+  [FormFieldsEnum.CALL_SERVICE]?: DeviceModelOfMatterAttrs;
+  [FormFieldsEnum.SERVICE_ID]?: string;
+}

+import { Ref, unref, nextTick, toRaw } from 'vue';
+import { DefineComponentsBasicExpose } from '/#/utils';
+import {
+  DoContextAlarmType,
+  DoContextType,
+  ExecutionActionDataItemType,
+  ExecutionActionFormItemRecordType,
+  ExecutionActionListRefItemType,
+} from './type';
+import { CommandTypeEnum, ExecutionActionEnum } from '/@/enums/linkedgeEnum';
+import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+import { useJsonParse } from '/@/hooks/business/useJsonParse';
+import { createNewExecutionActionItem } from '.';
+import { FormFieldsEnum } from './config';
+import { isObject, isString } from '/@/utils/is';
+
+export function useExecutionActionData(
+  executionActionListRef: Ref<ExecutionActionListRefItemType[]>,
+  hasAlarmNotify: Ref<boolean>
+): DefineComponentsBasicExpose<ExecutionActionDataItemType[]> {
+  const getExecutionActionItemData = (executionActionItem: ExecutionActionListRefItemType) => {
+    const { ref, alarmClearRuleElRef, thingsModelFormRefl } = executionActionItem;
+    const {
+      callType,
+      commandType,
+      deviceType,
+      deviceProfileId,
+      entityType,
+      entityId,
+      outTarget,
+      transportType,
+      alarmLevel,
+      callServiceIdentifier,
+      serviceId,
+      tcpCustomCommand,
+      customCommand,
+      alarmProfileId,
+    } = (ref?.getFieldsValue?.() || {}) as Required<ExecutionActionFormItemRecordType>;
+
+    const thingsModelFormRecord = thingsModelFormRefl?.getFieldsValue?.();
+
+    const clearRule = alarmClearRuleElRef?.getFieldsValue();
+
+    const record: ExecutionActionDataItemType = {
+      callType,
+      commandType,
+      alarmProfileId,
+      deviceType,
+      deviceProfileId,
+      entityType,
+      deviceId: entityId,
+      outTarget,
+      thingsModelId: serviceId,
+      doContext: {},
+    };
+
+    if (outTarget === ExecutionActionEnum.DEVICE_OUT) {
+      record.doContext = {
+        method: 'methodThingskit',
+        additionalInfo: { cmdType: commandType },
+        params:
+          commandType === CommandTypeEnum.CUSTOM
+            ? transportType === TransportTypeEnum.TCP
+              ? tcpCustomCommand
+              : useJsonParse(customCommand).value
+            : {
+                [callServiceIdentifier]: thingsModelFormRecord,
+              },
+      };
+    } else {
+      record.doContext = {
+        alarmLevel,
+        clearRule: clearRule || [],
+      };
+    }
+
+    return record;
+  };
+
+  const getFieldsValue = () => {
+    const dataList: ExecutionActionDataItemType[] = [];
+    for (const executionActionItem of unref(executionActionListRef)) {
+      dataList.push(getExecutionActionItemData(executionActionItem));
+    }
+
+    return dataList;
+  };
+
+  const setFieldsValue = (executionActionData: ExecutionActionDataItemType[]) => {
+    executionActionListRef.value = Array.from({ length: executionActionData.length }, () =>
+      createNewExecutionActionItem()
+    );
+
+    nextTick(() => {
+      unref(executionActionListRef).forEach((executionActionItem, index) => {
+        const result = executionActionData[index];
+
+        const { doContext, outTarget, commandType } = result;
+
+        const { thingsModelId, deviceId } = result;
+
+        const record = {
+          ...result,
+          [FormFieldsEnum.SERVICE_ID]: thingsModelId,
+          [FormFieldsEnum.ENTITY_ID]: deviceId,
+        };
+
+        if (outTarget === ExecutionActionEnum.MSG_NOTIFY) {
+          const { alarmLevel, clearRule } = doContext as DoContextAlarmType;
+          Object.assign(record, {
+            [FormFieldsEnum.ALARM_LEVEL]: alarmLevel,
+            [FormFieldsEnum.ENABLE_CLEAR_RULE]: !!(clearRule && clearRule.length),
+          });
+          hasAlarmNotify.value = true;
+        }
+
+        if (outTarget == ExecutionActionEnum.DEVICE_OUT && (doContext as DoContextType)?.params) {
+          const { params } = doContext as DoContextType;
+          Object.assign(record, {
+            [isString(params) ? FormFieldsEnum.TCP_CUSTOM_COMMAND : FormFieldsEnum.CUSTOM_COMMAND]:
+              params,
+          });
+        }
+
+        if (
+          outTarget === ExecutionActionEnum.DEVICE_OUT &&
+          commandType === CommandTypeEnum.SERVICE
+        ) {
+          const { params } = doContext as DoContextType;
+          if (isObject(params)) {
+            const [identifier] = Object.keys(params);
+            const result = params[identifier];
+            Object.assign(record, { [FormFieldsEnum.SERVICE_COMMAND]: toRaw(result || {}) });
+            executionActionItem.thingsModelFormRefl?.setFieldsValue(result || {});
+          }
+        }
+
+        executionActionItem.ref?.setFieldsValue(record);
+
+        if (
+          outTarget === ExecutionActionEnum.MSG_NOTIFY &&
+          (doContext as DoContextAlarmType).clearRule &&
+          (doContext as DoContextAlarmType).clearRule.length
+        ) {
+          nextTick(() => {
+            executionActionItem.alarmClearRuleElRef?.setFieldsValue(
+              (result.doContext as DoContextAlarmType).clearRule
+            );
+          });
+        }
+      });
+    });
+  };
+
+  const validate = async () => {
+    for (const executionActionItem of unref(executionActionListRef)) {
+      const { ref, alarmClearRuleElRef, thingsModelFormRefl } = executionActionItem;
+      await ref?.validate?.();
+      await alarmClearRuleElRef?.validate?.();
+      await thingsModelFormRefl?.validate?.();
+    }
+  };
+
+  const resetFieldsValue = () => {
+    executionActionListRef.value = [createNewExecutionActionItem()];
+    hasAlarmNotify.value = false;
+  };
+
+  return {
+    getFieldsValue,
+    setFieldsValue,
+    validate,
+    resetFieldsValue,
+  };
+}

+<script setup lang="ts">
+  import { InputGroup, InputNumber, Select } from 'ant-design-vue';
+  import { TriggerUnitEnum } from '/@/enums/linkedgeEnum';
+
+  withDefaults(
+    defineProps<{
+      value?: number;
+      unit?: TriggerUnitEnum;
+      unitOptions: Record<'label' | 'value', any>[];
+      disabled?: boolean;
+    }>(),
+    {
+      value: undefined,
+      unit: TriggerUnitEnum.SECONDS,
+      unitOptions: () => [],
+    }
+  );
+  const emit = defineEmits(['unitChange', 'update:unit', 'update:value']);
+
+  const handleUnitChange = (value: TriggerUnitEnum) => {
+    emit('update:unit', value);
+    emit('unitChange', value);
+  };
+</script>
+
+<template>
+  <InputGroup class="!flex" compact>
+    <InputNumber
+      :disabled="disabled"
+      :value="value"
+      :min="0"
+      @change="$emit('update:value', $event)"
+      v-bind="$attrs"
+    />
+    <Select
+      :disabled="disabled"
+      :value="unit"
+      :options="unitOptions"
+      :allow-clear="false"
+      @change="handleUnitChange"
+    />
+  </InputGroup>
+</template>

+import { unref } from 'vue';
+import { useSceneLinkageDrawerContext } from '../SceneLinkageDrawer/sceneLinkageDrawerContext';
+import { getDeviceProfile } from '/@/api/alarm/position';
+import { byOrganizationIdGetMasterDevice } from '/@/api/ruleengine/ruleengineApi';
+import { findDictItemByCode } from '/@/api/system/dict';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
+import { DictEnum } from '/@/enums/dictEnum';
+import { createPickerSearch } from '/@/utils/pickerSearch';
+import { DeviceTypeEnum } from '../../../dataFlow/cpns/config';
+import { getDeviceAttributes } from '/@/api/dataBoard';
+import { DeviceAttributeParams } from '/@/api/dataBoard/model';
+import {
+  TriggerValueTypeEnum,
+  TriggerValueTypeNameEnum,
+  TriggerEntityTypeEnum,
+  TriggerEntityTypeNameEnum,
+  TriggerTypeEnum,
+  TriggerTypeNameEnum,
+  DeviceTriggerTypeEum,
+  DeviceTriggerTypeNameEum,
+  FlipFlopTypeEnum,
+  FlipFlopTypeNameEnum,
+  TriggerUnitEnum,
+  TriggerUnitNameEnum,
+} from '/@/enums/linkedgeEnum';
+import { DeviceModelOfMatterAttrs } from '/@/api/device/model/deviceModel';
+import TriggerDurationInput from './TriggerDurationInput.vue';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
+
+export enum FormFieldEnum {
+  FLIP_FLOP_TYPE = 'flipFlopType',
+  DEVICE_TYPE = 'deviceType',
+  DEVICE_PROFILE_ID = 'deviceProfileId',
+  ENTITY_TYPE = 'entityType',
+  ENTITY_ID = 'entityId',
+  TRIGGER_TYPE = 'triggerType',
+  CONDITION_TYPE = 'conditionType',
+  CONDITION_KEY = 'conditionKey',
+  CONDITION_VALUE_TYPE = 'conditionValueType',
+  TRIGGER_DURATION_UNIT = 'triggerDurationUnit',
+  TRIGGER_DURATION_VALUE = 'triggerDurationValue',
+  TRIGGER_REPEAT_COUNT = 'triggerRepeatCount',
+
+  CONDITION_KEY_DETAIL = 'conditionKeyDetail',
+}
+
+export enum FormFieldNameEnum {
+  FLIP_FLOP_TYPE = '触发类型',
+  DEVICE_TYPE = '设备类型',
+  DEVICE_PROFILE_ID = '产品',
+  ENTITY_TYPE = '触发设备类型',
+  ENTITY_ID = '设备',
+  TRIGGER_TYPE = '触发方式',
+  CONDITION_TYPE = '触发条件',
+  CONDITION_KEY = '属性',
+  CONDITION_VALUE_TYPE = '比较类型',
+  TRIGGER_DURATION_VALUE = '持续时长',
+  TRIGGER_REPEAT_COUNT = '重复次数',
+}
+
+useComponentRegister('TriggerDurationInput', TriggerDurationInput);
+
+function getTriggerValueTypeByThingsModelType(type: DataTypeEnum) {
+  const map = {
+    [DataTypeEnum.BOOL]: TriggerValueTypeEnum.BOOLEAN,
+    [DataTypeEnum.NUMBER_DOUBLE]: TriggerValueTypeEnum.NUMERIC,
+    [DataTypeEnum.NUMBER_INT]: TriggerValueTypeEnum.NUMERIC,
+    [DataTypeEnum.STRING]: TriggerValueTypeEnum.STRING,
+    [DataTypeEnum.STRUCT]: TriggerValueTypeEnum.STRING,
+  };
+
+  return map[type];
+}
+
+export const getFormSchemas = (): FormSchema[] => {
+  const { organizationId } = useSceneLinkageDrawerContext();
+
+  return [
+    {
+      field: FormFieldEnum.FLIP_FLOP_TYPE,
+      label: '',
+      component: 'Select',
+      rules: [{ required: true, message: `请选择${FormFieldNameEnum.FLIP_FLOP_TYPE}` }],
+      defaultValue: FlipFlopTypeEnum.SIMPLE,
+      componentProps: () => {
+        return {
+          options: Object.keys(FlipFlopTypeEnum).map((value) => ({
+            label: FlipFlopTypeNameEnum[value],
+            value,
+          })),
+          placeholder: `请选择${FormFieldNameEnum.FLIP_FLOP_TYPE}`,
+        };
+      },
+    },
+    {
+      field: FormFieldEnum.DEVICE_TYPE,
+      label: '',
+      component: 'ApiSelect',
+      defaultValue: DeviceTypeEnum.SENSOR,
+      rules: [{ required: true, message: `请选择${FormFieldNameEnum.DEVICE_TYPE}` }],
+      componentProps: ({ formActionType }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          api: findDictItemByCode,
+          params: {
+            dictCode: DictEnum.DEVICE_TYPE,
+          },
+          labelField: 'itemText',
+          valueField: 'itemValue',
+          placeholder: `请选择${FormFieldNameEnum.DEVICE_TYPE}`,
+          onChange() {
+            setFieldsValue({
+              [FormFieldEnum.DEVICE_PROFILE_ID]: null,
+              [FormFieldEnum.ENTITY_ID]: [],
+              [FormFieldEnum.CONDITION_KEY]: null,
+            });
+          },
+        };
+      },
+    },
+    {
+      field: FormFieldEnum.DEVICE_PROFILE_ID,
+      label: '',
+      component: 'ApiSelect',
+      rules: [{ required: true, message: `请选择${FormFieldNameEnum.DEVICE_PROFILE_ID}` }],
+      componentProps: ({ formModel, formActionType }) => {
+        const deviceType = formModel[FormFieldEnum.DEVICE_TYPE];
+        const { setFieldsValue } = formActionType;
+        return {
+          api: async () => {
+            return await getDeviceProfile(deviceType);
+          },
+          labelField: 'name',
+          valueField: 'id',
+          placeholder: `请选择${FormFieldNameEnum.DEVICE_PROFILE_ID}`,
+          ...createPickerSearch(),
+          onChange() {
+            setFieldsValue({
+              [FormFieldEnum.ENTITY_ID]: [],
+              [FormFieldEnum.CONDITION_KEY]: null,
+            });
+          },
+        };
+      },
+    },
+    {
+      field: FormFieldEnum.ENTITY_TYPE,
+      label: '',
+      component: 'Select',
+      rules: [{ required: true, message: `请选择${FormFieldNameEnum.ENTITY_TYPE}` }],
+      componentProps: () => {
+        return {
+          options: Object.keys(TriggerEntityTypeEnum).map((value) => ({
+            label: TriggerEntityTypeNameEnum[value],
+            value,
+          })),
+          placeholder: `请选择${FormFieldNameEnum.ENTITY_TYPE}`,
+        };
+      },
+    },
+    {
+      field: FormFieldEnum.TRIGGER_DURATION_UNIT,
+      label: '',
+      component: 'Input',
+      ifShow: false,
+      defaultValue: TriggerUnitEnum.SECONDS,
+    },
+    {
+      field: FormFieldEnum.TRIGGER_DURATION_VALUE,
+      label: '',
+      component: 'TriggerDurationInput',
+      rules: [
+        {
+          required: true,
+          message: `请输入${FormFieldNameEnum.TRIGGER_DURATION_VALUE}`,
+          type: 'number',
+        },
+      ],
+      changeEvent: 'update:value',
+      ifShow: ({ model }) => model[FormFieldEnum.FLIP_FLOP_TYPE] === FlipFlopTypeEnum.DURATION,
+      componentProps: ({ formActionType, formModel }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          placeholder: `请输入${FormFieldNameEnum.TRIGGER_DURATION_VALUE}`,
+          unit: formModel[FormFieldEnum.TRIGGER_DURATION_UNIT],
+          unitOptions: Object.values(TriggerUnitEnum).map((value) => ({
+            label: TriggerUnitNameEnum[value],
+            value,
+          })),
+          onUnitChange(value: TriggerUnitEnum) {
+            setFieldsValue({ [FormFieldEnum.TRIGGER_DURATION_UNIT]: value });
+          },
+        };
+      },
+    },
+    {
+      field: FormFieldEnum.TRIGGER_REPEAT_COUNT,
+      label: '',
+      component: 'InputNumber',
+      rules: [{ required: true, message: `请输入${FormFieldNameEnum.TRIGGER_REPEAT_COUNT}` }],
+      ifShow: ({ model }) => model[FormFieldEnum.FLIP_FLOP_TYPE] === FlipFlopTypeEnum.REPEATING,
+      componentProps: {
+        placeholder: `请输入${FormFieldNameEnum.TRIGGER_REPEAT_COUNT}`,
+        min: 0,
+      },
+    },
+    {
+      field: FormFieldEnum.ENTITY_ID,
+      label: '',
+      component: 'ApiSelect',
+      rules: [{ required: true, type: 'array', message: `请选择${FormFieldNameEnum.ENTITY_ID}` }],
+      ifShow: ({ model }) => model[FormFieldEnum.ENTITY_TYPE] === TriggerEntityTypeEnum.PART,
+      componentProps: ({ formModel }) => {
+        return {
+          api: async (params: Record<'organizationId' | 'deviceProfileId', string>) => {
+            if (params.deviceProfileId && params.organizationId) {
+              const result = await byOrganizationIdGetMasterDevice(params);
+              if (result) {
+                return result.map((item) => ({
+                  ...item,
+                  label: item.alias || item.name,
+                  value: item.tbDeviceId,
+                }));
+              }
+            }
+            return [];
+          },
+          mode: 'multiple',
+          maxTagCount: 3,
+          params: {
+            organizationId: unref(organizationId),
+            deviceProfileId: formModel[FormFieldEnum.DEVICE_PROFILE_ID],
+          },
+          placeholder: `请选择${FormFieldNameEnum.ENTITY_ID}`,
+          ...createPickerSearch(),
+        };
+      },
+    },
+    {
+      field: FormFieldEnum.TRIGGER_TYPE,
+      label: '',
+      component: 'Select',
+      rules: [{ required: true, message: `请选择${FormFieldNameEnum.TRIGGER_TYPE}` }],
+      defaultValue: TriggerTypeEnum.DEVICE_TRIGGER,
+      componentProps: () => {
+        return {
+          options: [
+            { label: TriggerTypeNameEnum.DEVICE_TRIGGER, value: TriggerTypeEnum.DEVICE_TRIGGER },
+          ],
+        };
+      },
+    },
+    {
+      field: FormFieldEnum.CONDITION_TYPE,
+      label: '',
+      component: 'Select',
+      rules: [{ required: true, message: `请选择${FormFieldNameEnum.CONDITION_TYPE}` }],
+      defaultValue: DeviceTriggerTypeEum.TIME_SERIES,
+      componentProps: () => {
+        return {
+          options: [
+            {
+              label: DeviceTriggerTypeNameEum.TIME_SERIES,
+              value: DeviceTriggerTypeEum.TIME_SERIES,
+            },
+          ],
+        };
+      },
+    },
+    {
+      field: FormFieldEnum.CONDITION_KEY_DETAIL,
+      label: '',
+      component: 'Input',
+      ifShow: false,
+    },
+    {
+      field: FormFieldEnum.CONDITION_KEY,
+      label: '',
+      component: 'ApiSelect',
+      rules: [{ required: true, message: `请选择${FormFieldNameEnum.CONDITION_KEY}` }],
+      componentProps: ({ formModel, formActionType }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          api: async (params: DeviceAttributeParams) => {
+            if (params.deviceProfileId) {
+              return await getDeviceAttributes(params);
+            }
+            return [];
+          },
+          labelField: 'name',
+          valueField: 'identifier',
+          params: {
+            deviceProfileId: formModel[FormFieldEnum.DEVICE_PROFILE_ID],
+          },
+          placeholder: `请选择${FormFieldNameEnum.CONDITION_KEY}`,
+          onChange(
+            value: string,
+            option: DeviceModelOfMatterAttrs & Record<'label' | 'value', string>
+          ) {
+            setFieldsValue({
+              [FormFieldEnum.CONDITION_KEY_DETAIL]: value
+                ? { ...option, identifier: option?.value, name: option?.label }
+                : {},
+              [FormFieldEnum.CONDITION_VALUE_TYPE]:
+                value && option?.detail?.dataType?.type
+                  ? getTriggerValueTypeByThingsModelType(option.detail.dataType?.type)
+                  : null,
+            });
+          },
+          onOptionsChange(
+            options: (DeviceModelOfMatterAttrs & Record<'label' | 'value', string>)[]
+          ) {
+            const conditionKey = formModel[FormFieldEnum.CONDITION_KEY];
+            const res = options.find((item) => item.value === conditionKey);
+            res &&
+              setFieldsValue({
+                [FormFieldEnum.CONDITION_KEY_DETAIL]: {
+                  ...res,
+                  identifier: res?.value,
+                  name: res?.label,
+                },
+              });
+          },
+        };
+      },
+    },
+    {
+      field: FormFieldEnum.CONDITION_VALUE_TYPE,
+      label: '',
+      component: 'Select',
+      rules: [{ required: true, message: `请选择${FormFieldNameEnum.CONDITION_VALUE_TYPE}` }],
+      componentProps: () => {
+        return {
+          options: Object.keys(TriggerValueTypeEnum).map((value) => ({
+            label: TriggerValueTypeNameEnum[value],
+            value,
+          })),
+          placeholder: `请选择${FormFieldNameEnum.CONDITION_VALUE_TYPE}`,
+        };
+      },
+    },
+    {
+      field: 'conditionFilter',
+      label: '',
+      component: 'Input',
+      colProps: { span: 24, xxl: 24, xl: 24, lg: 24, md: 24, sm: 24, xs: 24 },
+      ifShow: ({ model }) =>
+        model[FormFieldEnum.CONDITION_KEY] && model[FormFieldEnum.CONDITION_VALUE_TYPE],
+      colSlot: 'conditionFilter',
+    },
+  ];
+};

+import { FlipFlopItemType } from './types';
+import { ScheduleTypeEnum } from '/@/enums/linkedgeEnum';
+import { buildUUID } from '/@/utils/uuid';
+
+export { default as FlipFlop } from './index.vue';
+
+export function createNewFlipFlopItem(): FlipFlopItemType {
+  return { key: buildUUID(), schedule: { type: ScheduleTypeEnum.ANY_TIME } };
+}

+<script setup lang="ts">
+  import { ComponentPublicInstance, ref, unref, watch } from 'vue';
+  import { Tooltip, Button } from 'ant-design-vue';
+  import { CollapseContainer } from '/@/components/Container';
+  import { Icon } from '/@/components/Icon';
+  import { FlipFlopItemType, ScheduleOptionItemType } from './types';
+  import { BasicForm, FormActionType } from '/@/components/Form';
+  import { getFormSchemas, FormFieldEnum } from './config';
+  import { useSceneLinkageDrawerContext } from '../SceneLinkageDrawer/sceneLinkageDrawerContext';
+  import { ScheduleTypeEnum, ScheduleTypeNameEnum } from '/@/enums/linkedgeEnum';
+  import { ConditionFilter } from '../ConditionFilter';
+  import { EnablingRule } from '../EnablingRule';
+  import { useModal } from '/@/components/Modal';
+  import { DataActionModeEnum } from '/@/enums/toolEnum';
+  import { EnableRuleFormModalParamsType, ScheduleType } from '../EnablingRule/type';
+  import { useFlipFlopData } from './useFlipFlopData';
+  import { createNewFlipFlopItem } from '.';
+
+  const { disabledDrawer } = useSceneLinkageDrawerContext();
+
+  const emit = defineEmits(['delete']);
+
+  const props = withDefaults(
+    defineProps<{
+      addButtonName?: string;
+      defaultNull?: boolean;
+      panelTitle?: (index: number) => string;
+      showAddButton?: boolean;
+      disabled?: boolean;
+    }>(),
+    {
+      addButtonName: '触发器 (OR)',
+      defaultNull: false,
+      panelTitle: (index: number) => `触发器${index}`,
+      showAddButton: true,
+      disabled: false,
+    }
+  );
+
+  const formSchemas = getFormSchemas();
+
+  const [registerModal, { openModal }] = useModal();
+
+  const handleOpenModal = (type: ScheduleTypeEnum, flipFlopItem: FlipFlopItemType) => {
+    if (unref(disabledDrawer) && type !== flipFlopItem.schedule.type) return;
+
+    if (type === ScheduleTypeEnum.ANY_TIME) {
+      flipFlopItem.schedule = { type };
+      return;
+    }
+
+    openModal(true, {
+      mode: DataActionModeEnum.CREATE,
+      record: {
+        type,
+        schedule: flipFlopItem.schedule,
+        key: flipFlopItem.key,
+      },
+    } as EnableRuleFormModalParamsType);
+  };
+
+  const handleRuleSetting = (params: ScheduleType, key: string) => {
+    const index = unref(flipFlopListElRef).findIndex((flipFlopItem) => flipFlopItem.key === key);
+
+    ~index && (unref(flipFlopListElRef)[index].schedule = params);
+  };
+
+  const scheduleOptions: ScheduleOptionItemType[] = Object.keys(ScheduleTypeEnum).map((value) => ({
+    label: ScheduleTypeNameEnum[value],
+    value: value as ScheduleTypeEnum,
+  }));
+
+  const { organizationId } = useSceneLinkageDrawerContext();
+
+  const flipFlopListElRef = ref<FlipFlopItemType[]>(
+    props.defaultNull ? [] : [createNewFlipFlopItem()]
+  );
+
+  /**
+   * @description on organization change
+   */
+  watch(organizationId, () => {
+    unref(flipFlopListElRef).forEach((flipFlopItem) =>
+      flipFlopItem.ref?.setFieldsValue({ [FormFieldEnum.ENTITY_ID]: [] })
+    );
+  });
+
+  const setFlopFlipFormRef = (
+    flipFlopItem: FlipFlopItemType,
+    el: Nullable<Element | ComponentPublicInstance>
+  ) => {
+    flipFlopItem.ref = el as unknown as FormActionType;
+  };
+
+  const setFlopFlipConditionRef = (
+    flipFlopItem: FlipFlopItemType,
+    el: Nullable<Element | ComponentPublicInstance>
+  ) => {
+    flipFlopItem.conditionRef = el as unknown as InstanceType<typeof ConditionFilter>;
+  };
+
+  const handleDelete = (flipFlopItem: FlipFlopItemType) => {
+    const index = unref(flipFlopListElRef).findIndex((item) => item.key === flipFlopItem.key);
+    ~index && unref(flipFlopListElRef).splice(index, 1);
+    emit('delete');
+  };
+
+  const handleAdd = () => {
+    flipFlopListElRef.value.push(createNewFlipFlopItem());
+  };
+
+  const { getFieldsValue, setFieldsValue, validate, resetFieldsValue } =
+    useFlipFlopData(flipFlopListElRef);
+
+  defineExpose({ getFieldsValue, setFieldsValue, validate, resetFieldsValue });
+</script>
+
+<template>
+  <section>
+    <CollapseContainer
+      v-for="(flipFlopItem, index) in flipFlopListElRef"
+      :key="flipFlopItem.key"
+      :title="panelTitle(index + 1)"
+      class="mb-4"
+    >
+      <template #action>
+        <header class="flex items-center justify-between">
+          <div class="flex items-center">
+            <div class="flex">
+              <span class="mr-2">启用规则:</span>
+              <div
+                class="px-1 cursor-pointer"
+                v-for="schedule in scheduleOptions"
+                :key="schedule.value"
+                type="text"
+                :class="flipFlopItem.schedule.type === schedule.value ? 'text-blue-400' : ''"
+                @click="handleOpenModal(schedule.value, flipFlopItem)"
+              >
+                {{ schedule.label }}
+              </div>
+            </div>
+            <Tooltip title="删除">
+              <Icon
+                v-if="!disabledDrawer"
+                class="ml-2 cursor-pointer"
+                icon="fluent:delete-off-20-regular"
+                size="20"
+                @click="handleDelete(flipFlopItem)"
+              />
+            </Tooltip>
+          </div>
+        </header>
+      </template>
+      <BasicForm
+        :ref="(el) => setFlopFlipFormRef(flipFlopItem, el)"
+        :key="flipFlopItem.key"
+        class="trigger-form"
+        layout="horizontal"
+        :disabled="disabledDrawer"
+        :schemas="formSchemas"
+        :showActionButtonGroup="false"
+        :baseColProps="{ span: 6, xxl: 6, xl: 8, lg: 12, sm: 24 }"
+      >
+        <template #conditionFilter="{ model }">
+          <ConditionFilter
+            :ref="(el) => setFlopFlipConditionRef(flipFlopItem, el)"
+            :triggerType="model[FormFieldEnum.CONDITION_VALUE_TYPE]"
+            :object-model="model[FormFieldEnum.CONDITION_KEY_DETAIL]"
+            :condition-type="model[FormFieldEnum.CONDITION_TYPE]"
+          />
+        </template>
+      </BasicForm>
+    </CollapseContainer>
+    <Button
+      v-if="showAddButton && !disabledDrawer"
+      type="primary"
+      class="w-full"
+      @click="handleAdd"
+    >
+      <Icon icon="ant-design:plus-outlined" />
+      {{ addButtonName }}
+    </Button>
+
+    <EnablingRule @register="registerModal" @setting-complete="handleRuleSetting" />
+  </section>
+</template>
+
+<style lang="less" scoped>
+  .trigger-form {
+    :deep(.ant-form-item-control-input-content) {
+      width: 100%;
+
+      > div > div {
+        width: 100%;
+      }
+
+      .ant-input-number {
+        width: 100% !important;
+      }
+      // .ant-col {
+      //   .ant-row{
+      //     .ant-col {
+      //       .
+      //     }
+      //   }
+      // }
+    }
+  }
+</style>

+import { ConditionFilter } from '../ConditionFilter';
+import { TriggerCondition } from '../ConditionFilter/type';
+import { ScheduleType } from '../EnablingRule/type';
+import { FormFieldEnum } from './config';
+import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
+import { FormActionType } from '/@/components/Form';
+import {
+  DeviceTriggerTypeEum,
+  FlipFlopTypeEnum,
+  ScheduleTypeEnum,
+  TriggerEntityTypeEnum,
+  TriggerTypeEnum,
+  TriggerUnitEnum,
+  TriggerValueTypeNameEnum,
+} from '/@/enums/linkedgeEnum';
+
+export interface ScheduleOptionItemType {
+  label: string;
+  value: ScheduleTypeEnum;
+}
+
+export interface FlipFlopItemType {
+  key: string;
+  ref?: FormActionType;
+  schedule: ScheduleType;
+  conditionRef?: InstanceType<typeof ConditionFilter>;
+}
+
+export interface FlipFlopConditionType {
+  deviceProfileId: string;
+  deviceType: DeviceTypeEnum;
+  entityId: string[];
+  entityType: TriggerEntityTypeEnum;
+  triggerCondition: TriggerCondition;
+  triggerType: TriggerTypeEnum;
+}
+
+export interface FlipFlopFormRecordType {
+  [FormFieldEnum.FLIP_FLOP_TYPE]: FlipFlopTypeEnum;
+  [FormFieldEnum.DEVICE_TYPE]: DeviceTypeEnum;
+  [FormFieldEnum.DEVICE_PROFILE_ID]: string;
+  [FormFieldEnum.ENTITY_TYPE]: TriggerEntityTypeEnum;
+  [FormFieldEnum.ENTITY_ID]: string[];
+  [FormFieldEnum.TRIGGER_TYPE]: TriggerTypeEnum;
+  [FormFieldEnum.CONDITION_TYPE]: DeviceTriggerTypeEum;
+  [FormFieldEnum.CONDITION_KEY]: string;
+  [FormFieldEnum.CONDITION_VALUE_TYPE]: TriggerValueTypeNameEnum;
+  [FormFieldEnum.TRIGGER_DURATION_VALUE]: number;
+  [FormFieldEnum.TRIGGER_REPEAT_COUNT]: number;
+  [FormFieldEnum.TRIGGER_DURATION_UNIT]: TriggerUnitEnum;
+}

+import { Ref, nextTick, toRaw, unref } from 'vue';
+import { FlipFlopConditionType, FlipFlopFormRecordType, FlipFlopItemType } from './types';
+import { DefineComponentsBasicExpose } from '/#/utils';
+import { FormFieldEnum } from './config';
+import { FlipFlopTypeEnum } from '/@/enums/linkedgeEnum';
+import { createNewFlipFlopItem } from '.';
+
+export function useFlipFlopData(
+  flipFlopListRef: Ref<FlipFlopItemType[]>
+): DefineComponentsBasicExpose<FlipFlopConditionType[]> {
+  const crateFlipFlopCondition = (flipFlopItem: FlipFlopItemType): FlipFlopConditionType => {
+    const {
+      deviceProfileId,
+      deviceType,
+      entityId,
+      entityType,
+      triggerType,
+      flipFlopType,
+      triggerDurationUnit,
+      triggerRepeatCount,
+      triggerDurationValue,
+    } = flipFlopItem.ref?.getFieldsValue() as FlipFlopFormRecordType;
+
+    const condition = flipFlopItem.conditionRef?.getFieldsValue() || [];
+
+    return {
+      deviceProfileId,
+      deviceType,
+      entityId,
+      entityType,
+      triggerType,
+      triggerCondition: {
+        condition: {
+          condition,
+          spec: {
+            type: flipFlopType,
+            ...(flipFlopType !== FlipFlopTypeEnum.SIMPLE
+              ? {
+                  unit: triggerDurationUnit,
+                  predicate: {
+                    defaultValue:
+                      flipFlopType === FlipFlopTypeEnum.DURATION
+                        ? triggerDurationValue
+                        : triggerRepeatCount,
+                  },
+                }
+              : {}),
+          },
+        },
+        schedule: toRaw(unref(flipFlopItem.schedule)),
+      },
+    };
+  };
+
+  const getFieldsValue = () => {
+    return unref(flipFlopListRef).map((flipFlopItem) => crateFlipFlopCondition(flipFlopItem));
+  };
+
+  const setFieldsValue = (flipFlopData: FlipFlopConditionType[]) => {
+    flipFlopListRef.value = Array.from({ length: flipFlopData.length }, () =>
+      createNewFlipFlopItem()
+    );
+
+    nextTick(() => {
+      unref(flipFlopListRef).forEach((item, index) => {
+        const data = flipFlopData[index];
+        const condition = data.triggerCondition.condition;
+        const [firstItem] = condition.condition;
+        const { key, valueType } = firstItem;
+        const { type, unit, predicate } = condition.spec;
+        const { defaultValue } = predicate || {};
+
+        item.ref?.setFieldsValue({
+          ...data,
+          [FormFieldEnum.FLIP_FLOP_TYPE]: type,
+          [FormFieldEnum.CONDITION_KEY]: key.key,
+          [FormFieldEnum.CONDITION_VALUE_TYPE]: valueType,
+          [FormFieldEnum.TRIGGER_DURATION_UNIT]: unit,
+          [FormFieldEnum.TRIGGER_DURATION_VALUE]:
+            type === FlipFlopTypeEnum.DURATION ? defaultValue : null,
+          [FormFieldEnum.TRIGGER_REPEAT_COUNT]:
+            type === FlipFlopTypeEnum.REPEATING ? defaultValue : null,
+        });
+
+        const {
+          daysOfWeek,
+          startsOn = 0,
+          endsOn = 0,
+          timezone,
+          type: scheduleType,
+          items,
+        } = data.triggerCondition.schedule;
+        item.schedule = {
+          type: scheduleType,
+          timezone,
+          daysOfWeek,
+          startsOn,
+          endsOn,
+          items,
+        };
+
+        nextTick(() => {
+          item.conditionRef?.setFieldsValue(condition.condition);
+        });
+      });
+    });
+  };
+
+  const validate = async () => {
+    for (const flipFlopItem of unref(flipFlopListRef)) {
+      await flipFlopItem.ref?.validate();
+      await flipFlopItem.conditionRef?.validate?.();
+    }
+  };
+
+  const resetFieldsValue = (defaultNull?: boolean) => {
+    flipFlopListRef.value = defaultNull ? [] : [createNewFlipFlopItem()];
+  };
+
+  return {
+    getFieldsValue,
+    setFieldsValue,
+    validate,
+    resetFieldsValue,
+  };
+}

+import { FormSchema, useComponentRegister } from '/@/components/Form';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
+
+export enum FormFieldsEnum {
+  NAME = 'name',
+  ORGANIZATION_ID = 'organizationId',
+  DESCRIPTION = 'description',
+}
+export enum FormFieldsNameEnum {
+  NAME = '场景联动名称',
+  ORGANIZATION_ID = '所属组织',
+  DESCRIPTION = '描述',
+}
+export const getFormSchemas = (
+  onOrgTreeSelectChange: Fn,
+  onOrgTreeSelectOptionsChange: Fn
+): FormSchema[] => {
+  return [
+    {
+      field: FormFieldsEnum.NAME,
+      component: 'Input',
+      label: FormFieldsNameEnum.NAME,
+      required: true,
+      componentProps: {
+        placeholder: `请输入${FormFieldsNameEnum.NAME}`,
+      },
+    },
+    {
+      field: FormFieldsEnum.ORGANIZATION_ID,
+      component: 'OrgTreeSelect',
+      label: FormFieldsNameEnum.ORGANIZATION_ID,
+      required: true,
+      componentProps: {
+        placeholder: `请输入${FormFieldsNameEnum.NAME}`,
+        onChange: onOrgTreeSelectChange,
+        onOptionsChange: onOrgTreeSelectOptionsChange,
+      },
+    },
+    {
+      field: FormFieldsEnum.DESCRIPTION,
+      component: 'InputTextArea',
+      label: FormFieldsNameEnum.DESCRIPTION,
+      componentProps: {
+        placeholder: `请输入${FormFieldsNameEnum.DESCRIPTION}`,
+      },
+    },
+    {
+      field: 'flipFlop',
+      component: 'Input',
+      label: '',
+      slot: 'flipFlop',
+    },
+    {
+      field: 'executionCondition',
+      component: 'Input',
+      label: '',
+      slot: 'executionCondition',
+    },
+    {
+      field: 'executionAction',
+      component: 'Input',
+      label: '',
+      slot: 'executionAction',
+    },
+  ];
+};

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

+<script setup lang="ts">
+  import { computed, ref, unref } from 'vue';
+  import { SceneLinkageDrawerDataType } from './type';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { DataActionModeEnum, DataActionModeNameEnum } from '/@/enums/toolEnum';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { getFormSchemas, FormFieldsEnum } from './config';
+  import { createSceneLinkageDrawerContext } from './sceneLinkageDrawerContext';
+  import { FlipFlop } from '../FlipFlop';
+  import { Divider, Tooltip } from 'ant-design-vue';
+  import { Icon } from '/@/components/Icon';
+  import { ExecutionAction } from '../ExecutionAction';
+  import { useSceneLinkageData } from './useSceneLinkedgeData';
+  import { screenLinkPageAddApi } from '/@/api/ruleengine/ruleengineApi';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { OrganizationListItem } from '/@/api/system/model/systemModel';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const drawerMode = ref(DataActionModeEnum.CREATE);
+
+  const getDrawTitle = computed(() => `${DataActionModeNameEnum[unref(drawerMode)]}场景联动`);
+
+  const disabledDrawer = ref(false);
+
+  const currentUpdateLinkedgeId = ref<string>();
+
+  const [register, { setDrawerProps, closeDrawer }] = useDrawerInner(
+    (data: SceneLinkageDrawerDataType) => {
+      const { mode, record } = data;
+      drawerMode.value = mode;
+      disabledDrawer.value = mode === DataActionModeEnum.READ;
+      resetFieldsValue?.();
+
+      if (mode === DataActionModeEnum.UPDATE || mode === DataActionModeEnum.READ) {
+        currentUpdateLinkedgeId.value = record.id;
+        setDrawerProps({ loading: true });
+        handleOnOrganizationChange(data.record.organizationId);
+        setTimeout(() => {
+          setFieldsValue(record);
+          setDrawerProps({ loading: false });
+        }, 300);
+      }
+
+      setDrawerProps({
+        showOkBtn: !unref(disabledDrawer),
+        cancelText: unref(disabledDrawer) ? '关闭' : '取消',
+      });
+    }
+  );
+
+  const [registerForm, basicFormActionType] = useForm({
+    schemas: getFormSchemas(handleOnOrganizationChange, handleOnOrganizationOptionsChange),
+    layout: 'horizontal',
+    labelWidth: 120,
+    showActionButtonGroup: false,
+  });
+
+  const organizationId = ref<string>();
+
+  function handleOnOrganizationChange(id: string) {
+    organizationId.value = id;
+  }
+
+  function handleOnOrganizationOptionsChange(options: OrganizationListItem[]) {
+    if (unref(drawerMode) === DataActionModeEnum.CREATE) {
+      const [firsetItem] = options;
+      organizationId.value = firsetItem?.id;
+      basicFormActionType.setFieldsValue({ [FormFieldsEnum.ORGANIZATION_ID]: firsetItem?.id });
+    }
+  }
+
+  createSceneLinkageDrawerContext({
+    organizationId: computed(() => unref(organizationId)),
+    disabledDrawer: computed(() => unref(disabledDrawer)),
+  });
+
+  const flipFlopElRef = ref<InstanceType<typeof FlipFlop>>();
+
+  const executionConditionElRef = ref<InstanceType<typeof FlipFlop>>();
+
+  const executionActionElRef = ref<InstanceType<typeof ExecutionAction>>();
+
+  const { getFieldsValue, setFieldsValue, validate, resetFieldsValue } = useSceneLinkageData({
+    flipFlopElRef,
+    executionActionElRef,
+    executionConditionElRef,
+    basicFormActionType,
+  });
+
+  const { createMessage } = useMessage();
+  const handleSave = async () => {
+    await validate?.();
+    setDrawerProps({ loading: true, confirmLoading: true });
+    try {
+      const value = getFieldsValue();
+
+      if (unref(drawerMode) === DataActionModeEnum.UPDATE) {
+        Reflect.set(value, 'id', unref(currentUpdateLinkedgeId));
+      }
+
+      await screenLinkPageAddApi(value, unref(drawerMode) === DataActionModeEnum.UPDATE);
+      createMessage.success(`${DataActionModeNameEnum[unref(drawerMode)]}成功`);
+      closeDrawer();
+      emit('success');
+    } finally {
+      setDrawerProps({ loading: false, confirmLoading: false });
+    }
+  };
+</script>
+
+<template>
+  <BasicDrawer
+    @register="register"
+    :title="getDrawTitle"
+    width="50%"
+    @ok="handleSave"
+    show-cancel-btn
+    show-footer
+  >
+    <BasicForm @register="registerForm" :disabled="disabledDrawer">
+      <template #flipFlop>
+        <Divider orientation="left">
+          <Tooltip>
+            <template #title> 触发器不可为空，消息只要满足触发条件中任意一个即可触发。 </template>
+            <label><span class="text-red-400 mr-1">*</span>触发器</label>
+            <Icon icon="ant-design:question-circle-outlined" class="ml-2" />
+          </Tooltip>
+        </Divider>
+        <FlipFlop ref="flipFlopElRef" />
+      </template>
+      <template #executionCondition>
+        <Divider orientation="left">
+          <Tooltip>
+            <template #title> 执行条件可为空，消息需要满足所有执行条件才会被处理。 </template>
+            <label>执行条件</label>
+            <Icon icon="ant-design:question-circle-outlined" class="ml-2" />
+          </Tooltip>
+        </Divider>
+        <FlipFlop
+          ref="executionConditionElRef"
+          addButtonName="执行条件 (AND)"
+          default-null
+          :panel-title="(index) => `执行条件${index}`"
+        />
+      </template>
+      <template #executionAction>
+        <Divider orientation="left">
+          <Tooltip>
+            <template #title>
+              触发器和执行条件都满足时，场景联动会做什么，例如：设备联动、告警通知等。
+            </template>
+            <label><span class="text-red-400 mr-1">*</span>执行动作</label>
+            <Icon icon="ant-design:question-circle-outlined" class="ml-2" />
+          </Tooltip>
+        </Divider>
+        <ExecutionAction ref="executionActionElRef" />
+      </template>
+    </BasicForm>
+  </BasicDrawer>
+</template>

+import type { ComputedRef, InjectionKey } from 'vue';
+import { createContext, useContext } from '/@/hooks/core/useContext';
+
+export interface SceneLinkageDrawerContextProps {
+  organizationId: ComputedRef<string | undefined>;
+  disabledDrawer: ComputedRef<boolean>;
+}
+
+const key: InjectionKey<SceneLinkageDrawerContextProps> = Symbol('scene-linkage-drawer-context');
+
+export function createSceneLinkageDrawerContext(context: SceneLinkageDrawerContextProps) {
+  return createContext<SceneLinkageDrawerContextProps>(context, key, { native: true });
+}
+
+export function useSceneLinkageDrawerContext() {
+  return useContext<SceneLinkageDrawerContextProps>(key);
+}

+import { ExecutionActionDataItemType } from '../ExecutionAction/type';
+import { FlipFlopConditionType } from '../FlipFlop/types';
+import { FormFieldsEnum } from './config';
+export type SceneLinkageDrawerDataType = ModalParamsType<SceneLinkageDataType>;
+
+export interface SceneLinkageFormRecordType {
+  [FormFieldsEnum.NAME]: string;
+  [FormFieldsEnum.ORGANIZATION_ID]: string;
+  [FormFieldsEnum.DESCRIPTION]: string;
+}
+
+export interface SceneLinkageDataType {
+  id?: string;
+  doActions: ExecutionActionDataItemType[];
+  triggers: FlipFlopConditionType[];
+  doConditions: FlipFlopConditionType[];
+  name: string;
+  description?: string;
+  organizationId: string;
+}

+import { Ref, unref } from 'vue';
+import { ExecutionAction } from '../ExecutionAction';
+import { FlipFlop } from '../FlipFlop';
+import { DefineComponentsBasicExpose } from '/#/utils';
+import { SceneLinkageDataType, SceneLinkageFormRecordType } from './type';
+import { FormActionType } from '/@/components/Form';
+
+interface UseSceneLinkageDataParamsType {
+  flipFlopElRef: Ref<InstanceType<typeof FlipFlop> | undefined>;
+  executionConditionElRef: Ref<InstanceType<typeof FlipFlop> | undefined>;
+  executionActionElRef: Ref<InstanceType<typeof ExecutionAction> | undefined>;
+  basicFormActionType: FormActionType;
+}
+
+export function useSceneLinkageData({
+  flipFlopElRef,
+  executionActionElRef,
+  executionConditionElRef,
+  basicFormActionType,
+}: UseSceneLinkageDataParamsType): DefineComponentsBasicExpose<SceneLinkageDataType> {
+  const getFieldsValue = () => {
+    const doActions = unref(executionActionElRef)?.getFieldsValue() || [];
+    const doConditions = unref(executionConditionElRef)?.getFieldsValue() || [];
+    const triggers = unref(flipFlopElRef)?.getFieldsValue() || [];
+    const { name, description, organizationId } =
+      basicFormActionType.getFieldsValue() as SceneLinkageFormRecordType;
+
+    return {
+      name,
+      description,
+      organizationId,
+      doActions,
+      doConditions,
+      triggers,
+    };
+  };
+
+  const setFieldsValue = (record: SceneLinkageDataType) => {
+    const { doActions, doConditions, triggers, name, description, organizationId } = record;
+
+    basicFormActionType.setFieldsValue({ name, description, organizationId });
+
+    unref(flipFlopElRef)?.setFieldsValue(triggers);
+
+    unref(executionConditionElRef)?.setFieldsValue(doConditions);
+
+    unref(executionActionElRef)?.setFieldsValue(doActions);
+  };
+
+  const validate = async () => {
+    await basicFormActionType.validate?.();
+    await unref(flipFlopElRef)?.validate?.();
+    await unref(executionConditionElRef)?.validate?.();
+    await unref(executionActionElRef)?.validate?.();
+  };
+
+  const resetFieldsValue = () => {
+    basicFormActionType.resetFields();
+    unref(flipFlopElRef)?.resetFieldsValue?.();
+    unref(executionConditionElRef)?.resetFieldsValue?.(true);
+    unref(executionActionElRef)?.resetFieldsValue?.();
+  };
+
+  return {
+    getFieldsValue,
+    setFieldsValue,
+    validate,
+    resetFieldsValue,
+  };
+}

 import { formatToDateTime } from '/@/utils/dateUtil';
-import { Number_Operation, String_Operation, Boolean_Operation } from '/@/enums/operationEnum';
+import {
+  NumberOperationEnum,
+  StringOperationEnum,
+  BooleanOperationEnum,
+} from '../../../../enums/linkedgeEnum';
 
 // 生成触发器或执行条件JSON数据
 export const genTriggerOrConditionData = (triggerData) => {
@@ -164,26 +168,26 @@ export const genActionData = (actionData) => {
 };
 
 export const operationNumber_OR_TIME = [
-  { label: '等于', value: Number_Operation.EQUAL, symbol: '=' },
-  { label: '不等于', value: Number_Operation.NOT_EQUAL, symbol: '!=' },
-  { label: '小于', value: Number_Operation.LESS, symbol: '<' },
-  { label: '小于等于', value: Number_Operation.LESS_OR_EQUAL, symbol: '<=' },
-  { label: '大于', value: Number_Operation.GREATER, symbol: '>' },
-  { label: '大于等于', value: Number_Operation.GREATER_OR_EQUAL, symbol: '>=' },
+  { label: '等于', value: NumberOperationEnum.EQUAL, symbol: '=' },
+  { label: '不等于', value: NumberOperationEnum.NOT_EQUAL, symbol: '!=' },
+  { label: '小于', value: NumberOperationEnum.LESS, symbol: '<' },
+  { label: '小于等于', value: NumberOperationEnum.LESS_OR_EQUAL, symbol: '<=' },
+  { label: '大于', value: NumberOperationEnum.GREATER, symbol: '>' },
+  { label: '大于等于', value: NumberOperationEnum.GREATER_OR_EQUAL, symbol: '>=' },
 ];
 
 export const operationString = [
-  { label: '等于', value: String_Operation.EQUAL, symbol: '=' },
-  { label: '不等于', value: String_Operation.NOT_EQUAL, symbol: '!=' },
-  { label: '开始于', value: String_Operation.BEGAN_IN, symbol: '开始于' },
-  { label: '结束于', value: String_Operation.END_IN, symbol: '结束于' },
-  { label: '包含', value: String_Operation.INCLUDE, symbol: '包含' },
-  { label: '不包含', value: String_Operation.NOT_INCLUDE, symbol: '不包含' },
+  { label: '等于', value: StringOperationEnum.EQUAL, symbol: '=' },
+  { label: '不等于', value: StringOperationEnum.NOT_EQUAL, symbol: '!=' },
+  { label: '开始于', value: StringOperationEnum.STARTS_WITH, symbol: '开始于' },
+  { label: '结束于', value: StringOperationEnum.ENDS_WITH, symbol: '结束于' },
+  { label: '包含', value: StringOperationEnum.CONTAINS, symbol: '包含' },
+  { label: '不包含', value: StringOperationEnum.NOT_CONTAINS, symbol: '不包含' },
 ];
 
 export const operationBoolean = [
-  { label: '等于', value: Boolean_Operation.EQUAL, symbol: '=' },
-  { label: '不等于', value: Boolean_Operation.NOT_EQUAL, symbol: '!=' },
+  { label: '等于', value: BooleanOperationEnum.EQUAL, symbol: '=' },
+  { label: '不等于', value: BooleanOperationEnum.NOT_EQUAL, symbol: '!=' },
 ];
 
 export const scheduleOptions = [
@@ -376,7 +380,8 @@ export function isType(operationType) {
 }
 export function conditionPreView(data, operationType) {
   if (operationType === 'NUMERIC' || operationType === 'DATE_TIME') {
-    const { EQUAL, NOT_EQUAL, LESS, LESS_OR_EQUAL, GREATER, GREATER_OR_EQUAL } = Number_Operation;
+    const { EQUAL, NOT_EQUAL, LESS, LESS_OR_EQUAL, GREATER, GREATER_OR_EQUAL } =
+      NumberOperationEnum;
     return data.map((item) => {
       return {
         operation:
@@ -398,7 +403,14 @@ export function conditionPreView(data, operationType) {
       };
     });
   } else if (operationType === 'STRING') {
-    const { EQUAL, NOT_EQUAL, BEGAN_IN, END_IN, INCLUDE, NOT_INCLUDE } = String_Operation;
+    const {
+      EQUAL,
+      NOT_EQUAL,
+      STARTS_WITH: BEGAN_IN,
+      ENDS_WITH: END_IN,
+      CONTAINS: INCLUDE,
+      NOT_CONTAINS: NOT_INCLUDE,
+    } = StringOperationEnum;
     return data.map((item) => {
       return {
         operation:
@@ -420,7 +432,7 @@ export function conditionPreView(data, operationType) {
       };
     });
   } else if (operationType === 'BOOLEAN') {
-    const { EQUAL, NOT_EQUAL } = Boolean_Operation;
+    const { EQUAL, NOT_EQUAL } = BooleanOperationEnum;
     return data.map((item) => {
       return {
         operation:

-<template>
-  <BasicModal
-    v-bind="$attrs"
-    :width="600"
-    :title="isUpdateFlag ? '编辑' + title : '新增' + title"
-    centered
-    @register="registerModal"
-    @ok="handleOk"
-    @cancel="handleCancel"
-  >
-    <BasicForm @register="registerForm" ref="basicFormRef">
-      <template #customEnable>
-        <template v-for="(item, optionIndex) in options" :key="item.flag">
-          <div :class="optionIndex >= 1 ? 'mt-4' : ''" class="flex">
-            <div class="ml-4 mr-4 flex items-center">
-              <Checkbox v-model:checked="item.enabled">星期{{ item.flag }}</Checkbox>
-            </div>
-            <TimePicker
-              placeholder="开始时间"
-              v-model:value="item.startsOn"
-              value-format="x"
-              format="HH:mm"
-              :disabled="!item.enabled"
-            />
-            <span class="ml-4 mr-4 flex items-center">~</span>
-            <TimePicker
-              @change="handleBlur(item.startsOn, item.endsOn)"
-              placeholder="结束时间"
-              v-model:value="item.endsOn"
-              value-format="x"
-              format="HH:mm"
-              :disabled="!item.enabled"
-            />
-          </div>
-        </template>
-      </template>
-      <template #timing>
-        <TimePicker
-          placeholder="开始时间"
-          v-model:value="timeState.startsOn"
-          value-format="x"
-          format="HH:mm"
-        />
-        <span class="ml-4 mr-4">~</span>
-        <TimePicker
-          @change="handleTimeBlur(timeState.startsOn, timeState.endsOn)"
-          placeholder="结束时间"
-          v-model:value="timeState.endsOn"
-          value-format="x"
-          format="HH:mm"
-        />
-      </template>
-    </BasicForm>
-  </BasicModal>
-</template>
-
-<script lang="ts" setup>
-  import { reactive, ref, watch, nextTick } from 'vue';
-  import { useModalInner, BasicModal } from '/@/components/Modal';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import { alarmScheduleSchemas } from '../config/config.data';
-  import { Checkbox, TimePicker } from 'ant-design-vue';
-  import { useMessage } from '/@/hooks/web/useMessage';
-
-  const emit = defineEmits(['register', 'cancel']);
-  const title = ref('');
-  const isUpdateFlag = ref(false);
-  const { createMessage } = useMessage();
-  const [registerForm, { setFieldsValue, getFieldsValue }] = useForm({
-    showActionButtonGroup: false,
-    schemas: alarmScheduleSchemas,
-  });
-  const timeState = reactive({
-    startsOn: null,
-    endsOn: null,
-  });
-
-  const options = ref([
-    {
-      enabled: false,
-      dayOfWeek: 1,
-      flag: '一',
-      endsOn: null,
-      startsOn: null,
-    },
-    {
-      enabled: false,
-      dayOfWeek: 2,
-      flag: '二',
-      endsOn: null,
-      startsOn: null,
-    },
-    {
-      enabled: false,
-      dayOfWeek: 3,
-      flag: '三',
-      endsOn: null,
-      startsOn: null,
-    },
-    {
-      enabled: false,
-      dayOfWeek: 4,
-      flag: '四',
-      endsOn: null,
-      startsOn: null,
-    },
-    {
-      enabled: false,
-      dayOfWeek: 5,
-      flag: '五',
-      endsOn: null,
-      startsOn: null,
-    },
-    {
-      enabled: false,
-      dayOfWeek: 6,
-      flag: '六',
-      endsOn: null,
-      startsOn: null,
-    },
-    {
-      enabled: false,
-      dayOfWeek: 7,
-      flag: '日',
-      endsOn: null,
-      startsOn: null,
-    },
-  ]);
-  const basicFormRef = ref<InstanceType<typeof BasicForm>>();
-  let index = ref(null);
-  watch(
-    options,
-    (newValue) => {
-      const arr = [];
-      for (let item of newValue) {
-        if (item.enabled && item.startsOn && item.endsOn) {
-          arr.push(true);
-        } else if ((!item.enabled && item.startsOn && item.endsOn) || item.enabled) {
-          arr.push(false);
-        }
-      }
-      const flag = arr.length ? !arr.every((item) => item) : true;
-      nextTick(() => {
-        setModalProps({
-          okButtonProps: {
-            disabled: flag,
-          },
-        });
-      });
-    },
-    {
-      deep: true,
-    }
-  );
-
-  const [registerModal, { closeModal, setModalProps }] = useModalInner((data) => {
-    watch([timeState, basicFormRef.value.formModel], ([timeState, formModel]) => {
-      setModalProps({
-        okButtonProps: {
-          disabled:
-            timeState.startsOn === null ||
-            timeState.endsOn === null ||
-            !formModel.daysOfWeek?.length,
-        },
-      });
-      watch(
-        () => formModel.schedule,
-        () => {
-          timeState.startsOn = null;
-          timeState.endsOn = null;
-        }
-      );
-    });
-    const { value, currentIndex, isUpdate, scheduleData } = data;
-    isUpdateFlag.value = isUpdate;
-    if (value === 'SPECIFIC_TIME') {
-      title.value = '定时启用';
-    } else {
-      title.value = '自定义启用';
-    }
-
-    index.value = currentIndex;
-    const dayZenoTime = Math.round(new Date(new Date().toLocaleDateString()).getTime());
-    // 编辑
-    setFieldsValue({
-      schedule: value,
-    });
-    if (isUpdate) {
-      nextTick(() => {
-        // 回显定时启用
-        if (scheduleData.type === 'SPECIFIC_TIME') {
-          setFieldsValue({
-            daysOfWeek: scheduleData.daysOfWeek,
-          });
-          timeState.startsOn = scheduleData.startsOn + dayZenoTime + '';
-          timeState.endsOn = scheduleData.endsOn + dayZenoTime + '';
-        }
-        // 回显自定义启用
-        if (scheduleData.type === 'CUSTOM') {
-          for (let [index, item] of scheduleData?.items.entries()) {
-            if (item.enabled) {
-              options.value[index].enabled = item.enabled;
-              options.value[index].startsOn = item.startsOn + dayZenoTime + '';
-              options.value[index].endsOn = item.endsOn + dayZenoTime + '';
-            }
-          }
-        }
-      });
-    }
-  });
-  const scheduleData = ref({
-    type: 'ANY_TIME',
-  });
-  const handleBlur = (eS, eE) => {
-    if (eS > eE) {
-      return createMessage.warn('开始时间不能大于结束时间');
-    }
-  };
-  const handleTimeBlur = (eS, eE) => {
-    if (eS > eE) {
-      return createMessage.warn('开始时间不能大于结束时间');
-    }
-  };
-  const handleOk = () => {
-    const { schedule: type, timezone, daysOfWeek } = getFieldsValue();
-    // 获取当天0时时间戳
-    const dayZenoTime = Math.round(new Date(new Date().toLocaleDateString()).getTime());
-    if (type === 'CUSTOM') {
-      const items = options.value.map((item) => {
-        return {
-          startsOn: item.startsOn ? item.startsOn - dayZenoTime : 0,
-          endsOn: item.endsOn ? item.endsOn - dayZenoTime : 0,
-          dayOfWeek: item.dayOfWeek,
-          enabled: item.enabled,
-        };
-      });
-      scheduleData.value = {
-        type,
-        timezone,
-        items,
-      };
-    } else if (type === 'SPECIFIC_TIME') {
-      scheduleData.value = {
-        type,
-        timezone,
-        daysOfWeek,
-        startsOn: timeState.startsOn - dayZenoTime,
-        endsOn: timeState.endsOn - dayZenoTime,
-      };
-    }
-    closeModal();
-  };
-  const handleCancel = () => {
-    emit('cancel', index.value);
-  };
-
-  defineExpose({
-    scheduleData,
-  });
-</script>
-
-<style lang="less" scoped>
-  :deep(.ant-time-picker) {
-    width: 12rem;
-  }
-</style>

-<template>
-  <div>
-    <CollapseContainer style="background-color: #f2f2f2" title="清除告警" :canExpan="false">
-      <template #action>
-        <div class="flex">
-          <div class="flex">
-            <span class="mr-2">启用规则:</span>
-            <template v-for="(item, scheduleIndex) in scheduleOptions" :key="item.label">
-              <div
-                :class="{ 'ml-4': scheduleIndex >= 1, active: scheduleIndex === currentIndex }"
-                class="cursor-pointer"
-                @click="handleScheduleChange(item.value)"
-                >{{ item.label }}</div
-              >
-            </template>
-          </div>
-          <Tooltip title="移除" class="ml-4">
-            <Icon
-              icon="fluent:delete-off-20-regular"
-              size="20"
-              class="mr-2 cursor-pointer"
-              @click="handleDelete(index)"
-              v-if="clearRuleList.length > 1"
-            />
-          </Tooltip>
-        </div>
-      </template>
-      <BasicForm @register="registerForm">
-        <template #operationType="{ model, field }">
-          <Select
-            :options="options"
-            :disabled="disabled"
-            v-model:value="model[field]"
-            @change="operationType = model[field]"
-            placeholder="请选择比较类型"
-            allowClear
-          />
-        </template>
-        <template #time="{ model, field }">
-          <Input v-model:value="model[field]" placeholder="请输入持续时间">
-            <template #addonAfter>
-              <Select
-                :disabled="disabled"
-                v-model:value="model[`timeUnit`]"
-                :options="timeUnitOptions"
-                style="width: 60px"
-              />
-            </template>
-          </Input>
-        </template>
-      </BasicForm>
-      <Card size="small" :bordered="false" style="border: 2px dashed #d9d9d9" v-if="operationType">
-        <ConditionScreening
-          :childGetFieldsValue="childGetFieldsValue"
-          ref="conditionScreeningRef"
-        />
-      </Card>
-    </CollapseContainer>
-    <AlarmSchedule ref="alarmScheduleRef" @register="registerModal" @cancel="handleCancel" />
-  </div>
-</template>
-<script lang="ts" setup>
-  import { ref, provide, nextTick, unref } from 'vue';
-  import { CollapseContainer } from '/@/components/Container/index';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { Card, Select, Input, Tooltip } from 'ant-design-vue';
-  import { trigger_condition_schema, TOption } from '../config/config.data';
-  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
-  import ConditionScreening from './ConditionScreening.vue';
-  import { scheduleOptions, timeUnitOptions, options } from '../config/formatData';
-  import { Icon } from '/@/components/Icon';
-  import AlarmSchedule from './AlarmSchedule.vue';
-  import { useModal } from '/@/components/Modal';
-  import { cloneDeep } from 'lodash-es';
-  import useCommonFun from '../hooks/useCommonFun';
-
-  const { useByProductGetAttribute } = useCommonFun();
-  defineProps({
-    index: {
-      type: Number,
-      required: true,
-    },
-    clearRuleList: {
-      type: Array,
-      default: () => [],
-    },
-  });
-  const emit = defineEmits(['delete']);
-  const isUpdate = ref(false);
-  const conditionScreeningRef = ref();
-  const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue, setProps }] =
-    useForm({
-      //TODO-wenwei-修复
-      schemas: cloneDeep(trigger_condition_schema),
-      //TODO-wenwei-修复
-      showActionButtonGroup: false,
-    });
-
-  const alarmScheduleRef = ref<InstanceType<typeof AlarmSchedule>>();
-  const getFieldsValueFunc = () => {
-    const predicate = conditionScreeningRef?.value?.refItem?.conditionScreeningRefs?.value?.map(
-      (item) => item.getFieldsValue()
-    );
-    return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
-  };
-
-  const updateFieldDeviceId = () => {
-    // console.log(deviceList);
-    // console.log(isUpdate);
-  };
-
-  const resetFieldsValueFunc = () => resetFields();
-  // 回显数据函数
-  const setFieldsFormValueFun = (fieldsValue) => {
-    setFieldsValue(fieldsValue);
-  };
-  const updateFieldAttributeFunc = async (e) => {
-    const res = await getAttribute(e);
-    const options = ref<TOption[]>([]);
-    useByProductGetAttribute(res, updateSchema, options);
-  };
-  //TODO-fengtao
-  const schedule = ref('ANY_TIME');
-  const operationType = ref<string>('');
-  provide('operationType', operationType);
-
-  const handleDelete = (index: number) => {
-    emit('delete', index);
-  };
-
-  // 子组件获取父组件的值
-  const childGetFieldsValue = () => getFieldsValue();
-
-  // 获取conditionScreeningForm的组件
-  const getRefItemConditionScreeningRefs = async () => {
-    await nextTick();
-    return conditionScreeningRef.value.refItem.conditionScreeningRefs;
-  };
-
-  const setConditionScreeningList = (list) => {
-    conditionScreeningRef.value.conditionScreeningList = list;
-  };
-  const setRichText = (list) => {
-    conditionScreeningRef.value.otherAttribute = list;
-  };
-
-  const currentIndex = ref(0);
-  const [registerModal, { openModal }] = useModal();
-  const handleScheduleChange = (value) => {
-    if (unref(disabled)) return;
-    const index = scheduleOptions.findIndex((item) => item.value === value);
-    // 报警日程弹窗
-    if (index !== 0) {
-      openModal(true, {
-        isUpdate: isUpdate.value,
-        value,
-        currentIndex: currentIndex.value,
-        scheduleData,
-      });
-    } else {
-      alarmScheduleRef.value.scheduleData = {
-        type: value,
-      };
-    }
-    currentIndex.value = index;
-  };
-  const handleCancel = (index) => {
-    currentIndex.value = index;
-  };
-  const scheduleData = ref(null);
-
-  const disabled = ref<boolean>(false);
-  const setDisabledProps = (value) => {
-    setProps(value);
-    disabled.value = true;
-  };
-
-  const setCancelDisabled = () => {
-    disabled.value = false;
-  };
-  defineExpose({
-    getFieldsValue,
-    updateFieldDeviceId,
-    resetFieldsValueFunc,
-    setFieldsFormValueFun,
-    childGetFieldsValue,
-    conditionScreeningRef,
-    schedule,
-    operationType,
-    getFieldsValueFunc,
-    getRefItemConditionScreeningRefs,
-    setConditionScreeningList,
-    setRichText,
-    currentIndex,
-    scheduleData,
-    isUpdate,
-    alarmScheduleRef,
-    updateFieldAttributeFunc,
-    setDisabledProps,
-    setCancelDisabled,
-  });
-</script>
-<style>
-  .active {
-    color: #377dff;
-  }
-</style>

-<template>
-  <div>
-    <CollapseContainer ref="collapseContainerRef" @expand="handleExpand">
-      <template #title>
-        <div>条件筛选</div>
-        <RichText :otherAttribute="otherAttribute" @resetFilter="resetFilter" />
-      </template>
-
-      <template v-for="(item, index) in conditionScreeningList" :key="item">
-        <ConditionScreeningForm
-          :conditionScreeningList="conditionScreeningList"
-          :ref="refItem.conditionScreeningRefs"
-          :index="index"
-          @deleteConditionForm="deleteConditionForm"
-        />
-      </template>
-    </CollapseContainer>
-
-    <div class="flex justify-between">
-      <a-button
-        :disabled="isViewDisabledBtn == 'isView' ? true : false"
-        type="primary"
-        class="mt-4 ml-2"
-        @click="addConditionForm"
-        >新增条件筛选</a-button
-      >
-      <a-button
-        :disabled="isViewDisabledBtn == 'isView' ? true : false"
-        type="primary"
-        class="mt-4 mr-2"
-        @click="preView"
-        v-if="isPreview"
-        >保存</a-button
-      >
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { unref, ref } from 'vue';
-  import ConditionScreeningForm from './ConditionScreeningForm.vue';
-  import { conditionPreView } from '../config/formatData.ts';
-  import { CollapseContainer } from '/@/components/Container/index';
-  import RichText from './RichText.vue';
-  const props = defineProps({
-    childGetFieldsValue: {
-      type: Function,
-      required: true,
-    },
-  });
-  const refItem = {
-    conditionScreeningRefs: ref([]),
-  };
-  const isViewDisabledBtn = window.localStorage.getItem('isViewDisabledBtn');
-  const isPreview = ref(true);
-  const collapseContainerRef = ref();
-  const conditionScreeningList = ref([Date.now()]);
-  const addConditionForm = () => {
-    if (!unref(isPreview)) {
-      collapseContainerRef.value.handleExpand();
-    }
-    unref(conditionScreeningList).push(Date.now());
-    const lastIndex = refItem.conditionScreeningRefs.value.length - 1;
-    refItem.conditionScreeningRefs.value[lastIndex]?.appendSchemaByField(
-      {
-        field: 'AND',
-        label: '和',
-        component: 'Input',
-        slot: 'and',
-        // labelWidth: 50,
-        colProps: { span: 3 },
-      },
-      'value'
-    );
-  };
-  const handleExpand = (show) => {
-    isPreview.value = show;
-  };
-
-  const otherAttribute = ref([]);
-  // 预览条件筛选结果
-  const preView = async () => {
-    const attributes = [];
-    const fieldsValue = props.childGetFieldsValue();
-    for (let i = 0; i < unref(refItem.conditionScreeningRefs).length; i++) {
-      const valid = await unref(refItem.conditionScreeningRefs)[i].validate();
-      if (!valid) return;
-      attributes.push({
-        ...unref(refItem.conditionScreeningRefs)[i].getFieldsValue(),
-        attribute: fieldsValue.type2,
-      });
-    }
-    otherAttribute.value = conditionPreView(attributes, fieldsValue.operationType);
-    // collapseContainerRef.value.handleExpand();
-    collapseContainerRef.value.show = true;
-  };
-
-  //ft add 表单数据置空
-  const resetConditionScreenForm = () => {
-    conditionScreeningList.value = [];
-    resetFilter();
-    for (let i = 0; i < unref(refItem.conditionScreeningRefs).length; i++) {
-      unref(refItem.conditionScreeningRefs)[i]?.resetConditionScreenForm();
-    }
-  };
-  //ft add 表单数据置空
-
-  const resetFilter = () => {
-    otherAttribute.value = [];
-  };
-  const deleteConditionForm = (index) => {
-    unref(conditionScreeningList).splice(index, 1);
-    const lastIndex = refItem.conditionScreeningRefs.value.length - 2;
-    refItem.conditionScreeningRefs.value[lastIndex]?.removeSchemaByFiled('AND');
-  };
-
-  defineExpose({
-    refItem,
-    conditionScreeningList,
-    otherAttribute,
-    resetConditionScreenForm,
-  });
-</script>
-
-<style lang="less" scoped>
-  :deep(.vben-collapse-container__header) {
-    overflow: hidden !important;
-    overflow-y: scroll !important;
-    white-space: pre !important;
-    height: 93px !important;
-  }
-</style>

-<template>
-  <div class="flex" style="align-items: center">
-    <BasicForm @register="registerFormCondition" class="basicStyle" />
-    <Tooltip title="移除" class="ml-4">
-      <Icon
-        icon="fluent:delete-off-20-regular"
-        size="20"
-        class="mr-2 cursor-pointer"
-        @click="deleteConditionForm(index)"
-      />
-    </Tooltip>
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { watch, ref, onMounted, inject } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { Icon } from '/@/components/Icon';
-  import { Tooltip } from 'ant-design-vue';
-  import { isType } from '../config/formatData';
-  defineProps({
-    index: {
-      type: Number,
-      required: true,
-    },
-    conditionScreeningList: {
-      type: Array,
-      default: () => [],
-    },
-  });
-  const emit = defineEmits(['deleteConditionForm']);
-  const operationType = inject('operationType');
-  let schemas = ref([]);
-  const isViewDisabledBtn = window.localStorage.getItem('isViewDisabledBtn');
-  onMounted(() => {
-    schemas.value = isType(operationType.value);
-
-    if (isViewDisabledBtn == 'isView') setProps({ disabled: true });
-  });
-  watch(operationType, (newValue) => {
-    schemas.value = isType(newValue);
-    resetFields();
-  });
-  const [
-    registerFormCondition,
-    {
-      resetFields,
-      appendSchemaByField,
-      removeSchemaByFiled,
-      getFieldsValue,
-      setFieldsValue,
-      validate,
-      setProps,
-    },
-  ] = useForm({
-    showActionButtonGroup: false,
-    labelWidth: 100,
-    compact: true,
-    schemas,
-  });
-  const deleteConditionForm = (index: number) => {
-    if (isViewDisabledBtn == 'isView') return;
-    emit('deleteConditionForm', index);
-  };
-  // ft add
-  const resetConditionScreenForm = () => resetFields();
-  // ft add
-  defineExpose({
-    appendSchemaByField,
-    removeSchemaByFiled,
-    getFieldsValue,
-    setFieldsValue,
-    validate,
-    resetConditionScreenForm,
-  });
-</script>
-
-<style lang="less">
-  .basicStyle {
-    margin-top: 0.5rem;
-    width: 80%;
-    border: 1px dashed #d9d9d9;
-    padding: 1rem 0 0.5rem;
-    border-radius: 0.25rem;
-  }
-</style>

-<template>
-  <div
-    style="width: 100%; flex-wrap: wrap"
-    v-if="otherAttribute.length > 0 && otherAttribute[0].value && otherAttribute[0].operation"
-    class="flex"
-  >
-    <template v-for="(item, index) in otherAttribute" :key="item.value">
-      <div class="flex" v-if="item?.value && item?.attribute">
-        <div class="text mr-2" style="color: #305680">{{ item.attribute }}</div>
-        {{ item.operation }}
-        <div class="text ml-2" style="color: #ff8c68">{{ item.value }}</div>
-        <span v-if="otherAttribute[index + 1]">和</span>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { watch, inject } from 'vue';
-  defineProps({
-    otherAttribute: {
-      type: Array,
-      default: () => [],
-    },
-  });
-  const emit = defineEmits(['resetFilter']);
-  const operationType = inject('operationType');
-  watch(operationType, () => {
-    emit('resetFilter');
-  });
-</script>
-
-<style scoped>
-  .text {
-    border: 1px solid #d2d2d2;
-    border-radius: 5px;
-    padding: 0 5px;
-    margin: 0 5px;
-  }
-</style>

-<template>
-  <div>
-    <CollapseContainer :title="`${title} ${index + 1}`">
-      <template #action>
-        <div class="flex">
-          <div class="flex">
-            <span class="mr-2">启用规则:</span>
-            <template v-for="(item, scheduleIndex) in scheduleOptions" :key="item.label">
-              <div
-                :class="{ 'ml-4': scheduleIndex >= 1, active: scheduleIndex === currentIndex }"
-                class="cursor-pointer !p-0"
-                :disabled="disabled"
-                @click="handleScheduleChange(item.value)"
-                >{{ item.label }}</div
-              >
-            </template>
-          </div>
-          <Tooltip title="移除" class="ml-4">
-            <Icon
-              icon="fluent:delete-off-20-regular"
-              size="20"
-              class="mr-2 cursor-pointer"
-              @click="handleDelete({ index, title })"
-            />
-          </Tooltip>
-        </div>
-      </template>
-      <BasicForm @register="registerForm">
-        <template #operationType="{ model, field }">
-          <Select
-            :options="options"
-            :disabled="disabled"
-            v-model:value="model[field]"
-            :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-            @change="operationType = model[field]"
-            placeholder="请选择比较类型"
-            allowClear
-          />
-        </template>
-        <template #time="{ model, field }">
-          <Input v-model:value="model[field]" placeholder="请输入持续时间">
-            <template #addonAfter>
-              <Select
-                :disabled="disabled"
-                v-model:value="model[`timeUnit`]"
-                :options="timeUnitOptions"
-                style="width: 60px"
-              />
-            </template>
-          </Input>
-        </template>
-      </BasicForm>
-      <Card size="small" :bordered="false" style="border: 2px dashed #d9d9d9" v-if="operationType">
-        <ConditionScreening
-          :childGetFieldsValue="childGetFieldsValue"
-          ref="conditionScreeningRef"
-        />
-      </Card>
-    </CollapseContainer>
-    <AlarmSchedule ref="alarmScheduleRef" @register="registerModal" @cancel="handleCancel" />
-  </div>
-</template>
-<script lang="ts" setup>
-  import { Card, Input, Select, Tooltip } from 'ant-design-vue';
-  import { cloneDeep } from 'lodash-es';
-  import { nextTick, provide, ref } from 'vue';
-  import { TOption, trigger_condition_schema } from '../config/config.data';
-  import { options, scheduleOptions, timeUnitOptions } from '../config/formatData';
-  import useCommonFun from '../hooks/useCommonFun';
-  import AlarmSchedule from './AlarmSchedule.vue';
-  import ConditionScreening from './ConditionScreening.vue';
-  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
-  import { CollapseContainer } from '/@/components/Container/index';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { Icon } from '/@/components/Icon';
-  import { useModal } from '/@/components/Modal';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { unref } from 'vue';
-
-  const { useByProductGetAttribute } = useCommonFun();
-  defineProps({
-    title: {
-      type: String,
-      required: true,
-    },
-    index: {
-      type: Number,
-      required: true,
-    },
-    provideOrgid: {
-      type: String,
-      default: '',
-    },
-  });
-  const emit = defineEmits(['delete']);
-  const { createMessage } = useMessage();
-
-  const isUpdate = ref(false);
-  const conditionScreeningRef = ref();
-  const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue, setProps }] =
-    useForm({
-      //TODO-wenwei-修复
-      schemas: cloneDeep(trigger_condition_schema),
-      //TODO-wenwei-修复
-      showActionButtonGroup: false,
-    });
-
-  const alarmScheduleRef = ref<InstanceType<typeof AlarmSchedule>>();
-
-  //ft-add
-  const resetConditionForm = () => {
-    conditionScreeningRef?.value?.resetConditionScreenForm();
-  };
-  //ft-add
-
-  const getFieldsValueFunc = () => {
-    const predicate = conditionScreeningRef?.value?.refItem?.conditionScreeningRefs?.value?.map(
-      (item) => item.getFieldsValue()
-    );
-    //TODO-fengtao-设备、属性、条件筛选验证
-    const validate = getFieldsValue();
-    if (validate.deviceProfileId === undefined || !validate.deviceProfileId) {
-      createMessage.error('请选择产品');
-      throw '请选择产品';
-    }
-    if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式');
-    if (validate.type1 == undefined) return createMessage.error('请选择属性触发方式');
-    if (!validate.deviceType) return createMessage.error('请选择设备类型');
-    if (validate.device == undefined) return createMessage.error('请选择设备');
-    if (validate.device == 'PART') {
-      if (validate.entityId == undefined) return createMessage.error('请选择设备');
-    }
-    if (validate.type2 == '' || validate.type2 == null) return createMessage.error('请选择属性');
-    if (predicate == undefined) return createMessage.error('请填写条件筛选');
-    let predicateIsRequired = false;
-    if (predicate) {
-      predicate.some((f) => {
-        let arr = Object.keys(f);
-        if (arr.length == 0) {
-          predicateIsRequired = true;
-        }
-        if (f.operation == undefined) {
-          predicateIsRequired = true;
-        }
-        if (f.value == undefined) {
-          predicateIsRequired = true;
-        }
-      });
-    }
-    if (predicateIsRequired) return createMessage.error('请填写条件筛选');
-    //TODO-fengtao-设备、属性、条件筛选验证
-    return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value?.scheduleData };
-  };
-
-  //TODO-fengtao
-  const updateFieldDeviceId = (_deviceList: any[], _, _isUpdate) => {
-    // console.log(deviceList);
-    // console.log(isUpdate);
-  };
-  //TODO-fengtao
-  const resetFieldsValueFunc = () => {
-    resetConditionForm();
-    resetFields();
-  };
-  // 回显数据函数
-  const setFieldsFormValueFun = (fieldsValue) => {
-    setFieldsValue(fieldsValue);
-  };
-  //TODO-fengtao
-  const updateFieldAttributeFunc = async (e) => {
-    const res = await getAttribute(e);
-    const options = ref<TOption[]>([]);
-    useByProductGetAttribute(res, updateSchema, options);
-  };
-  //TODO-fengtao
-  const handleDelete = (params: { index: number; title: string }) => {
-    if (unref(disabled)) return;
-    emit('delete', params);
-  };
-  const operationType = ref<string>('');
-  provide('operationType', operationType);
-
-  // 子组件获取父组件的值
-  const childGetFieldsValue = () => getFieldsValue();
-
-  // 获取conditionScreeningForm的组件
-  const getRefItemConditionScreeningRefs = async () => {
-    await nextTick();
-    return conditionScreeningRef.value.refItem.conditionScreeningRefs;
-  };
-
-  const setConditionScreeningList = (list) => {
-    conditionScreeningRef.value.conditionScreeningList = list;
-  };
-  const setRichText = (list) => {
-    conditionScreeningRef.value.otherAttribute = list;
-  };
-
-  const [registerModal, { openModal }] = useModal();
-  const currentIndex = ref(0);
-  const handleScheduleChange = (value) => {
-    if (unref(disabled)) return;
-    const index = scheduleOptions.findIndex((item) => item.value === value);
-    // 报警日程弹窗
-    if (index !== 0) {
-      openModal(true, {
-        isUpdate: isUpdate.value,
-        value,
-        currentIndex: currentIndex.value,
-        scheduleData,
-      });
-    } else {
-      alarmScheduleRef.value.scheduleData = {
-        type: value,
-      };
-    }
-    currentIndex.value = index;
-  };
-  const handleCancel = (index) => {
-    currentIndex.value = index;
-  };
-  const scheduleData = ref(null);
-  //FT add 2022-10-27
-  const updateFieldAlarmConfig = () => {
-    //什么也不做
-    // console.log(alarmConfigList);
-  };
-  //FT add 2022-10-27
-  const updateEditFieldAlarmConfig = () => {
-    //什么也不做
-    // console.log(alarmConfigList);
-  };
-
-  const disabled = ref<boolean>(false);
-  const setDisabledProps = (value) => {
-    setProps(value);
-    disabled.value = true;
-  };
-
-  const setCancelDisabled = () => {
-    disabled.value = false;
-  };
-
-  defineExpose({
-    getFieldsValueFunc,
-    updateFieldDeviceId,
-    resetFieldsValueFunc,
-    setFieldsFormValueFun,
-    childGetFieldsValue,
-    operationType,
-    getRefItemConditionScreeningRefs,
-    setConditionScreeningList,
-    setRichText,
-    currentIndex,
-    scheduleData,
-    isUpdate,
-    alarmScheduleRef,
-    updateFieldAttributeFunc,
-    updateFieldAlarmConfig,
-    updateEditFieldAlarmConfig,
-    setDisabledProps,
-    setCancelDisabled,
-  });
-</script>
-
-<style lang="less" scoped>
-  ///移除选择框默认样式（24px）否则超出默认宽度会造成页面样式错乱
-  :deep(.ant-select-selector) {
-    padding-right: 0 !important;
-  }
-</style>
-
-<style>
-  .active {
-    color: #377dff;
-  }
-</style>

-<template>
-  <CollapseContainer :title="`执行动作 ${actionIndex + 1}`">
-    <template #action>
-      <Tooltip title="移除" v-if="actionData.length > 1">
-        <Icon
-          icon="fluent:delete-off-20-regular"
-          size="20"
-          class="mr-2 cursor-pointer"
-          @click="handleDelete(actionIndex)"
-        />
-      </Tooltip>
-    </template>
-    <BasicForm @register="registerAction">
-      <template #outTarget="{ model, field }">
-        <Select
-          :disabled="disabled"
-          :options="options"
-          v-model:value="model[field]"
-          @change="changeOutTarget"
-          @dropdown-visible-change="handleDropdownVisibleChange"
-          placeholder="请选择执行动作"
-          allowClear
-        />
-      </template>
-      <template #alarmConfigSlot="{ model, field }">
-        <a-select
-          allowClear
-          :disabled="disabled"
-          placeholder="请选择告警配置"
-          v-model:value="model[field]"
-          style="width: 205px; margin-left: 10px"
-          :options="alarmConfigOptions.map((item) => ({ value: item.value, label: item.label }))"
-        >
-          <template #dropdownRender="{ menuNode: menu }">
-            <v-nodes :vnodes="menu" />
-            <a-divider style="margin: 4px 0" />
-            <div @click="handleOpenAlarmConfig" style="padding: 4px 0; cursor: pointer">
-              <plus-outlined />
-              新增告警配置
-            </div>
-          </template>
-        </a-select>
-      </template>
-      <template #doContext="{ model, field }">
-        <div v-if="model['transportType'] === TransportTypeEnum.TCP">
-          <Input v-model:value="model[field]" :disabled="disabled" placeholder="请输入自定义命令" />
-        </div>
-        <div
-          v-show="model['transportType'] !== TransportTypeEnum.TCP"
-          class="flex"
-          style="align-items: center"
-        >
-          <div v-show="!disabled" ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
-
-          <a-textarea
-            v-show="disabled"
-            :disabled="true"
-            :value="JSON.stringify(disabledValue)"
-            :rows="4"
-          />
-
-          <a-button style="margin: -5px 0" type="text" @click="handlePremitter">格式化</a-button>
-          <Tooltip
-            :title="
-              JSON.stringify({
-                method: 'setDOValue',
-                params: { devID: '492S211218028819', data: { DO1: 1 } },
-              })
-            "
-            class="ml-2"
-          >
-            <QuestionCircleOutlined style="font-size: 1rem" />
-          </Tooltip>
-        </div>
-      </template>
-      <template #clearAlarm>
-        <Checkbox v-model:checked="checked" :disabled="disabled" @change="handleCheckedChange">
-          清除告警
-        </Checkbox>
-        <Tooltip title="清除告警与触发器一一对应">
-          <QuestionCircleOutlined />
-        </Tooltip>
-      </template>
-    </BasicForm>
-    <template v-for="(item, index) in clearRuleList" :key="item">
-      <Card
-        :bordered="false"
-        style="border: 2px dashed #d9d9d9; margin-top: 1rem"
-        :bodyStyle="{ padding: 0 }"
-      >
-        <ClearAlarm
-          :clearRuleList="clearRuleList"
-          :index="index"
-          :ref="refItem.clearRuleRefs"
-          @delete="deleteClearRule"
-        />
-      </Card>
-    </template>
-
-    <a-button v-if="checked && isAddClearRule" class="mt-4" type="primary" @click="addClearRule"
-      >新增清除告警</a-button
-    >
-  </CollapseContainer>
-  <AlarmConfigDrawer
-    :defaultEnable="true"
-    @register="registerAlarmContactDrawer"
-    @success="handleSuccess"
-  />
-</template>
-
-<script lang="ts">
-  import { defineComponent } from 'vue';
-  import { isNullOrUnDef, isNumber, isObject, isString } from '/@/utils/is';
-  import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
-  export default defineComponent({
-    components: {
-      VNodes: (_, { attrs }) => {
-        return attrs.vnodes;
-      },
-      Input,
-    },
-    inheritAttrs: false,
-  });
-</script>
-<script lang="ts" setup>
-  import { ref, onMounted, nextTick, unref, computed, provide } from 'vue';
-  import { CollapseContainer } from '/@/components/Container/index';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { Tooltip, Select, Checkbox, Card, Input, message } from 'ant-design-vue';
-  import { Icon } from '/@/components/Icon';
-  import { actionSchema, CommandTypeEnum } from '../config/config.data';
-  import jsoneditor from 'jsoneditor';
-  import 'jsoneditor/dist/jsoneditor.min.css';
-  import { QuestionCircleOutlined, PlusOutlined } from '@ant-design/icons-vue';
-  import ClearAlarm from './ClearAlarm.vue';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { useDrawer } from '/@/components/Drawer';
-  import AlarmConfigDrawer from '/@/views/alarm/config/ContactDrawer.vue';
-
-  const props = defineProps({
-    actionIndex: {
-      type: Number,
-      required: true,
-    },
-    actionData: {
-      type: Array,
-      default: () => [],
-    },
-    triggerData: {
-      type: Array,
-      default: () => [],
-    },
-    deviceList: {
-      type: Array,
-      required: true,
-    },
-    arr: {
-      type: Array,
-      default: () => [],
-    },
-    provideOrgid: {
-      type: String,
-      default: '',
-    },
-  });
-  //新增代码2022-11-23
-  const handlePremitter = () => {
-    const value = unref(jsonInstance).get();
-    if (!value) return;
-    return unref(jsonInstance).set(value);
-  };
-  //新增代码2022-11-23
-  const alarmConfigOptions: any = ref([]);
-  const [registerAlarmContactDrawer, { openDrawer }] = useDrawer();
-  async function handleSuccess() {
-    emit('dynamicChangeAlarmConfig');
-  }
-  // 新增或编辑
-  const handleOpenAlarmConfig = () => {
-    openDrawer(true, {
-      isUpdate: false,
-    });
-  };
-  const isAddClearRule = computed(() => clearRuleList.value.length < props.triggerData.length);
-  const refItem = {
-    clearRuleRefs: ref([]),
-  };
-  const { createMessage } = useMessage();
-
-  const emit = defineEmits(['deleteAction', 'getActionFormArr', 'dynamicChangeAlarmConfig']);
-  const options = computed(() => {
-    return [
-      { label: '设备输出', value: 'DEVICE_OUT' },
-      {
-        label: '告警输出',
-        value: 'MSG_NOTIFY',
-        disabled:
-          props.arr.filter((item) => item.outTarget === 'MSG_NOTIFY').length ||
-          !props.triggerData.length,
-      },
-    ];
-  });
-
-  const changeOutTarget = (e) => {
-    if (!e) validateFields(['outTarget']);
-    else clearValidate('outTarget');
-    emit('getActionFormArr');
-  };
-  const [
-    registerAction,
-    {
-      getFieldsValue,
-      resetFields,
-      setFieldsValue,
-      validate,
-      clearValidate,
-      validateFields,
-      setProps,
-    },
-  ] = useForm({
-    schemas: actionSchema,
-    showActionButtonGroup: false,
-  });
-
-  // 获取整个执行动作表单值
-  const getFieldsValueFunc = () => {
-    const clearRule = refItem.clearRuleRefs.value.map((item) => {
-      const predicate = item.conditionScreeningRef?.refItem?.conditionScreeningRefs?.value?.map(
-        (item) => item.getFieldsValue()
-      );
-      return {
-        ...item.getFieldsValue(),
-        predicate,
-        schedule: item.alarmScheduleRef.scheduleData,
-      };
-    });
-    //TODO-fengtao-清除告警验证
-    let productIdIsRequired = false;
-    let deviceIdIsRequired = false;
-    let attrIsRequired = false;
-    let predicateIsRequired = false;
-    let predicateDoubleIsRequired = false;
-    let triggerTypeIsRequired = false;
-    let type1IsRequired = false;
-    if (clearRule) {
-      clearRule.some((s) => {
-        if (s.device == 'PART') {
-          if (s.entityId == undefined) {
-            deviceIdIsRequired = true;
-          }
-        }
-        if (s.deviceProfileId === undefined) {
-          productIdIsRequired = true;
-        }
-        if (s.type2 == '' || s.type2 == null) {
-          attrIsRequired = true;
-        }
-        if (s.type1 == '' || s.type1 == null) {
-          type1IsRequired = true;
-        }
-        if (s.triggerType == '' || s.triggerType == null || s.triggerType == undefined) {
-          triggerTypeIsRequired = true;
-        }
-        if (s.predicate == undefined) {
-          predicateIsRequired = true;
-        }
-        if (s?.predicate) {
-          s?.predicate.some((f) => {
-            let arr = Object.keys(f);
-            if (arr.length == 0) {
-              predicateDoubleIsRequired = true;
-            }
-            if (f.operation == undefined) {
-              predicateDoubleIsRequired = true;
-            }
-            if (f.value == undefined) {
-              predicateDoubleIsRequired = true;
-            }
-          });
-        }
-      });
-    }
-    if (productIdIsRequired) return createMessage.error('请选择产品');
-    if (deviceIdIsRequired) return createMessage.error('请选择设备');
-    if (attrIsRequired) return createMessage.error('请选择属性');
-    if (predicateIsRequired) return createMessage.error('请填写条件筛选');
-    if (predicateDoubleIsRequired) return createMessage.error('请填写条件筛选');
-    if (triggerTypeIsRequired) return createMessage.error('请选择设备触发方式');
-    if (type1IsRequired) return createMessage.error('请选择属性触发方式');
-    //TODO-fengtao-清除告警验证
-    //TODO-fengtao-设备验证
-    const validate = getFieldsValue();
-    //ft-add-2022-11-22
-    const type = validate?.outTarget;
-    if (type === 'DEVICE_OUT') {
-      if (!validate.deviceType) return createMessage.error('请选择类型');
-      if (!validate.deviceProfileId) return createMessage.error('请选择产品');
-      if (validate.device == 'PART' && validate.deviceId == undefined)
-        return createMessage.error('请选择设备');
-    }
-    if (type === 'MSG_NOTIFY') {
-      if (!validate.alarm_config) return createMessage.error('请选择告警配置');
-      if (!validate.alarm_level) return createMessage.error('请选择告警等级');
-    }
-    //ft-add-2022-11-22
-    //TODO-fengtao-设备验证
-    const value = getFieldsValue();
-    const isTCPTransportType = value.transportType === TransportTypeEnum.TCP;
-    const doContext = unref(jsonInstance)?.get() || {};
-    const serviceInputValue = Reflect.get(value, 'serviceInputValue') || {};
-
-    const getServiceIdentifier = Reflect.get(value, 'serviceIdentifier');
-
-    const isCustomCommand = Number(value.commandType) === CommandTypeEnum.CUSTOM;
-
-    const thingsModelKeys = Reflect.get(value, 'thingsModelKeys') || [];
-
-    if (!isCustomCommand) {
-      for (const key of thingsModelKeys) {
-        if (isNullOrUnDef((serviceInputValue || {})[key]) || '') {
-          message.warning('服务命令为必填项');
-          throw '';
-        }
-      }
-    }
-
-    return {
-      ...value,
-      ...(isCustomCommand
-        ? { doContext: isTCPTransportType ? value.doContext : doContext }
-        : {
-            doContext: isTCPTransportType
-              ? value.serviceIdentifier
-              : { [getServiceIdentifier]: serviceInputValue },
-          }),
-      clearRule,
-    };
-  };
-
-  const setFieldsFormValueFun = (fieldsValue) => {
-    const doContext = Reflect.get(fieldsValue, 'doContext');
-    const commandType = Reflect.get(fieldsValue, 'commandType');
-    const getServiceIdentifier = Object.keys(doContext?.params || {})[0];
-
-    setFieldsValue({
-      ...fieldsValue,
-      ...(isNumber(fieldsValue.commandType)
-        ? { commandType: String(fieldsValue.commandType) }
-        : {}),
-      ...(commandType === CommandTypeEnum.SERVICE
-        ? {
-            serviceInputValue: isObject(doContext.params)
-              ? doContext?.params?.[getServiceIdentifier] || {}
-              : {},
-            tcpServiceCommand: isString(doContext.params) ? doContext.params : '',
-          }
-        : { doContext: doContext.params }),
-    });
-  };
-  //ft-add
-  const resetConditionForm = () => {};
-
-  //ft-add
-  const resetFieldsValueFunc = () => {
-    resetFields();
-    resetConditionForm();
-  };
-
-  const orgIdItem = ref('');
-  const isUpdateItem = ref('');
-  const deviceListItem = ref([]);
-
-  //update 2022-11-28
-  const updateFieldDeviceId = (deviceList, orgId, isUpdate) => {
-    if (isUpdate.value) {
-      orgIdItem.value = orgId.value;
-    }
-    orgIdItem.value = orgId.value;
-    isUpdateItem.value = isUpdate.value;
-    deviceListItem.value = deviceList.value;
-  };
-  //FT add 2022-10-27
-  const updateEditFieldAlarmConfig = (alarmConfigList) => {
-    alarmConfigOptions.value = alarmConfigList.value.filter((item) => item.status);
-  };
-  const updateFieldAlarmConfig = (alarmConfigList) => {
-    alarmConfigOptions.value = alarmConfigList.value.filter((item) => item.status);
-  };
-  //FT add 2022-10-27
-
-  const checked = ref(false);
-  const validateForm = () => {
-    return validate();
-  };
-
-  const handleDelete = (actionIndex) => {
-    if (unref(disabled)) return;
-    emit('deleteAction', actionIndex);
-  };
-
-  const clearRuleList = ref([]);
-  const handleCheckedChange = (e: Event) => {
-    if (!e.target.checked) {
-      clearRuleList.value = [];
-    } else {
-      addClearRule();
-    }
-  };
-  const addClearRule = () => {
-    unref(clearRuleList).push(Date.now());
-    nextTick(() => {
-      setFields(refItem.clearRuleRefs);
-    });
-  };
-
-  function setFields(refs) {
-    unref(refs).map((item) => {
-      item.updateFieldDeviceId(
-        deviceListItem.value,
-        props.provideOrgid || orgIdItem.value,
-        isUpdateItem.value
-      );
-    });
-  }
-  const deleteClearRule = (index) => {
-    unref(clearRuleList).splice(index, 1);
-  };
-
-  // json 以及初始化JSON
-  const jsoneditorRef = ref();
-  const jsonValue = ref({});
-  const jsonInstance = ref();
-
-  const disabledValue = ref(); //查看时使用表单全部禁用使用这个来获取表单数据
-  onMounted(() => {
-    nextTick(() => {
-      let options = {
-        mode: 'code',
-        mainMenuBar: false,
-        statusBar: false,
-      };
-      let editor = new jsoneditor(jsoneditorRef.value, options);
-      editor.set(jsonValue.value);
-      jsonInstance.value = editor;
-    });
-  });
-
-  const getJsonValue = () => unref(jsonInstance).get();
-  const setJsonValue = (Json) => {
-    nextTick(() => {
-      disabledValue.value = Json;
-      unref(jsonInstance).set(Json);
-    });
-  };
-
-  const operationType = ref<string>('');
-  provide('operationType', operationType);
-
-  const getRefItemConditionScreeningRefs = async () => {
-    await nextTick();
-    return refItem.clearRuleRefs.value.map(
-      (item) => item.conditionScreeningRef.refItem.conditionScreeningRefs
-    );
-  };
-  const setConditionScreeningList = (list) => {
-    refItem.clearRuleRefs.value.map((item) => {
-      item.conditionScreeningRef.conditionScreeningList = list;
-    });
-  };
-
-  const setRichText = (list, index) => {
-    refItem.clearRuleRefs.value[index].conditionScreeningRef.otherAttribute = list;
-  };
-
-  const handleDropdownVisibleChange = () => {
-    emit('getActionFormArr');
-  };
-
-  const disabled = ref<boolean>(false);
-  const setDisabledProps = async (value) => {
-    setProps(value);
-    disabled.value = true;
-    await nextTick();
-    unref(refItem.clearRuleRefs)?.forEach((item) => {
-      item.setDisabledProps(value);
-    });
-  };
-
-  const setCancelDisabled = () => {
-    disabled.value = false;
-    unref(refItem.clearRuleRefs)?.forEach((item) => {
-      item.setCancelDisabled();
-    });
-  };
-
-  defineExpose({
-    getFieldsValue,
-    getFieldsValueFunc,
-    setFieldsFormValueFun,
-    resetFieldsValueFunc,
-    updateFieldDeviceId,
-    updateFieldAlarmConfig,
-    validateForm,
-    getJsonValue,
-    setJsonValue,
-    jsonInstance,
-    updateEditFieldAlarmConfig,
-    checked,
-    getRefItemConditionScreeningRefs,
-    setConditionScreeningList,
-    setRichText,
-    refItem,
-    clearRuleList,
-    resetConditionForm,
-    handleDropdownVisibleChange,
-    setDisabledProps,
-    setCancelDisabled,
-  });
-</script>
-
-<style>
-  .jsoneditor {
-    border: none;
-  }
-</style>

@@ -67,11 +67,11 @@
         </Tag>
       </template>
     </BasicTable>
-    <SceneLinkAgeDrawer @register="registerDrawer" @success="handleSuccess" />
+    <SceneLinkageDrawer @register="registerDrawer" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts" setup>
-  import { nextTick } from 'vue';
+  import { nextTick, toRaw, unref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import {
@@ -84,10 +84,12 @@
   import { columns, searchFormSchema } from './config/config.data';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
-  import SceneLinkAgeDrawer from './SceneLinkAgeDrawer.vue';
+  import { SceneLinkageDrawer } from './components/SceneLinkageDrawer';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
   import { usePermission } from '/@/hooks/web/usePermission';
+  import { SceneLinkageDrawerDataType } from './components/SceneLinkageDrawer/type';
+  import { DataActionModeEnum } from '/@/enums/toolEnum';
 
   const userInfo: any = getAuthCache(USER_INFO_KEY);
   const userId = userInfo.userId;
@@ -129,25 +131,22 @@
   });
 
   function handleAdd() {
-    window.localStorage.setItem('isViewDisabledBtn', 'noView');
     openDrawer(true, {
-      isUpdate: false,
-    });
+      mode: DataActionModeEnum.CREATE,
+    } as SceneLinkageDrawerDataType);
   }
 
   function handleEdit(record: Recordable) {
-    window.localStorage.setItem('isViewDisabledBtn', 'noView');
     openDrawer(true, {
-      record,
-      isUpdate: true,
-    });
+      mode: DataActionModeEnum.UPDATE,
+      record: toRaw(unref(record)),
+    } as SceneLinkageDrawerDataType);
   }
   function handleView(record: Recordable) {
-    window.localStorage.setItem('isViewDisabledBtn', 'isView');
     openDrawer(true, {
+      mode: DataActionModeEnum.READ,
       record,
-      isUpdate: 3,
-    });
+    } as SceneLinkageDrawerDataType);
   }
   function handleSuccess() {
     reload();

@@ -121,11 +121,11 @@
   const handleNewRecord = () => {
     const { componentKey } = unref(selectWidgetKeys);
     if (componentKey === 'HumidityComponent2' && unref(dataSource).length >= 6) {
-      createMessage.warning('绑定的数据源不能超过6条~');
+      createMessage.warning('绑定的数据源不能超过6条');
       return;
     }
     if (unref(dataSource).length >= DATA_SOURCE_LIMIT_NUMBER) {
-      createMessage.warning('绑定的数据源不能超过10条~');
+      createMessage.warning('绑定的数据源不能超过10条');
       return;
     }
     dataSource.value.push(genNewDataSourceItem());
@@ -246,7 +246,7 @@
         ? await updateDataComponent(value)
         : await addDataComponent(value);
       createMessage.success(
-        `${unref(currentMode) === DataActionModeEnum.UPDATE ? '编辑' : '新增'}成功~`
+        `${unref(currentMode) === DataActionModeEnum.UPDATE ? '编辑' : '新增'}成功`
       );
       closeModal();
       emit('ok');

@@ -9,13 +9,13 @@ import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
-import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
 import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import { CommandTypeEnum } from '/@/views/rule/linkedge/config/config.data';
 import { DataActionModeEnum } from '/@/enums/toolEnum';
 import { TaskTypeEnum } from '/@/views/task/center/config';
 import { createPickerSearch } from '/@/utils/pickerSearch';
+import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
@@ -362,7 +362,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
                     (isControlComponent(category!) &&
                       unref(selectWidgetKeys).componentKey !== 'LateralNumericalControl') ||
                     isBooleanComponent(unref(selectWidgetKeys))
-                      ? DataTypeEnum.IS_BOOL
+                      ? DataTypeEnum.BOOL
                       : undefined,
                 });
 

@@ -60,7 +60,10 @@
       event: DataActionModeEnum.DELETE,
       icon: 'ant-design:delete-outlined',
       auth: VisualComponentPermission.DELETE,
-      onClick: handleDelete,
+      popconfirm: {
+        title: '是否确认删除操作?',
+        onConfirm: handleDelete.bind(null),
+      },
     },
   ]);
 
@@ -71,7 +74,7 @@
   async function handleDelete() {
     try {
       await deleteDataComponent({ dataBoardId: unref(boardId), ids: [props.sourceInfo.id] });
-      createMessage.success('删除成功~');
+      createMessage.success('删除成功');
       emit('ok');
     } catch (error) {}
   }
@@ -132,7 +135,7 @@
           layout: layout as Layout,
         },
       });
-      createMessage.success('复制成功~');
+      createMessage.success('复制成功');
       emit('ok');
     } catch (error) {
       throw error;

@@ -10,3 +10,10 @@ export interface ModalParamsType<T = Recordable> {
   record: T;
   [key: string]: any;
 }
+
+export interface DefineComponentsBasicExpose<T = Recordable> {
+  getFieldsValue: () => T;
+  setFieldsValue: (value: T) => any;
+  validate?: () => Promise<any>;
+  resetFieldsValue?: (...args) => any;
+}