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

Merge branch 'dev' into pr@dev@perf_filter_first_selector

Browse Source
This commit is contained in:
fit2cloud-chenyw 2023-12-08 16:27:54 +08:00 committed by GitHub
commit d7756c8065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
101 changed files with 485 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
View File

@ -371,9 +371,11 @@ public class DatasourceService {
String datasourceStatus = null;
try {
Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
System.out.println(datasourceProvider.getClass());
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(datasource);
datasourceStatus = datasourceProvider.checkStatus(datasourceRequest);
System.out.println(datasourceStatus);
if (datasource.getType().equalsIgnoreCase("api")) {
List<ApiDefinition> apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<List<ApiDefinition>>() {
}.getType());
@ -398,6 +400,7 @@ public class DatasourceService {
return ResultHolder.success("Success");
} catch (Exception e) {
e.printStackTrace();
datasourceStatus = "Error";
return ResultHolder.error(Translator.get("I18N_DS_INVALID") + ": " + e.getMessage());
} finally {
@ -405,6 +408,7 @@ public class DatasourceService {
record.setStatus(datasourceStatus);
DatasourceExample example = new DatasourceExample();
example.createCriteria().andIdEqualTo(datasource.getId());
System.out.println(new Gson().toJson(record));
datasourceMapper.updateByExampleSelective(record, example);
}
}

2
core/frontend/src/App.vue
View File

@ -13,7 +13,7 @@
:title="$t('user.change_password')"
:show-close="false"
>
<PasswordUpdateForm :old-pwd=defaultPwd />
<PasswordUpdateForm :old-pwd="defaultPwd" />
</el-dialog>
</div>
</template>

1
core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
View File

@ -392,7 +392,6 @@ export default {
position: absolute;
top: 0;
left: 0;
z-index: 2;
width: 100% !important;
height: 100% !important;
}

14
core/frontend/src/components/canvas/components/editor/EditBar.vue
View File

@ -145,7 +145,7 @@
:target="curComponent.hyperlinks.openMode "
:href="curComponent.hyperlinks.content "
>
<i class="icon iconfont icon-com-jump"/>
<i class="icon iconfont icon-com-jump" />
</a>
</span>
@ -193,7 +193,7 @@
</template>
<script>
import {mapState} from 'vuex'
import { mapState } from 'vuex'
import bus from '@/utils/bus'
import SettingMenu from '@/components/canvas/components/editor/SettingMenu'
import LinkageField from '@/components/canvas/components/editor/LinkageField'
@ -202,13 +202,13 @@ import FieldsList from '@/components/canvas/components/editor/FieldsList'
import LinkJumpSet from '@/views/panel/linkJumpSet'
import Background from '@/views/background/index'
import MapLayerController from '@/views/chart/components/map/MapLayerController'
import {uploadFileResult} from '@/api/staticResource/staticResource'
import { uploadFileResult } from '@/api/staticResource/staticResource'
import eventBus from '@/components/canvas/utils/eventBus'
import {hasDataPermission} from '@/utils/permission'
import {exportExcelDownload} from '@/components/canvas/utils/utils'
import { hasDataPermission } from '@/utils/permission'
import { exportExcelDownload } from '@/components/canvas/utils/utils'
export default {
components: {Background, LinkJumpSet, FieldsList, SettingMenu, LinkageField, MapLayerController},
components: { Background, LinkJumpSet, FieldsList, SettingMenu, LinkageField, MapLayerController },
props: {
canvasId: {
@ -467,7 +467,7 @@ export default {
}
},
showViewDetails(openType = 'details') {
this.$emit('showViewDetails', {openType: openType})
this.$emit('showViewDetails', { openType: openType })
},
exportExcelDownload() {
exportExcelDownload(this.chart)

11
core/frontend/src/components/canvas/customComponent/UserView.vue
View File

@ -1025,10 +1025,13 @@ export default {
const tableChart = deepCopy(this.chart)
tableChart.customAttr = JSON.parse(this.chart.customAttr)
tableChart.customStyle = JSON.parse(this.chart.customStyle)
tableChart.customAttr.color.tableHeaderBgColor = '#f8f8f9'
tableChart.customAttr.color.tableItemBgColor = '#ffffff'
tableChart.customAttr.color.tableHeaderFontColor = '#7c7e81'
tableChart.customAttr.color.tableFontColor = '#7c7e81'
if (!this.chart.type?.includes('table')) {
tableChart.customAttr.color.tableHeaderBgColor = '#f8f8f9'
tableChart.customAttr.color.tableItemBgColor = '#ffffff'
tableChart.customAttr.color.tableHeaderFontColor = '#7c7e81'
tableChart.customAttr.color.tableFontColor = '#7c7e81'
tableChart.customAttr.color.enableTableCrossBG = false
}
tableChart.customAttr.color.tableStripe = true
tableChart.customAttr.size.tablePageMode = 'pull'
tableChart.customStyle.text.show = false

1
core/frontend/src/components/deDrag/index.vue
View File

@ -2167,7 +2167,6 @@ export default {
position: absolute;
top: 0;
left: 0;
z-index: 2;
width: 100% !important;
height: 100% !important;
}

2
core/frontend/src/components/widget/deWidget/DeTabs.vue
View File

@ -506,7 +506,7 @@ export default {
}
},
setTabLayout: _.debounce(function() {
this.headClassScroll = this.$refs?.deTabsConstom?.$refs?.tabsConstom?.$refs?.nav?.scrollable ? 'head-class-scroll' : ''
this.headClassScroll = !!this.$refs?.deTabsConstom?.$refs?.tabsConstom?.$refs?.nav?.scrollable ? 'head-class-scroll' : ''
}, 100),
calcTabLength() {
this.$nextTick(() => {

3
core/frontend/src/lang/en.js
View File

@ -1221,6 +1221,9 @@ export default {
axis_width: 'Axis Width',
axis_type: 'Axis Type',
grid_show: 'Grid Show',
dash_show: 'Dash Show',
dash_width: 'Dash Width',
dash_offset: 'Dash Offset',
grid_color: 'Grid Color',
grid_width: 'Grid Width',
grid_type: 'Grid Type',

3
core/frontend/src/lang/tw.js
View File

@ -1219,6 +1219,9 @@ export default {
axis_width: '軸線寬度',
axis_type: '軸線類型',
grid_show: '網格線顯示',
dash_show: '虛線顯示',
dash_width: '虛線寬度',
dash_offset: '虛線間距',
grid_color: '網格線顏色',
grid_width: '網格線寬度',
grid_type: '網格線類型',

3
core/frontend/src/lang/zh.js
View File

@ -1219,6 +1219,9 @@ export default {
axis_width: '轴线宽度',
axis_type: '轴线类型',
grid_show: '网格线显示',
dash_show: '虚线显示',
dash_width: '虚线宽度',
dash_offset: '虚线间距',
grid_color: '网格线颜色',
grid_width: '网格线宽度',
grid_type: '网格线类型',

15
core/frontend/src/views/chart/chart/chart.js
View File

@ -328,6 +328,11 @@ export const DEFAULT_XAXIS_STYLE = {
color: '#cccccc',
width: 1,
style: 'solid'
},
enableDash: false,
dashStyle: {
width: 4,
offset: 5
}
},
axisValue: {
@ -374,6 +379,11 @@ export const DEFAULT_YAXIS_STYLE = {
color: '#cccccc',
width: 1,
style: 'solid'
},
enableDash: false,
dashStyle: {
width: 4,
offset: 5
}
},
axisValue: {
@ -420,6 +430,11 @@ export const DEFAULT_YAXIS_EXT_STYLE = {
color: '#cccccc',
width: 1,
style: 'solid'
},
enableDash: false,
dashStyle: {
width: 4,
offset: 5
}
},
axisValue: {

21
core/frontend/src/views/chart/chart/common/common_antv.js
View File

@ -656,11 +656,16 @@ export function getXAxis(chart) {
},
spacing: 8
} : null
const gridCfg = a.splitLine ? a.splitLine : DEFAULT_XAXIS_STYLE.splitLine
if (!gridCfg.dashStyle) {
gridCfg.dashStyle = DEFAULT_XAXIS_STYLE.splitLine.dashStyle
}
const grid = a.splitLine.show ? {
line: {
style: {
stroke: a.splitLine.lineStyle.color,
lineWidth: parseInt(a.splitLine.lineStyle.width)
lineWidth: parseInt(a.splitLine.lineStyle.width),
lineDash: gridCfg.enableDash ? [gridCfg.dashStyle.width, gridCfg.dashStyle.offset] : undefined
}
}
} : null
@ -771,11 +776,16 @@ export function getYAxis(chart) {
},
spacing: 8
} : null
const gridCfg = a.splitLine ? a.splitLine : DEFAULT_YAXIS_STYLE.splitLine
if (!gridCfg.dashStyle) {
gridCfg.dashStyle = DEFAULT_YAXIS_STYLE.splitLine.dashStyle
}
const grid = a.splitLine.show ? {
line: {
style: {
stroke: a.splitLine.lineStyle.color,
lineWidth: parseInt(a.splitLine.lineStyle.width)
lineWidth: parseInt(a.splitLine.lineStyle.width),
lineDash: gridCfg.enableDash ? [gridCfg.dashStyle.width, gridCfg.dashStyle.offset] : undefined
}
}
} : null
@ -883,11 +893,16 @@ export function getYAxisExt(chart) {
},
spacing: 8
} : null
const gridCfg = a.splitLine ? a.splitLine : DEFAULT_YAXIS_EXT_STYLE.splitLine
if (!gridCfg.dashStyle) {
gridCfg.dashStyle = DEFAULT_YAXIS_EXT_STYLE.splitLine.dashStyle
}
const grid = a.splitLine.show ? {
line: {
style: {
stroke: a.splitLine.lineStyle.color,
lineWidth: parseInt(a.splitLine.lineStyle.width)
lineWidth: parseInt(a.splitLine.lineStyle.width),
lineDash: gridCfg.enableDash ? [gridCfg.dashStyle.width, gridCfg.dashStyle.offset] : undefined
}
}
} : null

2
core/frontend/src/views/chart/components/ChartComponentS2.vue
View File

@ -14,8 +14,8 @@
<span
v-if="chart.type"
v-show="title_show"
:class="titleIsRight"
ref="title"
:class="titleIsRight"
:style="title_class"
style="cursor: default;display: block;"
>

43
core/frontend/src/views/chart/components/componentStyle/XAxisSelectorAntV.vue
View File

@ -201,6 +201,46 @@
@change="changeXAxisStyle('splitLine')"
/>
</el-form-item>
<el-form-item
:label="$t('chart.dash_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.splitLine.enableDash"
@change="changeXAxisStyle('splitLine')"
>{{ $t('chart.dash_show') }}</el-checkbox>
</el-form-item>
<template v-if="axisForm.splitLine.enableDash">
<el-form-item
:label="$t('chart.dash_width')"
class="form-item form-item-slider"
>
<el-slider
v-model="axisForm.splitLine.dashStyle.width"
:min="1"
:max="10"
show-input
:show-input-controls="false"
input-size="mini"
@change="changeXAxisStyle('splitLine')"
/>
</el-form-item>
<el-form-item
:label="$t('chart.dash_offset')"
class="form-item form-item-slider"
>
<el-slider
v-model="axisForm.splitLine.dashStyle.offset"
:min="1"
:max="10"
show-input
:show-input-controls="false"
input-size="mini"
@change="changeXAxisStyle('splitLine')"
/>
</el-form-item>
</template>
</span>
<el-divider v-if="showProperty('axisForm')" />
<el-form-item
@ -412,6 +452,9 @@ export default {
if (!this.axisForm.axisLine) {
this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_XAXIS_STYLE.axisLine))
}
if (!this.axisForm.splitLine.dashStyle) {
this.axisForm.splitLine.dashStyle = JSON.parse(JSON.stringify(DEFAULT_XAXIS_STYLE.splitLine.dashStyle))
}
}
}
},

42
core/frontend/src/views/chart/components/componentStyle/YAxisExtSelectorAntV.vue
View File

@ -195,6 +195,45 @@
@change="changeYAxisStyle('lineStyle')"
/>
</el-form-item>
<el-form-item
:label="$t('chart.dash_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.splitLine.enableDash"
@change="changeYAxisStyle('splitLine')"
>{{ $t('chart.dash_show') }}</el-checkbox>
</el-form-item>
<template v-if="axisForm.splitLine.enableDash">
<el-form-item
:label="$t('chart.dash_width')"
class="form-item form-item-slider"
>
<el-slider
v-model="axisForm.splitLine.dashStyle.width"
:min="1"
:max="10"
show-input
:show-input-controls="false"
input-size="mini"
@change="changeYAxisStyle('splitLine')"
/>
</el-form-item>
<el-form-item
:label="$t('chart.dash_offset')"
class="form-item form-item-slider"
>
<el-slider
v-model="axisForm.splitLine.dashStyle.offset"
:min="1"
:max="10"
show-input
:show-input-controls="false"
input-size="mini"
@change="changeYAxisStyle('splitLine')"
/>
</el-form-item>
</template>
</span>
<el-divider v-if="showProperty('axisLabel')" />
<el-form-item
@ -408,6 +447,9 @@ export default {
if (!this.axisForm.axisLine) {
this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_YAXIS_EXT_STYLE.axisLine))
}
if (!this.axisForm.splitLine.dashStyle) {
this.axisForm.splitLine.dashStyle = JSON.parse(JSON.stringify(DEFAULT_YAXIS_EXT_STYLE.splitLine.dashStyle))
}
}
}
},

