Commit Graph

1633 Commits

Author SHA1 Message Date
胡彪 0f11e75bd4
Merge pull request #40 from jetlinks/dev-hub
Dev hub
2023-01-10 09:23:03 +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 e80d7f9039 fix: 增加jetlinks-store 2023-01-09 18:33:49 +08:00
wangshuaiswim 93e91f0073 fix: 增加权限按钮和相关内容 2023-01-09 18:33:02 +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 ef064a60c5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-01-09 16:12:12 +08:00
wangshuaiswim 5ad7ed969c add: 新增权限按钮 2023-01-09 16:12:00 +08:00
100011797 d3879bebd1 feat: 增加vue-jsx配置 2023-01-09 16:03:34 +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
xieyonghong 7fe7d70b21 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	yarn.lock
2023-01-04 10:28:41 +08:00
xieyonghong b153de1cef feat: 添加html的title和favicon控制 2023-01-04 10:19:09 +08:00
JiangQiming cf9787fd50 feat: 测试代码注释 2023-01-04 09:55:03 +08:00
JiangQiming 5fd1538d94 feat: 新增参数类型输入组件 2023-01-04 09:50:59 +08:00
wangshuaiswim 560bcd639a fix: 增加ant-design-vue引用 2022-12-30 17:30:53 +08:00
xieyonghong c2216c4c31 feat: 初始化项目 2022-12-26 15:27:55 +08:00