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

1721 Commits

Author SHA1 Message Date
fit2cloud-chenyw
a17641c7b6 fix: 大屏删除文件夹兼容脏数据 2023-10-25 11:39:37 +08:00
fit2cloud-chenyw
e963a95ffc fix: 非admin账号可以通过直接访问url方式访问系统设置页面 2023-10-25 11:10:17 +08:00
王嘉豪
306942017f
Merge pull request #6348 from dataease/pr@dev-v2@refactor_new-chart-tips 
refactor: 首次添加图表的图标显示时机优化
 2023-10-25 10:34:37 +08:00
wangjiahao
50b83c75f5 refactor: 首次添加图表的图标显示时机优化 2023-10-25 10:32:26 +08:00
dataeaseShu
9d527dc2eb Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-10-25 10:24:15 +08:00
dataeaseShu
c7ef351bff fix: 仪表板主题-查询组件标题颜色设置没有生效 2023-10-25 10:22:02 +08:00
王嘉豪
244ed186d4
Merge pull request #6346 from dataease/pr@dev-v2@fix_new-delete 
fix: 修复新建时切换Tab删除资源有异常提示问题
 2023-10-25 09:58:12 +08:00
wangjiahao
9c9c8110b3 fix: 修复新建时切换Tab删除资源有异常提示问题 2023-10-25 09:55:25 +08:00
wisonic-s
a6012476b0 feat: 阈值/辅助线开关 2023-10-24 19:39:07 +08:00
dataeaseShu
1818dc178c fix: 新建关联数据集，无法设置关联字段 2023-10-24 18:19:58 +08:00
王嘉豪
1bb2d2d324
Merge pull request #6341 from dataease/pr@dev-v2@style_track-bar 
style: 联动下钻弹框样式变更
 2023-10-24 17:57:27 +08:00
wangjiahao
7ae7424b6e style: 联动下钻弹框样式变更 2023-10-24 17:56:03 +08:00
王嘉豪
7b6c2e6e7d
Merge pull request #6338 from dataease/pr@dev-v2@refactor_view 
refactor: 视图放大隐藏标题
 2023-10-24 17:08:05 +08:00
wangjiahao
9ceb361fb9 refactor: 视图放大隐藏标题 2023-10-24 17:03:03 +08:00
junjun
8a5993fc58 fix: calcite中布尔类型将使用true/false表示，而不是1/0 2023-10-24 16:28:19 +08:00
dataeaseShu
c635da1c6a Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-10-24 14:58:12 +08:00
dataeaseShu
ea82cd89c3 fix: eslint fix 2023-10-24 14:56:20 +08:00
ulleo
da85d49c94 feat: 图表标题增加备注设置 2023-10-24 14:39:58 +08:00
fit2cloud-chenyw
2a53655bb3
Merge pull request #6328 from dataease/pr@dev-v2@fix_eslint_error 
fix: eslint导致打包报错
 2023-10-24 11:25:43 +08:00
fit2cloud-chenyw
b6744ad279 fix: eslint导致打包报错 2023-10-24 11:23:58 +08:00
wisonic-s
4f778aa9ec fix: 仪表盘/水波图动态值无效时边框显示为红色 2023-10-24 11:19:41 +08:00
dataeaseShu
a6bc2d9ee7
Merge pull request #6325 from dataease/pr@dev-v2_dzz 
fix: Oracle 数据源创建界面的连接方式没有必填项标记，单选项没有默认选项
 2023-10-24 10:39:47 +08:00