42
core/frontend/src/views/chart/components/componentStyle/YAxisSelectorAntV.vue
View File

@ -198,6 +198,45 @@
@change="changeYAxisStyle('splitLine')"
/>
</el-form-item>
<el-form-item
:label="$t('chart.dash_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.splitLine.enableDash"
@change="changeYAxisStyle('splitLine')"
>{{ $t('chart.dash_show') }}</el-checkbox>
</el-form-item>
<template v-if="axisForm.splitLine.enableDash">
<el-form-item
:label="$t('chart.dash_width')"
class="form-item form-item-slider"
>
<el-slider
v-model="axisForm.splitLine.dashStyle.width"
:min="1"
:max="10"
show-input
:show-input-controls="false"
input-size="mini"
@change="changeYAxisStyle('splitLine')"
/>
</el-form-item>
<el-form-item
:label="$t('chart.dash_offset')"
class="form-item form-item-slider"
>
<el-slider
v-model="axisForm.splitLine.dashStyle.offset"
:min="1"
:max="10"
show-input
:show-input-controls="false"
input-size="mini"
@change="changeYAxisStyle('splitLine')"
/>
</el-form-item>
</template>
</span>
<el-divider v-if="showProperty('axisLabel')" />
<el-form-item
@ -408,6 +447,9 @@ export default {
if (!this.axisForm.axisLine) {
this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_YAXIS_STYLE.axisLine))
}
if (!this.axisForm.splitLine.dashStyle) {
this.axisForm.splitLine.dashStyle = JSON.parse(JSON.stringify(DEFAULT_YAXIS_STYLE.splitLine.dashStyle))
}
}
}
},

