Commit Graph

2296 Commits

Author SHA1 Message Date
XieYongHong 14bc5cf16f Merge branch 'dev' into dev-dictionary 2023-10-07 15:25:48 +08:00
XieYongHong 90104848c1 fix: bug#18156 2023-10-07 15:11:39 +08:00
leiqiaochu 189c88aa92 fix: bug#18766 2023-10-07 14:03:21 +08:00
leiqiaochu 06f128bd0b fix: bug#18898 2023-10-07 13:36:48 +08:00
leiqiaochu 9d4177e1c9 fix: 修改请求菜单接口参数 2023-09-27 17:21:52 +08:00
leiqiaochu c8717c6f0c fix: bug#18850 2023-09-27 17:18:44 +08:00
leiqiaochu 3afcac7c71 feat: 新增用户角色展示 2023-09-27 16:31:31 +08:00
leiqiaochu c46122d08a Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary 2023-09-27 15:05:56 +08:00
leiqiaochu a55e7d2af1 fix: bug#18805 2023-09-27 15:05:35 +08:00
XieYongHong 7c75248aae Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary 2023-09-27 13:58:12 +08:00
leiqiaochu 490f34b215 feat: 关系改造 2023-09-27 13:42:24 +08:00
XieYongHong ed98810e95 fix: 修复低码渲染异常问题 2023-09-27 11:28:54 +08:00
leiqiaochu fbbcf60c35 fix: bug#18724 2023-09-27 11:25:49 +08:00
leiqiaochu b805c8b748 fix: bug#18760 2023-09-27 10:43:37 +08:00
leiqiaochu 9802069905 fix: 修改菜单 2023-09-27 09:43:49 +08:00
leiqiaochu e482e158f6 fix: 修改bug 2023-09-26 18:15:21 +08:00
leiqiaochu 1540cd71f8 fix: 数据字典菜单初始化 2023-09-25 15:00:09 +08:00
leiqiaochu d73e6641a1 feat: 关系配置通用组件 2023-09-25 11:53:33 +08:00
leiqiaochu bf0df077a9 feat: 关系配置通用组件 2023-09-25 11:51:01 +08:00
leiqiaochu b7849f4d07 feat: 关系配置组件 2023-09-25 10:37:18 +08:00
XieYongHong 8f663bb21d Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary 2023-09-22 18:30:19 +08:00
XieYongHong 3cdd04f675 fix: 优化低码回显 2023-09-22 18:30:02 +08:00
leiqiaochu bd09253eaf feat: 初始化页面改造 2023-09-22 17:48:02 +08:00
leiqiaochu e5388b418f feat: 初始化改造 2023-09-22 16:24:46 +08:00
leiqiaochu dd1ff0d018 fix: bug#18647 2023-09-22 14:57:22 +08:00
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