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

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

Browse Source
This commit is contained in:
taojinlong 2022-07-31 15:43:30 +08:00
commit a2fe087ca1
10 changed files with 272 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/package.json
View File

@ -22,11 +22,9 @@
"@tinymce/tinymce-vue": "^3.2.8",
"axios": "^0.21.1",
"core-js": "^2.6.5",
"css-color-function": "^1.3.3",
"echarts": "^5.0.1",
"element-resize-detector": "^1.2.3",
"element-ui": "2.15.7",
"file-save": "^0.2.0",
"file-saver": "^2.0.5",
"fit2cloud-ui": "^1.8.0",
"flv.js": "^1.6.2",
@ -54,7 +52,6 @@
"tinymce": "^5.8.2",
"umy-ui": "^1.1.6",
"vcolorpicker": "^1.1.0",
"videojs-flash": "^2.2.1",
"vue": "2.6.10",
"vue-axios": "3.2.4",
"vue-clipboard2": "0.3.1",
@ -90,8 +87,6 @@
"eslint": "5.15.3",
"eslint-plugin-vue": "5.2.2",
"html-webpack-plugin": "3.2.0",
"less": "^3.0.0",
"less-loader": "^5.0.0",
"mockjs": "1.0.1-beta3",
"runjs": "^4.1.3",
"sass": "^1.33.0",

2
frontend/src/layout/components/Sidebar/index.vue
View File

