Commit Graph

2421 Commits

Author SHA1 Message Date
leiqiaochu 387ae15120 fix: bug#18495 2023-09-21 16:55:56 +08:00
leiqiaochu 5f9988eda2 Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary 2023-09-21 11:02:23 +08:00
leiqiaochu 1fab8aa9f5 fix: 子设备解绑bug 2023-09-21 11:00:51 +08:00
XieYongHong 1a0cb1d9c8 Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary 2023-09-21 09:41:16 +08:00
XieYongHong 48d0c4cef5 fix: 优化低码回显 2023-09-21 09:41:00 +08:00
leiqiaochu 7943a4108f fix: bug#18550、18545、 2023-09-20 21:49:23 +08:00
leiqiaochu 351a399135 Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary 2023-09-20 20:14:00 +08:00
leiqiaochu 654c344455 fix: bug#18505、18507 2023-09-20 20:13:37 +08:00
XieYongHong f719c99d64 Merge branch 'dev' into dev-dictionary
# Conflicts:
#	vite.config.ts
2023-09-20 19:58:46 +08:00
qiaochuLei 41ea25f927
fix: bug#视频回放加载bug
* fix: bug#18502

* fix: bug#视频回放加载bug
2023-09-20 19:53:42 +08:00
leiqiaochu a9e25810f9 Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary 2023-09-20 16:38:21 +08:00
leiqiaochu 47fc37fffe feat: 菜单改造 2023-09-20 16:37:40 +08:00
XieYongHong 1b4ebe5297 fix: 优化低码回显 2023-09-20 13:45:45 +08:00
XieYongHong 2d80c4ad4e Merge branch 'dev' into dev-dictionary 2023-09-20 10:08:12 +08:00
qiaochuLei 566df47ce8
fix: 边缘端映射bug
* fix: 物联网卡首页图片加载失败

* fix: 边缘端映射bug
2023-09-20 10:04:14 +08:00
XieYongHong 0bfe7efc43 Merge branch 'dev' into dev-dictionary 2023-09-14 10:09:51 +08:00
qiaochuLei d8f712471f
fix: bug#18148;解决合并冲突
* fix: bug#13639、17665

* fix: bug#18148

* fix: 回退上次版本

* fix: 解决合并冲突
2023-09-14 09:28:04 +08:00
leiqiaochu 03db286aab Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary 2023-09-11 14:35:18 +08:00
leiqiaochu 69e4599337 feat: 角色管理用户管理改造 2023-09-11 14:34:26 +08:00
XieYongHong 51794071a7 fix: 获取低码服务url 2023-09-08 19:16:17 +08:00
XieYongHong 96a2499b92 Merge branch 'dev' into dev-dictionary 2023-09-08 19:10:07 +08:00
XieYongHong f1a40db005 fix: 添加低码路由处理 2023-09-08 18:58:44 +08:00
leiqiaochu 99533a38be feat: 角色管理改造 2023-09-08 16:27:32 +08:00
qiaochuLei 0dc60d125f
fix: bug#18002、17889、17665、17684
* fix: bug#17781、17791、17847、17849、17666、17667、17670

* fix: bug#17617

* fix: bug#17665、17684

* fix: bug#17889

* fix: bug#18002
2023-09-08 10:12:08 +08:00
leiqiaochu a3b29ae01e feat: 数据字典权限 2023-09-06 10:35:04 +08:00
leiqiaochu 6a62c2bf4e feat: 数据字典优化 2023-09-04 19:55:50 +08:00
leiqiaochu 22ee69d1db Merge branch 'dev' into dev-dictionary 2023-09-04 19:15:51 +08:00
leiqiaochu dfc1d1556c feat: 数据字典 2023-09-04 19:15:23 +08:00
leiqiaochu d72e88d725 feat: 字典项新增功能 2023-09-04 09:57:05 +08:00
qiaochuLei 7f0d66c486
fix: 社区版优化告警,菜单
fix: 社区版优化告警,菜单
2023-09-01 15:12:43 +08:00
leiqiaochu 12055d5e7a feat: 字典左侧选中数据传递 2023-09-01 14:42:34 +08:00
leiqiaochu e3cafb9e35 feat: 代码精简 2023-09-01 11:55:58 +08:00
leiqiaochu 1c5b134ab2 feat: 删除禁用编辑功能 2023-09-01 11:54:24 +08:00
qiaochuLei 6f41c16874
fix: bug#17758
* fix: 提取ipv4和ipv6校验

* fix: bug#17758
2023-09-01 10:31:20 +08:00
leiqiaochu 21293b5484 feat: 数据字典新增功能 2023-09-01 10:05:56 +08:00
qiaochuLei c9a6e97795
fix: bug#17715、17705、17699、17696
* fix: bug#17696、17694、17693、17691、17676

* fix: bug#17715、17705、17699、17696
2023-08-31 15:51:07 +08:00
leiqiaochu 97c4ace8a3 feat: 数据字典开头 2023-08-31 15:42:30 +08:00
qiaochuLei 06a323e6f0
fix: bug#17687
fix: bug#17687
2023-08-30 10:59:48 +08:00
XieYongHong abfb305181 Merge remote-tracking branch 'origin/dev' into dev 2023-08-28 14:18:23 +08:00
XieYongHong e29cba2ff3 fix: 修改组件按需引入插件 2023-08-28 14:16:54 +08:00
qiaochuLei 9bcda35de4
fix: 视频屏蔽RTC
* fix: bug#17668

* fix: 视频屏蔽RTC
2023-08-28 14:14:44 +08:00
qiaochuLei 02eb16d0eb
fix: bug#17651、17633、视频分享点位bug及样式
* fix: bug#17651、17633、视频分享点位bug及样式
2023-08-24 18:04:15 +08:00
XieYongHong fe3b636a78 Merge remote-tracking branch 'origin/dev' into dev 2023-08-24 10:10:31 +08:00
XieYongHong 72e5e43c73 fix: 优化jetlinks-ui-components按需引入插件 2023-08-24 10:10:02 +08:00
qiaochuLei 699dabd490
fix: bug#17631、17625、17578
* fix: bug#17631、17625、17578
2023-08-24 10:05:48 +08:00
qiaochuLei 6274b1f01d
fix: 添加产品物模型规则TS,添加 tcp粘拆包TS
* fix: bug#17584

* fix: bug#17605、规则属性脚本提示语

* fix: 系统管理菜单管理

* fix: tcp粘拆包TS

* fix: 产品物模型规则TS
2023-08-23 13:53:57 +08:00
XieYongHong 1a905ddc90 fix: 放开设备区版中运维cpu、jvm 2023-08-22 10:30:52 +08:00
XieYongHong 9649d05d9a Merge remote-tracking branch 'origin/dev' into dev 2023-08-18 16:25:45 +08:00
qiaochuLei f742db1fce
fix: bug#17584
* fix: 组织管理树提交bug

* fix: bug#17584
2023-08-18 16:03:23 +08:00
XieYongHong 85fd17cd8c fix: 修复404页面 2023-08-18 16:00:01 +08:00