Commit Graph

548 Commits

Author SHA1 Message Date
taojinlong
f5c8c5422e fix(数据集): 数据集参数传递支持 IN 2022-07-04 00:45:03 +08:00
taojinlong
c100179997 refactor(数据集): 解决冲突 2022-07-01 18:19:14 +08:00
fit2cloud-chenyw
c85c633209 feat: 修改初始密码提示优化 2022-06-30 16:21:21 +08:00
fit2cloud-chenyw
7159812333 fix: 过滤条件选择空数据集给出提示 2022-06-30 16:20:47 +08:00
taojinlong
54e1ed31ad fix: sql 变量 2022-06-30 11:37:44 +08:00
taojinlong
5366fd1a3b feat: 支持查询超时 2022-06-27 17:16:43 +08:00
taojinlong
fb5f713d62 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-27 12:42:30 +08:00
taojinlong
0f5b69aebe fix: 显示并提示 sql 变量只能在where中使用 2022-06-27 12:42:08 +08:00
fit2cloud-chenyw
77e20462df fix: 过滤组件禁止同数据集多字段 2022-06-27 11:20:17 +08:00
fit2cloud-chenyw
4f8948c020
Merge pull request #2507 from dataease/pr@dev@fix_filter_dialog_text
fix: 过滤器弹框文字精简
2022-06-27 10:10:51 +08:00
fit2cloud-chenyw
912c73bdab fix: 过滤器弹框文字精简 2022-06-27 10:09:35 +08:00
junjun
a3e8f31e71 feat: 表格滚动 2022-06-26 15:56:21 +08:00
taojinlong
91491eb1ab fix: 尝试修复支持数据库字符集 2022-06-25 17:24:23 +08:00
taojinlong
be11424539 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-25 15:33:56 +08:00
taojinlong
dc7b06bca5 fix: 参数默认值的時間格式化 2022-06-25 15:33:39 +08:00
wangjiahao
028c03733c feat: 图片组件增加尺寸适应方式 2022-06-24 17:59:20 +08:00
wangjiahao
bc5d6f0b8a Merge remote-tracking branch 'origin/dev' into dev 2022-06-22 18:02:55 +08:00
wangjiahao
d2bd4f03cb refactor: 仪表板主题优化,支持主题色切换新建视图主题集成 2022-06-22 18:02:42 +08:00
taojinlong
1349431c63 feat: excel 替换数据显示'同步中' 2022-06-22 16:04:07 +08:00
fit2cloud-chenyw
9e84312073 perf: 增加cas切换默认登录方式api提示 2022-06-17 11:18:15 +08:00
taojinlong
6c9191e9bd refactor: 解决冲突 2022-06-16 23:03:07 +08:00
fit2cloud-chenyw
a18964f0b7
Merge pull request #2439 from dataease/pr@dev@feat_fit_xpack_cas
feat: 适配xpack-cas单点登录
2022-06-16 18:42:06 +08:00
fit2cloud-chenyw
0baa789fa9 feat: 适配xpack-cas单点登录 2022-06-16 16:58:46 +08:00
taojinlong
4b5788b63c feat: 参数管理 2022-06-16 14:16:47 +08:00
wangjiahao
fd8197fc77 refactor: 视图重置增加提示 2022-06-16 11:58:23 +08:00
wangjiahao
bbab167253 style: 画布工具栏样式修改 2022-06-15 11:23:56 +08:00
junjun
c64fec487b feat: 视图支持计算字段 2022-06-14 14:28:23 +08:00
wangjiahao
d0dc50a9b4 refactor: 仪表板编辑餐单层级调整合并 2022-06-10 17:24:08 +08:00
wangjiahao
f08769f9c4 refactor: 重新设计明细查看 2022-06-10 10:27:59 +08:00
wangjiahao
47a3a04aef refactor: 仪表板编辑页面操作布局优化 2022-06-09 15:51:22 +08:00
taojinlong
10d7bfa0db feat: sql 数据集参数传递 2022-06-08 10:46:12 +08:00
taojinlong
ba5832b58f
Merge pull request #2345 from Antoniano1963/main
feat:提高请求超时时间的范围,创建关联数据集时保留原数据类型
2022-06-07 17:43:16 +08:00
fit2cloud-chenyw
71d0b343ed perf: 优化选项卡选择组件提示 2022-05-31 23:15:16 +08:00
taojinlong
5608e576cd fix: 数据源管理页面优化 2022-05-31 19:03:54 +08:00
taojinlong
987fd07403 feat: 调整驱动管理页面 2022-05-30 15:51:39 +08:00
taojinlong
2ae62dff1e fix: 替换excel时,提示影响计算字段 2022-05-30 10:40:52 +08:00
吕昊泽
1df069bc28 增加了注释 2022-05-29 22:54:05 +08:00
吕昊泽
2ace1cbb68 修复[issue:2293](https://github.com/dataease/dataease/issues/2293)建议把请求超时时间的设置数值范围加大 2022-05-29 21:42:17 +08:00
fit2cloud-chenyw
bab9634d2e fix: 日志导出增加条件 2022-05-26 22:41:46 +08:00
fit2cloud-chenyw
f5241528ff
Merge pull request #2313 from dataease/pr@dev@feat_tree_select
feat: 过滤条件增加下拉树
2022-05-26 12:54:14 +08:00
fit2cloud-chenyw
2cf026edcf feat: 过滤条件增加下拉树 2022-05-26 12:53:18 +08:00
taojinlong
626f97935e fix: 优化驱动管理 2022-05-25 23:07:59 +08:00
taojinlong
a346a7718d Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-24 23:05:35 +08:00
taojinlong
c29875ffa9 feat: 替换excel时,提示信息 2022-05-24 23:05:25 +08:00
wangjiahao
1a75c3ed33 Merge remote-tracking branch 'origin/dev' into dev 2022-05-24 22:32:31 +08:00
wangjiahao
da26a5b40f feat: 仪表板编辑时可以按照仪表板复用视图 2022-05-24 22:32:11 +08:00
fit2cloud-chenyw
8152848c43 perf: 优化审计日志 2022-05-24 17:55:53 +08:00
wangjiahao
544ea07e57 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/views/chart/chart/util.js
#	frontend/src/views/chart/view/ChartEdit.vue
#	frontend/src/views/chart/view/ChartStyle.vue
2022-05-23 13:31:03 +08:00
wangjiahao
9041866e9c refactor: 批量修改样式优化 2022-05-23 13:23:39 +08:00
taojinlong
df17468447 refactor: 冲突 2022-05-22 10:16:23 +08:00