1
core/frontend/src/views/chart/components/normal/LabelNormal.vue
View File

@ -255,7 +255,6 @@ export default {
let flag = false
const t = senior.threshold.labelThreshold[i]
const tv = parseFloat(t.value)
console.log(t)
if (t.term === 'eq') {
if (value === tv) {
if (!setBg) {

3
core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
View File

@ -605,7 +605,8 @@ export default {
this.colorForm.tableHeaderFontColor = this.colorForm.tableHeaderFontColor ? this.colorForm.tableHeaderFontColor : this.colorForm.tableFontColor
this.$set(this.colorForm, 'gradient', this.colorForm.gradient || false)
this.colorForm.tableScrollBarColor = this.colorForm.tableScrollBarColor ? this.colorForm.tableScrollBarColor : DEFAULT_COLOR_CASE.tableScrollBarColor
this.colorForm.quotaSuffixColor = this.colorForm.quotaSuffixColor ? this.colorForm.quotaSuffixColor :DEFAULT_COLOR_CASE.quotaSuffixColor
this.colorForm.quotaSuffixColor = this.colorForm.quotaSuffixColor ? this.colorForm.quotaSuffixColor : DEFAULT_COLOR_CASE.quotaSuffixColor
this.colorForm.tableItemSubBgColor = this.colorForm.tableItemSubBgColor ? this.colorForm.tableItemSubBgColor : DEFAULT_COLOR_CASE.tableItemSubBgColor
this.colorForm.mapStyle = this.colorForm.mapStyle ? this.colorForm.mapStyle : DEFAULT_COLOR_CASE.mapStyle
this.colorForm.mapLineGradient = this.colorForm.mapLineGradient ? this.colorForm.mapLineGradient : DEFAULT_COLOR_CASE.mapLineGradient

18
core/frontend/src/views/dataset/add/AddExcel.vue
View File

@ -68,8 +68,9 @@
@node-click="handleNodeClick"
@check-change="handleCheckChange"
>
<span class="custom-tree-node"
<span
slot-scope="{ node, data}"
class="custom-tree-node"
:title="data.excelLabel"
>
<span class="label">{{ data.excelLabel }}</span>
@ -91,9 +92,10 @@
v-show="!data.sheet"
type="text"
size="mini"
@click="() => remove(node, data)">
{{ $t('dataset.delete') }}
</el-button>
@click="() => remove(node, data)"
>
{{ $t('dataset.delete') }}
</el-button>
</span>
</span>
@ -475,10 +477,10 @@ export default {
}
},
remove(node, data) {
const parent = node.parent;
const children = parent.data.children || parent.data;
const index = children.findIndex(d => d.id === data.id);
children.splice(index, 1);
const parent = node.parent
const children = parent.data.children || parent.data
const index = children.findIndex(d => d.id === data.id)
children.splice(index, 1)
},
save() {
var validate = true

1
core/frontend/src/views/panel/outerParamsSet/index.vue
View File

@ -421,7 +421,6 @@ export default {
}
},
viewInfoOnChange(targetViewInfo) {
console.log('test1=' + this.viewIdFieldArrayMap[targetViewInfo.targetViewId])
if (this.viewIdFieldArrayMap[targetViewInfo.targetViewId] && this.viewIdFieldArrayMap[targetViewInfo.targetViewId].length === 1 && this.viewIdFieldArrayMap[targetViewInfo.targetViewId][0].id === 'empty') {
targetViewInfo.targetFieldId = 'empty'
} else {

48
core/frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -526,14 +526,14 @@
</el-form-item>
<el-form-item
:label="$t('datasource.query_timeout')"
prop="apiQueryTimeout"
:label="$t('datasource.query_timeout')"
prop="apiQueryTimeout"
>
<el-input
v-model="apiItem.apiQueryTimeout"
autocomplete="off"
type="number"
:min="0"
v-model="apiItem.apiQueryTimeout"
autocomplete="off"
type="number"
:min="0"
>
<template slot="append">{{ $t('panel.second') }}</template>
</el-input>
@ -1158,24 +1158,24 @@ export default {
}
callback()
},
isNumber(rule, value, callback) {
if (!value) {
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return
}
let isNumber = false
var reg = /^\d+$/;
isNumber = reg.test(value);
if (!isNumber) {
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return
}
if(value <= 0 || value > 300){
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return
}
callback()
},
isNumber(rule, value, callback) {
if (!value) {
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return
}
let isNumber = false
var reg = /^\d+$/
isNumber = reg.test(value)
if (!isNumber) {
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return
}
if (value <= 0 || value > 300) {
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return
}
callback()
},
next() {
if (this.active === 1) {
let hasRepeatName = false

10
core/frontend/src/views/system/sysParam/BasicSetting.vue
View File

@ -85,14 +85,14 @@
</el-form-item>
<el-form-item
:label="$t('system_parameter_setting.ds_sync_log_retention_time')"
prop="logTimeOut"
:label="$t('system_parameter_setting.ds_sync_log_retention_time')"
prop="logTimeOut"
>
<el-input
v-model="formInline.dsSyncLogTimeOut"
:placeholder="$t('system_parameter_setting.empty_msg')"
v-model="formInline.dsSyncLogTimeOut"
:placeholder="$t('system_parameter_setting.empty_msg')"
><template
slot="append"
slot="append"
>{{ $t('components.day') }}</template></el-input>
</el-form-item>

1
extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java
View File

@ -4,6 +4,7 @@ package io.dataease.plugins.datasource.dm.query;
import io.dataease.plugins.common.constants.datasource.SQLConstants;
import static io.dataease.plugins.common.constants.DatasourceTypes.mysql;
import static io.dataease.plugins.common.constants.DatasourceTypes.oracle;
public class DmConstants extends SQLConstants {

6
extensions/dataease-extensions-datasource/dm/dm-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-datasource/dm/dm-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

7
extensions/dataease-extensions-datasource/dm/dm-frontend/build/check-versions.js
View File

@ -39,16 +39,13 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
process.exit(1)
}
}

6
extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

7
extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/check-versions.js
View File

@ -39,16 +39,13 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
process.exit(1)
}
}

2
extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java
View File

@ -9,7 +9,7 @@ public class KylinConstants extends SQLConstants {
public static final String KEYWORD_FIX = "%s." + "%s";
public static final String ALIAS_FIX = "%s";
public static final String CAST = "CAST(%s AS %s)";
public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";

6
extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

7
extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/check-versions.js
View File

@ -39,16 +39,13 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
process.exit(1)
}
}

1
extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java
View File

@ -11,6 +11,7 @@ public class MaxConstants extends SQLConstants {
public static final String KEYWORD_FIX = "%s." + "%s";
public static final String ALIAS_FIX = "%s";
public static final String UNIX_TIMESTAMP = "TO_MILLIS(%s)";
public static final String DATE_FORMAT = "to_char(%s, '%s')";

6
extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

7
extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/check-versions.js
View File

@ -39,16 +39,13 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
process.exit(1)
}
}

6
extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

9
extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/check-versions.js
View File

@ -39,16 +39,13 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
console.warn()
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
process.exit(1)
}
}

