diff --git a/README.md b/README.md index 517a23c13c..12c3980b2c 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ DataEase 是开源的数据可视化分析工具,帮助用户快速分析数 仅需两步快速安装 DataEase: -1. 准备一台不小于 16 G内存的 64位 Linux 主机; +1. 准备一台不小于 8 G内存的 64位 Linux 主机; 2. 以 root 用户执行如下命令一键安装 DataEase。 ```sh diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.java index c86fa302b0..110b76dafb 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.java @@ -16,13 +16,13 @@ public interface ExtSysMsgMapper { @Update({ "" }) - int batchStatus(@Param("msgIds") List msgIds); + int batchStatus(@Param("msgIds") List msgIds, @Param("time") Long time); @Delete({ diff --git a/backend/src/main/java/io/dataease/service/message/SysMsgService.java b/backend/src/main/java/io/dataease/service/message/SysMsgService.java index 58809cc63d..b43d1cf687 100644 --- a/backend/src/main/java/io/dataease/service/message/SysMsgService.java +++ b/backend/src/main/java/io/dataease/service/message/SysMsgService.java @@ -109,7 +109,7 @@ public class SysMsgService { } public void setBatchReaded(List msgIds) { - extSysMsgMapper.batchStatus(msgIds); + extSysMsgMapper.batchStatus(msgIds, System.currentTimeMillis()); } public void batchDelete(List msgIds) { diff --git a/frontend/package.json b/frontend/package.json index 75addb3a7c..d33d755db0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -59,6 +59,7 @@ "babel-eslint": "10.0.1", "chalk": "2.4.2", "connect": "3.6.6", + "copy-webpack-plugin": "^4.6.0", "eslint": "5.15.3", "eslint-plugin-vue": "5.2.2", "html-webpack-plugin": "3.2.0", diff --git a/frontend/src/api/system/msg.js b/frontend/src/api/system/msg.js index d84dba9cb9..83accc340f 100644 --- a/frontend/src/api/system/msg.js +++ b/frontend/src/api/system/msg.js @@ -26,6 +26,15 @@ export function batchRead(data) { }) } +export function batchDelete(data) { + return request({ + url: '/api/sys_msg/batchDelete', + method: 'post', + loading: true, + data + }) +} + export function treeList() { return request({ url: '/api/sys_msg/treeNodes', diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 70cdab8bc6..5b8fcbd1c9 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -215,6 +215,7 @@ export default { min-height: 300px; width: 100%; height: 100%; + overflow-x: hidden; /*border: 1px solid #E6E6E6;*/ background-size: 100% 100% !important; .canvas-container { diff --git a/frontend/src/components/canvas/custom-component/UserViewDialog.vue b/frontend/src/components/canvas/custom-component/UserViewDialog.vue index d1a3c2cce3..53425cf324 100644 --- a/frontend/src/components/canvas/custom-component/UserViewDialog.vue +++ b/frontend/src/components/canvas/custom-component/UserViewDialog.vue @@ -5,7 +5,7 @@ - + diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue index ebd6734bfe..0b1e0a6e83 100644 --- a/frontend/src/views/chart/components/table/TableNormal.vue +++ b/frontend/src/views/chart/components/table/TableNormal.vue @@ -12,7 +12,7 @@ :row-style="getRowStyle" class="table-class" :class="chart.id" - show-summary + :show-summary="showSummary" :summary-method="summaryMethod" > - + diff --git a/frontend/src/views/msg/readed.vue b/frontend/src/views/msg/readed.vue index 0866f44f88..f573391921 100644 --- a/frontend/src/views/msg/readed.vue +++ b/frontend/src/views/msg/readed.vue @@ -11,9 +11,16 @@ :pagination-config="paginationConfig" @select="select" @search="search" + @selection-change="handleSelectionChange" @sort-change="sortChange" > - + +