Commit Graph

10754 Commits

Author SHA1 Message Date
王嘉豪
018eb21b7b
Merge pull request #6993 from dataease/pr@dev-v2@refactor_template-manage
Pr@dev v2@refactor template manage
2023-12-05 09:36:47 +08:00
wangjiahao
4297c21bef refactor: 模版管理支持多标签 2023-12-05 09:35:43 +08:00
wangjiahao
61582af011 style: 调整新建可视化资源入口样式 2023-12-04 19:55:41 +08:00
fit2cloud-chenyw
7aa587817c
Merge pull request #6992 from dataease/pr@dev-v2@perf_lark_login_limit
feat: 飞书用户登录受限
2023-12-04 17:58:31 +08:00
fit2cloud-chenyw
482d166680 feat: 飞书用户登录受限 2023-12-04 17:57:45 +08:00
fit2cloud-chenyw
d60c1ebda8
Merge pull request #6991 from dataease/pr@dev-v2@feat_lark_validate
Pr@dev v2@feat lark validate
2023-12-04 16:28:14 +08:00
fit2cloud-chenyw
5292051a96 feat: 飞书配置信息验证 2023-12-04 16:27:44 +08:00
fit2cloud-chenyw
0cb2efd354 feat: 飞书配置信息验证 2023-12-04 16:25:29 +08:00
taojinlong
7669f6c8c1
Merge pull request #6990 from dataease/pr@dev-v2@fixDatasource
fix: API 数据源更新数据
2023-12-04 02:23:18 -06:00
taojinlong
0db5bb3eec fix: API 数据源更新数据 2023-12-04 16:22:22 +08:00
王嘉豪
2b7e430b53
Merge pull request #6987 from dataease/pr@dev-v2@fix_img-upload
fix: 修复反复切换图片组件样式中缩略图没有变化问题
2023-12-04 15:30:45 +08:00
wangjiahao
79ef6d7ae2 fix: 修复反复切换图片组件样式中缩略图没有变化问题 2023-12-04 15:30:00 +08:00
王嘉豪
014c5c5b83
* fix: 修复使用快捷键反复切换桌面应用导致的数据大屏组件移动失效问题
Pr@dev v2@fix app switch
2023-12-04 15:09:20 +08:00
wangjiahao
df2627bd9f fix: 修复使用快捷键反复切换桌面应用导致的数据大屏组件移动失效问题 2023-12-04 15:08:16 +08:00
dataeaseShu
fb3b61f799
Merge pull request #6985 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-12-04 14:41:36 +08:00
dataeaseShu
3de4575a8a Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-12-04 14:39:41 +08:00
dataeaseShu
470949f7eb fix: 【系统设置】-模板管理-修改模板名称长度=50,模板的「···」按钮被挤出显示图标范围 2023-12-04 13:53:31 +08:00
fit2cloud-chenyw
0b2fc63f6d
Merge pull request #6983 from dataease/pr@dev-v2@perf_user_limit
fix: 受限用户浏览器循环刷新错误
2023-12-04 13:29:44 +08:00
fit2cloud-chenyw
375d6b984c fix: 受限用户浏览器循环刷新错误 2023-12-04 13:28:46 +08:00
王嘉豪
36e03c5f3e
fix: 修复首页公共链接分享文案,模版中心分类
* refactor: UI

* refactor: UI

* refactor: UI

* refactor: UI

* refactor: 优化文案样式等

* fix: 修复首页公共链接分享文案,模版中心分类
2023-12-04 13:19:16 +08:00
wangjiahao
5b762ec871 fix: 修复首页公共链接分享文案,模版中心分类 2023-12-04 13:18:01 +08:00
fit2cloud-chenyw
d1659894be
Merge pull request #6981 from dataease/pr@dev-v2@fix_user_import_error
fix: 用户批量导入失败
2023-12-04 12:53:54 +08:00
fit2cloud-chenyw
d658387b60 fix: 用户批量导入失败 2023-12-04 12:53:14 +08:00
wangjiahao
6e8e8ef4fc Merge branch 'dev-v2' of github.com:dataease/dataease into dev-v2 2023-12-04 12:41:15 +08:00
王嘉豪
229ed8ad45
refactor: 优化文案样式等
* refactor: UI