1
extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java
View File

@ -11,6 +11,7 @@ public class PrestoConstants extends SQLConstants {
public static final String KEYWORD_FIX = "%s." + "%s";
public static final String ALIAS_FIX = "%s";
public static final String UNIX_TIMESTAMP = "to_unixtime(%s)";
public static final String FROM_UNIXTIME = "from_unixtime(%s)";

6
extensions/dataease-extensions-datasource/presto/presto-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-datasource/presto/presto-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

7
extensions/dataease-extensions-datasource/presto/presto-frontend/build/check-versions.js
View File

@ -39,16 +39,13 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
process.exit(1)
}
}

6
extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

8
extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/check-versions.js
View File

@ -39,16 +39,12 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
process.exit(1)
}
}

6
extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/components/views/ChartDragItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -175,7 +175,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onItemChange', this.item)
},
@ -185,7 +184,6 @@ export default {
}
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onItemChange', this.item)
},
@ -200,7 +198,6 @@ export default {
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onItemChange', this.item)
},
@ -210,7 +207,6 @@ export default {
}
},
datePattern(param) {
// console.log(param)
this.item.datePattern = param.type
this.$emit('onItemChange', this.item)
},

4
extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/components/views/DimensionExtItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -155,7 +155,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onDimensionItemChange', this.item)
},
@ -165,7 +164,6 @@ export default {
}
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onDimensionItemChange', this.item)
},

