Commit Graph

2251 Commits

Author SHA1 Message Date
100011797 7504dc3f88 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-10 17:55:44 +08:00
100011797 bd42cdd3fb fix: 修改bug 2023-07-10 17:55:36 +08:00
leiqiaochu 56b3b0acfb fix: bug#16085、16024、15967、15924、16072、16070、16067 2023-07-10 17:01:50 +08:00
100011797 a4aa193781 fix: 修改message 2023-07-10 15:42:28 +08:00
100011797 b3f194675b fix: 修改bug 2023-07-10 11:57:08 +08:00
100011797 fe9fe82e20 fix: 修改bug 2023-07-10 11:42:37 +08:00
XieYongHong cf4806738f fix: 优化设备物模型 2023-07-10 10:39:04 +08:00
100011797 7daaa88407 fix: allow-scripts 2023-07-10 10:19:51 +08:00
100011797 bee1c13d94 fix: 修改bug 2023-07-10 09:43:00 +08:00
xieyonghong a8338a5981 fix: 优化设备物模型 2023-07-09 19:34:16 +08:00
XieYongHong c8fa001655 fix: 优化物模型-标签定义 2023-07-08 18:13:47 +08:00
xieyonghong 3231c7ea12 fix: 优化物模型-编辑表格标识校验 2023-07-07 21:57:12 +08:00
100011797 2e50b866f0 fix: 修改bug 2023-07-07 18:29:47 +08:00
XieYongHong 9eacdb2687 fix: 优化物模型-功能定义-(输入、输出) 2023-07-07 18:21:17 +08:00
XieYongHong 7c2f4c410c Merge remote-tracking branch 'origin/dev' into dev 2023-07-07 17:25:00 +08:00
XieYongHong 4d995d98ed fix: 优化物模型-功能定义-输出 2023-07-07 17:22:46 +08:00
100011797 ddcc8db097 fix: 修改bug 2023-07-07 17:22:29 +08:00
100011797 5af3624676 fix: 修改bug 2023-07-07 15:00:00 +08:00
100011797 daef6b7f1f fix: 修改bug 2023-07-07 14:04:51 +08:00
XieYongHong e103369689 Merge remote-tracking branch 'origin/dev' into dev 2023-07-07 11:09:50 +08:00
XieYongHong 90df330400 fix: 优化物模型-功能定义-输出 2023-07-07 11:09:28 +08:00
100011797 c43e5a162a fix: 修改bug 2023-07-07 10:44:03 +08:00
xieyonghong d76aa3f65c fix: 优化物模型-事件定义 2023-07-06 22:33:29 +08:00
XieYongHong a869162799 fix: 优化物模型-功能定义-输入 2023-07-06 20:53:48 +08:00
XieYongHong c56dbff80b Merge remote-tracking branch 'origin/dev' into dev 2023-07-06 18:16:11 +08:00
100011797 42745b19a1 fix: 修改bug 2023-07-06 18:15:40 +08:00
XieYongHong 1622206283 fix: 优化物模型-功能定义(输入、输出) 2023-07-06 18:15:19 +08:00
XieYongHong c4faec62c1 Merge remote-tracking branch 'origin/dev' into dev 2023-07-06 16:50:29 +08:00
XieYongHong 09d1d388b8 fix: 优化物模型-功能定义(输入、输出) 2023-07-06 16:49:48 +08:00
100011797 56d56af3f1 fix: 修改bug 2023-07-06 16:33:38 +08:00
100011797 65e1249104 fix: 修改bug 2023-07-06 16:11:12 +08:00
XieYongHong 5912ebd703 Merge remote-tracking branch 'origin/dev' into dev 2023-07-06 16:02:07 +08:00
XieYongHong 1ceb3bb925 fix: 优化物模型-功能定义 2023-07-06 16:01:38 +08:00
100011797 76f22d8503 fix: 修改bug 2023-07-06 15:59:49 +08:00
XieYongHong 3065cd88c2 fix: 优化物模型-规则 2023-07-06 15:59:10 +08:00
XieYongHong 590a82b156 Merge remote-tracking branch 'origin/dev' into dev 2023-07-06 15:01:02 +08:00
XieYongHong bb602aecd2 fix: 优化物模型-详情 2023-07-06 15:00:16 +08:00
100011797 99637f0938 fix: 物模型映射搜索 2023-07-06 14:56:31 +08:00
100011797 9acec4efa1 fix: 修改bug 2023-07-06 14:21:36 +08:00
100011797 8fc0d9f6d4 fix: 修改bug 2023-07-06 14:03:34 +08:00
xieyonghong 7f75c05f79 fix: 优化物模型必填校验 2023-07-05 22:27:36 +08:00
100011797 be0aeb9a0a fix: 修改bug 2023-07-05 18:29:24 +08:00
XieYongHong 6651e75930 fix: 优化物模型-编辑表格-时间、枚举 2023-07-05 18:27:41 +08:00
XieYongHong c27757aea8 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	yarn.lock
2023-07-05 15:08:33 +08:00
XieYongHong e6b10a75f2 fix: 修复物模型-编辑表格 2023-07-05 15:06:27 +08:00
100011797 268745ff1d fix: 修改bug 2023-07-05 15:04:12 +08:00
100011797 f295104d8e fix: 修改ui 2023-07-04 18:25:04 +08:00
XieYongHong 0d6e9d8ae8 fix: 修复物模型-功能详情 2023-07-04 18:19:33 +08:00
XieYongHong aaa8c1498f fix: 修复物模型-功能无法编辑问题 2023-07-03 20:01:13 +08:00
XieYongHong d1ff921f6f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	vite.config.ts
2023-07-03 18:09:21 +08:00