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 |
|
maninhill
|
b5f5f3744c
|
Update README.md
|
2023-12-02 23:14:26 +08:00 |
|
wangjiahao
|
4bca0ebfbc
|
refactor: UI
|
2023-12-01 21:35:02 +08:00 |
|
wangjiahao
|
d5d57c6a48
|
refactor: UI
|
2023-12-01 18:41:42 +08:00 |
|
taojinlong
|
cde9664013
|
Merge pull request #6962 from dataease/pr@dev-v2@fixDatasource
fix: 【数据集】列权限自定义脱敏格式显示不正确
|
2023-12-01 03:21:20 -06:00 |
|
fit2cloud-chenyw
|
6060978ee3
|
Merge pull request #6961 from dataease/pr@dev-v2@feat_toolbox_menu
style: 工作台样式恢复
|
2023-12-01 17:13:15 +08:00 |
|
fit2cloud-chenyw
|
bbf0093f8c
|
Merge branch 'dev-v2' into pr@dev-v2@feat_toolbox_menu
|
2023-12-01 17:11:56 +08:00 |
|
fit2cloud-chenyw
|
53f61613d6
|
style: 工作台样式恢复
|
2023-12-01 17:08:31 +08:00 |
|
taojinlong
|
d1107c5625
|
fix: 【数据集】列权限自定义脱敏格式显示不正确
|
2023-12-01 16:39:49 +08:00 |
|
王嘉豪
|
925ed694c6
|
Merge pull request #6960 from dataease/pr@dev-v2@style_UI-adjust
refactor: UI调整,增加调试信息
|
2023-12-01 16:27:19 +08:00 |
|
wangjiahao
|
c355e6a66e
|
refactor: UI调整,增加调试信息
|
2023-12-01 16:26:08 +08:00 |
|
fit2cloud-chenyw
|
ccb75f5388
|
Merge pull request #6959 from dataease/pr@dev-v2@style_workbranch_restore
style: 工作台样式恢复
|
2023-12-01 16:00:57 +08:00 |
|
fit2cloud-chenyw
|
46c983b863
|
style: 工作台样式恢复
|
2023-12-01 15:58:55 +08:00 |
|
fit2cloud-chenyw
|
062ac32209
|
Merge pull request #6957 from dataease/pr@dev-v2@perf_embedded_validate_domain
perf: 嵌入式校验域名
|
2023-12-01 15:41:37 +08:00 |
|
fit2cloud-chenyw
|
86a0a96094
|
perf: 嵌入式校验域名
|
2023-12-01 15:40:42 +08:00 |
|
fit2cloud-chenyw
|
5ff9cca7b3
|
Merge pull request #6955 from dataease/pr@dev-v2@perf_embedded_token_validate
perf: 嵌入式持续校验
|
2023-12-01 14:27:02 +08:00 |
|
fit2cloud-chenyw
|
8a5230f7a7
|
perf: 嵌入式持续校验
|
2023-12-01 14:25:19 +08:00 |
|
王嘉豪
|
93a7b23180
|
Merge pull request #6951 from dataease/pr@dev-v2@style_UI-UPDATE
style: UI调整
|
2023-11-30 23:16:16 +08:00 |
|
wangjiahao
|
476cc0be75
|
style: UI调整
|
2023-11-30 23:15:09 +08:00 |
|
fit2cloud-chenyw
|
590a704b61
|
Merge pull request #6950 from dataease/pr@dev-v2@perf_front_package
perf: 降低前端打包时间
|
2023-11-30 20:28:27 +08:00 |
|
fit2cloud-chenyw
|
932c98aeec
|
perf: 降低前端打包时间
|
2023-11-30 20:27:11 +08:00 |
|
fit2cloud-chenyw
|
ee68dbcbe2
|
Merge pull request #6949 from dataease/pr@dev-v2@perf_version_number
perf: 升级版本号
|
2023-11-30 19:58:33 +08:00 |
|
fit2cloud-chenyw
|
246765d989
|
perf: 升级版本号
|
2023-11-30 19:57:37 +08:00 |
|