7
extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/components/views/DimensionItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -36,7 +36,7 @@
<el-dropdown-item :command="beforeSort('desc')">{{ $t('chart.desc') }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item v-show="item.deType === 1" divided>
<el-dropdown placement="right-start" size="mini" style="width: 100%" @command="dateStyle">
<span class="el-dropdown-link inner-dropdown-menu">
@ -154,7 +154,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onDimensionItemChange', this.item)
},
@ -164,7 +163,6 @@ export default {
}
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onDimensionItemChange', this.item)
},
@ -174,7 +172,6 @@ export default {
}
},
datePattern(param) {
// console.log(param)
this.item.datePattern = param.type
this.$emit('onDimensionItemChange', this.item)
},

5
extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/components/views/QuotaExtItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -233,7 +233,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -244,7 +243,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -274,7 +272,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},

7
extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/components/views/QuotaItem.vue
View File

@ -1,5 +1,5 @@
<template>
<span>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -213,7 +213,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -224,7 +223,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -254,7 +252,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -284,7 +281,7 @@ export default {
this.item.calcType = 'quota'
this.$emit('editItemCompare', this.item)
},
getItemTagType() {
this.tagType = getItemType(this.dimensionData, this.quotaData, this.item)
}

21
extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/utils/3dpie.js
View File

@ -105,14 +105,13 @@ export const BASE_PIE = {
let terminalType = 'pc'
export function basePieOption(chart_option, chart, terminal = 'pc') {
console.log('apple......')
terminalType = terminal
let customAttr = {}
if (chart.customAttr) {
customAttr = JSON.parse(chart.customAttr)
if (customAttr.color) {
chart_option.colors = customAttr.color.colors
}
}
// tooltip
if (customAttr.tooltip) {
const tooltip = JSON.parse(JSON.stringify(customAttr.tooltip))
@ -125,7 +124,7 @@ export function basePieOption(chart_option, chart, terminal = 'pc') {
formatter = formatter.replace('{a}', '{series.name}')
formatter = formatter.replace('{b}', '{point.name}')
formatter = formatter.replace('{c}', '{point.y}')
formatter = formatter.replace('{d', '{point.percentage')
formatter = formatter.replace('{d', '{point.percentage')
chart_option.tooltip.formatter = formatter
}
@ -145,10 +144,10 @@ export function basePieOption(chart_option, chart, terminal = 'pc') {
dataLabels.format = formatter
chart_option.plotOptions.pie.dataLabels = dataLabels
}
}
// 处理data
if (chart.data) {
chart_option.title.text = chart.title
@ -158,14 +157,14 @@ export function basePieOption(chart_option, chart, terminal = 'pc') {
/*if (customAttr.size) {
chart_option.series[0].radius = [customAttr.size.pieInnerRadius + '%', customAttr.size.pieOuterRadius + '%']
}*/
const valueArr = chart.data.series[0].data
for (let i = 0; i < valueArr.length; i++) {
const y = valueArr[i]
y.name = chart.data.x[i]
y.y = y.value
chart_option.series[0].data.push(y)
}
}
@ -180,7 +179,7 @@ export function componentStyle(chart_option, chart) {
const customStyle = JSON.parse(chart.customStyle)
if (customStyle.text) {
chart_option.title.text = customStyle.text.show ? chart.title : ''
chart_option.title.text = customStyle.text.show ? chart.title : ''
const style = chart_option.title.style ? chart_option.title.style : {}
style.fontSize = customStyle.text.fontSize
style.color = customStyle.text.color
@ -190,20 +189,20 @@ export function componentStyle(chart_option, chart) {
chart_option.title.align = customStyle.text.hPosition
chart_option.title.verticalAlign = customStyle.text.vPosition
}
if (customStyle.legend && chart_option.legend) {
chart_option.plotOptions.pie.showInLegend = customStyle.legend.show
// chart_option.legend.padding = padding
chart_option.legend.layout = customStyle.legend.orient
chart_option.legend.verticalAlign = customStyle.legend.vPosition
chart_option.legend.align = customStyle.legend.hPosition
chart_option.legend.itemStyle = customStyle.legend.textStyle
}
if (customStyle.background) {
chart_option.chart.backgroundColor = hexColorToRGBA(customStyle.background.color, customStyle.background.alpha)
}
}

1
extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/utils/map.js
View File

@ -228,7 +228,6 @@ export function baseMapOption(chart_option, chart, mapData, terminal = 'pc') {
}
}
// console.log(chart_option);
componentStyle(chart_option, chart)
return chart_option
}

2
extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/views/highcharts/3dpie/index.vue
View File

@ -71,7 +71,6 @@
watch: {
chart: {
handler(newVal, oldVla) {
console.log('chart is change')
this.preDraw()
},
deep: true
@ -176,7 +175,6 @@
chartResize() {
// 指定图表的配置项和数据
const chart = this.myChart
// console.log(chart)
chart.reflow()
},

6
extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

9
extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/build/check-versions.js
View File

@ -39,16 +39,11 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
process.exit(1)
}
}

6
extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/src/components/views/ChartDragItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -175,7 +175,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onItemChange', this.item)
},
@ -185,7 +184,6 @@ export default {
}
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onItemChange', this.item)
},
@ -200,7 +198,6 @@ export default {
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onItemChange', this.item)
},
@ -210,7 +207,6 @@ export default {
}
},
datePattern(param) {
// console.log(param)
this.item.datePattern = param.type
this.$emit('onItemChange', this.item)
},

