XieYongHong 2abc3362c8 Merge branch 'dev' into dev-dictionary ... # Conflicts: # package.json # src/store/menu.ts # src/utils/menu.ts # src/views/device/Instance/Detail/components/BindParentDevice/index.vue # src/views/system/Menu/Detail/BasicInfo.vue # src/views/system/Menu/index.vue # yarn.lock		2023-10-27 15:15:58 +08:00
..
AMapComponent	feat: 优化地区管理地图操作	2023-10-25 18:52:30 +08:00
BadgeStatus	fix: 修复BadgeStatus中status类型	2023-03-25 18:09:48 +08:00
BatchDropdown	fix: 批量操作按钮	2023-03-23 15:44:58 +08:00
CardBox	feat: 2.1	2023-07-17 09:22:49 +08:00
Empty	update: 更新为组件库组件	2023-04-03 17:00:54 +08:00
FRuleEditor	Dev bug (#217)	2023-10-26 15:17:10 +08:00
FRuleEditor-copy	fix: 修改设备物模型-属性来源可以选择规则	2023-08-02 11:30:09 +08:00
FileFormat	feat: 设备管理批量操作	2023-01-17 18:04:42 +08:00
Form	feat: 新增设备批量导出-映射设备	2023-04-19 17:25:07 +08:00
GeoComponent	update: geoComponent添加change事件	2023-03-24 15:26:59 +08:00
HomeView	fix: 修复公网host多次校验提示	2023-08-07 10:18:10 +08:00
InputSelect	update: 更新为组件库组件	2023-04-03 17:00:54 +08:00
JIndicators	fix: 修改物模型BUG	2023-03-20 20:40:30 +08:00
Layout	Merge branch 'dev' into dev-dictionary	2023-10-27 15:15:58 +08:00
MCarousel	fix: 修改订阅通知样式	2023-07-18 15:12:31 +08:00
Metadata	fix: 修复公网host多次校验提示	2023-08-07 10:18:10 +08:00
MonacoEditor	fix: 修复代码编辑器光标问题	2023-03-01 20:31:22 +08:00
NormalUpload	feat: 2.1	2023-07-17 09:22:49 +08:00
PermissionButton	fix: bug#17054	2023-10-23 16:17:11 +08:00
Player	fix: bug#17651、17633、视频分享点位bug及样式	2023-08-24 18:04:15 +08:00
RadioCard	feat: 2.1	2023-07-17 09:22:49 +08:00
RowPagination	fix: bug#10891、10890、10893、10894、10905、10901	2023-03-24 18:47:55 +08:00
Search	feat: 2.1	2023-07-17 09:22:49 +08:00
Table	update: 表格组件新增表头插槽	2023-03-02 14:05:06 +08:00
TitleComponent	style: 更改TitleComponent组件样式	2023-03-20 10:33:54 +08:00
Upload	feat: 2.1	2023-07-17 09:22:49 +08:00
ValueItem	fix: 优化物模型-全屏编辑	2023-07-26 17:57:57 +08:00
index.ts	feat: 2.1	2023-07-17 09:22:49 +08:00