dataeaseShu
0c65938e5a fix: Oracle 数据源创建界面的连接方式没有必填项标记，单选项没有默认选项 2023-10-24 10:38:19 +08:00
wangjiahao
e665e94d00 style: 查询组件编辑栏样式修改 2023-10-24 10:16:31 +08:00
fit2cloud-chenyw
afd05faf63 refactor: 初始化dev-v2 2023-10-23 22:00:14 +08:00
fit2cloud-chenyw
910d5b26ab refactor: 初始化v2 2023-10-23 21:58:50 +08:00
fit2cloud-chenyw
e29b93ef9d fix: 符号地图key配置 2023-10-23 16:22:07 +08:00
fit2cloud-chenyw
e7a0a9ea8a fix: 视图插件类型选项出现重复#6220 2023-10-23 14:27:33 +08:00
fit2cloud-chenyw
e15adfa948 fix: 厦门地图文件覆盖 2023-10-20 11:52:11 +08:00
fit2cloud-chenyw
7be5465df5 fix: 厦门地图 2023-10-20 11:11:07 +08:00
wisonic-s
dd2f5b2cfb fix: 维度为时间格式时图例显示不全#6253 2023-10-12 10:59:51 +08:00
junjun
de628cad99 feat: 过滤器时间和数值支持过滤为空项 2023-10-10 14:31:42 +08:00
fit2cloud-chenyw
6b190e83ea feat: 动态设置访问路径前缀 2023-09-22 13:28:37 +08:00
wisonic-s
8498e5cc7c fix: 编辑时切换到明细表会清空字段 2023-09-15 17:31:25 +08:00
fit2cloud-chenyw
f18db060e2 fix(过滤器): 字段过多时过滤组件排序字段显示不全#6088 2023-09-14 09:25:18 +08:00
fit2cloud-chenyw
477c4d3aa9 fix: 前端源码泄漏风险 2023-09-13 21:45:48 +08:00
fit2cloud-chenyw
3fba4a0f50
Merge pull request #6140 from dataease/pr@dev@feat_api_key_log 
fix(日志): apikey记录日志
 2023-09-13 21:27:53 +08:00
fit2cloud-chenyw
c1c0f7bf16 fix(日志): apikey记录日志 2023-09-13 21:26:09 +08:00
taojinlong
fba54de4d2 Merge branch 'dev' into pr@dev@fixrowpermissions 2023-09-13 18:51:46 +08:00
taojinlong
15d18488c9 fix: NUMERIC 类型丢失精度的问题 2023-09-13 18:45:44 +08:00
王嘉豪
cfb27a16e3
Merge pull request #6136 from dataease/pr@dev@fix_xss-bug 
fix: 加强图片校验，防止恶意代码通过合成到图片上传到服务器中引起的攻击行为
 2023-09-13 18:22:34 +08:00
wangjiahao
8265130531 fix: 加强图片校验，防止恶意代码通过合成到图片上传到服务器中引起的攻击行为 2023-09-13 18:20:55 +08:00
fit2cloud-chenyw
09de0bcc5c fix(插件): 自动升级插件版本号 2023-09-13 15:35:14 +08:00
xuwei-fit2cloud
f634cbf9ed chore: 升级版本号至1.18.11 2023-09-13 14:54:28 +08:00
xuwei-fit2cloud
67e21ceb16 chore: 升级前端sheetJS版本 2023-09-13 10:48:47 +08:00
taojinlong
8ba3e583a2
Merge pull request #6109 from dataease/pr@dev@fixrowpermissions 
fix: pg、db2 支持currentSchema
 2023-09-12 20:55:22 -05:00
wisonic-s
0d01aee716 fix: 修复透视表表头悬停未显示单元格全部内容 2023-09-12 18:05:40 +08:00
fit2cloud-chenyw
9b7fc446ae fix: 代码合并 2023-09-12 13:20:31 +08:00
fit2cloud-chenyw
60688f9040 fix: 普通用户查询定时任务错误 2023-09-12 12:56:47 +08:00
taojinlong
793061c7a6 fix: pg、db2 支持currentSchema 2023-09-12 11:53:12 +08:00
taojinlong
cf00f46a7a
Merge pull request #6014 from linweijiang/pr-2 
用户查询接口屏蔽密码信息返回
 2023-09-11 22:42:08 -05:00
taojinlong
67c09dd069 Merge branch 'dev' into pr@dev@fixrowpermissions 2023-09-12 11:34:18 +08:00
taojinlong
612b7052ca refactor: 删除废弃代码 2023-09-12 11:32:02 +08:00
fit2cloud-chenyw
f0b0771aea fix: 行列权限接口sql-inject 2023-09-12 11:09:58 +08:00
fit2cloud-chenyw
849f110f7f fix: 应用日志接口sql-inject 2023-09-11 20:51:33 +08:00
maninhill
75e7148776
chore: 删除无用注释 2023-09-11 18:21:36 +08:00
fit2cloud-chenyw
f2df9b655e fix: 分享组织备选项接口sql-inject 2023-09-11 18:07:09 +08:00
fit2cloud-chenyw
5dd5c3b31b fix: 分享收藏接口sql-inject 2023-09-11 17:38:00 +08:00
fit2cloud-chenyw
f5f3214271 fix: 定时同步接口sql-inject 2023-09-11 17:24:57 +08:00
ulleo
d3b842c314 fix: 插件与内置图表类型重名导致内置图表被插件覆盖 2023-09-11 16:35:24 +08:00
fit2cloud-chenyw
f2a6166a8d fix: 消息列表接口sql-inject 2023-09-11 13:58:54 +08:00
fit2cloud-chenyw
7fa8c53718 fix: 日志列表接口sql-inject 2023-09-11 13:45:11 +08:00
fit2cloud-chenyw
6ca92d239a fix: 组织列表接口sql-inject 2023-09-11 12:10:19 +08:00
fit2cloud-chenyw
197473bb36 fix: 角色列表接口sql-inject 2023-09-11 11:03:07 +08:00
fit2cloud-chenyw
4da7495f91 fix: 插件列表接口sql-inject 2023-09-11 10:03:22 +08:00
fit2cloud-chenyw
d4d6cc23a1 fix: 用户列表接口sql-inject 2023-09-11 09:18:39 +08:00
fit2cloud-chenyw
bbc1139b1c
Merge pull request #6094 from dataease/pr@dev@fix_dynamic_time 
fix(过滤器): 时间范围组件自定义动态时间异常#5780
 2023-09-08 18:43:19 +08:00