4
extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/src/components/views/DimensionExtItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -155,7 +155,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onDimensionItemChange', this.item)
},
@ -165,7 +164,6 @@ export default {
}
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onDimensionItemChange', this.item)
},

5
extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/src/components/views/DimensionItem.vue
View File

@ -36,7 +36,7 @@
<el-dropdown-item :command="beforeSort('desc')">{{ $t('chart.desc') }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item v-show="item.deType === 1" divided>
<el-dropdown placement="right-start" size="mini" style="width: 100%" @command="dateStyle">
<span class="el-dropdown-link inner-dropdown-menu">
@ -154,7 +154,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onDimensionItemChange', this.item)
},
@ -164,7 +163,6 @@ export default {
}
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onDimensionItemChange', this.item)
},
@ -174,7 +172,6 @@ export default {
}
},
datePattern(param) {
// console.log(param)
this.item.datePattern = param.type
this.$emit('onDimensionItemChange', this.item)
},

5
extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/src/components/views/QuotaExtItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -233,7 +233,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -244,7 +243,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -274,7 +272,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},

5
extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/src/components/views/QuotaItem.vue
View File

@ -214,7 +214,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -225,7 +224,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -255,7 +253,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -285,7 +282,7 @@ export default {
this.item.calcType = 'quota'
this.$emit('editItemCompare', this.item)
},
getItemTagType() {
this.tagType = getItemType(this.dimensionData, this.quotaData, this.item)
}

6
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

10
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/build/check-versions.js
View File

@ -39,16 +39,14 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn('')
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
console.warn()
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
process.exit(1)
}
}

42
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/YAxisExtSelectorAntV.vue
View File

@ -178,6 +178,45 @@
@change="changeYAxisStyle('lineStyle')"
/>
</el-form-item>
<el-form-item
:label="$t('chart.dash_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.splitLine.enableDash"
@change="changeYAxisStyle('splitLine')"
>{{ $t('chart.dash_show') }}</el-checkbox>
</el-form-item>
<template v-if="axisForm.splitLine.enableDash">
<el-form-item
:label="$t('chart.dash_width')"
class="form-item form-item-slider"
>
<el-slider
v-model="axisForm.splitLine.dashStyle.width"
:min="1"
:max="10"
show-input
:show-input-controls="false"
input-size="mini"
@change="changeYAxisStyle('splitLine')"
/>
</el-form-item>
<el-form-item
:label="$t('chart.dash_offset')"
class="form-item form-item-slider"
>
<el-slider
v-model="axisForm.splitLine.dashStyle.offset"
:min="1"
:max="10"
show-input
:show-input-controls="false"
input-size="mini"
@change="changeYAxisStyle('splitLine')"
/>
</el-form-item>
</template>
</span>
<el-divider/>
<el-form-item
@ -385,6 +424,9 @@ export default {
if (!this.axisForm.axisLine) {
this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_YAXIS_EXT_STYLE.axisLine))
}
if (!this.axisForm.splitLine.dashStyle) {
this.axisForm.splitLine.dashStyle = JSON.parse(JSON.stringify(DEFAULT_YAXIS_EXT_STYLE.splitLine.dashStyle))
}
}
}
},

42
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/YAxisSelectorAntV.vue
View File

