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,