fit2cloud-chenyw
a0f589fb96 fix(过滤器): 时间范围组件自定义动态时间异常#5780 2023-09-08 18:42:41 +08:00
wisonic-s
f786616c77 fix: Doris 日期格式化年季度无效 2023-09-08 17:30:56 +08:00
fit2cloud-chenyw
5c5bc938dc fix(过滤器): 模版试图更换数据集之后过滤器未能显示数据集列表#5634 2023-09-08 17:09:09 +08:00
fit2cloud-chenyw
da60b4ca8a fix(过滤器-日期): 动态时间刷新频率设置为每天 2023-09-08 15:48:02 +08:00
fit2cloud-chenyw
e2a80af0cf
Merge pull request #6086 from dataease/pr@dev@fix_mark_map_template 
fix: 使用echarts地图符号功能模版报错#5918
 2023-09-08 14:34:36 +08:00
fit2cloud-chenyw
90bf3d0e85 fix: 使用echarts地图符号功能模版报错#5918 2023-09-08 14:33:54 +08:00
fit2cloudrd
324a17350a
Merge pull request #6078 from dataease/pr@dev@fix_panel-tooltips 
fix(仪表板): 修复全屏模式下动态排序没有提示问题
 2023-09-08 12:00:54 +08:00
dataeaseShu
7dd7ab6c3a Merge branch 'dev' into pr@dev_refresh 2023-09-08 11:57:04 +08:00
dataeaseShu
163bffbdea fix: 时间过滤组件弹框错位 2023-09-08 11:56:19 +08:00
wisonic-s
c9eed4fc03 fix: 透视表列悬浮显示内容有误 2023-09-08 11:50:05 +08:00
fit2cloud-chenyw
80c4385c5d fix: 修复sql注入漏洞 2023-09-08 10:20:34 +08:00
wangjiahao
e234fac813 fix(仪表板): 修复全屏模式下动态排序没有提示问题 2023-09-08 09:48:37 +08:00
wisonic-s
933d78d68b feat: AntV 柱状图/条形图支持刷选 2023-09-07 20:59:42 +08:00
wisonic-s
9d94b0bf16 refactor: 文本/指标卡位置属性编辑调整#5978 2023-09-07 20:16:11 +08:00
wisonic-s
08a173c8c1 fix: 气泡图大小字段失效 2023-09-07 20:00:14 +08:00
wisonic-s
e6f71bb101
Merge pull request #6073 from dataease/pr@dev@fix_table_drill 
feat: 表格行/列头悬停提示
 2023-09-07 19:45:33 +08:00
wisonic-s
6d25a53725 feat: 表格行/列头悬停提示 2023-09-07 19:42:02 +08:00
dataeaseShu
c201cd3b85 Merge branch 'dev' into pr@dev_refresh 2023-09-07 18:35:39 +08:00
dataeaseShu
c9b0deee1c fix: 弹框错位 2023-09-07 18:34:50 +08:00
junjun
19e7e1a127 fix: 修复数据集移动可以重名的问题 2023-09-07 17:59:32 +08:00
王嘉豪
81f967ec7c
Merge pull request #6069 from dataease/pr@dev@style_panel-layout 
style(仪表板): 仪表板移动端布局时按钮样式优化 #5526
 2023-09-07 17:16:06 +08:00
