Commit Graph

1360 Commits

Author SHA1 Message Date
JiangQiming 9594893a50 fix: bug#10909、10912 2023-03-27 15:44:48 +08:00
JiangQiming d58bef5897 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 15:29:39 +08:00
JiangQiming 6c47f20f9d fix: bug#10892、10953 2023-03-27 15:29:23 +08:00
胡彪 607eefd5f7
Merge pull request #70 from jetlinks/dev-hub
Dev hub
2023-03-27 15:28:56 +08:00
jackhoo_98 414a9987d2 Merge branch 'dev' into dev-hub 2023-03-27 15:27:01 +08:00
jackhoo_98 049bf99395 fix: 菜单管理 完成菜单配置 2023-03-27 15:25:53 +08:00
leiqiaochu b8dac68cfa Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 14:20:25 +08:00
leiqiaochu 5ac6df4ffb fix: bug#11022 2023-03-27 14:20:04 +08:00
JiangQiming 5d19f58f59 fix: bug#10967、10974 2023-03-27 14:13:52 +08:00
leiqiaochu ca9f2a66c0 fix: bug#10999 10977 10964 10957 10951 10940 10868 2023-03-27 11:16:20 +08:00
wangshuaiswim 1afe27ca91 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 11:08:38 +08:00
wangshuaiswim 38a0bc418a fix: 修改布尔类型组件在chrome浏览器下的排版问题 2023-03-27 11:07:59 +08:00
JiangQiming 71fe3f81bd fix: bug#10894 2023-03-27 10:47:50 +08:00
xieyonghong fed5c348e0 style: 优化场景联动卡片的省略内容显示样式 2023-03-27 09:24:45 +08:00
xieyonghong 9b459f2507 update: 优化useParams 2023-03-27 09:22:24 +08:00
xieyonghong 6919d41b93 Merge remote-tracking branch 'origin/dev' into dev 2023-03-26 22:27:49 +08:00
xieyonghong 0dfbac22c5 fix: bug#10937 2023-03-26 22:20:01 +08:00
xieyonghong dcd584c9c7 fix: bug#10946 2023-03-26 21:42:23 +08:00
xieyonghong 3810046bee fix: bug#10947 2023-03-26 21:18:03 +08:00
xieyonghong 1d782a1231 fix: bug#10956 2023-03-26 21:14:17 +08:00
jackhoo_98 05776bd630 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-26 19:13:34 +08:00
jackhoo_98 0f6f2cccb6 feat: 菜单管理 重构菜单配置 完成交互逻辑 2023-03-26 19:12:01 +08:00
xieyonghong 6f8f77bcd6 fix: bug#10958 2023-03-26 17:15:05 +08:00
xieyonghong 065cf055f9 fix: bug#10959 2023-03-26 17:04:34 +08:00
xieyonghong cc84a2a54c fix: bug#10962、10791 2023-03-26 00:34:45 +08:00
xieyonghong ec7ad63f89 style: 优化首页样式 2023-03-26 00:24:33 +08:00
xieyonghong b9e332447e fix: bug#10979 2023-03-26 00:05:03 +08:00
xieyonghong 3dd39c5279 fix: bug#10983 2023-03-25 23:22:15 +08:00
xieyonghong 8370f863bb fix: bug#10984 2023-03-25 23:17:54 +08:00
xieyonghong 8c66b348a3 fix: bug#10986 2023-03-25 23:12:14 +08:00
xieyonghong 1f16b4e827 fix: 修复错误校验 2023-03-25 23:00:46 +08:00
xieyonghong 783010bcb1 fix: bug#10987 2023-03-25 22:55:18 +08:00
xieyonghong 9dab329841 fix: bug#10989 2023-03-25 22:49:18 +08:00
xieyonghong 5c6c8dbed4 fix: bug#10990 2023-03-25 22:40:24 +08:00
xieyonghong b8d0fd5bcf fix: bug#10992 2023-03-25 22:32:53 +08:00
xieyonghong 1455fe8141 fix: bug#10994 2023-03-25 22:26:49 +08:00
xieyonghong 9fb9571699 fix: bug#10995 2023-03-25 21:22:50 +08:00
xieyonghong 4445e81ceb fix: bug#10996 2023-03-25 21:12:19 +08:00
xieyonghong 0f17aee1ab fix: 删除错误引入AIcon 2023-03-25 18:45:38 +08:00
xieyonghong 6549c98605 fix: bug#10837 2023-03-25 18:09:52 +08:00
xieyonghong 7f9cf53dd0 fix: bug#10873 2023-03-25 18:09:51 +08:00
xieyonghong d34af0aeb4 fix: bug#10930 2023-03-25 18:09:51 +08:00
xieyonghong dce719c9d3 fix: bug#10922 2023-03-25 18:09:50 +08:00
xieyonghong 1c0812f8d5 fix: bug#10821 2023-03-25 18:09:50 +08:00
xieyonghong dc0fc31503 fix: bug#10867 2023-03-25 18:09:49 +08:00
xieyonghong 75d748a416 fix: bug#10559 2023-03-25 18:09:49 +08:00
xieyonghong 605466c482 fix: 修复BadgeStatus中status类型 2023-03-25 18:09:48 +08:00
xieyonghong 620a3a4ae8 fix: bug#10514 2023-03-25 18:09:48 +08:00
JiangQiming 532c82afe6 fix: bug#10905、10895、10912、10926、10927、10886 2023-03-25 15:56:11 +08:00
JiangQiming 32f49d95b8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-25 14:44:22 +08:00