Skip to content

D
dataease
提交 19d08770 authored 作者: taojinlong's avatar taojinlong
浏览文件
操作

Merge branch 'dev' of github.com:dataease/dataease into dev

上级 1e67e666 f2b2c3b4
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 120 行增加 和 729 行删除
backend/src/main/java/io/dataease/map/utils/MapUtils.java
浏览文件 @ 19d08770
......@@ -68,7 +68,7 @@ public class MapUtils {
AreaEntity china = root();
maps.parallelStream().forEach(map -> {
maps.stream().forEach(map -> {
// maps.stream().forEach(map -> {
String province_code = map.get(Constants.PROVINCE_CODE).toString();
String city_code = map.get(Constants.CITY_CODE).toString();
......
frontend/src/components/DeDrag/index.vue
浏览文件 @ 19d08770
......@@ -1155,7 +1155,9 @@ export default {
this.resizing = false
await this.conflictCheck()
this.$emit('refLineParams', refLine)
this.$emit('resizestop', this.left, this.top, this.width, this.height)
// this.$emit('resizestop', this.left, this.top, this.width, this.height)
// private
// this.$emit('resizestop')
}
if (this.dragging) {
this.dragging = false
......@@ -1484,6 +1486,12 @@ export default {
style.rotate = this.rotate
// this.hasMove = true
this.$store.commit('setShapeStyle', style)
// resize
const self = this
setTimeout(function() {
self.$emit('resizestop')
}, 200)
},
mountedFunction() {
// private 冲突检测 和水平设计值保持一致
......
frontend/src/components/canvas/components/Editor/PreviewEject.vue
浏览文件 @ 19d08770
......@@ -7,6 +7,8 @@
import Preview from './Preview'
import { uuid } from 'vue-uuid'
import { findOne } from '@/api/panel/panel'
import { getPanelAllLinkageInfo } from '@/api/panel/linkage'
export default {
components: { Preview },
......@@ -24,6 +26,10 @@ export default {
id: response.data.id,
name: response.data.name
}
// 刷新联动信息
getPanelAllLinkageInfo(this.panelId).then(rsp => {
this.$store.commit('setNowPanelTrackInfo', rsp.data)
})
this.$store.dispatch('panel/setPanelInfo', data)
})
},
......
frontend/src/components/canvas/components/Editor/index.vue
浏览文件 @ 19d08770
......@@ -37,6 +37,7 @@
:linkage-active="linkageSettingStatus&&item===curLinkageView"
@refLineParams="getRefLineParams"
@showViewDetails="showViewDetails(index)"
@resizestop="resizestop(index,item)"
>
<component
:is="item.component"
......@@ -620,6 +621,11 @@ export default {
},
showViewDetails(index) {
this.$refs.wrapperChild[index].openChartDetailsDialog()
},
resizestop(index, item) {
if (item.type === 'view') {
this.$refs.wrapperChild[index].chartResize()
}
}
}
}
......
frontend/src/components/canvas/custom-component/UserView.vue
浏览文件 @ 19d08770
......@@ -128,6 +128,9 @@ export default {
console.log('trackMenuInfo' + JSON.stringify(trackMenuInfo))
return trackMenuInfo
},
chartType() {
return this.chart.type
},
...mapState([
'canvasStyleData',
'nowPanelTrackInfo'
......@@ -159,12 +162,13 @@ export default {
},
deep: true
},
// 监听外部的样式变化
// 监听外部的样式变化 （非实时性要求）
outStyle: {
handler(newVal, oldVla) {
if (this.$refs[this.element.propValue.id]) {
this.$refs[this.element.propValue.id].chartResize()
}
//
// if (this.$refs[this.element.propValue.id]) {
// this.$refs[this.element.propValue.id].chartResize()
// }
},
deep: true
},
......@@ -173,6 +177,11 @@ export default {
if (val1 > 0) {
this.getData(this.element.propValue.viewId)
}
},
'chartType': function(newVal, oldVal) {
if (newVal === 'map' && newVal !== oldVal) {
this.initAreas()
}
}
},
......@@ -180,7 +189,7 @@ export default {
this.refId = uuid.v1
// this.filter.filter = this.$store.getters.conditions
this.getData(this.element.propValue.viewId)
this.initAreas()
// this.initAreas()
},
mounted() {
},
......@@ -219,7 +228,9 @@ export default {
// 增加判断 仪表板公共连接中使用viewInfo 正常使用viewData
let method = viewData
if (!getToken() && getLinkToken()) {
const token = this.$store.getters.token || getToken()
const linkToken = this.$store.getters.linkToken || getLinkToken()
if (!token && linkToken) {
method = viewInfo
}
......@@ -346,14 +357,14 @@ export default {
}
},
initAreas() {
let mapping
if ((mapping = localStorage.getItem('areaMapping')) !== null) {
this.places = JSON.parse(mapping)
return
}
// let mapping
// if ((mapping = localStorage.getItem('areaMapping')) !== null) {
// this.places = JSON.parse(mapping)
// return
// }
Object.keys(this.places).length === 0 && areaMapping().then(res => {
this.places = res.data
localStorage.setItem('areaMapping', JSON.stringify(res.data))
// localStorage.setItem('areaMapping', JSON.stringify(res.data))
})
},
doMapLink(linkFilters) {
......@@ -378,6 +389,12 @@ export default {
if (temp) return temp
}
}
},
// chart
chartResize() {
if (this.$refs[this.element.propValue.id]) {
this.$refs[this.element.propValue.id].chartResize()
}
}
}
}
......
frontend/src/store/getters.js
浏览文件 @ 19d08770
......@@ -4,6 +4,7 @@ const getters = {
size: state => state.app.size,
device: state => state.app.device,
token: state => state.user.token,
linkToken: state => state.user.linkToken,
avatar: state => state.user.avatar,
name: state => state.user.name,
introduction: state => state.user.introduction,
......
frontend/src/store/modules/user.js
浏览文件 @ 19d08770
......@@ -18,7 +18,8 @@ const getDefaultState = () => {
// 当前用户拥有哪些资源权限
permissions: [],
language: getLanguage(),
uiInfo: null
uiInfo: null,
linkToken: null
}
}
......@@ -31,6 +32,9 @@ const mutations = {
SET_TOKEN: (state, token) => {
state.token = token
},
SET_LINK_TOKEN: (state, linkToken) => {
state.linkToken = linkToken
},
SET_NAME: (state, name) => {
state.name = name
},
......@@ -165,6 +169,9 @@ const actions = {
commit('SET_LANGUAGE', language)
router.go(0)
})
},
setLinkToken({ commit }, linkToken) {
commit('SET_LINK_TOKEN', linkToken)
}
}
......
frontend/src/utils/request.js
浏览文件 @ 19d08770
......@@ -34,6 +34,10 @@ service.interceptors.request.use(
if ((linkToken = getLinkToken()) !== null) {
config.headers[LinkTokenKey] = linkToken
}
if (!linkToken) {
linkToken = store.getters.linkToken
config.headers[LinkTokenKey] = linkToken
}
if (i18n.locale) {
const lang = i18n.locale.replace('_', '-')
......@@ -92,6 +96,7 @@ const checkAuth = response => {
if (response.headers[LinkTokenKey.toLocaleLowerCase()] || (response.config.headers && response.config.headers[LinkTokenKey.toLocaleLowerCase()])) {
const linkToken = response.headers[LinkTokenKey.toLocaleLowerCase()] || response.config.headers[LinkTokenKey.toLocaleLowerCase()]
setLinkToken(linkToken)
store.dispatch('user/setLinkToken', linkToken)
}
// 许可状态改变 刷新页面
// if (response.headers['lic-status']) {
......
frontend/src/views/chart/chart/map/map.js
浏览文件 @ 19d08770
......@@ -33,18 +33,24 @@ export function baseMapOption(chart_option, chart) {
}
// visualMap
const valueArr = chart.data.series[0].data
const values = []
valueArr.forEach(function(ele) {
values.push(ele.value)
})
chart_option.visualMap.min = Math.min(...values)
chart_option.visualMap.max = Math.max(...values)
if (chart_option.visualMap.min === chart_option.visualMap.max) {
if (valueArr && valueArr.length > 0) {
const values = []
valueArr.forEach(function(ele) {
values.push(ele.value)
})
chart_option.visualMap.min = Math.min(...values)
chart_option.visualMap.max = Math.max(...values)
if (chart_option.visualMap.min === chart_option.visualMap.max) {
chart_option.visualMap.min = 0
}
} else {
chart_option.visualMap.min = 0
chart_option.visualMap.max = 0
}
// color
if (customAttr.color && customAttr.color.colors) {
chart_option.visualMap.inRange.color = customAttr.color.colors
chart_option.visualMap.inRange.colorAlpha = customAttr.color.alpha / 100
}
for (let i = 0; i < valueArr.length; i++) {
// const y = {
......
frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
浏览文件 @ 19d08770
......@@ -10,26 +10,6 @@
</el-form-item>
</el-form>
</el-col>
<!-- <div style="width: 100%">-->
<!-- <el-popover-->
<!-- placement="right"-->
<!-- width="400"-->
<!-- trigger="click"-->
<!-- >-->
<!-- <el-col>-->
<!-- <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini">-->
<!-- <el-form-item :label="$t('chart.color')" class="form-item">-->
<!-- <colorPicker v-model="colorForm.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeBackgroundStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.not_alpha')" class="form-item form-item-slider">-->
<!-- <el-slider v-model="colorForm.alpha" show-input :show-input-controls="false" input-size="mini" @change="changeBackgroundStyle" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-col>-->
<!-- <el-button slot="reference" :disabled="param && !hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.background') }}<i class="el-icon-setting el-icon&#45;&#45;right" /></el-button>-->
<!-- </el-popover>-->
<!-- </div>-->
</div>
</template>
......
frontend/src/views/chart/components/component-style/LegendSelector.vue
浏览文件 @ 19d08770
......@@ -47,71 +47,6 @@
</div>
</el-form>
</el-col>
<!-- <div style="width: 100%">-->
<!-- <el-popover-->
<!-- v-model="isSetting"-->
<!-- placement="right"-->
<!-- width="400"-->
<!-- trigger="click"-->
<!-- >-->
<!-- <el-col>-->
<!-- <el-form ref="legendForm" :model="legendForm" label-width="80px" size="mini">-->
<!-- &lt;!&ndash; <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-checkbox v-model="legendForm.show" @change="changeLegendStyle">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- <el-form-item :label="$t('chart.icon')" class="form-item">-->
<!-- <el-select v-model="legendForm.icon" :placeholder="$t('chart.icon')" @change="changeLegendStyle">-->
<!-- <el-option-->
<!-- v-for="item in iconSymbolOptions"-->
<!-- :key="item.value"-->
<!-- :label="item.name"-->
<!-- :value="item.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.orient')" class="form-item">-->
<!-- <el-radio-group v-model="legendForm.orient" size="mini" @change="changeLegendStyle">-->
<!-- <el-radio-button label="horizontal">{{ $t('chart.horizontal') }}</el-radio-button>-->
<!-- <el-radio-button label="vertical">{{ $t('chart.vertical') }}</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_fontsize')" class="form-item">-->
<!-- <el-select v-model="legendForm.textStyle.fontSize" :placeholder="$t('chart.text_fontsize')" size="mini" @change="changeLegendStyle">-->
<!-- <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_color')" class="form-item">-->
<!-- <colorPicker v-model="legendForm.textStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLegendStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_h_position')" class="form-item">-->
<!-- <el-radio-group v-model="legendForm.hPosition" size="mini" @change="changeLegendStyle">-->
<!-- <el-radio-button label="left">{{ $t('chart.text_pos_left') }}</el-radio-button>-->
<!-- <el-radio-button label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>-->
<!-- <el-radio-button label="right">{{ $t('chart.text_pos_right') }}</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_v_position')" class="form-item">-->
<!-- <el-radio-group v-model="legendForm.vPosition" size="mini" @change="changeLegendStyle">-->
<!-- <el-radio-button label="top">{{ $t('chart.text_pos_top') }}</el-radio-button>-->
<!-- <el-radio-button label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>-->
<!-- <el-radio-button label="bottom">{{ $t('chart.text_pos_bottom') }}</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-col>-->
<!-- <el-button slot="reference" size="mini" class="shape-item" :disabled="!legendForm.show || !hasDataPermission('manage',param.privileges)">-->
<!-- {{ $t('chart.legend') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
<!-- <el-switch-->
<!-- v-model="legendForm.show"-->
<!-- :disabled="!hasDataPermission('manage',param.privileges)"-->
<!-- class="switch-style"-->
<!-- @click.stop.native-->
<!-- @change="changeLegendStyle"-->
<!-- />-->
<!-- </el-button>-->
<!-- </el-popover>-->
<!-- </div>-->
</div>
</template>
......
frontend/src/views/chart/components/component-style/SplitSelector.vue
浏览文件 @ 19d08770
......@@ -41,59 +41,6 @@
</el-form-item>
</el-form>
</el-col>
<!-- <div style="width: 100%">-->
<!-- <el-popover-->
<!-- placement="right"-->
<!-- width="400"-->
<!-- trigger="click"-->
<!-- >-->
<!-- <el-col>-->
<!-- <el-form ref="splitForm" :model="splitForm" label-width="80px" size="mini">-->
<!-- <el-form-item :label="$t('chart.name')" class="form-item">-->
<!-- <el-checkbox v-model="splitForm.name.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.color')" class="form-item">-->
<!-- <colorPicker v-model="splitForm.name.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_fontsize')" class="form-item form-item-slider">-->
<!-- <el-select v-model="splitForm.name.fontSize" :placeholder="$t('chart.text_fontsize')" @change="changeSplitStyle">-->
<!-- <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_line')" class="form-item">-->
<!-- <el-checkbox v-model="splitForm.axisLine.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_color')" class="form-item">-->
<!-- <colorPicker v-model="splitForm.axisLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_label')" class="form-item">-->
<!-- <el-checkbox v-model="splitForm.axisLabel.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_label_color')" class="form-item">-->
<!-- <colorPicker v-model="splitForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.label_fontsize')" class="form-item form-item-slider">-->
<!-- <el-select v-model="splitForm.axisLabel.fontSize" :placeholder="$t('chart.label_fontsize')" @change="changeSplitStyle">-->
<!-- <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.split_line')" class="form-item">-->
<!-- <el-checkbox v-model="splitForm.splitLine.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.split_color')" class="form-item">-->
<!-- <colorPicker v-model="splitForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.shadow')" class="form-item">-->
<!-- <el-checkbox v-model="splitForm.splitArea.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-col>-->
<!-- <el-button slot="reference" :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">-->
<!-- {{ $t('chart.split') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
<!-- </el-button>-->
<!-- </el-popover>-->
<!-- </div>-->
</div>
</template>
......
frontend/src/views/chart/components/component-style/TitleSelector.vue
浏览文件 @ 19d08770
......@@ -45,69 +45,6 @@
</div>
</el-form>
</el-col>
<!-- <div style="width: 100%">-->
<!-- <el-popover-->
<!-- v-model="isSetting"-->
<!-- placement="right"-->
<!-- width="400"-->
<!-- trigger="click"-->
<!-- >-->
<!-- <el-col>-->
<!-- <el-form ref="titleForm" :model="titleForm" label-width="80px" size="mini">-->
<!-- &lt;!&ndash; <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-checkbox v-model="titleForm.show" @change="changeTitleStyle">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- <el-form-item :label="$t('chart.title')" class="form-item">-->
<!-- <el-input-->
<!-- v-model="titleForm.title"-->
<!-- size="mini"-->
<!-- :placeholder="$t('chart.title')"-->
<!-- clearable-->
<!-- @blur="changeTitleStyle"-->
<!-- @input="inputOnInput($event)"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_fontsize')" class="form-item">-->
<!-- <el-select v-model="titleForm.fontSize" :placeholder="$t('chart.text_fontsize')" size="mini" @change="changeTitleStyle">-->
<!-- <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_color')" class="form-item">-->
<!-- <colorPicker v-model="titleForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeTitleStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_h_position')" class="form-item">-->
<!-- <el-radio-group v-model="titleForm.hPosition" size="mini" @change="changeTitleStyle">-->
<!-- <el-radio-button label="left">{{ $t('chart.text_pos_left') }}</el-radio-button>-->
<!-- <el-radio-button label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>-->
<!-- <el-radio-button label="right">{{ $t('chart.text_pos_right') }}</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-show="chart.type && !chart.type.includes('table')" :label="$t('chart.text_v_position')" class="form-item">-->
<!-- <el-radio-group v-model="titleForm.vPosition" size="mini" @change="changeTitleStyle">-->
<!-- <el-radio-button label="top">{{ $t('chart.text_pos_top') }}</el-radio-button>-->
<!-- <el-radio-button label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>-->
<!-- <el-radio-button label="bottom">{{ $t('chart.text_pos_bottom') }}</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_style')" class="form-item">-->
<!-- <el-checkbox v-model="titleForm.isItalic" @change="changeTitleStyle">{{ $t('chart.italic') }}</el-checkbox>-->
<!-- <el-checkbox v-model="titleForm.isBolder" @change="changeTitleStyle">{{ $t('chart.bolder') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-col>-->
<!-- <el-button slot="reference" size="mini" class="shape-item" :disabled="!titleForm.show || !hasDataPermission('manage',param.privileges)">-->
<!-- {{ $t('chart.title') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
<!-- <el-switch-->
<!-- v-model="titleForm.show"-->
<!-- :disabled="!hasDataPermission('manage',param.privileges)"-->
<!-- class="switch-style"-->
<!-- @click.stop.native-->
<!-- @change="changeTitleStyle"-->
<!-- />-->
<!-- </el-button>-->
<!-- </el-popover>-->
<!-- </div>-->
</div>
</template>
......
frontend/src/views/chart/components/component-style/XAxisSelector.vue
浏览文件 @ 19d08770
......@@ -66,90 +66,6 @@
</div>
</el-form>
</el-col>
<!-- <div style="width: 100%">-->
<!-- <el-popover-->
<!-- v-model="isSetting"-->
<!-- placement="right"-->
<!-- width="400"-->
<!-- trigger="click"-->
<!-- >-->
<!-- <el-col>-->
<!-- <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini">-->
<!-- &lt;!&ndash; <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-checkbox v-model="axisForm.show" @change="changeXAxisStyle">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- <el-form-item :label="$t('chart.position')" class="form-item">-->
<!-- <el-radio-group v-model="axisForm.position" size="mini" @change="changeXAxisStyle">-->
<!-- <el-radio-button label="top">{{ $t('chart.text_pos_top') }}</el-radio-button>-->
<!-- <el-radio-button label="bottom">{{ $t('chart.text_pos_bottom') }}</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.name')" class="form-item">-->
<!-- <el-input v-model="axisForm.name" size="mini" @blur="changeXAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.rotate')" class="form-item form-item-slider">-->
<!-- <el-slider v-model="axisForm.axisLabel.rotate" show-input :show-input-controls="false" :min="-90" :max="90" input-size="mini" @change="changeXAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_name_color')" class="form-item">-->
<!-- <colorPicker v-model="axisForm.nameTextStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_name_fontsize')" class="form-item form-item-slider">-->
<!-- <el-select v-model="axisForm.nameTextStyle.fontSize" :placeholder="$t('chart.axis_name_fontsize')" @change="changeXAxisStyle">-->
<!-- <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-divider />-->
<!-- <el-form-item :label="$t('chart.axis_show')" class="form-item">-->
<!-- <el-checkbox v-model="axisForm.splitLine.show" @change="changeXAxisStyle">{{ $t('chart.axis_show') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- <span v-show="axisForm.splitLine.show">-->
<!-- <el-form-item :label="$t('chart.axis_color')" class="form-item">-->
<!-- <colorPicker v-model="axisForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_width')" class="form-item form-item-slider">-->
<!-- <el-slider v-model="axisForm.splitLine.lineStyle.width" :min="1" :max="10" show-input :show-input-controls="false" input-size="mini" @change="changeXAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_type')" class="form-item">-->
<!-- <el-radio-group v-model="axisForm.splitLine.lineStyle.type" size="mini" @change="changeXAxisStyle">-->
<!-- <el-radio-button label="solid">{{ $t('chart.axis_type_solid') }}</el-radio-button>-->
<!-- <el-radio-button label="dashed">{{ $t('chart.axis_type_dashed') }}</el-radio-button>-->
<!-- <el-radio-button label="dotted">{{ $t('chart.axis_type_dotted') }}</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </span>-->
<!-- <el-divider />-->
<!-- <el-form-item :label="$t('chart.axis_label_show')" class="form-item">-->
<!-- <el-checkbox v-model="axisForm.axisLabel.show" @change="changeXAxisStyle">{{ $t('chart.axis_label_show') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- <span v-show="axisForm.axisLabel.show">-->
<!-- <el-form-item :label="$t('chart.axis_label_color')" class="form-item">-->
<!-- <colorPicker v-model="axisForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_label_fontsize')" class="form-item form-item-slider">-->
<!-- <el-select v-model="axisForm.axisLabel.fontSize" :placeholder="$t('chart.axis_label_fontsize')" @change="changeXAxisStyle">-->
<!-- <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </span>-->
<!-- <el-divider />-->
<!-- <el-form-item :label="$t('chart.content_formatter')" class="form-item">-->
<!-- <el-input v-model="axisForm.axisLabel.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeXAxisStyle" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-col>-->
<!-- <el-button slot="reference" size="mini" class="shape-item" :disabled="!axisForm.show || !hasDataPermission('manage',param.privileges)">-->
<!-- {{ $t('chart.xAxis') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
<!-- <el-switch-->
<!-- v-model="axisForm.show"-->
<!-- :disabled="!hasDataPermission('manage',param.privileges)"-->
<!-- class="switch-style"-->
<!-- @click.stop.native-->
<!-- @change="changeXAxisStyle"-->
<!-- />-->
<!-- </el-button>-->
<!-- </el-popover>-->
<!-- </div>-->
</div>
</template>
......
frontend/src/views/chart/components/component-style/YAxisSelector.vue
浏览文件 @ 19d08770
......@@ -66,90 +66,6 @@
</div>
</el-form>
</el-col>
<!-- <div style="width: 100%">-->
<!-- <el-popover-->
<!-- v-model="isSetting"-->
<!-- placement="right"-->
<!-- width="400"-->
<!-- trigger="click"-->
<!-- >-->
<!-- <el-col>-->
<!-- <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini">-->
<!-- &lt;!&ndash; <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-checkbox v-model="axisForm.show" @change="changeYAxisStyle">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- <el-form-item :label="$t('chart.position')" class="form-item">-->
<!-- <el-radio-group v-model="axisForm.position" size="mini" @change="changeYAxisStyle">-->
<!-- <el-radio-button label="left">{{ $t('chart.text_pos_left') }}</el-radio-button>-->
<!-- <el-radio-button label="right">{{ $t('chart.text_pos_right') }}</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.name')" class="form-item">-->
<!-- <el-input v-model="axisForm.name" size="mini" @blur="changeYAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.rotate')" class="form-item form-item-slider">-->
<!-- <el-slider v-model="axisForm.axisLabel.rotate" show-input :show-input-controls="false" :min="-90" :max="90" input-size="mini" @change="changeYAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_name_color')" class="form-item">-->
<!-- <colorPicker v-model="axisForm.nameTextStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_name_fontsize')" class="form-item form-item-slider">-->
<!-- <el-select v-model="axisForm.nameTextStyle.fontSize" :placeholder="$t('chart.axis_name_fontsize')" @change="changeYAxisStyle">-->
<!-- <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-divider />-->
<!-- <el-form-item :label="$t('chart.axis_show')" class="form-item">-->
<!-- <el-checkbox v-model="axisForm.splitLine.show" @change="changeYAxisStyle">{{ $t('chart.axis_show') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- <span v-show="axisForm.splitLine.show">-->
<!-- <el-form-item :label="$t('chart.axis_color')" class="form-item">-->
<!-- <colorPicker v-model="axisForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_width')" class="form-item form-item-slider">-->
<!-- <el-slider v-model="axisForm.splitLine.lineStyle.width" :min="1" :max="10" show-input :show-input-controls="false" input-size="mini" @change="changeYAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_type')" class="form-item">-->
<!-- <el-radio-group v-model="axisForm.splitLine.lineStyle.type" size="mini" @change="changeYAxisStyle">-->
<!-- <el-radio-button label="solid">{{ $t('chart.axis_type_solid') }}</el-radio-button>-->
<!-- <el-radio-button label="dashed">{{ $t('chart.axis_type_dashed') }}</el-radio-button>-->
<!-- <el-radio-button label="dotted">{{ $t('chart.axis_type_dotted') }}</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </span>-->
<!-- <el-divider />-->
<!-- <el-form-item :label="$t('chart.axis_label_show')" class="form-item">-->
<!-- <el-checkbox v-model="axisForm.axisLabel.show" @change="changeYAxisStyle">{{ $t('chart.axis_label_show') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- <span v-show="axisForm.axisLabel.show">-->
<!-- <el-form-item :label="$t('chart.axis_label_color')" class="form-item">-->
<!-- <colorPicker v-model="axisForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.axis_label_fontsize')" class="form-item form-item-slider">-->
<!-- <el-select v-model="axisForm.axisLabel.fontSize" :placeholder="$t('chart.axis_label_fontsize')" @change="changeYAxisStyle">-->
<!-- <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </span>-->
<!-- <el-divider />-->
<!-- <el-form-item :label="$t('chart.content_formatter')" class="form-item">-->
<!-- <el-input v-model="axisForm.axisLabel.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeYAxisStyle" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-col>-->
<!-- <el-button slot="reference" size="mini" class="shape-item" :disabled="!axisForm.show || !hasDataPermission('manage',param.privileges)">-->
<!-- {{ $t('chart.yAxis') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
<!-- <el-switch-->
<!-- v-model="axisForm.show"-->
<!-- :disabled="!hasDataPermission('manage',param.privileges)"-->
<!-- class="switch-style"-->
<!-- @click.stop.native-->
<!-- @change="changeYAxisStyle"-->
<!-- />-->
<!-- </el-button>-->
<!-- </el-popover>-->
<!-- </div>-->
</div>
</template>
......
frontend/src/views/chart/components/shape-attr/ColorSelector.vue
浏览文件 @ 19d08770
......@@ -42,58 +42,6 @@
</el-form-item>
</el-form>
</el-col>
<!-- <div style="width: 100%">-->
<!-- <el-popover-->
<!-- placement="right"-->
<!-- width="400"-->
<!-- trigger="click"-->
<!-- >-->
<!-- <el-col>-->
<!-- <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini">-->
<!-- <div v-if="sourceType==='view' || sourceType==='panelEchart'">-->
<!-- <el-form-item v-show="chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :label="$t('chart.color_case')" class="form-item">-->
<!-- <el-select v-model="colorForm.value" :placeholder="$t('chart.pls_slc_color_case')" size="mini" @change="changeColorCase">-->
<!-- <el-option v-for="option in colorCases" :key="option.value" :label="option.name" :value="option.value" style="display: flex;align-items: center;">-->
<!-- <div style="float: left">-->
<!-- <span v-for="(c,index) in option.colors" :key="index" :style="{width: '20px',height: '20px',float: 'left',backgroundColor: c}" />-->
<!-- </div>-->
<!-- <span style="margin-left: 4px;">{{ option.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.dimension_color')" class="form-item">-->
<!-- <colorPicker v-model="colorForm.dimensionColor" style="margin-top: 6px;cursor: pointer;z-index: 1003;border: solid 1px black" @change="changeColorCase" />-->
<!-- </el-form-item>-->
<!-- <el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.quota_color')" class="form-item">-->
<!-- <colorPicker v-model="colorForm.quotaColor" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeColorCase" />-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- <div v-if="sourceType==='view' || sourceType==='panelTable'">-->
<!-- <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_header_bg')" class="form-item">-->
<!-- <colorPicker v-model="colorForm.tableHeaderBgColor" style="margin-top: 6px;cursor: pointer;z-index: 1002;border: solid 1px black" @change="changeColorCase" />-->
<!-- </el-form-item>-->
<!-- <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_item_bg')" class="form-item">-->
<!-- <colorPicker v-model="colorForm.tableItemBgColor" style="margin-top: 6px;cursor: pointer;z-index: 1003;border: solid 1px black" @change="changeColorCase" />-->
<!-- </el-form-item>-->
<!-- <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_item_font_color')" class="form-item">-->
<!-- <colorPicker v-model="colorForm.tableFontColor" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeColorCase" />-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 暂时不支持该功能&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.stripe')" class="form-item">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-checkbox v-model="colorForm.tableStripe" @change="changeColorCase">{{ $t('chart.stripe') }}</el-checkbox>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- </div>-->
<!-- <el-form-item v-show="chart.type && !chart.type.includes('text')" :label="$t('chart.not_alpha')" class="form-item form-item-slider">-->
<!-- <el-slider v-model="colorForm.alpha" show-input :show-input-controls="false" input-size="mini" @change="changeColorCase" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-col>-->
<!-- <el-button slot="reference" :disabled="param && !hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.color') }}<i class="el-icon-setting el-icon&#45;&#45;right" /></el-button>-->
<!-- </el-popover>-->
<!-- </div>-->
</div>
</template>
......
frontend/src/views/chart/components/shape-attr/LabelSelector.vue
浏览文件 @ 19d08770
......@@ -61,85 +61,6 @@
</el-form-item>
</el-form>
</el-col>
<!-- <div style="width: 100%">-->
<!-- <el-popover-->
<!-- v-model="isSetting"-->
<!-- placement="right"-->
<!-- width="400"-->
<!-- trigger="click"-->
<!-- >-->
<!-- <el-col>-->
<!-- <el-form v-show="chart.type && !chart.type.includes('gauge')" ref="labelForm" :model="labelForm" label-width="80px" size="mini">-->
<!-- &lt;!&ndash; <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-checkbox v-model="labelForm.show" @change="changeLabelAttr">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- <el-form-item :label="$t('chart.pie_label_line_show')" class="form-item">-->
<!-- <el-checkbox v-model="labelForm.labelLine.show" @change="changeLabelAttr">{{ $t('chart.pie_label_line_show') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_fontsize')" class="form-item">-->
<!-- <el-select v-model="labelForm.fontSize" :placeholder="$t('chart.text_fontsize')" size="mini" @change="changeLabelAttr">-->
<!-- <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_color')" class="form-item">-->
<!-- <colorPicker v-model="labelForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLabelAttr" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.label_position')" class="form-item">-->
<!-- <el-select v-model="labelForm.position" :placeholder="$t('chart.label_position')" @change="changeLabelAttr">-->
<!-- <el-option v-for="option in labelPosition" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item class="form-item">-->
<!-- <span slot="label">-->
<!-- <span class="span-box">-->
<!-- <span>{{ $t('chart.content_formatter') }}</span>-->
<!-- <el-tooltip class="item" effect="dark" placement="bottom">-->
<!-- <div slot="content">-->
<!-- 字符串模板 模板变量有：<br>{a}：系列名。<br>{b}：数据名。<br>{c}：数据值。<br>{d}：百分比（用于饼图等）。-->
<!-- </div>-->
<!-- <i class="el-icon-info" style="cursor: pointer;" />-->
<!-- </el-tooltip>-->
<!-- </span>-->
<!-- </span>-->
<!-- <el-input v-model="labelForm.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeLabelAttr" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form v-show="chart.type && chart.type.includes('gauge')" ref="labelForm" :model="labelForm" label-width="80px" size="mini">-->
<!-- <el-form-item :label="$t('chart.show')" class="form-item">-->
<!-- <el-checkbox v-model="labelForm.show" @change="changeLabelAttr">{{ $t('chart.show') }}</el-checkbox>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_fontsize')" class="form-item">-->
<!-- <el-select v-model="labelForm.fontSize" :placeholder="$t('chart.text_fontsize')" size="mini" @change="changeLabelAttr">-->
<!-- <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_color')" class="form-item">-->
<!-- <colorPicker v-model="labelForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLabelAttr" />-->
<!-- </el-form-item>-->
<!-- <el-form-item class="form-item">-->
<!-- <span slot="label">-->
<!-- <span class="span-box">-->
<!-- <span>{{ $t('chart.content_formatter') }}</span>-->
<!-- </span>-->
<!-- </span>-->
<!-- <el-input v-model="labelForm.gaugeFormatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeLabelAttr" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-col>-->
<!-- <el-button slot="reference" size="mini" class="shape-item" :disabled="!labelForm.show || !hasDataPermission('manage',param.privileges)">-->
<!-- {{ $t('chart.label') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
<!-- <el-switch-->
<!-- v-model="labelForm.show"-->
<!-- :disabled="!hasDataPermission('manage',param.privileges)"-->
<!-- class="switch-style"-->
<!-- @click.stop.native-->
<!-- @change="changeLabelAttr"-->
<!-- />-->
<!-- </el-button>-->
<!-- </el-popover>-->
<!-- </div>-->
</div>
</template>
......
frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
浏览文件 @ 19d08770
......@@ -49,73 +49,6 @@
</div>
</el-form>
</el-col>
<!-- <div style="width: 100%">-->
<!-- <el-popover-->
<!-- v-model="isSetting"-->
<!-- placement="right"-->
<!-- width="400"-->
<!-- trigger="click"-->
<!-- >-->
<!-- <el-col>-->
<!-- <el-form ref="tooltipForm" :model="tooltipForm" label-width="80px" size="mini">-->
<!-- &lt;!&ndash; <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-checkbox v-model="tooltipForm.show" @change="changeTooltipAttr">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- <el-form-item :label="$t('chart.trigger_position')" class="form-item">-->
<!-- <el-radio-group v-model="tooltipForm.trigger" size="mini" @change="changeTooltipAttr">-->
<!-- <el-radio-button label="item">{{ $t('chart.tooltip_item') }}</el-radio-button>-->
<!-- <el-radio-button label="axis">{{ $t('chart.tooltip_axis') }}</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_fontsize')" class="form-item">-->
<!-- <el-select v-model="tooltipForm.textStyle.fontSize" :placeholder="$t('chart.text_fontsize')" size="mini" @change="changeTooltipAttr">-->
<!-- <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('chart.text_color')" class="form-item">-->
<!-- <colorPicker v-model="tooltipForm.textStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeTooltipAttr" />-->
<!-- </el-form-item>-->
<!-- <el-form-item class="form-item">-->
<!-- <span slot="label">-->
<!-- <span class="span-box">-->
<!-- <span>{{ $t('chart.content_formatter') }}</span>-->
<!-- <el-tooltip class="item" effect="dark" placement="bottom">-->
<!-- <div slot="content">-->
<!-- 模板变量有 {a}, {b}，{c}，{d}，{e}，分别表示系列名，数据名，数据值等。-->
<!-- <br>-->
<!-- 在 trigger 为 'axis' 的时候，会有多个系列的数据，此时可以通过 {a0}, {a1}, {a2} 这种后面加索引的方式表示系列的索引。-->
<!-- <br>-->
<!-- 不同图表类型下的 {a}，{b}，{c}，{d} 含义不一样。 其中变量{a}, {b}, {c}, {d}在不同图表类型下代表数据含义为：-->
<!-- <br><br>-->
<!-- 折线（区域）图、柱状（条形）图、K线图 : {a}（系列名称），{b}（类目值），{c}（数值）, {d}（无）-->
<!-- <br>-->
<!-- 散点图（气泡）图 : {a}（系列名称），{b}（数据名称），{c}（数值数组）, {d}（无）-->
<!-- <br>-->
<!-- 地图 : {a}（系列名称），{b}（区域名称），{c}（合并数值）, {d}（无）-->
<!-- <br>-->
<!-- 饼图、仪表板、漏斗图: {a}（系列名称），{b}（数据项名称），{c}（数值）, {d}（百分比）-->
<!-- </div>-->
<!-- <i class="el-icon-info" style="cursor: pointer;" />-->
<!-- </el-tooltip>-->
<!-- </span>-->
<!-- </span>-->
<!-- <el-input v-model="tooltipForm.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" :placeholder="$t('chart.formatter_plc')" @blur="changeTooltipAttr" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-col>-->
<!-- <el-button slot="reference" size="mini" class="shape-item" :disabled="!tooltipForm.show || !hasDataPermission('manage',param.privileges)">-->
<!-- {{ $t('chart.tooltip') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
<!-- <el-switch-->
<!-- v-model="tooltipForm.show"-->
<!-- :disabled="!hasDataPermission('manage',param.privileges)"-->
<!-- class="switch-style"-->
<!-- @click.stop.native-->
<!-- @change="changeTooltipAttr"-->
<!-- />-->
<!-- </el-button>-->
<!-- </el-popover>-->
<!-- </div>-->
</div>
</template>
......
frontend/src/views/chart/view/ChartEdit.vue
浏览文件 @ 19d08770
......@@ -711,7 +711,8 @@ export default {
},
moveId: -1,
chart: {
id: 'echart'
id: 'echart',
type: null
},
dimensionFilterEdit: false,
dimensionItem: {},
......@@ -754,6 +755,9 @@ export default {
// this.getData(this.$store.state.chart.viewId)
// return this.$store.state.chart.viewId
// }
chartType() {
return this.chart.type
}
},
watch: {
'param': function() {
......@@ -766,11 +770,16 @@ export default {
},
searchField(val) {
this.fieldFilter(val)
},
'chartType': function(newVal, oldVal) {
if (newVal === 'map' && newVal !== oldVal) {
this.initAreas()
}
}
},
created() {
// this.get(this.$store.state.chart.viewId);
this.initAreas()
// this.initAreas()
},
mounted() {
// this.get(this.$store.state.chart.viewId);
......@@ -821,6 +830,9 @@ export default {
return
}
view.tableId = this.view.tableId
if (view.type === 'map' && view.xaxis.length > 1) {
view.xaxis = [view.xaxis[0]]
}
view.xaxis.forEach(function(ele) {
// if (!ele.summary || ele.summary === '') {
// ele.summary = 'sum'
......@@ -838,6 +850,9 @@ export default {
ele.filter = []
}
})
if (view.type === 'map' && view.yaxis.length > 1) {
view.yaxis = [view.yaxis[0]]
}
view.yaxis.forEach(function(ele) {
if (!ele.summary || ele.summary === '') {
if (ele.id === 'count' || ele.deType === 0 || ele.deType === 1) {
......@@ -925,67 +940,6 @@ export default {
})
},
// saveSnapshot() {
// if (this.view.title && this.view.title.length > 50) {
// this.$warning(this.$t('chart.title_limit'))
// return
// }
// if (this.loading) {
// return
// }
// this.loading = true
// html2canvas(this.$refs.imageWrapper).then(canvas => {
// const snapshot = canvas.toDataURL('image/jpeg', 0.1) // 0.1是图片质量
// if (snapshot !== '') {
// const view = JSON.parse(JSON.stringify(this.view))
// view.id = this.view.id
// view.sceneId = this.view.sceneId
// view.name = this.view.name ? this.view.name : this.table.name
// view.tableId = this.view.tableId
// view.xaxis.forEach(function(ele) {
// // if (!ele.summary || ele.summary === '') {
// // ele.summary = 'sum'
// // }
// if (!ele.sort || ele.sort === '') {
// ele.sort = 'none'
// }
// if (!ele.filter) {
// ele.filter = []
// }
// })
// view.yaxis.forEach(function(ele) {
// if (!ele.summary || ele.summary === '') {
// if (ele.id === 'count') {
// ele.summary = 'count'
// } else {
// ele.summary = 'sum'
// }
// }
// if (!ele.sort || ele.sort === '') {
// ele.sort = 'none'
// }
// if (!ele.filter) {
// ele.filter = []
// }
// })
// if (view.type.startsWith('pie') || view.type.startsWith('funnel') || view.type.startsWith('gauge')) {
// if (view.yaxis.length > 1) {
// view.yaxis.splice(1, view.yaxis.length)
// }
// }
// view.xaxis = JSON.stringify(view.xaxis)
// view.yaxis = JSON.stringify(view.yaxis)
// view.customAttr = JSON.stringify(view.customAttr)
// view.customStyle = JSON.stringify(view.customStyle)
// view.customFilter = JSON.stringify(view.customFilter)
// view.snapshot = snapshot
// post('/chart/view/save', view).then(response => {
// this.loading = false
// this.$success(this.$t('commons.save_success'))
// })
// }
// })
// },
closeEdit() {
if (this.view.title && this.view.title.length > 50) {
this.$warning(this.$t('chart.title_limit'))
......@@ -1067,74 +1021,6 @@ export default {
}
},
// 左边往右边拖动时的事件
// start1(e) {
// // console.log(e)
// e.clone.className = 'item'
// e.item.className = 'item'
// },
// end1(e) {
// // console.log(e)
// e.clone.className = 'item'
// e.item.className = 'item'
// this.refuseMove(e)
// this.removeCheckedKey(e)
// this.save(true)
// },
// 右边往左边拖动时的事件
// start2(e) {
// console.log(e)
// },
// end2(e) {
// // console.log(e)
// this.removeDuplicateKey(e)
// this.save(true)
// },
// removeCheckedKey(e) {
// const that = this
// const xItems = this.view.xaxis.filter(function(m) {
// return m.id === that.moveId
// })
// const yItems = this.view.yaxis.filter(function(m) {
// return m.id === that.moveId
// })
// if (xItems && xItems.length > 1) {
// this.view.xaxis.splice(e.newDraggableIndex, 1)
// }
// if (yItems && yItems.length > 1) {
// this.view.yaxis.splice(e.newDraggableIndex, 1)
// }
// },
// refuseMove(e) {
// const that = this
// const xItems = this.dimension.filter(function(m) {
// return m.id === that.moveId
// })
// const yItems = this.quota.filter(function(m) {
// return m.id === that.moveId
// })
// if (xItems && xItems.length > 1) {
// this.dimension.splice(e.newDraggableIndex, 1)
// }
// if (yItems && yItems.length > 1) {
// this.quota.splice(e.newDraggableIndex, 1)
// }
// },
// removeDuplicateKey(e) {
// const that = this
// const xItems = this.dimension.filter(function(m) {
// return m.id === that.moveId
// })
// const yItems = this.quota.filter(function(m) {
// return m.id === that.moveId
// })
// if (xItems && xItems.length > 1) {
// this.dimension.splice(e.newDraggableIndex, 1)
// }
// if (yItems && yItems.length > 1) {
// this.quota.splice(e.newDraggableIndex, 1)
// }
// },
// move回调方法
onMove(e, originalEvent) {
// console.log(e)
......@@ -1411,11 +1297,17 @@ export default {
}
},
addXaxis(e) {
if (this.view.type === 'map' && this.view.xaxis.length > 1) {
this.view.xaxis = [this.view.xaxis[0]]
}
this.dragCheckType(this.view.xaxis, 'd')
this.dragMoveDuplicate(this.view.xaxis, e)
this.save(true)
},
addYaxis(e) {
if (this.view.type === 'map' && this.view.yaxis.length > 1) {
this.view.yaxis = [this.view.yaxis[0]]
}
this.dragCheckType(this.view.yaxis, 'q')
this.dragMoveDuplicate(this.view.yaxis, e)
this.save(true)
......@@ -1444,14 +1336,14 @@ export default {
},
initAreas() {
let mapping
if ((mapping = localStorage.getItem('areaMapping')) !== null) {
this.places = JSON.parse(mapping)
return
}
// let mapping
// if ((mapping = localStorage.getItem('areaMapping')) !== null) {
// this.places = JSON.parse(mapping)
// return
// }
Object.keys(this.places).length === 0 && areaMapping().then(res => {
this.places = res.data
localStorage.setItem('areaMapping', JSON.stringify(res.data))
// localStorage.setItem('areaMapping', JSON.stringify(res.data))
})
},
......
frontend/src/views/link/index.vue
浏览文件 @ 19d08770
<template>
<div style="height: 100%;">
<link-error v-if="showIndex===0" :resource-id="resourceId" />
<link-pwd v-if="showIndex===1" :resource-id="resourceId" />
<link-pwd v-if="showIndex===1" :resource-id="resourceId" @fresh-token="refreshToken" />
<link-view v-if="showIndex===2" :resource-id="resourceId" />
</div>
</template>
......@@ -49,6 +49,9 @@ export default {
this.showError()
})
},
refreshToken() {
this.loadInit()
},
// 显示无效链接
showError() {
......
frontend/src/views/link/pwd/index.vue
浏览文件 @ 19d08770
......@@ -96,7 +96,8 @@ export default {
if (!res.data) {
this.msg = this.$t('pblink.pwd_error')
} else {
window.location.reload()
// window.location.reload()
this.$emit('fresh-token')
}
})
})
......
frontend/src/views/link/view/index.vue
浏览文件 @ 19d08770
......@@ -8,6 +8,8 @@
import { loadResource } from '@/api/link'
import { uuid } from 'vue-uuid'
import Preview from '@/components/canvas/components/Editor/Preview'
import { getPanelAllLinkageInfo } from '@/api/panel/linkage'
export default {
name: 'LinkView',
components: { Preview },
......@@ -29,6 +31,10 @@ export default {
methods: {
setPanelInfo() {
loadResource(this.resourceId).then(res => {
// 刷新联动信息
getPanelAllLinkageInfo(this.resourceId).then(rsp => {
this.$store.commit('setNowPanelTrackInfo', rsp.data)
})
this.$store.commit('setComponentData', this.resetID(JSON.parse(res.data.panelData)))
// this.$store.commit('setComponentData', JSON.parse(res.data.panelData))
this.$store.commit('setCanvasStyle', JSON.parse(res.data.panelStyle))
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论