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