JiangQiming
|
0154ca8a32
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 18:02:07 +08:00 |
|
JiangQiming
|
7ee453b706
|
feat: webhook请求头字段表格
|
2023-01-12 18:00:04 +08:00 |
wangshuaiswim
|
bcdf8b7882
|
fix: 新增设备和产品接口
|
2023-01-12 17:56:51 +08:00 |
|
wangshuaiswim
|
a1e00a3734
|
add: 增加设备和产品typing
|
2023-01-12 17:56:19 +08:00 |
|
wangshuaiswim
|
9658a11666
|
add: 增加instanceStore
|
2023-01-12 17:55:48 +08:00 |
easy
|
085a2d711a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 17:39:45 +08:00 |
|
easy
|
6728105539
|
update: api配置
|
2023-01-12 17:39:02 +08:00 |
|
JiangQiming
|
a91b4b6b99
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 16:50:37 +08:00 |
|
JiangQiming
|
c05cf5d961
|
feat: 通知配置详情表单
|
2023-01-12 16:48:39 +08:00 |
100011797
|
ea151386b9
|
fix: merge
|
2023-01-12 15:32:14 +08:00 |
|
100011797
|
7451dad544
|
fix: vue转tsx
|
2023-01-12 15:31:20 +08:00 |
blp
|
b69a1721bf
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-12 14:42:11 +08:00 |
|
blp
|
2ef9df6c04
|
fix: 登录页样式修改
|
2023-01-12 14:41:49 +08:00 |
xieyonghong
|
bd7ef2131b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-12 11:46:44 +08:00 |
|
xieyonghong
|
34459132cf
|
update: 添加axios response泛型处理
|
2023-01-12 11:45:59 +08:00 |
|
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 |
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 |
|
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
|
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 |
|
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 |
|
100011797
|
26c84eeab6
|
fix: yarn.lock不忽略
|
2023-01-10 17:06:53 +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
|
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 |
|
easy
|
02d91eaec4
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 15:29:38 +08:00 |
|
easy
|
30f930ef30
|
1
|
2023-01-10 15:27:07 +08:00 |
|
blp
|
54855c5263
|
fix：登录页修改
|
2023-01-10 15:11:46 +08:00 |
|
JiangQiming
|
79fc6a419c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 14:45:58 +08:00 |
|
JiangQiming
|
20d30e99b2
|
feat: 单点登录接口联调
|
2023-01-10 14:42:59 +08:00 |
|
easy
|
fac9f36162
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-10 14:39:49 +08:00 |
|
easy
|
d1eb8165c0
|
首页
|
2023-01-10 14:37:25 +08:00 |
|
jackhoo_98
|
1bd0b49dc4
|
fix: Merge branch 'dev' into dev-hub
|
2023-01-10 13:56:41 +08:00 |
|
jackhoo_98
|
7e1c9de11f
|
feat: 设备接入网关 自定义设备接入基本Card样式
|
2023-01-10 13:51:14 +08:00 |
|
jackhoo_98
|
c2b83da156
|
feat: 新增TitleComponent组件
|
2023-01-10 13:44:31 +08:00 |
|
100011797
|
da0fc1b45a
|
fix: 修改token取反
|
2023-01-10 11:44:03 +08:00 |
|
100011797
|
be792dd961
|
feat: table
|
2023-01-10 11:44:03 +08:00 |
|
blp
|
81c27df227
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# components.d.ts
# vite.config.ts
|
2023-01-10 11:38:46 +08:00 |
|
blp
|
8de9512364
|
fix：修改bug
|
2023-01-10 11:33:40 +08:00 |
|
JiangQiming
|
5c9e024b62
|
fix: 解决冲突
|
2023-01-10 11:26:47 +08:00 |
|
JiangQiming
|
80bd48693d
|
fix: 三方绑定样式优化
|
2023-01-10 11:22:02 +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
|
0434d12416
|
feat: 新增表单验证
|
2023-01-10 10:27:40 +08:00 |
|
jackhoo_98
|
bd267b32ff
|
Merge branch 'dev' into dev-hub
|
2023-01-10 09:20:53 +08:00 |
|
wangshuaiswim
|
f6ad749282
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# components.d.ts
|
2023-01-09 18:35:19 +08:00 |
|
wangshuaiswim
|
6530755873
|
fix: 修改ext参数为非必输
|
2023-01-09 18:30:58 +08:00 |
|
easy
|
d38fe9e5b8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-09 18:13:41 +08:00 |
|
easy
|
c3b06ad3cd
|
首页页面
|
2023-01-09 18:12:23 +08:00 |
|
JiangQiming
|
640f6d898b
|
feat: 新增单点登录页面
|
2023-01-09 18:03:46 +08:00 |
|
jackhoo_98
|
9a633a1f5c
|
Merge branch 'dev' into dev-hub
|
2023-01-09 17:59:11 +08:00 |
|
jackhoo_98
|
bdd6f40079
|
feat: 日志管理 基本样式框架
|
2023-01-09 17:57:12 +08:00 |
|
jackhoo_98
|
e19947893a
|
feat: 证书管理新增 基本样式
|
2023-01-09 17:56:10 +08:00 |
|
wangshuaiswim
|
5ad7ed969c
|
add: 新增权限按钮
|
2023-01-09 16:12:00 +08:00 |
|
wangshuaiswim
|
4b0529631b
|
add: 增加permissionStore以及相关引用
|
2023-01-09 15:02:40 +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
|
735470715e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-01-06 17:53:53 +08:00 |
|
blp
|
0cdd32319a
|
feat：新增卡片、状态组件
|
2023-01-06 17:53:29 +08:00 |
|
JiangQiming
|
d37113b24b
|
fix: 删除无用代码
|
2023-01-05 17:47:52 +08:00 |
|
JiangQiming
|
291a9621bb
|
fix: 新增注释
|
2023-01-05 17:46:25 +08:00 |
|
JiangQiming
|
0323594841
|
fix: 地图标记点实现方式更改
|
2023-01-05 17:42:20 +08:00 |
|
JiangQiming
|
37689880f1
|
fix: 组件优化
|
2023-01-05 16:38:53 +08:00 |
|
JiangQiming
|
cb8f393a17
|
fix: 组件bug修复
|
2023-01-04 16:09:13 +08:00 |
|
JiangQiming
|
ebb0f58be5
|
fix: 编辑器默认值
|
2023-01-04 14:03:10 +08:00 |
|
JiangQiming
|
3fbb1dd312
|
fix: 高德地图完整导入改为自动导入
|
2023-01-04 11:30:17 +08:00 |
|
JiangQiming
|
cf9787fd50
|
feat: 测试代码注释
|
2023-01-04 09:55:03 +08:00 |