diff --git a/backend/src/main/java/io/dataease/controller/sys/MsgController.java b/backend/src/main/java/io/dataease/controller/sys/MsgController.java index e7f8cc5cf9..2fb50323a3 100644 --- a/backend/src/main/java/io/dataease/controller/sys/MsgController.java +++ b/backend/src/main/java/io/dataease/controller/sys/MsgController.java @@ -75,7 +75,7 @@ public class MsgController { @PostMapping("/setReaded/{msgId}") @ApiImplicitParam(paramType = "path", name = "msgId", value = "消息ID", required = true, dataType = "Long") public void setReaded(@PathVariable Long msgId) { - sysMsgService.setReaded(msgId); + sysMsgService.setRead(msgId); } @@ -83,7 +83,7 @@ public class MsgController { @PostMapping("/batchRead") @ApiImplicitParam(name = "msgIds", value = "消息ID集合", required = true, dataType = "List") public void batchRead(@RequestBody List msgIds) { - sysMsgService.setBatchReaded(msgIds); + sysMsgService.setBatchRead(msgIds); } @ApiOperation("全部设置已读") diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index 6afb467b8f..4f9d1bced1 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; @Service("emailTaskHandler") public class EmailTaskHandler extends TaskHandler implements Job { - private static final Integer RUNING = 0; + private static final Integer RUNNING = 0; private static final Integer SUCCESS = 1; private static final Integer ERROR = -1; @@ -124,7 +124,7 @@ public class EmailTaskHandler extends TaskHandler implements Job { private GlobalTaskInstance buildInstance(GlobalTaskEntity taskEntity) { GlobalTaskInstance taskInstance = new GlobalTaskInstance(); taskInstance.setTaskId(taskEntity.getTaskId()); - taskInstance.setStatus(RUNING); + taskInstance.setStatus(RUNNING); taskInstance.setExecuteTime(System.currentTimeMillis()); return taskInstance; } diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index 59208091d0..0a2e7f8800 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -278,8 +278,8 @@ public class JdbcProvider extends DefaultJdbcProvider { row[j] = rs.getBlob(j + 1) == null ? "" : rs.getBlob(j + 1).toString(); } else { if (charset != null && StringUtils.isNotEmpty(rs.getString(j + 1))) { - String orginStr = new String(rs.getString(j + 1).getBytes(charset), targetCharset); - row[j] = new String(orginStr.getBytes("UTF-8"), "UTF-8"); + String originStr = new String(rs.getString(j + 1).getBytes(charset), targetCharset); + row[j] = new String(originStr.getBytes("UTF-8"), "UTF-8"); } else { row[j] = rs.getString(j + 1); } diff --git a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java index b403f1e41f..7314367c28 100644 --- a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java +++ b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java @@ -18,7 +18,7 @@ public class ChartDataBuild { public static Map transChartDataAntV(List xAxis, List yAxis, ChartViewWithBLOBs view, List data, boolean isDrill) { Map map = new HashMap<>(); - List datas = new ArrayList<>(); + List dataList = new ArrayList<>(); for (int i1 = 0; i1 < data.size(); i1++) { String[] row = data.get(i1); @@ -65,7 +65,7 @@ public class ChartDataBuild { } axisChartDataDTO.setCategory(yAxis.get(j).getName()); } - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } else { for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) { @@ -95,18 +95,18 @@ public class ChartDataBuild { axisChartDataDTO.setValue(new BigDecimal(0)); } axisChartDataDTO.setCategory(yAxis.get(j).getName()); - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } } - map.put("datas", datas); + map.put("data", dataList); return map; } public static Map transBaseGroupDataAntV(List xAxisBase, List xAxis, List xAxisExt, List yAxis, ChartViewWithBLOBs view, List data, boolean isDrill) { Map map = new HashMap<>(); - List datas = new ArrayList<>(); + List dataList = new ArrayList<>(); for (int i1 = 0; i1 < data.size(); i1++) { String[] row = data.get(i1); @@ -159,10 +159,10 @@ public class ChartDataBuild { axisChartDataDTO.setValue(new BigDecimal(0)); } axisChartDataDTO.setCategory(b.toString()); - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } - map.put("datas", datas); + map.put("data", dataList); return map; } @@ -170,7 +170,7 @@ public class ChartDataBuild { public static Map transStackChartDataAntV(List xAxis, List yAxis, ChartViewWithBLOBs view, List data, List extStack, boolean isDrill) { Map map = new HashMap<>(); - List datas = new ArrayList<>(); + List dataList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(extStack)) { for (int i1 = 0; i1 < data.size(); i1++) { @@ -219,7 +219,7 @@ public class ChartDataBuild { axisChartDataDTO.setQuotaList(quotaList); axisChartDataDTO.setValue(new BigDecimal(0)); } - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } else { for (int i1 = 0; i1 < data.size(); i1++) { @@ -265,11 +265,11 @@ public class ChartDataBuild { axisChartDataDTO.setValue(new BigDecimal(0)); } axisChartDataDTO.setCategory(yAxis.get(j).getName()); - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } } - map.put("datas", datas); + map.put("data", dataList); return map; } @@ -277,7 +277,7 @@ public class ChartDataBuild { public static Map transScatterDataAntV(List xAxis, List yAxis, ChartViewWithBLOBs view, List data, List extBubble, boolean isDrill) { Map map = new HashMap<>(); - List datas = new ArrayList<>(); + List dataList = new ArrayList<>(); for (int i1 = 0; i1 < data.size(); i1++) { String[] row = data.get(i1); @@ -329,10 +329,10 @@ public class ChartDataBuild { axisChartDataDTO.setPopSize(new BigDecimal(0)); } } - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } - map.put("datas", datas); + map.put("data", dataList); return map; } @@ -340,7 +340,7 @@ public class ChartDataBuild { public static Map transRadarChartDataAntV(List xAxis, List yAxis, ChartViewWithBLOBs view, List data, boolean isDrill) { Map map = new HashMap<>(); - List datas = new ArrayList<>(); + List dataList = new ArrayList<>(); for (int i1 = 0; i1 < data.size(); i1++) { String[] row = data.get(i1); @@ -384,10 +384,10 @@ public class ChartDataBuild { axisChartDataDTO.setValue(new BigDecimal(0)); } axisChartDataDTO.setCategory(yAxis.get(j).getName()); - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } - map.put("datas", datas); + map.put("data", dataList); return map; } @@ -450,7 +450,7 @@ public class ChartDataBuild { } } - map.put("datas", series); + map.put("data", series); return map; } 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 d4b5ead87f..3621bf8d66 100644 --- a/backend/src/main/java/io/dataease/service/message/SysMsgService.java +++ b/backend/src/main/java/io/dataease/service/message/SysMsgService.java @@ -87,7 +87,7 @@ public class SysMsgService { return sysMsgMapper.countByExample(example); } - public void setReaded(Long msgId) { + public void setRead(Long msgId) { SysMsg sysMsg = new SysMsg(); sysMsg.setMsgId(msgId); sysMsg.setStatus(true); @@ -95,7 +95,7 @@ public class SysMsgService { sysMsgMapper.updateByPrimaryKeySelective(sysMsg); } - public void setBatchReaded(List msgIds) { + public void setBatchRead(List msgIds) { extSysMsgMapper.batchStatus(msgIds, System.currentTimeMillis()); } diff --git a/backend/src/main/resources/db/migration/V42__1.16.sql b/backend/src/main/resources/db/migration/V42__1.16.sql index 68e5d4c663..2423350791 100644 --- a/backend/src/main/resources/db/migration/V42__1.16.sql +++ b/backend/src/main/resources/db/migration/V42__1.16.sql @@ -13,4 +13,4 @@ ALTER TABLE `dataset_table_field` ADD COLUMN `date_format` VARCHAR(255) NULL AFT ALTER TABLE `sys_task_email` ADD COLUMN `view_data_range` VARCHAR(255) NULL DEFAULT 'view' AFTER `reci_users`; - +UPDATE `sys_msg_type` set `type_name` = 'i18n_msg_type_dataset_sync_failed' WHERE (`msg_type_id` = 6); diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 0a89245a15..d3ba643e92 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -102,7 +102,7 @@ i18n_msg_type_panel_share=Dashboard sharing i18n_msg_type_panel_share_cacnel=Dashboard unshared i18n_msg_type_dataset_sync=Data set synchronization i18n_msg_type_dataset_sync_success=Dataset synchronization successful -i18n_msg_type_dataset_sync_faild=Dataset synchronization failed +i18n_msg_type_dataset_sync_failed=Dataset synchronization failed i18n_data_not_sync=Please sync data first i18n_excel_column_change=The column name of Excel is inconsistent with the original data set i18n_excel_column_inconsistent=The column names of the selected sheet pages are inconsistent @@ -178,10 +178,10 @@ i18n_not_admin_error=Not an administrator account i18n_user_not_exist=user does not exist i18n_default_login_reset=Switched back to default login mode I18N_COMMON_LEVEL_USE=Consult -I18N_PANNEL_LEVEL_VIEW=Consult -I18N_PANNEL_LEVEL_EXPORT=Export -I18N_PANNEL_LEVEL_MANAGE=Manage -I18N_PANNEL_LEVEL_GRANT=Grant +I18N_PANEL_LEVEL_VIEW=Consult +I18N_PANEL_LEVEL_EXPORT=Export +I18N_PANEL_LEVEL_MANAGE=Manage +I18N_PANEL_LEVEL_GRANT=Grant I18N_DATASET_LEVEL_USE=Consult I18N_DATASET_LEVEL_MANAGE=Manage I18N_DATASET_LEVEL_GRANT=Grant diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index b8a3daf1bd..bdaa67a794 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -102,7 +102,7 @@ i18n_msg_type_panel_share=\u4EEA\u8868\u677F\u5206\u4EAB i18n_msg_type_panel_share_cacnel=\u4EEA\u8868\u677F\u53D6\u6D88\u5206\u4EAB i18n_msg_type_dataset_sync=\u6570\u636E\u96C6\u540C\u6B65 i18n_msg_type_dataset_sync_success=\u6570\u636E\u96C6\u540C\u6B65\u6210\u529F -i18n_msg_type_dataset_sync_faild=\u6570\u636E\u96C6\u540C\u6B65\u5931\u8D25 +i18n_msg_type_dataset_sync_failed=\u6570\u636E\u96C6\u540C\u6B65\u5931\u8D25 i18n_data_not_sync=\u8BF7\u5148\u5B8C\u6210\u6570\u636E\u540C\u6B65 i18n_excel_column_change=Excel\u7684\u5217\u540D\u4E0E\u539F\u6570\u636E\u96C6\u4E0D\u4E00\u81F4 i18n_excel_column_inconsistent=\u6240\u9009sheet\u9875\u9762\u7684\u5217\u540D\u4E0D\u4E00\u81F4 @@ -178,10 +178,10 @@ i18n_not_admin_error=\u4E0D\u662F\u7BA1\u7406\u5458\u8D26\u53F7 i18n_user_not_exist=\u7528\u6237\u4E0D\u5B58\u5728 i18n_default_login_reset=\u5DF2\u5207\u6362\u56DE\u9ED8\u8BA4\u767B\u5F55\u65B9\u5F0F I18N_COMMON_LEVEL_USE=\u67E5\u770B -I18N_PANNEL_LEVEL_VIEW=\u67E5\u770B -I18N_PANNEL_LEVEL_EXPORT=\u5BFC\u51FA -I18N_PANNEL_LEVEL_MANAGE=\u7BA1\u7406 -I18N_PANNEL_LEVEL_GRANT=\u6388\u6743 +I18N_PANEL_LEVEL_VIEW=\u67E5\u770B +I18N_PANEL_LEVEL_EXPORT=\u5BFC\u51FA +I18N_PANEL_LEVEL_MANAGE=\u7BA1\u7406 +I18N_PANEL_LEVEL_GRANT=\u6388\u6743 I18N_DATASET_LEVEL_USE=\u67E5\u770B I18N_DATASET_LEVEL_MANAGE=\u7BA1\u7406 I18N_DATASET_LEVEL_GRANT=\u6388\u6743 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 035637a4dc..2003f5a638 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -102,7 +102,7 @@ i18n_msg_type_panel_share=\u5100\u8868\u677F\u5206\u4EAB i18n_msg_type_panel_share_cacnel=\u5100\u8868\u677F\u53D6\u6D88\u5206\u4EAB i18n_msg_type_dataset_sync=\u6578\u64DA\u96C6\u540C\u6B65 i18n_msg_type_dataset_sync_success=\u6578\u64DA\u96C6\u540C\u6B65\u6210\u529F -i18n_msg_type_dataset_sync_faild=\u6578\u64DA\u96C6\u540C\u6B65\u5931\u6557 +i18n_msg_type_dataset_sync_failed=\u6578\u64DA\u96C6\u540C\u6B65\u5931\u6557 i18n_data_not_sync=\u8ACB\u5148\u5B8C\u6210\u6578\u64DA\u540C\u6B65 i18n_excel_column_change=Excel\u7684\u5217\u540D\u8207\u539F\u6578\u64DA\u96C6\u4E0D\u4E00\u81F4 i18n_excel_column_inconsistent=\u6240\u9078sheet\u9801\u9762\u7684\u5217\u540D\u4E0D\u4E00\u81F4 @@ -174,10 +174,10 @@ i18n_not_admin_error=\u4E0D\u662F\u7BA1\u7406\u54E1\u8CEC\u865F i18n_user_not_exist=\u7528\u6236\u4E0D\u5B58\u5728 i18n_default_login_reset=\u5DF2\u5207\u63DB\u56DE\u9ED8\u8A8D\u767B\u9304\u65B9\u5F0F I18N_COMMON_LEVEL_USE=\u67E5\u770B -I18N_PANNEL_LEVEL_VIEW=\u67E5\u770B -I18N_PANNEL_LEVEL_EXPORT=\u5C0E\u51FA -I18N_PANNEL_LEVEL_MANAGE=\u7BA1\u7406 -I18N_PANNEL_LEVEL_GRANT=\u6388\u6B0A +I18N_PANEL_LEVEL_VIEW=\u67E5\u770B +I18N_PANEL_LEVEL_EXPORT=\u5C0E\u51FA +I18N_PANEL_LEVEL_MANAGE=\u7BA1\u7406 +I18N_PANEL_LEVEL_GRANT=\u6388\u6B0A I18N_DATASET_LEVEL_USE=\u67E5\u770B I18N_DATASET_LEVEL_MANAGE=\u7BA1\u7406 I18N_DATASET_LEVEL_GRANT=\u6388\u6B0A diff --git a/frontend/src/views/chart/chart/bar/bar_antv.js b/frontend/src/views/chart/chart/bar/bar_antv.js index 9c73137ff7..5c3cbb30a6 100644 --- a/frontend/src/views/chart/chart/bar/bar_antv.js +++ b/frontend/src/views/chart/chart/bar/bar_antv.js @@ -23,7 +23,7 @@ export function baseBarOptionAntV(plot, container, chart, action, isGroup, isSta const xAxis = getXAxis(chart) const yAxis = getYAxis(chart) // data - const data = chart.data.datas + const data = chart.data.data // config const slider = getSlider(chart) const analyse = getAnalyse(chart) @@ -121,7 +121,7 @@ export function hBaseBarOptionAntV(plot, container, chart, action, isGroup, isSt const xAxis = getXAxis(chart) const yAxis = getYAxis(chart) // data - const data = chart.data.datas + const data = chart.data.data // config const slider = getSlider(chart) const analyse = getAnalyse(chart) diff --git a/frontend/src/views/chart/chart/funnel/funnel_antv.js b/frontend/src/views/chart/chart/funnel/funnel_antv.js index 61168c5a53..61a5a25a08 100644 --- a/frontend/src/views/chart/chart/funnel/funnel_antv.js +++ b/frontend/src/views/chart/chart/funnel/funnel_antv.js @@ -11,7 +11,7 @@ export function baseFunnelOptionAntV(plot, container, chart, action) { // style const legend = getLegend(chart) // data - const data = chart.data.datas + const data = chart.data.data // options const options = { theme: theme, diff --git a/frontend/src/views/chart/chart/line/line_antv.js b/frontend/src/views/chart/chart/line/line_antv.js index f64f906202..52cd766dfe 100644 --- a/frontend/src/views/chart/chart/line/line_antv.js +++ b/frontend/src/views/chart/chart/line/line_antv.js @@ -23,7 +23,7 @@ export function baseLineOptionAntV(plot, container, chart, action) { const xAxis = getXAxis(chart) const yAxis = getYAxis(chart) // data - const data = chart.data.datas + const data = chart.data.data // config const slider = getSlider(chart) const analyse = getAnalyse(chart) @@ -111,7 +111,7 @@ export function baseAreaOptionAntV(plot, container, chart, action, isStack) { const xAxis = getXAxis(chart) const yAxis = getYAxis(chart) // data - const data = chart.data.datas + const data = chart.data.data // config const slider = getSlider(chart) const analyse = getAnalyse(chart) diff --git a/frontend/src/views/chart/chart/mix/mix_antv.js b/frontend/src/views/chart/chart/mix/mix_antv.js index ca77bc3afc..737416abda 100644 --- a/frontend/src/views/chart/chart/mix/mix_antv.js +++ b/frontend/src/views/chart/chart/mix/mix_antv.js @@ -23,7 +23,7 @@ export function baseMixOptionAntV(plot, container, chart, action) { const yAxis = getYAxis(chart) const yAxisExt = getYAxisExt(chart) // data - const data = chart.data.datas + const data = chart.data.data const plots = [] // color let customAttr = {} diff --git a/frontend/src/views/chart/chart/pie/pie_antv.js b/frontend/src/views/chart/chart/pie/pie_antv.js index 81a7812067..00fbb8ba81 100644 --- a/frontend/src/views/chart/chart/pie/pie_antv.js +++ b/frontend/src/views/chart/chart/pie/pie_antv.js @@ -18,7 +18,7 @@ export function basePieOptionAntV(plot, container, chart, action) { // style const legend = getLegend(chart) // data - const data = chart.data.datas + const data = chart.data.data // options const options = { theme: theme, @@ -103,7 +103,7 @@ export function basePieRoseOptionAntV(plot, container, chart, action) { // style const legend = getLegend(chart) // data - const data = chart.data.datas + const data = chart.data.data // options const options = { theme: theme, diff --git a/frontend/src/views/chart/chart/radar/radar_antv.js b/frontend/src/views/chart/chart/radar/radar_antv.js index 6cbcae6f94..0336c518b9 100644 --- a/frontend/src/views/chart/chart/radar/radar_antv.js +++ b/frontend/src/views/chart/chart/radar/radar_antv.js @@ -11,7 +11,7 @@ export function baseRadarOptionAntV(plot, container, chart, action) { // style const legend = getLegend(chart) // data - const data = chart.data.datas + const data = chart.data.data const xAxis = { tickLine: null, diff --git a/frontend/src/views/chart/chart/scatter/scatter_antv.js b/frontend/src/views/chart/chart/scatter/scatter_antv.js index d9ca30cc85..96032b3844 100644 --- a/frontend/src/views/chart/chart/scatter/scatter_antv.js +++ b/frontend/src/views/chart/chart/scatter/scatter_antv.js @@ -24,7 +24,7 @@ export function baseScatterOptionAntV(plot, container, chart, action) { const xAxis = getXAxis(chart) const yAxis = getYAxis(chart) // data - const data = chart.data.datas + const data = chart.data.data // config const slider = getSlider(chart) const analyse = getAnalyse(chart) diff --git a/frontend/src/views/chart/chart/treemap/treemap_antv.js b/frontend/src/views/chart/chart/treemap/treemap_antv.js index 598609813e..406602f539 100644 --- a/frontend/src/views/chart/chart/treemap/treemap_antv.js +++ b/frontend/src/views/chart/chart/treemap/treemap_antv.js @@ -10,7 +10,7 @@ export function baseTreemapOptionAntV(plot, container, chart, action) { // style const legend = getLegend(chart) // data - const data = chart.data.datas + const data = chart.data.data // options const options = { theme: theme, diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index 2fbc508a8d..b5915a81da 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -3091,7 +3091,7 @@ export function getColors(chart, colors, reset) { let series if (chart.type.includes('stack')) { if (chart.data) { - const data = chart.data.datas + const data = chart.data.data const stackData = [] for (let i = 0; i < data.length; i++) { const s = data[i] @@ -3128,7 +3128,7 @@ export function getColors(chart, colors, reset) { } } else if (chart.type === 'bar-group') { // 拿到data中的category，并去重，然后构建seriesColor - const data = chart.data.datas + const data = chart.data.data const s = [] data.forEach((cur) => { if (s.indexOf(cur.category) < 0) { @@ -3144,7 +3144,7 @@ export function getColors(chart, colors, reset) { } } else { if (chart.data) { - const data = chart.data.datas + const data = chart.data.data // data 的维度值，需要根据自定义顺序排序 // let customSortData // if (Object.prototype.toString.call(chart.customSort) === '[object Array]') { diff --git a/frontend/src/views/chart/chart/waterfall/waterfall.js b/frontend/src/views/chart/chart/waterfall/waterfall.js index ee20f50307..61a20c363e 100644 --- a/frontend/src/views/chart/chart/waterfall/waterfall.js +++ b/frontend/src/views/chart/chart/waterfall/waterfall.js @@ -27,7 +27,7 @@ export function baseWaterfallOptionAntV(plot, container, chart, action) { delete yAxis.maxLimit } // data - const data = chart.data.datas + const data = chart.data.data // total const total = { label: '合计', diff --git a/frontend/src/views/chart/chart/wordCloud/word_cloud.js b/frontend/src/views/chart/chart/wordCloud/word_cloud.js index af7000e998..f33f1f3f85 100644 --- a/frontend/src/views/chart/chart/wordCloud/word_cloud.js +++ b/frontend/src/views/chart/chart/wordCloud/word_cloud.js @@ -11,7 +11,7 @@ export function baseWordCloudOptionAntV(plot, container, chart, action) { // attr const tooltip = getTooltip(chart) // data - const data = chart.data.datas + const data = chart.data.data // options const options = { theme: theme, diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue index 30b6eb13f8..cd7b2b1334 100644 --- a/frontend/src/views/chart/components/ChartComponentG2.vue +++ b/frontend/src/views/chart/components/ChartComponentG2.vue @@ -237,9 +237,9 @@ export default { // type // if (chart.data) { this.antVRenderStatus = true - if (!chart.data || (!chart.data.datas && !chart.data.series)) { + if (!chart.data || (!chart.data.data && !chart.data.series)) { chart.data = { - datas: [{}], + data: [{}], series: [ { data: [0] diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue index d99553a2c6..8ed97e0ff3 100644 --- a/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/frontend/src/views/chart/components/ChartComponentS2.vue @@ -224,27 +224,27 @@ export default { }, methods: { initData() { - let datas = [] + let data = [] this.showPage = false if (this.chart.data && this.chart.data.fields) { this.fields = JSON.parse(JSON.stringify(this.chart.data.fields)) const attr = JSON.parse(this.chart.customAttr) this.currentPage.pageSize = parseInt(attr.size.tablePageSize ? attr.size.tablePageSize : 20) - datas = JSON.parse(JSON.stringify(this.chart.data.tableRow)) - if (this.chart.type === 'table-info' && (attr.size.tablePageMode === 'page' || !attr.size.tablePageMode) && datas.length > this.currentPage.pageSize) { + data = JSON.parse(JSON.stringify(this.chart.data.tableRow)) + if (this.chart.type === 'table-info' && (attr.size.tablePageMode === 'page' || !attr.size.tablePageMode) && data.length > this.currentPage.pageSize) { // 计算分页 - this.currentPage.show = datas.length + this.currentPage.show = data.length const pageStart = (this.currentPage.page - 1) * this.currentPage.pageSize const pageEnd = pageStart + this.currentPage.pageSize - datas = datas.slice(pageStart, pageEnd) + data = data.slice(pageStart, pageEnd) this.showPage = true } } else { this.fields = [] - datas = [] + data = [] this.resetPage() } - this.tableData = datas + this.tableData = data }, preDraw() { this.initData() @@ -275,9 +275,9 @@ export default { // type // if (chart.data) { this.antVRenderStatus = true - if (!chart.data || (!chart.data.datas && !chart.data.series)) { + if (!chart.data || (!chart.data.data && !chart.data.series)) { chart.data = { - datas: [{}], + data: [{}], series: [ { data: [0] diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue index 3ca0f03226..deebdf9217 100644 --- a/frontend/src/views/dataset/add/AddExcel.vue +++ b/frontend/src/views/dataset/add/AddExcel.vue @@ -70,10 +70,10 @@ > - {{ data.excelLable }} + {{ data.excelLabel }} @@ -198,7 +198,7 @@ export default { }, fields: [], data: [], - sycnStatus: '', + syncStatus: '', lastRequestComplete: true, page: { page: 1, @@ -231,7 +231,7 @@ export default { }, created() { this.taskLogTimer = setInterval(() => { - if (this.sycnStatus !== 'Underway') { + if (this.syncStatus !== 'Underway') { return } if (!this.lastRequestComplete) { @@ -279,7 +279,7 @@ export default { this.fields = response.data.fields this.data = response.data.data this.page = response.data.page - this.sycnStatus = response.data.sycnStatus + this.syncStatus = response.data.syncStatus if (response.data.status === 'warnning') { this.$warning(response.data.msg, 3000) } diff --git a/frontend/src/views/system/datasource/DsAppForm.vue b/frontend/src/views/system/datasource/DsAppForm.vue index 87b16230c0..01a5af6a2c 100644 --- a/frontend/src/views/system/datasource/DsAppForm.vue +++ b/frontend/src/views/system/datasource/DsAppForm.vue @@ -805,7 +805,7 @@ export default { this.$success(i18n.t('commons.success')) this.active++ this.apiItem.fields = res.data.fields - this.$refs.plxTable.reloadData(res.data.datas) + this.$refs.plxTable.reloadData(res.data.data) }).catch(res => { this.loading = false this.disabledNext = false @@ -860,7 +860,7 @@ export default { this.loading = false this.$success(i18n.t('commons.success')) this.apiItem.fields = res.data.fields - this.$refs.plxTable.reloadData(res.data.datas) + this.$refs.plxTable.reloadData(res.data.data) }).catch(res => { this.loading = false }) diff --git a/frontend/src/views/system/datasource/DsForm.vue b/frontend/src/views/system/datasource/DsForm.vue index 78d7438e3b..96ca0ac5f0 100644 --- a/frontend/src/views/system/datasource/DsForm.vue +++ b/frontend/src/views/system/datasource/DsForm.vue @@ -401,7 +401,7 @@ export default { }, async created() { await this.datasourceTypes() - this.queryTreeDatas() + this.queryTreeData() const { id, showModel, type, name } = this.$route.query this.params = this.$route.query if (id) { @@ -430,7 +430,7 @@ export default { this.params = { ...res.data, showModel } }) }, - queryTreeDatas() { + queryTreeData() { listDatasource().then((res) => { this.tData = this.buildTree(res.data) }) @@ -897,7 +897,7 @@ export default { this.$success(i18n.t('commons.success')) this.active++ this.apiItem.fields = res.data.fields - this.$refs.plxTable.reloadData(res.data.datas) + this.$refs.plxTable.reloadData(res.data.data) }) .catch((res) => { this.loading = false @@ -957,7 +957,7 @@ export default { this.loading = false this.$success(i18n.t('commons.success')) this.apiItem.fields = res.data.fields - this.$refs.plxTable.reloadData(res.data.datas) + this.$refs.plxTable.reloadData(res.data.data) }) .catch((res) => { this.loading = false diff --git a/frontend/src/views/system/log/FilterUser.vue b/frontend/src/views/system/log/FilterUser.vue index b538340655..512098c640 100644 --- a/frontend/src/views/system/log/FilterUser.vue +++ b/frontend/src/views/system/log/FilterUser.vue @@ -103,7 +103,7 @@ export default { usersValue: [], activeUser: [], users: [], - userCahe: [], + userCache: [], activeType: [], userDrawer: false } @@ -113,7 +113,7 @@ export default { return this.users.filter((ele) => !this.activeUser.includes(ele.id)) }, usersValueCopy() { - return this.userCahe.filter((ele) => this.activeUser.includes(ele.id)) + return this.userCache.filter((ele) => this.activeUser.includes(ele.id)) } }, mounted() { @@ -135,10 +135,10 @@ export default { }, changeUser() { if ( - this.userCahe.length > + this.userCache.length > this.usersValue.length + this.activeUser.length ) { - this.userCahe = this.userCahe.filter((ele) => + this.userCache = this.userCache.filter((ele) => this.usersValue .map((ele) => ele.id) .concat(this.activeUser) @@ -148,14 +148,14 @@ export default { } const userIdx = this.usersValue.findIndex( (ele) => - !this.userCahe + !this.userCache .map((ele) => ele.id) .concat(this.activeUser) .includes(ele.id) ) if (userIdx === -1) return this.activeUser.push(this.usersValue[userIdx].id) - this.userCahe.push(this.usersValue[userIdx]) + this.userCache.push(this.usersValue[userIdx]) this.usersValue.splice(userIdx, 1) }, activeUserChange(id) { @@ -165,7 +165,7 @@ export default { this.usersValue = this.usersValue.filter((ele) => ele.id !== id) } else { this.activeUser.splice(userIndex, 1) - const user = this.userCahe.find((ele) => ele.id === id) + const user = this.userCache.find((ele) => ele.id === id) this.usersValue.push(user) } }, @@ -174,7 +174,7 @@ export default { this.usersValue = [] this.activeUser = [] this.activeType = [] - this.userCahe = [] + this.userCache = [] this.$emit('search', [], []) }, clearOneFilter(index) { @@ -219,7 +219,7 @@ export default { this.filterTextMap.push([ 'usersValue', 'activeUser', - 'userCahe' + 'userCache' ]) }