@ -175,6 +175,45 @@
@change="changeYAxisStyle('splitLine')"
/>
</el-form-item>
<el-form-item
:label="$t('chart.dash_show')"
class="form-item"
>
<el-checkbox
v-model="axisForm.splitLine.enableDash"
@change="changeYAxisStyle('splitLine')"
>{{ $t('chart.dash_show') }}</el-checkbox>
</el-form-item>
<template v-if="axisForm.splitLine.enableDash">
<el-form-item
:label="$t('chart.dash_width')"
class="form-item form-item-slider"
>
<el-slider
v-model="axisForm.splitLine.dashStyle.width"
:min="1"
:max="10"
show-input
:show-input-controls="false"
input-size="mini"
@change="changeYAxisStyle('splitLine')"
/>
</el-form-item>
<el-form-item
:label="$t('chart.dash_offset')"
class="form-item form-item-slider"
>
<el-slider
v-model="axisForm.splitLine.dashStyle.offset"
:min="1"
:max="10"
show-input
:show-input-controls="false"
input-size="mini"
@change="changeYAxisStyle('splitLine')"
/>
</el-form-item>
</template>
</span>
<el-divider/>
<el-form-item
@ -385,6 +424,9 @@ export default {
if (!this.axisForm.axisLine) {
this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_YAXIS_STYLE.axisLine))
}
if (!this.axisForm.splitLine.dashStyle) {
this.axisForm.splitLine.dashStyle = JSON.parse(JSON.stringify(DEFAULT_YAXIS_STYLE.splitLine.dashStyle))
}
}
}
},

6
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/ChartDragItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -175,7 +175,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onItemChange', this.item)
},
@ -185,7 +184,6 @@ export default {
}
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onItemChange', this.item)
},
@ -200,7 +198,6 @@ export default {
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onItemChange', this.item)
},
@ -210,7 +207,6 @@ export default {
}
},
datePattern(param) {
// console.log(param)
this.item.datePattern = param.type
this.$emit('onItemChange', this.item)
},

4
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionExtItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -155,7 +155,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onDimensionItemChange', this.item)
},
@ -165,7 +164,6 @@ export default {
}
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onDimensionItemChange', this.item)
},

1
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionItem.vue
View File

@ -336,7 +336,6 @@ export default {
this.item.index = this.index
this.item.renameType = 'dimension'
this.item.dsFieldName = getOriginFieldName(this.dimensionData, this.quotaData, this.item)
console.log(this.item)
this.$emit('onNameEdit', this.item)
},
removeItem() {

3
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaExtItem.vue
View File

@ -267,7 +267,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -278,7 +277,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -324,7 +322,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},

3
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaItem.vue
View File

@ -264,7 +264,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -275,7 +274,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -323,7 +321,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},

11
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/map.js
View File

@ -303,7 +303,6 @@ export function baseMapOption(chart_option, chart, mapData, terminal = 'pc') {
}
}
// console.log(chart_option);
componentStyle(chart_option, chart)
return chart_option
}
@ -417,6 +416,11 @@ export const DEFAULT_YAXIS_STYLE = {
color: '#cccccc',
width: 1,
style: 'solid'
},
enableDash: false,
dashStyle: {
width: 4,
offset: 5
}
},
axisValue: {
@ -463,6 +467,11 @@ export const DEFAULT_YAXIS_EXT_STYLE = {
color: '#cccccc',
width: 1,
style: 'solid'
},
enableDash: false,
dashStyle: {
width: 4,
offset: 5
}
},
axisValue: {

2
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue
View File

@ -321,8 +321,6 @@ export default {
//}
},
calcData(cache) {
//this.view.xaxis = [...this.source, ...this.target]
this.$emit('plugin-call-back', {
eventName: 'calc-data',
eventParam: {

14
extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue
View File

@ -510,11 +510,16 @@ export default {
},
spacing: 8
} : null
const gridCfg = a.splitLine ? a.splitLine : DEFAULT_YAXIS_STYLE.splitLine
if (!gridCfg.dashStyle) {
gridCfg.dashStyle = DEFAULT_YAXIS_STYLE.splitLine.dashStyle
}
const grid = a.splitLine.show ? {
line: {
style: {
stroke: a.splitLine.lineStyle.color,
lineWidth: parseInt(a.splitLine.lineStyle.width)
lineWidth: parseInt(a.splitLine.lineStyle.width),
lineDash: gridCfg.enableDash ? [gridCfg.dashStyle.width, gridCfg.dashStyle.offset] : undefined
}
}
} : null
@ -601,11 +606,16 @@ export default {
},
spacing: 8
} : null
const gridCfg = a.splitLine ? a.splitLine : DEFAULT_YAXIS_EXT_STYLE.splitLine
if (!gridCfg.dashStyle) {
gridCfg.dashStyle = DEFAULT_YAXIS_EXT_STYLE.splitLine.dashStyle
}
const grid = a.splitLine.show ? {
line: {
style: {
stroke: a.splitLine.lineStyle.color,
lineWidth: parseInt(a.splitLine.lineStyle.width)
lineWidth: parseInt(a.splitLine.lineStyle.width),
lineDash: gridCfg.enableDash ? [gridCfg.dashStyle.width, gridCfg.dashStyle.offset] : undefined
}
}
} : null

6
extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

10
extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/build/check-versions.js
View File

@ -39,16 +39,16 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn('')
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
console.warn()
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
console.warn()
process.exit(1)
}
}

6
extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/ChartDragItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -175,7 +175,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onItemChange', this.item)
},
@ -185,7 +184,6 @@ export default {
}
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onItemChange', this.item)
},
@ -200,7 +198,6 @@ export default {
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onItemChange', this.item)
},
@ -210,7 +207,6 @@ export default {
}
},
datePattern(param) {
// console.log(param)
this.item.datePattern = param.type
this.$emit('onItemChange', this.item)
},