wangjiahao
c04d0cfacb style(仪表板): 仪表板移动端布局时按钮样式优化 #5526 2023-09-07 17:14:53 +08:00
taojinlong
81aa79a4e8
Merge pull request #6068 from dataease/pr@dev@pgsql 
fix: 树形过滤失败
 2023-09-07 17:12:45 +08:00
taojinlong
752561e74c fix: 树形过滤失败 2023-09-07 17:09:40 +08:00
王嘉豪
e7398859a4
Merge pull request #6067 from dataease/pr@dev@fix_app-import 
修复导出仪表板中存在删除数据集时，再次导入会报错的问题 #5892
 2023-09-07 17:08:27 +08:00
wangjiahao
bf3c6d5bab 修复导出仪表板中存在删除数据集时，再次导入会报错的问题 #5892 2023-09-07 17:06:43 +08:00
ulleo
fc7e8fcdb9
Merge pull request #6066 from ulleo/dev 
fix bugs
 2023-09-07 16:50:59 +08:00
fit2cloudrd
9341bc5007
Update V57__1.18-table-desc-update.sql 2023-09-07 16:50:51 +08:00
ulleo
a3799cd568 feat: [Echarts动态排序图] 隐藏“联动设置/跳转设置”入口 2023-09-07 16:42:04 +08:00
王嘉豪
bb377ecdbd
Merge pull request #6065 from dataease/pr@dev@fix_panel-filter-init 
fix(仪表板): 修复Tab组件中的过滤组件设置默认值不生效问题 #5795
 2023-09-07 16:32:02 +08:00
wangjiahao
a4f6265c65 fix(仪表板): 修复Tab组件中的过滤组件设置默认值不生效问题 #5795 2023-09-07 16:30:12 +08:00
dataeaseShu
cf1de9d11a Merge branch 'dev' into pr@dev_refresh 2023-09-07 16:27:09 +08:00
dataeaseShu
abb0a2b2aa fix: select tree 全屏弹出错位 2023-09-07 16:26:10 +08:00
ulleo
baab79b29d fix: [插件] 指标过滤不生效 2023-09-07 15:51:11 +08:00
fit2cloudrd
2678737849
Update V18__add_demo.sql 2023-09-07 15:17:35 +08:00
王嘉豪
a32937287e
Merge pull request #6063 from dataease/pr@dev@refactor_panel-linkage 
refactor(仪表板): 联动配置初始化时只保留有效的联动字段，优化页面卡顿现象 #5926
 2023-09-07 15:04:29 +08:00
王嘉豪
6b8f6b8926
Merge pull request #6059 from dataease/pr@dev@refactor_panel-template 
refactor(仪表板): 优化模版查询结果，防止数据过多出现卡顿 #5992
 2023-09-07 15:03:45 +08:00
wangjiahao
f183aad56b refactor(仪表板): 联动配置初始化时只保留有效的联动字段，优化页面卡顿现象 #5926 2023-09-07 15:02:55 +08:00
fit2cloud-chenyw
e1d1d35666
Merge pull request #6062 from dataease/pr@dev@feat_locked_email 
feat: 登录失败次数过多发送邮件通知管理员#5621
 2023-09-07 15:01:14 +08:00
fit2cloud-chenyw
bc0a695aca feat: 登录失败次数过多发送邮件通知管理员#5621 2023-09-07 14:57:29 +08:00
Junjun
4dc57de783
Merge pull request #6061 from dataease/pr@dev@feat_date_format 
feat: 视图日期字段支持"年月日时"格式展示
 2023-09-07 14:35:04 +08:00
junjun
cff3c4988f feat: 视图日期字段支持"年月日时"格式展示 2023-09-07 14:32:31 +08:00
dataeaseShu
bb1df8a182 Merge branch 'dev' into pr@dev_refresh 2023-09-07 14:31:47 +08:00
dataeaseShu
18a79615d7 fix: 建议在数据集导出时，点击确认按钮后增加遮罩层或禁用导出按钮，出错时给出提示 2023-09-07 14:28:47 +08:00
wangjiahao
5039d5b1dd refactor(仪表板): 优化模版查询结果，防止数据过多出现卡顿 #5992 2023-09-07 14:07:26 +08:00
taojinlong
23b58400c8
Merge pull request #6058 from dataease/pr@dev@pgsql 
Pr@dev@pgsql
 2023-09-07 12:35:03 +08:00
taojinlong
3f09367414 fix: DB2数据集，没有根据数据源侧配置的schema 进行正确的读取 2023-09-07 12:31:53 +08:00
王嘉豪
9ec7888139
Merge pull request #6057 from dataease/pr@dev@fix_panel-echarts-tootips 
fix(仪表板): 修复全屏模式下echart的提示不显示问题 #5960
 2023-09-07 11:15:57 +08:00