* refactor: UI

* refactor: UI

* refactor: UI

* refactor: 优化文案样式等
2023-12-04 12:40:54 +08:00
wangjiahao
f29efdd2be refactor: 优化文案样式等 2023-12-04 12:38:26 +08:00
fit2cloud-chenyw
c64d54ade5
Merge pull request #6979 from dataease/pr@dev-v2@perf_lic_limit_user
perf: 许可证机制
2023-12-04 12:16:42 +08:00
fit2cloud-chenyw
f6b34ffe12 perf: 许可证机制 2023-12-04 12:15:49 +08:00
wangjiahao
d2522886cb Merge branch 'dev-v2' of github.com:dataease/dataease into dev-v2
 Conflicts:
	core/core-frontend/src/views/template-market/component/CategoryTemplateV2.vue
	core/core-frontend/src/views/template-market/index.vue
2023-12-04 11:53:40 +08:00
dataeaseShu
e701b54d08
Merge pull request #6978 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-12-04 11:19:28 +08:00
dataeaseShu
e15524b460 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-12-04 11:18:15 +08:00
dataeaseShu
b7455ede80 fix: 【查询组件】-查询条件设置默认值为固定时间,保存后默认值被置空 2023-12-04 11:00:48 +08:00
王嘉豪
76a4a23689
style: UI (#6974)
* refactor: UI

* refactor: UI

* refactor: UI
2023-12-03 23:37:09 +08:00
wangjiahao
999209757b refactor: UI 2023-12-03 23:35:51 +08:00
wangjiahao
d0d957b695 refactor: UI 2023-12-03 23:18:04 +08:00
fit2cloud-chenyw
6aff064fab
Merge pull request #6973 from dataease/pr@dev-v2@fix_ask_page
fix: ask页面文案
2023-12-03 17:22:36 +08:00
fit2cloud-chenyw
829d5d94f4 fix: ask页面文案 2023-12-03 17:21:30 +08:00
fit2cloud-chenyw
8c2fef30a8
Merge pull request #6972 from dataease/pr@dev-v2@fix_embedded_app_name
fix: 嵌入式应用名称长度限制
2023-12-03 17:19:28 +08:00
fit2cloud-chenyw
78ee1b8aa9 fix: 嵌入式应用名称长度限制 2023-12-03 17:18:29 +08:00
fit2cloud-chenyw
38509e1217
Merge pull request #6971 from dataease/pr@dev-v2@fix_pwd_validator
fix: 修改密码验证规则
2023-12-03 17:04:20 +08:00
fit2cloud-chenyw
c4068322ce fix: 修改密码验证规则 2023-12-03 17:03:33 +08:00
fit2cloud-chenyw
7d103e326d
Merge pull request #6970 from dataease/pr@dev-v2@perf_ask_token
perf: askToken认证机制
2023-12-03 16:49:54 +08:00
fit2cloud-chenyw
1c3d6fd2e3 perf: askToken认证机制 2023-12-03 16:48:55 +08:00
fit2cloud-chenyw
1fbc2521a7
Merge pull request #6969 from dataease/pr@dev-v2@perf_lic_limit
perf: 企业版许可限制机制
2023-12-03 15:00:17 +08:00
fit2cloud-chenyw
6af4c59fe8 perf: 企业版许可限制机制 2023-12-03 14:59:25 +08:00
fit2cloud-chenyw
c1b11ed31f
Merge pull request #6968 from dataease/pr@dev-v2@perf_menu_cache
perf: 菜单缓存机制禁止持久化
2023-12-03 12:29:14 +08:00
fit2cloud-chenyw
a6b047b60b perf: 菜单缓存机制禁止持久化 2023-12-03 12:28:27 +08:00
fit2cloud-chenyw
4d19cc55de
Merge pull request #6967 from dataease/pr@dev-v2@feat_distributed_i18n
perf: 分布式国际化
2023-12-03 12:11:17 +08:00
fit2cloud-chenyw
49a0ef79bc perf: 分布式国际化 2023-12-03 12:10:19 +08:00
maninhill
9f6d5e1eb4
Update README.md 2023-12-03 11:56:56 +08:00