3
extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/QuotaExtItem.vue
View File

@ -262,7 +262,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -273,7 +272,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -315,7 +313,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},

3
extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/QuotaItem.vue
View File

@ -244,7 +244,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -255,7 +254,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -299,7 +297,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},

3
extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue
View File

@ -319,9 +319,6 @@ export default {
},
calcData(cache) {
//console.log(cache)
//this.view.xaxis = [...this.source, ...this.target]
this.$emit('plugin-call-back', {
eventName: 'calc-data',
eventParam: {

1
extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/style.vue
View File

@ -199,7 +199,6 @@ export default {
},
onMarginChange(val) {
this.view.customStyle.margin = val
console.log(val)
this.calcStyle()
},
onChangeBaseMapForm(val) {

6
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

10
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/build/check-versions.js
View File

@ -39,16 +39,16 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn('')
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
console.warn()
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
console.warn()
process.exit(1)
}
}

6
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/components/views/ChartDragItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -175,7 +175,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onItemChange', this.item)
},
@ -185,7 +184,6 @@ export default {
}
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onItemChange', this.item)
},
@ -200,7 +198,6 @@ export default {
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onItemChange', this.item)
},
@ -210,7 +207,6 @@ export default {
}
},
datePattern(param) {
// console.log(param)
this.item.datePattern = param.type
this.$emit('onItemChange', this.item)
},

4
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/components/views/DimensionExtItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -155,7 +155,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onDimensionItemChange', this.item)
},
@ -165,7 +164,6 @@ export default {
}
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onDimensionItemChange', this.item)
},

3
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/components/views/QuotaExtItem.vue
View File

@ -233,7 +233,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -244,7 +243,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -274,7 +272,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},

1
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/components/views/SankeyDimensionItem.vue
View File

@ -258,7 +258,6 @@ export default {
this.item.index = this.index
this.item.renameType = 'dimension'
this.item.dsFieldName = getOriginFieldName(this.dimensionData, this.quotaData, this.item)
console.log(this.item)
this.$emit('onNameEdit', this.item)
},
removeItem() {

3
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/components/views/SankeyQuotaItem.vue
View File

@ -201,7 +201,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -212,7 +211,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -242,7 +240,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},

1
extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/utils/map.js
View File

@ -321,7 +321,6 @@ export function baseMapOption(chart_option, chart, mapData, terminal = 'pc') {
}
}
// console.log(chart_option);
componentStyle(chart_option, chart)
return chart_option
}

6
extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/build/build-async-plugins.js
View File

@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

6
extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/build/build.js
View File

@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
console.error(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
console.warn(chalk.cyan(' Build complete.\n'))
console.warn(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))

10
extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/build/check-versions.js
View File

@ -39,16 +39,16 @@ module.exports = function () {
}
if (warnings.length) {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
console.warn('')
console.warn(chalk.yellow('To use this template, you must update following to modules:'))
console.warn()
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
console.warn(' ' + warning)
}
console.log()
console.warn()
process.exit(1)
}
}

6
extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/components/views/ChartDragItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -175,7 +175,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onItemChange', this.item)
},
@ -185,7 +184,6 @@ export default {
}
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onItemChange', this.item)
},
@ -200,7 +198,6 @@ export default {
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onItemChange', this.item)
},
@ -210,7 +207,6 @@ export default {
}
},
datePattern(param) {
// console.log(param)
this.item.datePattern = param.type
this.$emit('onItemChange', this.item)
},

4
extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/components/views/DimensionExtItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -155,7 +155,6 @@ export default {
}
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onDimensionItemChange', this.item)
},
@ -165,7 +164,6 @@ export default {
}
},
dateStyle(param) {
// console.log(param)
this.item.dateStyle = param.type
this.$emit('onDimensionItemChange', this.item)
},

5
extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/components/views/QuotaExtItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis" :type="tagType">
@ -233,7 +233,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -244,7 +243,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -274,7 +272,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},

11
extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/components/views/QuotaItem.vue
View File

@ -9,7 +9,7 @@
<svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
<svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
<svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
<svg-icon v-if="item.sort === 'asc'" icon-class="sort-asc" class-name="field-icon-sort" />
<svg-icon v-if="item.sort === 'desc'" icon-class="sort-desc" class-name="field-icon-sort" />
</span>
@ -59,8 +59,8 @@
</el-dropdown>
</el-dropdown-item>
<el-dropdown-item icon="el-icon-files" :command="beforeClickItem('filter')">
<span>{{ $t('chart.filter') }}...</span>
</el-dropdown-item>
@ -179,7 +179,6 @@ export default {
},
summary(param) {
// console.log(param)
this.item.summary = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -190,7 +189,6 @@ export default {
},
switchChartType(param) {
// console.log(param)
this.item.chartType = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -220,7 +218,6 @@ export default {
},
sort(param) {
// console.log(param)
this.item.sort = param.type
this.$emit('onQuotaItemChange', this.item)
},
@ -250,7 +247,7 @@ export default {
this.item.calcType = 'quota'
this.$emit('editItemCompare', this.item)
},
getItemTagType() {
this.tagType = getItemType(this.dimensionData, this.quotaData, this.item)
}

Some files were not shown because too many files have changed in this diff Show More