wangshuaiswim
|
48ca21ab3d
|
fix: 修改设备api目录，增加产品api
|
2023-01-12 11:34:24 +08:00 |
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 |
|
xieyonghong
|
ec79fa0669
|
feat: 新增Search组件
|
2023-01-11 18:26:30 +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 |
jackhoo_98
|
011f289262
|
Merge branch 'dev-hub' into dev
|
2023-01-11 18:13:39 +08:00 |
|
jackhoo_98
|
8ac810bfb5
|
feat: 设备接入网关 接入第一步部分功能
|
2023-01-11 18:12:41 +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 |
|
xieyonghong
|
2e4d853e1b
|
update: 优化config文件
|
2023-01-11 18:04:28 +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
|
e2e12cd5c5
|
update: 优化FormBuilder组件的验证
|
2023-01-11 16:10:58 +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 |
|
jackhoo_98
|
a703709123
|
Merge branch 'dev' into dev-hub
|
2023-01-11 11:23:19 +08:00 |
|
jackhoo_98
|
a4830e4c30
|
fix: 修复证书新增 表单多层数据校验、文件上传数据双向绑定
|
2023-01-11 10:50:31 +08:00 |
|
100011797
|
aab98f3ddf
|
Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev
|
2023-01-11 10:20:13 +08:00 |
|
100011797
|
016650a9e9
|
fix: merge
|
2023-01-11 10:17:14 +08:00 |
|
100011797
|
d682234293
|
fix: merge
|
2023-01-11 10:01:28 +08:00 |
|
xiongqian
|
748fac80a7
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# components.d.ts
# src/utils/consts.ts
|
2023-01-10 18:31:05 +08:00 |
|
100011797
|
78e423cc50
|
feat: 表格按钮
|
2023-01-10 18:30:05 +08:00 |
|
easy
|
c22c195200
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 18:26:47 +08:00 |
|
easy
|
c67de84110
|
首页目录调整+api配置页面
|
2023-01-10 18:26:17 +08:00 |
|
xiongqian
|
73278105e7
|
feat:添加初始化页面
|
2023-01-10 18:25:54 +08:00 |
胡彪
|
aa6b6e7788
|
Merge pull request #42 from jetlinks/dev-hub
Dev hub
|
2023-01-10 18:24:51 +08:00 |
|
jackhoo_98
|
0de329a361
|
Merge branch 'dev' into dev-hub
|
2023-01-10 18:23:52 +08:00 |
|
jackhoo_98
|
c448f50bf2
|
feat：证书管理新增 基本功能
|
2023-01-10 18:22:30 +08:00 |
|
jackhoo_98
|
bfc98e013b
|
fix: 修改ts类型校验 any类型可索引
|
2023-01-10 18:19:57 +08:00 |
|
100011797
|
26c84eeab6
|
fix: yarn.lock不忽略
|
2023-01-10 17:06:53 +08:00 |
|
XieYongHong
|
e2696b8d3c
|
update: 删除components.d.ts
|
2023-01-10 17:00:37 +08:00 |
|
JiangQiming
|
1b2a8f1b79
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 16:54:54 +08:00 |
|
JiangQiming
|
4d83ed9e46
|
fix: 三方绑定联调
|
2023-01-10 16:54:47 +08:00 |
|
wangshuaiswim
|
b9edb9dc14
|
add: 新增api/device.ts，设备相关接口
|
2023-01-10 16:26:05 +08:00 |
|
wangshuaiswim
|
6350a8f3b9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 16:22:36 +08:00 |
|
wangshuaiswim
|
f801cffc00
|
fix: 删除菜单和按钮枚举
|
2023-01-10 16:22:24 +08:00 |
|
xieyonghong
|
c5eb9fddc3
|
feat: 添加FormBuilder组件
|
2023-01-10 16:11:02 +08:00 |
|
xieyonghong
|
458b4ae3d3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-10 15:58:33 +08:00 |
|
xieyonghong
|
bd81041067
|
feat: merge
|
2023-01-10 15:58:05 +08:00 |
|
xieyonghong
|
387d94494e
|
feat: 添加setup插件以支持setup可以设置name
|
2023-01-10 15:54:19 +08:00 |
|
JiangQiming
|
2bd5fb94d9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 15:34:21 +08:00 |
|
JiangQiming
|
c318d28044
|
fix: 三方绑定接口联调
|
2023-01-10 15:34:13 +08:00 |