dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
junjun 2022-10-22 14:07:19 +08:00
commit 6d58e210b3
27 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/controller/sys/MsgController.java
View File

@ -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<Long> msgIds) {
sysMsgService.setBatchReaded(msgIds);
sysMsgService.setBatchRead(msgIds);
}
@ApiOperation("全部设置已读")

4
backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java
View File

@ -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;
}

4
backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -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);
}

36
backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
View File

@ -18,7 +18,7 @@ public class ChartDataBuild {
public static Map<String, Object> transChartDataAntV(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, boolean isDrill) {
Map<String, Object> map = new HashMap<>();
List<AxisChartDataAntVDTO> datas = new ArrayList<>();
List<AxisChartDataAntVDTO> 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<String, Object> transBaseGroupDataAntV(List<ChartViewFieldDTO> xAxisBase, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> xAxisExt, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, boolean isDrill) {
Map<String, Object> map = new HashMap<>();
List<AxisChartDataAntVDTO> datas = new ArrayList<>();
List<AxisChartDataAntVDTO> 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<String, Object> transStackChartDataAntV(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, List<ChartViewFieldDTO> extStack, boolean isDrill) {
Map<String, Object> map = new HashMap<>();
List<AxisChartDataAntVDTO> datas = new ArrayList<>();
List<AxisChartDataAntVDTO> 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<String, Object> transScatterDataAntV(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, List<ChartViewFieldDTO> extBubble, boolean isDrill) {
Map<String, Object> map = new HashMap<>();
List<AxisChartDataAntVDTO> datas = new ArrayList<>();
List<AxisChartDataAntVDTO> 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<String, Object> transRadarChartDataAntV(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, boolean isDrill) {
Map<String, Object> map = new HashMap<>();
List<AxisChartDataAntVDTO> datas = new ArrayList<>();
List<AxisChartDataAntVDTO> 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;
}

4
backend/src/main/java/io/dataease/service/message/SysMsgService.java
View File

@ -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<Long> msgIds) {
public void setBatchRead(List<Long> msgIds) {
extSysMsgMapper.batchStatus(msgIds, System.currentTimeMillis());
}

2
backend/src/main/resources/db/migration/V42__1.16.sql
View File

@ -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);

10
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -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

10
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -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

10
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -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

4
frontend/src/views/chart/chart/bar/bar_antv.js
View File

@ -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)

2
frontend/src/views/chart/chart/funnel/funnel_antv.js
View File

@ -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,

4
frontend/src/views/chart/chart/line/line_antv.js
View File

@ -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)

2
frontend/src/views/chart/chart/mix/mix_antv.js
View File

@ -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 = {}

4
frontend/src/views/chart/chart/pie/pie_antv.js
View File

@ -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,

2
frontend/src/views/chart/chart/radar/radar_antv.js
View File

@ -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,

2
frontend/src/views/chart/chart/scatter/scatter_antv.js
View File

@ -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)

2
frontend/src/views/chart/chart/treemap/treemap_antv.js
View File

@ -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,

6
frontend/src/views/chart/chart/util.js
View File

@ -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]') {

2
frontend/src/views/chart/chart/waterfall/waterfall.js
View File

@ -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: '合计',

2
frontend/src/views/chart/chart/wordCloud/word_cloud.js
View File

@ -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,

4
frontend/src/views/chart/components/ChartComponentG2.vue
View File

@ -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]

18
frontend/src/views/chart/components/ChartComponentS2.vue
View File

@ -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]

10
frontend/src/views/dataset/add/AddExcel.vue
View File

@ -70,10 +70,10 @@
>
<span
slot-scope="{ data }"
:title="data.excelLable"
:title="data.excelLabel"
class="custom-tree-node"
>
<span class="label">{{ data.excelLable }}</span>
<span class="label">{{ data.excelLabel }}</span>
<span
v-if="
(data.nameExsit && !param.tableId) ||
@ -290,7 +290,7 @@ export default {
}
],
props: {
label: 'excelLable',
label: 'excelLabel',
children: 'sheets'
},
count: 1,
@ -374,8 +374,8 @@ export default {
this.sheetObj = data
this.fields = data.fields
this.jsonArray = data.jsonArray
const datas = this.jsonArray
this.$refs.plxTable.reloadData(datas)
const data = this.jsonArray
this.$refs.plxTable.reloadData(data)
}
},
handleCommand(type, field) {

8
frontend/src/views/dataset/data/ViewTable.vue
View File

@ -26,7 +26,7 @@
}}</span>
</template>
<span
v-if="sycnStatus === 'Underway'"
v-if="syncStatus === 'Underway'"
class="blue-color"
style="line-height: 26px"
>
@ -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)
}

4
frontend/src/views/system/datasource/DsAppForm.vue
View File

@ -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
})

8
frontend/src/views/system/datasource/DsForm.vue
View File

@ -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

18
frontend/src/views/system/log/FilterUser.vue
View File

@ -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'
])
}