@ -49,7 +49,7 @@ export default {
// return this.$router.options.routes
if (this.isCollapse) {
return this.flatterRouter(
this.$store.state.permission.currentRoutes.children
JSON.parse(JSON.stringify(this.$store.state.permission.currentRoutes.children))
);
}
return this.$store.state.permission.currentRoutes.children;

26
frontend/src/styles/sidebar.scss
View File

@ -22,7 +22,7 @@
left: 0;
z-index: 999;
overflow: hidden;
.horizontal-collapse-transition {
transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
}
@ -63,33 +63,33 @@
border: none;
height: 100%;
width: 100% !important;
background-color: var(--SiderBG, #ffffff);
background-color: var(--SiderBG, #ffffff);
}
.submenu-title-noDropdown:not(.is-active), .el-submenu__title {
color: var(--SiderTextColor, #1e212a);
&:hover {
background-color: var(--MenuHovorBG, rgba(158,158,158,.2)) !important;
color: var(--TextActive, #409EFF);
color: var(--TextActive, #3370ff);
}
&:focus {
background-color: var(--MenuActiveBG, #ecf5ff) !important;
color: var(--TextActive, #409EFF);
color: var(--TextActive, #3370ff);
}
}
.submenu-title-noDropdown.is-active {
background-color: var(--MenuActiveBG, #ecf5ff) !important;
color: var(--TextActive, #409EFF);
color: var(--TextActive, #3370ff);
}
.is-active > .el-submenu__title {
background-color: var(--MenuActiveBG, #ecf5ff) !important;
color: var(--TextActive, #409EFF);
color: var(--TextActive, #3370ff);
}
& .nest-menu .el-submenu > .el-submenu__title,
& .el-submenu .el-menu-item {
@ -106,10 +106,10 @@
& .el-submenu .is-active.el-menu-item {
min-width: $sideBarWidth !important;
background-color: var(--SiderBG) !important;
color: var(--TextActive, #409EFF);
color: var(--TextActive, #3370ff);
}
}
@ -160,7 +160,7 @@
overflow: hidden;
visibility: hidden;
display: inline-block;
}
}
}
@ -173,7 +173,7 @@
min-width: $sideBarWidth !important;
}
.withoutAnimation {

5
frontend/src/views/chart/chart/map/map.js
View File

@ -88,6 +88,11 @@ export function baseMapOption(chart_option, chart, themeStyle) {
y.name = chart.data.x[i]
chart_option.series[0].data.push(y)
}
if (chart.senior) {
const senior = JSON.parse(chart.senior)
senior && senior.mapMapping && (chart_option.series[0].nameMap = senior.mapMapping)
}
}
}
componentStyle(chart_option, chart)

1
frontend/src/views/chart/components/ChartComponent.vue
View File

@ -81,7 +81,6 @@ import {
geoJson
} from '@/api/map/map'
import ViewTrackBar from '@/components/canvas/components/Editor/ViewTrackBar'
import eventBus from '@/components/canvas/utils/eventBus'
export default {
name: 'ChartComponent',

207
frontend/src/views/chart/components/senior/MapMapping.vue Normal file
View File

@ -0,0 +1,207 @@
<template>
<div style="width: 100%;display: block !important;">
<el-table
:data="currentDatas"
size="mini"
:span-method="mergeCellMethod"
style="width: 100%"
:row-style="{height:0+'px'}"
>
<el-table-column
label="图形"
prop="mapArea"
width="160"
show-overflow-tooltip
/>
<el-table-column
label="属性"
width="50"
>
<template slot-scope="scope">
<el-input
v-if="scope.row.isEdit"
:ref="scope.row.mapArea + scope.$index + '-widget'"
v-model="scope.row.attrArea"
size="mini"
@blur="finishEdit(scope.row)"
@keyup.enter.native="$event.target.blur()"
>
<i slot="suffix" class="el-icon-success el-input__icon map-mapping-ok" @click="finishEdit(scope.row)" />
</el-input>
<el-button v-else size="mini" plain @click="triggerEdit(scope)">
<span class="mapping-span">{{ scope.row.attrArea }}</span>
<i class="el-icon-edit el-icon--right" />
</el-button>
</template>
</el-table-column>
<el-table-column align="right">
<template slot="header">
<el-input
v-model="keyWord"
size="mini"
placeholder="输入关键字搜索"
/>
</template>
</el-table-column>
</el-table>
<div class="mapping-pagination">
<el-pagination
small
layout="prev, pager, next"
:page-size="pageSize"
:total="total"
:current-page="currentPage"
@current-change="searchPager"
@prev-click="searchPager"
@next-click="searchPager"
/>
</div>
</div>
</template>
<script>
export default {
name: 'FunctionCfg',
props: {
chart: {
type: Object,
required: true
}
},
data() {
return {
mappingForm: {},
keyWord: '',
dynamicAreaCode: '',
gridList: [],
currentPage: 1,
pageSize: 10,
total: 0,
currentDatas: [],
usePage: true
}
},
watch: {
'chart': {
handler: function() {
this.initData()
}
},
'keyWord': {
handler: function() {
this.buildGridList()
}
}
},
mounted() {
this.initData()
},
methods: {
triggerEdit(scope) {
this.$set(scope.row, 'isEdit', true)
this.$nextTick(() => {
this.$refs[scope.row.mapArea + scope.$index + '-widget'] && this.$refs[scope.row.mapArea + scope.$index + '-widget'].focus()
})
},
finishEdit(row) {
row.isEdit = false
this.mappingForm[row.mapArea] = row.attrArea
this.changeMapping()
},
mergeCellMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 1) {
return [1, 2]
}
if (columnIndex === 2) {
return [0, 0]
}
},
initData() {
const chart = JSON.parse(JSON.stringify(this.chart))
if (chart.senior) {
let senior = null
if (Object.prototype.toString.call(chart.senior) === '[object Object]') {
senior = JSON.parse(JSON.stringify(chart.senior))
} else {
senior = JSON.parse(chart.senior)
}
if (senior.mapMapping) {
this.mappingForm = senior.mapMapping
} else {
this.initMapping()
}
this.buildGridList()
}
},
buildGridList() {
this.gridList = Object.keys(this.mappingForm).map(key => {
return {
mapArea: key,
attrArea: this.mappingForm[key] || key
}
})
const baseDatas = JSON.parse(JSON.stringify(this.gridList))
const tempDatas = baseDatas.filter(data => !this.keyWord || data.mapArea.toLowerCase().includes(this.keyWord.toLowerCase()) || (data.attrArea && data.attrArea.toLowerCase().includes(this.keyWord.toLowerCase())))
if (this.usePage) {
const start = (this.currentPage - 1) * this.pageSize
let end = this.currentPage * this.pageSize
if (end >= tempDatas.length) end = tempDatas.length
this.currentDatas = tempDatas.slice(start, end)
} else {
this.currentDatas = tempDatas
}
this.total = tempDatas.length
},
initMapping() {
const chart = JSON.parse(JSON.stringify(this.chart))
const customAttr = JSON.parse(chart.customAttr)
const cCode = this.chart.DetailAreaCode || this.dynamicAreaCode || customAttr.areaCode
if (this.$store.getters.geoMap[cCode]) {
const json = this.$store.getters.geoMap[cCode]
const features = json.features
this.mappingForm = {}
features.forEach(feature => {
this.mappingForm[feature.properties.name] = null
})
} else {
this.$warning('请先选择地图范围')
}
},
changeMapping() {
this.$emit('onMapMappingChange', this.mappingForm)
},
searchPager(pageNumber) {
this.currentPage = pageNumber
this.buildGridList()
}
}
}
</script>
<style lang="scss" scoped>
.mapping-span {
display: inline-block;
width: 90px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
text-align: left
}
.map-mapping-ok {
cursor: pointer;
}
.map-mapping-ok:hover {
color: #409eff;
}
</style>

29
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -703,7 +703,7 @@
<el-tab-pane name="senior" :label="$t('chart.senior')" class="padding-tab" style="width: 350px;">
<el-row class="view-panel">
<div
v-if="view.type && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('mix') || view.type.includes('gauge') || view.type === 'text' || view.type.includes('table'))"
v-if="view.type && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('mix') || view.type.includes('gauge') || view.type === 'text' || view.type.includes('table') || view.type === 'map' || view.type === 'buddle-map')"
style="overflow:auto;border-right: 1px solid #e6e6e6;height: 100%;width: 100%;"
class="attr-style theme-border-class"
>
@ -761,6 +761,25 @@
</el-collapse-item>
</el-collapse>
</el-row>
<el-row v-if="view.type && (view.type === 'map' || view.type === 'buddle-map')">
<span class="padding-lr">{{ $t('chart.senior_cfg') }}</span>
<el-collapse v-model="attrActiveNames" class="style-collapse">
<el-collapse-item title="地名映射">
<map-mapping
:param="param"
class="attr-selector"
:chart="chart"
@onMapMappingChange="onMapMappingChange"
/>
</el-collapse-item>
</el-collapse>
</el-row>
</div>
<div v-else class="no-senior">
{{ $t('chart.chart_no_senior') }}
@ -1084,6 +1103,7 @@ import PluginCom from '@/views/system/plugin/PluginCom'
import { mapState } from 'vuex'
import FunctionCfg from '@/views/chart/components/senior/FunctionCfg'
import MapMapping from '@/views/chart/components/senior/MapMapping'
import AssistLine from '@/views/chart/components/senior/AssistLine'
import Threshold from '@/views/chart/components/senior/Threshold'
import LabelNormalText from '@/views/chart/components/normal/LabelNormalText'
@ -1129,7 +1149,8 @@ export default {
ChartDragItem,
DrillItem,
DrillPath,
PluginCom
PluginCom,
MapMapping
},
props: {
param: {
@ -1952,6 +1973,10 @@ export default {
this.view.senior.scrollCfg = val
this.calcStyle()
},
onMapMappingChange(val) {
this.view.senior.mapMapping = val
this.calcStyle()
},
showDimensionEditFilter(item) {
this.dimensionItem = JSON.parse(JSON.stringify(item))

7
frontend/src/views/panel/list/PanelList.vue
View File

@ -374,8 +374,7 @@ export default {
bus.$off('newPanelFromMarket', this.newPanelFromMarket)
},
mounted() {
this.$store.commit('setComponentData', [])
this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
this.clearCanvas()
this.defaultTree(true)
this.initCache()
const routerParam = this.$router.currentRoute.params
@ -845,7 +844,9 @@ export default {
this.searchType = searchTypeInfo
},
editFromPanelViewShow() {
this.edit(this.lastActiveNodeData, this.lastActiveNode)
this.$store.commit('setComponentData', [])
this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
bus.$emit('PanelSwitchComponent', { name: 'PanelEdit' })
},
editPanelBashInfo(params) {
if (params.operation === 'status') {

13
frontend/src/views/panel/template/index.vue
View File

@ -1,6 +1,6 @@
<template>
<de-container>
<de-aside-container isTemplate>
<de-container class="content-container">
<de-aside-container class="template-aside-container" is-template>
<el-tabs v-model="currentTemplateType" @tab-click="handleClick">
<el-tab-pane name="self">
<span slot="label"><i class="el-icon-star-off tablepanel-i" />{{ $t('panel.user_template') }}</span>
@ -211,4 +211,13 @@ export default {
height: 100%;
}
.content-container{
padding: 20px!important;
overflow: hidden;
height: calc(100vh - 56px)!important;
}
.template-aside-container{
height: calc(100vh - 96px)!important;
}
</style>

6
frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -1039,7 +1039,9 @@ export default {
for (var j = 0; j < this.apiItem.fields.length; j++) {
if(this.apiItem.fields[j].name === jsonFields[i].name){
jsonFields[i].checked = false;
this.$nextTick(() => {
jsonFields[i].checked = false;
})
this.$message.error(jsonFields[i].name + ', ' + i18n.t('datasource.has_repeat_field_name'))
return
}
@ -1200,7 +1202,7 @@ export default {
background-color: rgba(187, 191, 196, 0.5);
height: 1px;
top: 13px;
left: calc(50% + 22px);
left: calc(50% + 22px) !important;
width: 100px;
margin-right: 0px;