center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
5,423 Commits 1 Branch 86 Tags 417 MiB
cd07cee14a
Commit Graph

5423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
taojinlong
cd07cee14a Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-23 19:44:44 +08:00
taojinlong
3e9abcb9d1 refactor: 打印日志 2022-05-23 19:44:24 +08:00
junjun
7fa3c0ac53 feat: 自定义颜色 2022-05-23 18:48:45 +08:00
junjun
df759a6ae8 feat: 自定义颜色 2022-05-23 18:27:57 +08:00
taojinlong
c657f56c29 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-23 17:22:49 +08:00
taojinlong
ff12a33d87 refactor: 格式化代码 2022-05-23 17:22:27 +08:00
王嘉豪
522b61537b
Merge pull request #2297 from dataease/refactor_panel-unpublished 
refactor: 下架显示优化
 2022-05-23 16:37:12 +08:00
wangjiahao
6b8dbf5093 refactor: 下架显示优化 2022-05-23 16:36:27 +08:00
fit2cloud-chenyw
d7a1654ae0
Merge pull request #2294 from dataease/pr@dev@feat_marker_map_sql 
feat: 符号地图sql
 2022-05-23 15:47:53 +08:00
fit2cloud-chenyw
4bb9f244b6 feat: 符号地图sql 2022-05-23 15:46:39 +08:00
wangjiahao
8fe5d4e343 Merge remote-tracking branch 'origin/dev' into dev 2022-05-23 15:06:28 +08:00
wangjiahao
8ee057aac3 refactor: 批量修改样式优化 2022-05-23 15:06:07 +08:00
taojinlong
8401f4e14f Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-23 13:51:21 +08:00
taojinlong
928713b4e0 refactor: 驱动路径 2022-05-23 13:51:12 +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
junjun
3889eff052 feat: 自定义颜色 2022-05-23 11:15:44 +08:00
fit2cloud-chenyw
09324a21d9
Merge pull request #2292 from dataease/pr@dev@fix_panel_console_error 
fix: 仪表板浏览器console报错
 2022-05-23 11:08:54 +08:00
fit2cloud-chenyw
b72955204d fix: 仪表板浏览器console报错 2022-05-23 11:08:02 +08:00
fit2cloud-chenyw
5a78aa0599
Merge pull request #2291 from dataease/pr@dev@feat_marker_map_label 
feat: 气泡地图增加标签字段设置
 2022-05-23 10:40:28 +08:00
fit2cloud-chenyw
0c25b5f553 feat: 气泡地图增加标签字段设置 2022-05-23 10:38:16 +08:00
junjun
4fe718bb45 feat: 自定义颜色 2022-05-23 10:23:36 +08:00
taojinlong
13aff751f8 feat: 驱动管理的日志记录 2022-05-22 11:39:10 +08:00
taojinlong
df17468447 refactor: 冲突 2022-05-22 10:16:23 +08:00
王嘉豪
d70b3ffa95
Merge pull request #2289 from dataease/pr@dev@refactor_svg 
refactor: 修改SvgIcon组件，未找到class显示未发现图标防止报错
 2022-05-20 20:42:45 +08:00
wangjiahao
8f37ee68c9 refactor: 修改SvgIcon组件，未找到class显示未发现图标防止报错 2022-05-20 20:41:45 +08:00
王嘉豪
47163af09e
Merge pull request #2288 from dataease/pr@dev@refactor_rich-text 
refactor: 丰富富文本插件
 2022-05-20 20:30:57 +08:00
wangjiahao
a3767831f6 refactor: 丰富富文本插件 2022-05-20 20:16:29 +08:00
wangjiahao
9f01bc4ee0 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/views/chart/view/ChartStyle.vue
#	frontend/src/views/panel/list/PanelMain.vue
 2022-05-20 13:08:51 +08:00
wangjiahao
fec7a67787 refactor: 批量修改样式优化 2022-05-20 13:08:26 +08:00
wangjiahao
0066fe6000 Merge remote-tracking branch 'origin/dev' into dev 2022-05-20 12:35:16 +08:00
wangjiahao
704cb29d19 refactor: 批量修改样式优化 2022-05-20 12:34:47 +08:00
junjun
fef7dd1e22 feat: 自定义颜色 2022-05-20 10:30:13 +08:00
taojinlong
ad01a695b4 feat: 支持数据源驱动管理 2022-05-20 00:31:17 +08:00
wangjiahao
0d7e913ad3 refactor: 插件样式设置兼容 2022-05-19 21:14:27 +08:00
wangjiahao
7db5e73125 Merge remote-tracking branch 'origin/dev' into dev 2022-05-19 18:17:37 +08:00
wangjiahao
9ae6b82113 refactor: 优化仪表板下架逻辑，下架禁止查看 2022-05-19 18:16:33 +08:00
王嘉豪
cb9f427782
Merge pull request #2282 from dataease/pr@dev@refactor_panel-unpublished 
refactor: 优化仪表板下架逻辑，下架禁止查看
 2022-05-19 17:59:12 +08:00
wangjiahao
f0b9d02603 refactor: 优化仪表板下架逻辑，下架禁止查看 2022-05-19 17:58:19 +08:00
王嘉豪
1cab504402
Merge pull request #2275 from dataease/pr@dev@feat_fulltext 
feat: 新增富文本编辑器
 2022-05-19 14:01:12 +08:00
wangjiahao
66925df6f9 feat: 新增富文本编辑器 2022-05-19 14:00:00 +08:00
fit2cloud-chenyw
bac23c3c4a
Merge pull request #2274 from dataease/pr@dev@fix_plugin_view_miss 
fix: 插件视图属性和样式无法显示
 2022-05-19 10:51:35 +08:00
fit2cloud-chenyw
2398e685fb fix: 插件视图属性和样式无法显示 2022-05-19 10:49:57 +08:00
junjun
50233116f6 feat: 视图编辑块字段增加快速删除按钮 2022-05-19 10:23:05 +08:00
fit2cloud-chenyw
eea37713ea
Merge pull request #2273 from dataease/pr@dev@feat_log_search_type 
feat: 日志通过操作类型搜索
 2022-05-18 19:07:24 +08:00
fit2cloud-chenyw
c80eea153b feat: 日志通过操作类型搜索 2022-05-18 19:06:27 +08:00
fit2cloud-chenyw
027d4e021f
Merge pull request #2272 from dataease/pr@dev@feat_log_sql 
feat: 操作日志数据结构
 2022-05-18 18:24:10 +08:00
fit2cloud-chenyw
cc8ab2d623 feat: 操作日志数据结构 2022-05-18 18:23:12 +08:00
fit2cloud-chenyw
6ca15ce455
Merge pull request #2271 from dataease/pr@dev@feat_log 
feat: 操作日志
 2022-05-18 18:17:31 +08:00
fit2cloud-chenyw
f0f5813071 feat: 操作日志 2022-05-18 18:12:10 +08:00