Commit Graph

808 Commits

Author SHA1 Message Date
wangjiahao
b85bd443e5 feat: 增加默认刷新时间 2021-06-22 12:40:29 +08:00
wangjiahao
76162f1461 fix: 仪表盘样式设置 回显不准确问题 2021-06-22 11:25:59 +08:00
wangjiahao
394fb46b3c feat: 优化拖拽效果 防止多次请求后台数据 2021-06-21 18:43:41 +08:00
wangjiahao
a80e5d9e72 fix: 拖拽问题回退 2021-06-21 17:17:39 +08:00
wangjiahao
55f4e2244a fix: 拖拽问题回退 2021-06-21 15:33:52 +08:00
wangjiahao
66eb1c2b3d fix: 拖拽问题回退 2021-06-21 15:33:10 +08:00
wangjiahao
f88d0f5eaa fix: 拖拽问题回退 2021-06-21 14:00:03 +08:00
wangjiahao
a7b67c5c64 feat: 修改文字组件样式 2021-06-21 12:39:24 +08:00
wangjiahao
8aaf2aa0b6 Merge remote-tracking branch 'origin/main' into main 2021-06-18 11:10:23 +08:00
wangjiahao
602c002e21 feat: 调整图标位置 2021-06-18 11:10:09 +08:00
junjie
70f8082916 Merge remote-tracking branch 'origin/main' into main 2021-06-18 11:07:25 +08:00
junjie
d77d6197ca feat(fix):cron设置增加week说明;cron数字修复 2021-06-18 11:07:12 +08:00
wangjiahao
17dd2dbe59 feat: 更换其他组件图标 将上传图片组件 移动到侧边栏中 2021-06-18 10:58:26 +08:00
wangjiahao
f2f698b2d1 fix: 主题设置 表格样式跟随问题 2021-06-17 18:21:13 +08:00
wangjiahao
73d311e99f fix: 去掉锁定按钮 2021-06-17 14:29:59 +08:00
wangjiahao
9a8c0d1356 fix: 重做是 刷新CurComponent 2021-06-17 11:56:05 +08:00
wangjiahao
eeb15f9aa2 feat: 编辑仪表盘 辅助栏显示调整 2021-06-17 11:46:15 +08:00
wangjiahao
07bc218172 feat: 去掉组件复制的功能 2021-06-16 19:11:54 +08:00
wangjiahao
20d91ee4db feat(fix): 【仪表板】文本,选中后无法取消 2021-06-16 19:06:31 +08:00
fit2cloud-chenyw
a8b9a4fbb2 feat: 删除不等于 不包含 2021-06-16 18:03:59 +08:00
wangjiahao
63ef5ab3f6 fix: 【仪表板】非自适应仪表板中,视图操作菜单出现的位置不对 2021-06-16 17:28:16 +08:00
wangjiahao
d89efc707d fix: 仪表盘 背景显示不全问题 2021-06-16 16:55:22 +08:00
wangjiahao
2cd4eef984 feat: 去掉非矩阵设计吸附效果 2021-06-16 09:47:19 +08:00
wangjiahao
b8f95eefab feat: 预览和编辑相同的gap效果 2021-06-15 18:17:38 +08:00
wangjiahao
5dc6c5923f feat: 编辑大屏,显示不全问题 2021-06-15 16:47:35 +08:00
wangjiahao
34c81b07fd feat(fix): 非自适应画布的 仪表盘展示时 超高显示滚动条,修复间隙不准问题 2021-06-11 17:44:47 +08:00
wangjiahao
a31b783ab0 Merge remote-tracking branch 'origin/main' into main 2021-06-11 16:53:40 +08:00
wangjiahao
698f12fcad feat: 非自适应画布的 仪表盘展示时 超高显示滚动条 2021-06-11 16:53:26 +08:00
fit2cloud-chenyw
2a7685c274 fix: 修复vue空对象导致判断布尔条件错误 2021-06-11 15:44:11 +08:00
wangjiahao
9fede2852c feat: 标题样式控制范围太广-不在仪表盘中控制-改为视图自己控制 2021-06-11 12:09:11 +08:00
fit2cloud-chenyw
1c7fde3f5a fix: 【ID1004278】【仪表板】时间过滤组件-日期,选择日期没反应 2021-06-11 09:51:17 +08:00
wangjiahao
a12a670383 Merge remote-tracking branch 'origin/main' into main 2021-06-10 17:46:30 +08:00
wangjiahao
5dd942348a feat: 去掉一些日志 2021-06-10 17:46:16 +08:00
fit2cloud-chenyw
7bf65480ac feat: 下拉框多选样式适配新画布 2021-06-10 17:33:20 +08:00
wangjiahao
a06297a73a Merge remote-tracking branch 'origin/main' into main 2021-06-10 17:12:45 +08:00
wangjiahao
dba5eeb571 feat: 画布升级 增加矩阵 边界 对齐 吸附等功能 2021-06-10 17:12:31 +08:00
fit2cloud-chenyw
89c3e6fe04 fix: 【ID1003951】【仪表盘】文本多选下拉框组件显示错位 2021-06-10 16:39:48 +08:00
fit2cloud-chenyw
8e4e4a9d01 fix: 新建仪表板报错 2021-06-08 18:33:28 +08:00
fit2cloud-chenyw
880a26cd0a feat: 仪表板过滤 局部刷新 基本功能完善 2021-06-08 16:03:49 +08:00
fit2cloud-chenyw
8ac634fbb3 feat: 优化仪表板查询使用局部请求 2021-06-08 12:39:04 +08:00
taojinlong
d04500f3a7 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-08 12:16:37 +08:00
taojinlong
a196430d85 feat: 替换svg logo图片 2021-06-08 12:16:25 +08:00
fit2cloud-chenyw
e520101af1 feat: 格式化前端报错代码 2021-06-07 17:08:57 +08:00
wangjiahao
cbc76cf2c9 feat: 去掉不必要的log 和初始化数据 2021-06-07 11:15:03 +08:00
wangjiahao
36ec45baf7 Merge remote-tracking branch 'origin/main' into main 2021-06-07 11:10:27 +08:00
wangjiahao
32223f4c57 fix: 新建仪表盘样式为空的问题 2021-06-07 11:10:04 +08:00
junjie
2b85822794 feat(提示):视图提示优化 2021-06-07 11:01:21 +08:00
fit2cloud-chenyw
1b7ae16fa6 fix: 【ID1004125】【仪表板】添加 文本搜索组件,搜索框不显示输入的内容 2021-06-07 10:53:57 +08:00
wangjiahao
264032f9a4 Merge remote-tracking branch 'origin/main' into main 2021-06-04 15:47:48 +08:00
wangjiahao
e0136d7530 fix: 画布切换背景图片 图片是空依然显示颜色的问题 2021-06-04 15:45:41 +08:00
fit2cloud-chenyw
72e30a8c93 feat: 优化查询组件默认样式 2021-06-04 14:43:05 +08:00
wangjiahao
fa70a33de1 feat: 去掉不必要的前段日志 2021-06-04 14:35:32 +08:00
wangjiahao
df0d2a9b22 Merge remote-tracking branch 'origin/main' into main 2021-06-04 11:20:07 +08:00
wangjiahao
ccf13b9e50 feat: 1.编辑界面调整 预览自动全屏预览 2.仪表盘主界面调整,增加全屏预览,新tab页预览 2021-06-04 11:19:50 +08:00
fit2cloud-chenyw
fc4bb32331 feat: 优化下拉查询组件 2021-06-03 18:49:59 +08:00
fit2cloud-chenyw
a62dedb981 feat: 优化下拉框多选组件 2021-06-03 15:39:17 +08:00
junjie
fb02dd6160 feat(fix):前端样式调整 2021-06-02 18:49:14 +08:00
junjie
e20f4c23ed feat(fix):前端样式冲突修复;doris ddl修复 2021-06-02 17:08:12 +08:00
wangjiahao
eeb331d522 fix: 仪表盘编辑时清除临时数据缓存 去除不必要的debugger和日志 2021-06-01 23:02:00 +08:00
wangjiahao
039f3832a8 feat(仪表盘): 增加文字组件 矩形组件等,统一归类为样式组件 增加仪表盘侧边 '其他' 按钮 用来存放其他类型的组件 2021-06-01 22:46:08 +08:00
wangjiahao
e05dd9f681 feat: 编辑仪表盘同时支持自适应画布区域和实际画布大小两种编辑模式 2021-06-01 14:01:34 +08:00
wangjiahao
5ef299dfcf feat: 编辑仪表盘同时支持自适应画布区域和实际画布大小两种编辑模式 2021-06-01 13:40:26 +08:00
wangjiahao
cfd8e6eb2b Merge remote-tracking branch 'origin/main' into main 2021-05-31 11:20:43 +08:00
wangjiahao
ceb1805083 feat: 新增组件辅助设计 可以精确定位组件坐标 宽高透明度 2021-05-31 11:20:32 +08:00
fit2cloud-chenyw
ae733b0776 fix: 删除原有菜单'系统参数'、'角色管理',初步整合xpack插件模块 2021-05-30 20:24:54 +08:00
wangjiahao
1ce02bf403 feat: 仪表盘命名出现多个仪表盘问题,仪表盘改为仪表板 2021-05-28 11:21:54 +08:00
wangjiahao
81dece8fa5 feat: 上传图片 增加尺寸控制 2021-05-28 10:37:29 +08:00
wangjiahao
ba3117fbad fix: UI 调整 2021-05-28 10:18:21 +08:00
wangjiahao
71bafb628c fix: UI 调整 2021-05-28 00:04:39 +08:00
wangjiahao
7d16420f35 Merge remote-tracking branch 'origin/main' into main 2021-05-27 18:54:24 +08:00
wangjiahao
836fde170c fix: UI 调整 2021-05-27 18:54:06 +08:00
junjie
07a8b82914 feat(仪表板):UI fix 2021-05-27 17:34:46 +08:00
wangjiahao
36a327f81c fix: UI 调整 2021-05-27 17:06:38 +08:00
wangjiahao
83a243e193 Merge remote-tracking branch 'origin/main' into main 2021-05-26 18:48:06 +08:00
wangjiahao
ca31ea2021 feat: 画布自适应 2021-05-26 18:47:55 +08:00
junjie
83555f9830 feat(cron):cron fix 2021-05-26 18:46:19 +08:00
wangjiahao
77a919c60d feat: 画布样式修改 也记录镜像 2021-05-26 18:12:22 +08:00
wangjiahao
9351e48be2 feat: 全局样式修改 2021-05-26 16:33:52 +08:00
wangjiahao
22248e521a fix: 编辑仪表盘时 卡顿导致视图大小不变的问题 2021-05-26 16:15:54 +08:00
wangjiahao
133f5dcae9 feat: 1.仪表盘页面动态添加目录,新建仪表盘无需刷新直接展开,2.新建仪表盘直接进入编辑界面,3.【【仪表盘】右键点开的功能顺序调整】4.【【仪表盘】仪表盘画板中,视图层级操作的文案调整】 2021-05-25 12:36:35 +08:00
wangjiahao
746e6c49c3 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	backend/src/main/resources/i18n/messages_en_US.properties
#	backend/src/main/resources/i18n/messages_zh_CN.properties
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/components/canvas/components/Toolbar.vue
2021-05-24 17:30:13 +08:00
wangjiahao
b59c4967f7 fix: 1.普通仪表盘可转为默认仪表盘同时增加默认仪表盘全新 2.仪表盘,视图,数据集加载慢的问题 3.上传大图片不成功的问题,4.仪表盘页面整体加上loading 5.编辑仪表盘预览改为全屏弹框模式 2021-05-24 17:28:03 +08:00
taojinlong
f9bb4b3142 fix: 抽取excel数据格式问题; 2021-05-24 17:06:35 +08:00
taojinlong
6c3a595339 feat: 保存按钮作为“文字按钮”放在关闭按钮的左边 2021-05-24 14:07:21 +08:00
taojinlong
a17d7cc1e7 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-24 13:46:11 +08:00
taojinlong
8c6b60ff17 feat: 字段处默认给出提示信息“请将左侧字段拖至此处” 2021-05-24 13:46:00 +08:00
junjie
d205e75730 feat(frontend):UI fix 2021-05-24 12:42:37 +08:00
wangjiahao
872067ce97 fix: 仪表盘列表中的仪表盘可转为默认仪表盘 2021-05-24 10:28:11 +08:00
wangjiahao
a588e9e29a fix: 国际化问题 2021-05-21 13:55:55 +08:00
fit2cloud-chenyw
efe1830d88 feat: 下拉选择组件报错 2021-05-21 12:44:23 +08:00
wangjiahao
5770ee9a42 Merge remote-tracking branch 'origin/main' into main 2021-05-21 12:42:52 +08:00
wangjiahao
2222eda12f fix: 编辑仪表盘 全屏预览问题 2021-05-21 12:42:40 +08:00
fit2cloud-chenyw
2261323af5 feat: 时间组件全部用between 2021-05-21 12:23:30 +08:00
fit2cloud-chenyw
955a0ec6bc feat: 时间组件参数改为时间戳 2021-05-21 12:19:32 +08:00
fit2cloud-chenyw
4f8f9080cf feat: 绑定日期过滤组件 2021-05-20 22:14:07 +08:00
fit2cloud-chenyw
20c0b4b68d feat: 过滤组件绑定 2021-05-20 18:38:28 +08:00
fit2cloud-chenyw
6aab309741 feat: 查询条件绑定视图 2021-05-20 17:44:31 +08:00
fit2cloud-chenyw
3d7a65aa93 feat: 下拉框查询组件非空过滤 2021-05-20 17:07:19 +08:00
junjie
d908467028 feat(仪表盘):仪表盘 过滤组件 2021-05-20 16:56:44 +08:00
fit2cloud-chenyw
df8413731e fix: 修复画布中组件加载多次 2021-05-20 16:45:27 +08:00
fit2cloud-chenyw
3f33dc38db feat: 查询组件数据存储到store 2021-05-20 12:02:12 +08:00
wangjiahao
d56fc014c4 fix: 仪表盘编辑 做出菜单不关闭问题 2021-05-20 11:18:31 +08:00
fit2cloud-chenyw
f7cc4599cc fix: 外部链接预览 2021-05-19 19:03:50 +08:00
wangjiahao
a1c4c61d95 fix: 样式修改 2021-05-19 16:58:21 +08:00
wangjiahao
c0ccf23a20 fix: 仪表板滚动条的问题 2021-05-19 16:29:19 +08:00
fit2cloud-chenyw
5f8a0126d5 feat: 路由名称改为英文 2021-05-19 10:30:51 +08:00
fit2cloud-chenyw
0185c0c4af feat: 前端适配后台国际化 2021-05-18 17:30:36 +08:00
junjie
ad0c75eacf feat(dashboard):仪表盘 Table Label支持,大小自适应;收藏取消bug fix 2021-05-18 16:38:24 +08:00
wangjiahao
c9b206ccd8 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
#	backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
#	backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
#	backend/src/main/resources/generatorConfig.xml
#	frontend/src/views/panel/list/PanelViewShow.vue
2021-05-18 16:14:46 +08:00
wangjiahao
79e93655ec feat: 数据权限配置 2021-05-18 16:07:19 +08:00
fit2cloud-chenyw
31e5cca439 feat:前端增加国际化切换 2021-05-18 15:46:14 +08:00
junjie
a9201c794e feat(frontend):i18n fix;run build 样式冲突 fix后测试 2021-05-17 19:11:07 +08:00
junjie
83fa095052 feat(frontend):i8n fix;top-bar 右上角个人信息 i18n样式优化 2021-05-17 17:23:29 +08:00
taojinlong
c96ae8caf2 feat: 去掉暫未支持的按鈕 2021-05-17 15:18:47 +08:00
taojinlong
e2e2b09fee feat: 国际化 2021-05-17 14:19:46 +08:00
taojinlong
622169a33e refactor: 去掉调试信息 2021-05-12 11:53:50 +08:00
fit2cloud-chenyw
9d6680ad31 feat: 插件管理v0.01 2021-05-11 16:32:21 +08:00
wangjiahao
0959535093 fix: 背景图片空url 问题 2021-05-08 10:42:23 +08:00
wangjiahao
33a93b8916 feat:主题 2021-05-07 19:20:47 +08:00
wangjiahao
53b021bbf7 feat:样式修改 2021-05-06 23:40:34 +08:00
wangjiahao
01eb4abca6 feat:增加预览背景设置 解决改变窗口大小 echart 有滚动条的问题 2021-05-06 10:58:46 +08:00
wangjiahao
9ba7aeaedc feat:仪表盘支持表格 2021-05-05 23:48:05 +08:00
wangjiahao
cd5f1af773 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/components/canvas/components/Editor/ContextMenu.vue
2021-05-05 22:14:47 +08:00
wangjiahao
2cd2365770 feat:主题设置 2021-05-05 22:14:23 +08:00
fit2cloud-chenyw
1285ba494d feat: 系统管理弹框改为隐藏路由 2021-04-29 12:46:51 +08:00
fit2cloud-chenyw
e32be3b5a5 feat: 用户管理弹窗修改 2021-04-28 17:09:05 +08:00
fit2cloud-chenyw
52d31b504e fix: 表格按照最新fit2cloud-ui样式 2021-04-28 14:54:55 +08:00
junjie
86d87d7b47 fix(frontend): 视图 表格合计fix;仪表盘跳转视图编辑fix 2021-04-27 18:10:05 +08:00
wangjiahao
0f644e7842 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/components/canvas/components/Toolbar.vue
#	frontend/src/views/panel/edit/index.vue
2021-04-27 10:30:04 +08:00
wangjiahao
43489d63f1 feat:恢复显示设置,仪表盘样式设置等 2021-04-27 10:28:55 +08:00
fit2cloud-chenyw
d28a69e056 feat: 调整一级菜单 2021-04-22 17:59:16 +08:00
fit2cloud-chenyw
69f5a09cdc feat: 解决关闭编辑页面但是没有关闭左侧面板 2021-04-22 13:46:59 +08:00
fit2cloud-chenyw
5327d5170b Merge remote-tracking branch 'origin/main' into main 2021-04-20 10:24:54 +08:00
fit2cloud-chenyw
d8239381cc feat: 修复重复查询条件 2021-04-20 10:24:39 +08:00
wangjiahao
7cdc0c220f Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/components/canvas/custom-component/UserView.vue
2021-04-19 18:21:07 +08:00
wangjiahao
5405332dc2 feat:仪表盘模板导入导出 2021-04-19 18:20:15 +08:00
fit2cloud-chenyw
149eb535bb feat: 增加数字下拉 2021-04-19 18:10:46 +08:00
fit2cloud-chenyw
b87766adce feat: 设置必须绑定数据集字段 2021-04-19 17:40:15 +08:00
fit2cloud-chenyw
5ec60144e8 feat: 过滤条件 2021-04-19 16:50:31 +08:00
fit2cloud-chenyw
fb53686109 feat: 下拉框样式 2021-04-19 15:53:26 +08:00
fit2cloud-chenyw
5af4158dc4 feat:设置条件绑定视图 2021-04-19 15:31:03 +08:00
fit2cloud-chenyw
e2a5a2f440 feat: 过滤条件格式修改 2021-04-19 11:51:12 +08:00
fit2cloud-chenyw
9de0749200 feat: 查询条件编辑 2021-04-19 10:47:07 +08:00
fit2cloud-chenyw
ee63e0be73 feat: 定义操作符 2021-04-16 17:42:29 +08:00
fit2cloud-chenyw
e5715d6898 feat:优化查询条件 2021-04-16 17:26:13 +08:00
fit2cloud-chenyw
fea7ceec9b feat: 优化过滤组件 2021-04-15 10:33:22 +08:00
junjie
1276109f47 feat(frontend):仪表板样式微调 2021-04-14 15:18:53 +08:00
wangjiahao
91a7696615 feat:合并bug修复 2021-04-09 18:19:45 +08:00
wangjiahao
53c1d36c4f Merge remote-tracking branch 'origin/main' into main 2021-04-09 13:53:21 +08:00
wangjiahao
57fe2bc62f feat:样式修改 2021-04-09 13:53:04 +08:00
fit2cloud-chenyw
acdfd5015f feat: 大改前存档 2021-04-09 11:58:03 +08:00
fit2cloud-chenyw
8f2c2fbc30 feat: 条件过滤组件公共功能 2021-04-08 18:18:08 +08:00
wangjiahao
ff02cb9a1f fix:禁用localstorage存储仪表盘数据 容易导致浏览器本地存储越界 2021-04-08 17:46:02 +08:00
wangjiahao
8d61299f3e Merge remote-tracking branch 'origin/main' into main 2021-04-08 16:54:53 +08:00
wangjiahao
dfde1da4f4 feat:仪表盘样式适配 2021-04-08 16:54:37 +08:00
fit2cloud-chenyw
dc6419302f feat: 过滤组件年份页面 2021-04-08 11:39:00 +08:00
fit2cloud-chenyw
4ee166e86c feat: 过滤组件 2021-04-07 17:54:37 +08:00
wangjiahao
09b772bc18 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/components/canvas/components/Editor/PreviewEject.vue
2021-04-07 11:15:32 +08:00
wangjiahao
547801ceeb feat:预览增加自适应屏幕尺寸功能 2021-04-07 11:12:02 +08:00
fit2cloud-chenyw
26a25d0338 feat: 删除debugger 2021-04-07 09:49:07 +08:00
fit2cloud-chenyw
a783be2556 feat: 过滤组件弹框选择数据 2021-04-06 19:10:16 +08:00
wangjiahao
1538ff6406 feat:增加预览连接功能 2021-04-06 15:07:13 +08:00
wangjiahao
ea7efe5608 feat:预览弹出 2021-04-06 10:16:11 +08:00
wangjiahao
c4cea61e5e feat:修复编辑视图后 原有画布样式还原问题 2021-04-01 18:54:14 +08:00
wangjiahao
334638adf4 feat:画布增加视图编辑功能 2021-04-01 18:36:51 +08:00
wangjiahao
2d7ad3224b feat:画布切换修改 2021-04-01 17:40:12 +08:00
wangjiahao
10feea18a9 Merge remote-tracking branch 'origin/main' into main 2021-04-01 14:42:57 +08:00
wangjiahao
31b291a3ec feat:增加画布鼠标悬停虚线边框 2021-04-01 14:42:46 +08:00
wangjiahao
33468cf39b feat:增加画布鼠标悬停虚线边框 2021-04-01 14:31:45 +08:00
fit2cloud-chenyw
7fe40040a2 Merge remote-tracking branch 'origin/main' into main 2021-04-01 13:34:06 +08:00
fit2cloud-chenyw
f89f1726cc feat: 过滤组件样式调整 2021-04-01 13:33:40 +08:00
wangjiahao
eaa4cf9a7f feat:恢复合并冲突 2021-04-01 11:56:46 +08:00
wangjiahao
d7d4c77b66 Merge branch 'main' of github.com:dataease/dataease into main 2021-04-01 11:50:27 +08:00
wangjiahao
c87a6f132c feat:仪表盘预览 2021-04-01 11:38:30 +08:00
fit2cloud-chenyw
ebf90fb02a feat: 组件解偶 使用继承 2021-03-31 18:23:43 +08:00
fit2cloud-chenyw
8bbb8c7e9b feat: 封装条件组件类 2021-03-30 19:01:46 +08:00
wangjiahao
af24ba2733 feat:封装画布组件 2021-03-30 16:11:59 +08:00
wangjiahao
8016aba46a feat:将画布整合在组件中 2021-03-30 15:38:32 +08:00
fit2cloud-chenyw
ab2a840bd5 feat: 封装条件组件 2021-03-29 21:24:33 +08:00
wangjiahao
50c692fefb feat:恢复冲突 2021-03-29 15:49:29 +08:00
wangjiahao
873a03065c feat:增加仪表盘预览等功能 2021-03-29 14:57:04 +08:00
wangjiahao
208878c062 feat:恢复样式 2021-03-26 12:26:48 +08:00
wangjiahao
fcb579d439 feat:增加背景图片 2021-03-26 11:37:32 +08:00
wangjiahao
0a75df5838 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/main.js
2021-03-25 19:17:25 +08:00
wangjiahao
5db39b5855 feat:更换画布 2021-03-25 19:16:32 +08:00
junjie
c7351ac742 style(视图): css 2021-03-25 15:48:20 +08:00
fit2cloud-chenyw
7d248904d3 feat: 合并仪表板代码 2021-03-22 19:05:35 +08:00
wangjiahao
8a6b75eb97 feat:保存已经设计的面板 2021-03-22 17:27:16 +08:00
wangjiahao
3937624c57 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/components/vue-drag-resize-rotate/index.vue
#	frontend/src/store/modules/panel.js
#	frontend/src/views/panel/list/PanelViewShow.vue
2021-03-19 15:57:29 +08:00
wangjiahao
592f08ac7b feat:增加仪表盘设计组件及设计 自适应view 组件 2021-03-19 15:54:35 +08:00
fit2cloud-chenyw
6440804d93 feat: 仪表盘分享页面 2021-03-17 18:50:29 +08:00
wangjiahao
1f6f8503b4 feat:增加仪表盘设计组件及设计 增加面板中 view 删除功能 2021-03-17 16:30:40 +08:00
fit2cloud-chenyw
46d24a17bc feat: 删除前端工程中meterSphere组件 2021-03-16 17:53:43 +08:00
fit2cloud-chenyw
2441edd166 feat: ESLint插件格式化前端代码 2021-03-16 12:02:30 +08:00
wangjiahao
d7e0eb64ef Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	frontend/src/components/vue-drag-resize-rotate/index.vue
2021-03-16 11:39:04 +08:00
wangjiahao
915ccf326e feat:增加仪表盘设计组件及设计 2021-03-16 11:38:20 +08:00
fit2cloud-chenyw
ac8f8271ae feat: 新增树表格 2021-03-15 14:56:01 +08:00
fit2cloud-chenyw
19fa6975eb feat: 前段代码遵循ESLint规范 2021-03-12 21:51:37 +08:00
wangjiahao
13bb7663f8 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
2021-03-12 16:10:18 +08:00
wangjiahao
8b80d8fa72 feat:增加仪表盘设计组件及设计 2021-03-12 16:08:55 +08:00
fit2cloud-chenyw
1992e84b59 feat:用户列表完善 2021-03-10 18:26:53 +08:00
fit2cloud-chenyw
fec733f262 feat: 使用fit2cloud-ui改造系统管理 2021-03-09 18:52:27 +08:00
fit2cloud-chenyw
d16cd853ca feat:eslint格式 scss样式 2021-03-08 12:29:11 +08:00
fit2cloud-chenyw
3df90648a1 feat:样式调整 2021-03-08 11:57:18 +08:00
fit2cloud-chenyw
7965552518 feat: 样式调整 2021-03-07 21:29:41 +08:00
fit2cloud-chenyw
f04809c638 feat: 新前端 2021-03-03 15:06:52 +08:00
taojinlong
3a141cad25 feat: 初始化 2021-02-20 10:23:37 +08:00
taojinlong
41c53b451b feat: 修改包名 2021-02-19 16:34:02 +08:00