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 |
|
xieyonghong
|
cc50da7b49
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# components.d.ts
# yarn.lock
|
2023-01-10 15:30:33 +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 |
|
xieyonghong
|
3fba23e19f
|
feat: 添加commit校验
|
2023-01-10 15:26:20 +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 |
|
胡彪
|
58c8f15c22
|
Merge pull request #41 from jetlinks/dev-hub
Dev hub
|
2023-01-10 13:57:57 +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 |
|
blp
|
dda2821830
|
fix:配置文件修改
|
2023-01-10 11:30:37 +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
|
35f4b18ada
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
# Conflicts:
# components.d.ts
# package.json
# src/views/account/Center/bind/index.vue
|
2023-01-10 11:13:09 +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 |