wangjiahao
8d2f1db7bb fix(仪表板): 修复全屏模式下echart的提示不显示问题 #5960 2023-09-07 11:15:03 +08:00
xuwei-fit2cloud
5c468b5cb3
Merge pull request #6053 from dataease/pr@dev@fix_panel-button 
fix(仪表板): 修复复用时的按钮样式受到上层仪表板样式影响的问题
 2023-09-07 11:09:22 +08:00
xuwei-fit2cloud
1712a61f72
Merge pull request #6052 from dataease/pr@dev@fix_fullscreen-filter-error 
fix(仪表板): 修复全屏模式下过滤组件显示异常问题
 2023-09-07 11:09:05 +08:00
junjun
db5849f122 fix: 修复表格下钻页码不从第一页开始的问题 2023-09-07 11:04:47 +08:00
wisonic-s
27ac90b931 fix: 横轴标签旋转角度较大时和图表重叠 2023-09-07 11:04:04 +08:00
fit2cloud-chenyw
056777b854
Merge pull request #6054 from dataease/pr@dev@perf_map_setting 
perf(地图设置): 地球村和中国区域只能增加不能删除提示#5979
 2023-09-07 10:52:31 +08:00
fit2cloud-chenyw
ecae4f413b perf(地图设置): 地球村和中国区域只能增加不能删除提示#5979 2023-09-07 10:51:38 +08:00
wangjiahao
b55f516aa1 fix(仪表板): 修复复用时的按钮样式受到上层仪表板样式影响的问题 2023-09-07 10:40:02 +08:00
wangjiahao
87533a33fd fix(仪表板): 修复全屏模式下过滤组件显示异常问题 2023-09-07 09:52:38 +08:00
fit2cloudrd
8d74ec179d
Update V57__1.18-table-desc-update.sql 2023-09-07 09:42:00 +08:00
fit2cloud-chenyw
a484fc2329 fix(用户): 支持账号以数字开头#5763 2023-09-07 09:33:20 +08:00
fit2cloud-chenyw
107c793d1d
Merge pull request #6049 from dataease/pr@dev@fix_drill_tips 
fix(视图-地图): 删除地图下钻错误提示
 2023-09-07 09:05:38 +08:00
fit2cloud-chenyw
5a9922385c fix(视图-地图): 删除地图下钻错误提示 2023-09-07 09:01:58 +08:00
wangjiahao
d6ebb8c7a7 fix(仪表板): 仪表板背景不透明 度0的时候失效 2023-09-06 23:48:11 +08:00
wangjiahao
c7a2de5f0d fix(仪表板): 仪表板背景不透明度0的时候失效 2023-09-06 23:39:03 +08:00
wangjiahao
d6de13e48c refactor(仪表板): 除了编辑状态下，鼠标移动到仪表板组件上时不显示边框 2023-09-06 23:21:48 +08:00
wangjiahao
2913994b28 fix(仪表板): 修复全屏模式下过滤组件显示异常问题 2023-09-06 23:08:57 +08:00
wisonic-s
00ce5d2309 Merge branch 'dev' into pr@dev@fix_font_family 2023-09-06 21:45:45 +08:00
wisonic-s
bf10112e79 fix: 标题字体在部分操作系统上不生效 2023-09-06 21:45:19 +08:00
fit2cloud-chenyw
d02fb3ac5c fix: websocket基础url 2023-09-06 21:37:51 +08:00
fit2cloud-chenyw
bb255018d9 fix: 引入依赖错误github#5770 2023-09-06 21:31:29 +08:00
fit2cloud-chenyw
f364da727c
Merge pull request #6041 from dataease/pr@dev@feat_auto_mobile 
feat: 自动识别移动端配置
 2023-09-06 21:24:09 +08:00
fit2cloud-chenyw
5db47c1126 feat: 自动识别移动端配置 2023-09-06 21:21:20 +08:00
wisonic-s
f77f1f6eb7 style: code format 2023-09-06 20:07:36 +08:00
wisonic-s
f502ffa6c0 Merge branch 'dev' into pr@dev@fix_gauge_batch_edit 2023-09-06 19:41:30 +08:00
wisonic-s
71234df2f1 fix: 仪表盘批量编辑不显示最大值和最小值 2023-09-06 19:39:16 +08:00
wisonic-s
5fbd10ff82 fix: 仪表盘批量编辑刻度标签开关不生效 2023-09-06 19:34:04 +08:00
wisonic-s
763918907f refactor: 词云图字体区间和字体间距编辑样式调整 2023-09-06 18:31:04 +08:00
ulleo
5d1f484a27
Merge pull request #6039 from ulleo/dev 
Bugs fix
 2023-09-06 18:29:45 +08:00
