Commit Graph

29 Commits

Author SHA1 Message Date
xieyonghong 3135213a05 fix: 修复commit信息无法校验 2023-01-12 09:54:56 +08:00
xieyonghong 0890350cf2 Merge remote-tracking branch 'origin/dev' into dev 2023-01-12 09:34:31 +08:00
xieyonghong ce3d168f68 feat: merge components.d.ts 2023-01-12 09:13:05 +08:00
xiongqian b0983a1988 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
#	components.d.ts
2023-01-11 18:41:06 +08:00
xiongqian 5304559608 feat: 添加初始化页面接口数据 2023-01-11 18:38:33 +08:00
100011797 7f61e53b75 fix: merge 2023-01-11 18:24:29 +08:00
100011797 2d49f87cea feat: 表格选择 2023-01-11 18:24:07 +08:00
easy fed499e18c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-11 18:12:21 +08:00
easy ffc55b91e0 update: api配置 2023-01-11 18:11:56 +08:00
JiangQiming 0f7cc7d9ec fix: 单点登录接口联调 2023-01-11 18:07:10 +08:00
JiangQiming d2a82edbe4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-11 16:39:30 +08:00
JiangQiming f687ca0fad fix: 单点登录接口 2023-01-11 16:38:57 +08:00
xieyonghong 3cfee37765 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	components.d.ts
2023-01-11 16:12:01 +08:00
xieyonghong bf493c3a96 feat: 完善FormBuilder组件 2023-01-11 16:06:06 +08:00
easy 26617fc559 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-11 14:42:21 +08:00
easy 2436e8fa0d update: api配置界面 2023-01-11 14:41:16 +08:00
100011797 e3c3e43b31 feat: 表格插槽 2023-01-11 14:33:17 +08:00
xiongqian 73278105e7 feat:添加初始化页面 2023-01-10 18:25:54 +08:00
xieyonghong bd81041067 feat: merge 2023-01-10 15:58:05 +08:00
JiangQiming 5c9e024b62 fix: 解决冲突 2023-01-10 11:26:47 +08:00
blp af223a16b8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-10 11:11:04 +08:00
blp 3dbe4ea2af feat:登录页 2023-01-10 11:04:52 +08:00
JiangQiming 640f6d898b feat: 新增单点登录页面 2023-01-09 18:03:46 +08:00
easy 5aeeda5433 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-06 18:17:03 +08:00
easy c691f246fe 添加iot首页 2023-01-06 18:15:19 +08:00
blp 0cdd32319a feat:新增卡片、状态组件 2023-01-06 17:53:29 +08:00
JiangQiming ebb0f58be5 fix: 编辑器默认值 2023-01-04 14:03:10 +08:00
JiangQiming 5fd1538d94 feat: 新增参数类型输入组件 2023-01-04 09:50:59 +08:00
xieyonghong c2216c4c31 feat: 初始化项目 2022-12-26 15:27:55 +08:00