fit2cloudrd
b232314e4a
Merge pull request #6038 from dataease/pr@dev@fix_map_click 
fix(视图-地图): 点击事件触发多次
 2023-09-06 18:29:10 +08:00
fit2cloud-chenyw
13842e9257 fix(视图-地图): 点击事件触发多次 2023-09-06 18:14:58 +08:00
wisonic-s
1a94fdecd7 Merge remote-tracking branch 'origin/dev' into dev 2023-09-06 17:11:54 +08:00
wisonic-s
c8ee83d753 fix: 柱状图标签在顶部时可能被遮挡 2023-09-06 17:11:39 +08:00
ulleo
f1124fad3f fix: 仪表板>过滤器 选择“字段枚举值”后，再次打开下拉框没有数据 2023-09-06 16:29:55 +08:00
junjun
9cce42bc30 fix: 时间过滤 2023-09-06 15:37:35 +08:00
wisonic-s
e8e0d5a752
Merge pull request #6034 from dataease/pr@dev@fix_stack_dim_date_format 
fix: 分组堆叠柱状图日期堆叠项支持年季度和年周#5290
 2023-09-06 15:15:55 +08:00
wisonic-s
40ce299ddb fix: 分组堆叠柱状图日期堆叠项支持年季度和年周#5290 2023-09-06 15:14:21 +08:00
junjun
92f25e94fd fix: 时间过滤 2023-09-06 14:47:03 +08:00
junjun
c3b093201e fix: 时间过滤 2023-09-06 11:56:00 +08:00
dataeaseShu
b4960f8f20 fix: 在视图中设置显示名，单击回车会刷新页面，并且访问路径发生变化。 #5771 2023-09-06 10:15:34 +08:00
taojinlong
82cb6d6c63 fix: PG SQL数据集，没有根据数据源侧配置的schema 进行正确的读取 2023-09-05 16:20:21 +08:00
weijiang.lin
60afde4d0c
用户查询接口屏蔽密码信息返回 2023-09-01 12:02:07 +08:00
fit2cloudrd
a0307fc869
Merge pull request #6000 from AndroidBaby1/dev 
【数据源】金仓数据源插件关于数据集创建失败问题修复
 2023-08-30 16:10:19 +08:00
AndroidBaby1
06546a1155 feat(数据集)：修复金仓数据库关联数据集创建报错问题 2023-08-30 14:22:33 +08:00
fit2cloudrd
abca924238
Merge pull request #5971 from Domi-Zhang/dev 
refactor(权限): 多个“获取授权对象拥有资源”SQL查询语句合并
 2023-08-30 11:09:19 +08:00
fit2cloudrd
5720fd0250
Merge pull request #5980 from North-CS/pr@dev@feat_echarts_map_power_icon 
feat: Echarts 地图标记样式支持能源类型图标
 2023-08-30 09:54:14 +08:00
xuwei-fit2cloud
86da50874d chore: 更改Dockerfile 2023-08-28 17:03:25 +08:00
liubo
9ce4d9af54 feat: Echarts 地图标记样式支持能源类型图标 2023-08-26 00:42:15 +08:00
zhangnf
e257556b5c refactor(权限): 多个“获取授权对象拥有资源”SQL查询语句合并 2023-08-24 23:30:12 +08:00
ulleo
8e4072f29c Revert "Revert "Merge sdk and extension"" 
This reverts commit 937744b6a9.
 2023-08-24 17:34:35 +08:00
fit2cloudrd
937744b6a9
Revert "Merge sdk and extension" 2023-08-24 17:21:24 +08:00
ulleo
b548a017ae Merge branch 'dev' into merge-sdk-plugin 2023-08-24 11:02:19 +08:00
ulleo
5efe8c0d55 add flatten 2023-08-23 17:52:39 +08:00
ulleo
c724eb2cab .typos.toml 2023-08-23 17:33:35 +08:00
ulleo
c4ad3e1cb9 chore: 去除pom内注释 2023-08-23 17:33:14 +08:00
ulleo
563d608fe6 合并sdk到主工程 2023-08-23 16:05:58 +08:00