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

Merge branch 'dev' into v1.18

Browse Source
This commit is contained in:
taojinlong 2023-05-25 16:31:08 +08:00
commit c56c947c55
36 changed files with 174 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -781,6 +781,9 @@ public class JdbcProvider extends DefaultJdbcProvider {
case StarRocks:
MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class);
mysqlConfiguration.getJdbc();
if(!mysqlConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
throw new Exception("Invalid database name");
}
break;
case redshift:
RedshiftConfiguration redshiftConfiguration = new Gson().fromJson(datasource.getConfiguration(), RedshiftConfiguration.class);
@ -791,6 +794,48 @@ public class JdbcProvider extends DefaultJdbcProvider {
throw new Exception("Invalid database name");
}
break;
case sqlServer:
SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasource.getConfiguration(), SqlServerConfiguration.class);
if(!sqlServerConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
throw new Exception("Invalid database name");
}
break;
case pg:
PgConfiguration pgConfiguration = new Gson().fromJson(datasource.getConfiguration(), PgConfiguration.class);
if(!pgConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
throw new Exception("Invalid database name");
}
break;
case oracle:
OracleConfiguration oracleConfiguration = new Gson().fromJson(datasource.getConfiguration(), OracleConfiguration.class);
if(!oracleConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
throw new Exception("Invalid database name");
}
break;
case mongo:
MongodbConfiguration mongodbConfiguration = new Gson().fromJson(datasource.getConfiguration(), MongodbConfiguration.class);
if(!mongodbConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
throw new Exception("Invalid database name");
}
break;
case impala:
ImpalaConfiguration impalaConfiguration = new Gson().fromJson(datasource.getConfiguration(), ImpalaConfiguration.class);
if(!impalaConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
throw new Exception("Invalid database name");
}
break;
case hive:
HiveConfiguration hiveConfiguration = new Gson().fromJson(datasource.getConfiguration(), HiveConfiguration.class);
if(!hiveConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
throw new Exception("Invalid database name");
}
break;
case db2:
Db2Configuration db2Configuration = new Gson().fromJson(datasource.getConfiguration(), Db2Configuration.class);
if(!db2Configuration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
throw new Exception("Invalid database name");
}
break;
default:
break;
}

4
backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
View File

@ -1158,11 +1158,11 @@ public class DorisQueryProvider extends QueryProvider {
case "y":
return "%Y";
case "y_Q":
return "CONCAT(%s,'" + split + "',%s)";
return "CONCAT(%s,'" + split + "','Q',%s)";
case "y_M":
return "%Y" + split + "%m";
case "y_W":
return "%Y" + split + "%u";
return "%Y" + split + "W%u";
case "y_M_d":
return "%Y" + split + "%m" + split + "%d";
case "H_m_s":

4
backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
View File

@ -1145,11 +1145,11 @@ public class MysqlQueryProvider extends QueryProvider {
case "y":
return "%Y";
case "y_Q":
return "CONCAT(%s,'" + split + "',%s)";
return "CONCAT(%s,'" + split + "','Q',%s)";
case "y_M":
return "%Y" + split + "%m";
case "y_W":
return "%Y" + split + "%u";
return "%Y" + split + "W%u";
case "y_M_d":
return "%Y" + split + "%m" + split + "%d";
case "H_m_s":

4
backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
View File

@ -1178,11 +1178,11 @@ public class MysqlQueryProvider extends QueryProvider {
case "y":
return "%Y";
case "y_Q":
return "CONCAT(%s,'" + split + "',%s)";
return "CONCAT(%s,'" + split + "','Q',%s)";
case "y_M":
return "%Y" + split + "%m";
case "y_W":
return "%Y" + split + "%u";
return "%Y" + split + "W%u";
case "y_M_d":
return "%Y" + split + "%m" + split + "%d";
case "H_m_s":

16
backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
View File

@ -899,7 +899,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.equalsIgnoreCase(item.getTerm(), "not_empty")) {
whereValue = "''";
} else if (StringUtils.containsIgnoreCase(item.getTerm(), "in") || StringUtils.containsIgnoreCase(item.getTerm(), "not in")) {
if(field.getType().equals("NVARCHAR")){
if(field.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = Arrays.asList(value.split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
}else {
whereValue = "('" + String.join("','", value.split(",")) + "')";
@ -907,7 +907,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) {
whereValue = "'%" + value + "%'";
} else {
if(field.getType().equals("NVARCHAR")){
if(field.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value);
}else {
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value);
@ -1034,7 +1034,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
whereValue = "''";
} else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in") || StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "not in")) {
if(field.getType().equals("NVARCHAR")){
if(field.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = Arrays.asList(value.split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
}else {
whereValue = "('" + String.join("','", value.split(",")) + "')";
@ -1042,7 +1042,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
whereValue = "'%" + value + "%'";
} else {
if(field.getType().equals("NVARCHAR")){
if(field.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value);
}else {
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value);
@ -1146,7 +1146,7 @@ public class SqlserverQueryProvider extends QueryProvider {
String whereValue = "";
if (StringUtils.containsIgnoreCase(request.getOperator(), "in")) {
if(request.getDatasetTableField().getType().equals("NVARCHAR")){
if(request.getDatasetTableField().getType().equalsIgnoreCase("NVARCHAR")){
whereValue = value.stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
}else {
whereValue = "('" + StringUtils.join(value, "','") + "')";
@ -1166,7 +1166,7 @@ public class SqlserverQueryProvider extends QueryProvider {
}
} else {
if(request.getDatasetTableField().getType().equals("NVARCHAR")){
if(request.getDatasetTableField().getType().equalsIgnoreCase("NVARCHAR")){
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value.get(0));
}else {
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value.get(0));
@ -1328,7 +1328,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_empty")) {
whereValue = "''";
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
if(y.getType().equals("NVARCHAR")){
if(y.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = Arrays.asList(f.getValue().split(",")).stream().map(str ->{return "N"+ str;}).collect(Collectors.joining(","));
}else {
whereValue = "('" + String.join("','", f.getValue().split(",")) + "')";
@ -1336,7 +1336,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
whereValue = "'%" + f.getValue() + "%'";
} else {
if(y.getType().equals("NVARCHAR")){
if(y.getType().equalsIgnoreCase("NVARCHAR")){
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, f.getValue());
}else {
whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, f.getValue());

6
frontend/src/api/map/map.js
View File

@ -4,7 +4,7 @@ export const areaMapping = () => {
return request({
url: '/api/map/globalEntitys/0',
method: 'get',
loading: true
loading: false
})
}
@ -12,7 +12,7 @@ export const globalMapping = () => {
return request({
url: '/api/map/globalEntitys/0',
method: 'get',
loading: true
loading: false
})
}
@ -21,7 +21,7 @@ export function geoJson(areaCode) {
return request({
url: '/geo/full/' + countryCode + '/' + areaCode + '_full.json',
method: 'get',
loading: true
loading: false
})
}

3
frontend/src/components/canvas/components/editor/PreviewFullScreen.vue
View File

@ -17,9 +17,6 @@
</template>
<script>
import fullscreen from 'vue-fullscreen'
import Vue from 'vue'
Vue.use(fullscreen)
import Preview from './Preview'
import bus from '@/utils/bus'
import { mapState } from 'vuex'

3
frontend/src/components/canvas/components/editor/ViewTrackBar.vue
View File

@ -66,8 +66,7 @@ export default {
}
::v-deep.el-popper[x-placement^=bottom] .popper__arrow {
transform: rotate(180deg) !important;
top: 75px !important;
display: none;
}
::v-deep.el-popper[x-placement^=bottom] {

3
frontend/src/components/canvas/customComponent/DeVideo.vue
View File

@ -37,11 +37,8 @@
import '@/custom-theme.css'
import { mapState } from 'vuex'
import bus from '@/utils/bus'
import { videoPlayer } from 'vue-video-player'
import 'video.js/dist/video-js.css'
export default {
components: { videoPlayer },
props: {
propValue: {
type: String,

2
frontend/src/components/deDrag/index.vue
View File

@ -1544,8 +1544,6 @@ export default {
} else {
this.element.style.left = 0
this.element.style.top = 0
this.element.style.width = this.element.style.width * this.curCanvasScaleSelf.matrixStyleWidth / targetCanvasScale.matrixStyleWidth
this.element.style.height = this.element.style.height * this.curCanvasScaleSelf.matrixStyleHeight / targetCanvasScale.matrixStyleHeight
}
this.element.canvasId = targetCanvasId
}

27
frontend/src/main.js
View File

@ -2,6 +2,8 @@ import Vue from 'vue'
import Cookies from 'js-cookie'
import '@/styles/index.scss' // global css
import ElementUI from 'element-ui'
import Vuetify from 'vuetify'
import Fit2CloudUI from 'fit2cloud-ui'
import i18n from './lang' // internationalization
import App from './App'
@ -14,12 +16,16 @@ import api from '@/api/index.js'
import filter from '@/filter/filter'
import directives from './directive'
import VueClipboard from 'vue-clipboard2'
import widgets from '@/components/widget'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import './utils/dialog'
import DeComplexInput from '@/components/business/conditionTable/DeComplexInput'
import DeComplexSelect from '@/components/business/conditionTable/DeComplexSelect'
import DeViewSelect from '@/components/deViewSelect'
import RemarkEditor from '@/views/chart/components/componentStyle/dialog/RemarkEditor'
import TitleRemark from '@/views/chart/view/TitleRemark'
import '@/components/canvas/customComponent' // 注册自定义组件
import deBtn from '@/components/deCustomCm/DeBtn.vue'
import '@/utils/DateUtil'
@ -27,11 +33,15 @@ import draggable from 'vuedraggable'
import deWebsocket from '@/websocket'
import { GaodeMap } from '@antv/l7-maps'
import * as echarts from 'echarts'
import UmyUi from 'umy-ui'
// 全屏插件
import fullscreen from 'vue-fullscreen'
import VueFriendlyIframe from 'vue-friendly-iframe'
import vueToPdf from 'vue-to-pdf'
import VueVideoPlayer from 'vue-video-player'
import 'video.js/dist/video-js.css'
// 控制标签宽高成比例的指令
import proportion from 'vue-proportion-directive'
import xss from 'xss'
// 定义全局XSS解决方法
@ -41,13 +51,19 @@ Object.defineProperty(Vue.prototype, '$xss', {
Vue.config.productionTip = false
Vue.use(VueClipboard)
Vue.use(widgets)
Vue.component('Draggable', draggable)
Vue.prototype.$api = api
Vue.prototype.$echarts = echarts
Vue.prototype.$gaodeMap = GaodeMap
Vue.use(UmyUi)
Vue.use(fullscreen)
Vue.use(VueFriendlyIframe)
Vue.use(Vuetify)
// import TEditor from '@/components/Tinymce/index.vue'
// Vue.component('TEditor', TEditor)
@ -73,6 +89,9 @@ Vue.use(ElementUI, {
size: Cookies.get('size') || 'medium', // set element-ui default size
i18n: (key, value) => i18n.t(key, value)
})
Vue.use(Fit2CloudUI, {
i18n: (key, value) => i18n.t(key, value)
})
// Vue.use(VueAxios, axios)
Vue.use(filter)
Vue.use(directives)
@ -81,12 +100,18 @@ Vue.component('Treeselect', Treeselect)
Vue.component('DeComplexInput', DeComplexInput)
Vue.component('DeComplexSelect', DeComplexSelect)
Vue.component('DeViewSelect', DeViewSelect)
Vue.component('RemarkEditor', RemarkEditor)
Vue.component('TitleRemark', TitleRemark)
Vue.component('DeBtn', deBtn)
Vue.config.productionTip = false
Vue.use(vueToPdf)
Vue.use(VueVideoPlayer)
Vue.use(proportion)
Vue.prototype.hasDataPermission = function(pTarget, pSource) {
if (this.$store.state.user.user.isAdmin || pSource === 'ignore') {
return true

12
frontend/src/router/index.js
View File

@ -44,7 +44,7 @@ export const constantRoutes = [
},
{
path: '/login',
component: () => import(/* webpackChunkName:"login" */'@/views/login/index'),
component: () => import('@/views/login/index'),
hidden: true
},
@ -67,29 +67,29 @@ export const constantRoutes = [
children: [
{
path: 'edit',
component: () => import(/* webpackChunkName:"panelEdit" */'@/views/panel/edit')
component: () => import('@/views/panel/edit')
}
]
},
{
path: '/delink',
component: () => import(/* webpackChunkName:"link" */'@/views/link'),
component: () => import('@/views/link'),
hidden: true
},
{
path: '/preview/:reportId',
component: () => import(/* webpackChunkName:"preview" */'@/components/canvas/components/editor/PreviewEject'),
component: () => import('@/components/canvas/components/editor/PreviewEject'),
hidden: true
},
{
path: '/previewScreenShot/:reportId/:backScreenShot',
component: () => import(/* webpackChunkName:"PreviewEject" */'@/components/canvas/components/editor/PreviewEject'),
component: () => import('@/components/canvas/components/editor/PreviewEject'),
hidden: true
},
{
path: '/previewFullScreen',
component: () => import(/* webpackChunkName:"previewFullScreen" */'@/components/canvas/components/editor/PreviewFullScreen'),
component: () => import('@/components/canvas/components/editor/PreviewFullScreen'),
hidden: true
},
{

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

@ -9,7 +9,8 @@ import {
getPadding,
getSlider,
getAnalyse,
setGradientColor
setGradientColor,
getMeta
} from '@/views/chart/chart/common/common_antv'
import { antVCustomColor, handleEmptyDataStrategy } from '@/views/chart/chart/util'
import _ from 'lodash'
@ -319,6 +320,11 @@ export function baseBidirectionalBarOptionAntV(plot, container, chart, action, i
handleEmptyDataStrategy(emptyDataStrategy, chart, data, options)
}
// meta，处理类别轴数据类型为时间时排序失效
const meta = getMeta(chart)
if (meta) {
options.meta = meta
}
// 开始渲染
if (plot) {
plot.destroy()

17
frontend/src/views/chart/chart/common/common_antv.js
View File

@ -966,3 +966,20 @@ export function setGradientColor(rawColor, show = false, angle = 0) {
item.splice(3, 1, '0.3)')
return show ? `l(${angle}) 0:${item.join(',')} 1:${rawColor}` : rawColor
}
export function getMeta(chart) {
let meta
if (chart.type === 'bidirectional-bar') {
const xAxis = JSON.parse(chart.xaxis)
if (xAxis?.length === 1 && xAxis[0].deType === 1) {
const values = chart.data.data.map(item => item.field)
meta = {
field: {
type: 'cat',
values: values.reverse()
}
}
}
}
return meta
}

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

@ -2,6 +2,7 @@
import { componentStyle } from '../common/common'
import { BASE_ECHARTS_SELECT, DEFAULT_TOOLTIP } from '@/views/chart/chart/chart'
import { isGradientValue } from '@/components/gradientColorSelector/base'
import _ from 'lodash'
const linearCOlor = (start, end) => {
return {
type: 'linear',
@ -146,20 +147,38 @@ export function baseMapOption(chart_option, chart, themeStyle, curAreaCode, seri
}
}
let senior = chart.senior
if (senior) {
senior = JSON.parse(senior)
}
// 空值处理，echarts 对于值为 null 的默认策略是不展示，也就是保持为空，所以只需要处理忽略数据和置为 0 就行
// 隐藏和不展示的区别是隐藏不会参与颜色分布的计算，而不展示会参与颜色计算
let emptyDataStrategy = senior?.functionCfg?.emptyDataStrategy
if (!emptyDataStrategy) {
emptyDataStrategy = 'breakLine'
}
for (let i = 0; i < valueArr.length; i++) {
const y = valueArr[i]
if (y.value === null && emptyDataStrategy === 'ignoreData') {
continue
}
y.name = chart.data.x[i]
if (y.value === null && emptyDataStrategy === 'setZero') {
const tmp = _.clone(y)
tmp.value = 0
chart_option.series[0].data.push(tmp)
continue
}
chart_option.series[0].data.push(y)
}
if (isGradient) {
chart_option.series[0].data = fillGradientColor(chart_option.series[0].data, customAttr.color.colors)
delete chart_option.visualMap
}
if (chart.senior) {
const senior = JSON.parse(chart.senior)
senior && senior.mapMapping && senior.mapMapping[curAreaCode] && (chart_option.geo.nameMap = senior.mapMapping[curAreaCode])
if (senior) {
senior.mapMapping && senior.mapMapping[curAreaCode] && (chart_option.geo.nameMap = senior.mapMapping[curAreaCode])
}
if (chart.data?.detailFields?.length > 1) {

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

@ -1582,7 +1582,6 @@ export const TYPE_CONFIGS = [
'x-axis-selector-ant-v': [
'show',
'position',
'name',
'nameTextStyle',
'splitLine',
'axisForm',

2
frontend/src/views/chart/components/componentStyle/TitleSelectorAntV.vue
View File

@ -226,11 +226,9 @@
import { CHART_FONT_FAMILY, CHART_FONT_LETTER_SPACE, COLOR_PANEL, DEFAULT_TITLE_STYLE } from '../../chart/chart'
import { checkViewTitle } from '@/components/canvas/utils/utils'
import { mapState } from 'vuex'
import RemarkEditor from '@/views/chart/components/componentStyle/dialog/RemarkEditor'
export default {
name: 'TitleSelectorAntV',
components: { RemarkEditor },
props: {
param: {
type: Object,

7
frontend/src/views/chart/components/senior/FunctionCfg.vue
View File

@ -90,7 +90,7 @@
<script>
import { DEFAULT_FUNCTION_CFG, COLOR_PANEL } from '../../chart/chart'
import { includesAny } from '@/utils/StringUtils'
import { equalsAny, includesAny } from '@/utils/StringUtils'
export default {
name: 'FunctionCfg',
@ -108,10 +108,11 @@ export default {
},
computed: {
showSlider() {
return this.chart.type !== 'bidirectional-bar'
return this.chart.type !== 'bidirectional-bar' && !equalsAny(this.chart.type, 'map')
},
showEmptyStrategy() {
return this.chart.render === 'antv' && includesAny(this.chart.type, 'line', 'bar', 'area')
return (this.chart.render === 'antv' && includesAny(this.chart.type, 'line', 'bar', 'area')) ||
this.chart.render === 'echarts' && equalsAny(this.chart.type, 'map')
}
},
watch: {

3
frontend/src/views/chart/components/table/TableNormal.vue
View File

@ -99,10 +99,9 @@ import eventBus from '@/components/canvas/utils/eventBus'
import { DEFAULT_COLOR_CASE, DEFAULT_SCROLL, DEFAULT_SIZE, NOT_SUPPORT_PAGE_DATASET } from '@/views/chart/chart/chart'
import { mapState } from 'vuex'
import DePagination from '@/components/deCustomCm/pagination.js'
import { UxGrid, UxTableColumn } from 'umy-ui'
export default {
name: 'TableNormal',
components: { DePagination, UxGrid, UxTableColumn },
components: { DePagination },
props: {
chart: {
type: Object,

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

@ -983,12 +983,7 @@
</div>
</el-row>
<el-row
v-if="view.type
&& !(view.type.includes('table') && view.render === 'echarts')
&& !view.type.includes('text') && !view.type.includes('gauge')
&& view.type !== 'liquid' && view.type !== 'word-cloud'
&& view.type !== 'table-pivot' && view.type !=='label'
&& view.type !=='richTextView' && view.type !== 'flow-map'"
v-if="showDrill"
class="padding-lr"
style="margin-top: 6px;"
>
@ -1763,7 +1758,6 @@ import CalcChartFieldEdit from '@/views/chart/view/CalcChartFieldEdit'
import { equalsAny, includesAny } from '@/utils/StringUtils'
import PositionAdjust from '@/views/chart/view/PositionAdjust'
import MarkMapDataEditor from '@/views/chart/components/map/MarkMapDataEditor'
import FuSplitPane from './FuSplitPane.vue'
export default {
name: 'ChartEdit',
components: {
@ -1802,7 +1796,6 @@ export default {
PluginCom,
MapMapping,
MarkMapDataEditor,
FuSplitPane
},
props: {
param: {
@ -1963,10 +1956,10 @@ export default {
},
showSeniorCfg() {
return includesAny(this.view.type, 'bar', 'line', 'area', 'mix') ||
equalsAny(this.view.type, 'table-normal', 'table-info')
equalsAny(this.view.type, 'table-normal', 'table-info', 'map')
},
showFunctionCfg() {
return includesAny(this.view.type, 'bar', 'line', 'area', 'mix')
return includesAny(this.view.type, 'bar', 'line', 'area', 'mix', 'map')
},
showScrollCfg() {
return equalsAny(this.view.type, 'table-normal', 'table-info')
@ -1990,6 +1983,13 @@ export default {
equalsAny(this.view.type, 'text', 'label') ||
(this.view.render === 'antv' && this.view.type.includes('table'))
},
showDrill() {
return this.view.type &&
!(this.view.type.includes('table') && this.view.render === 'echarts') &&
!includesAny(this.view.type, 'text', 'gauge') &&
!equalsAny(this.view.type, 'liquid', 'bidirectional-bar',
'word-cloud', 'table-pivot', 'label', 'richTextView', 'flow-map')
},
...mapState([
'curComponent',
'panelViewEditInfo',

237
frontend/src/views/chart/view/FuSplitPane.vue
View File

@ -1,237 +0,0 @@
<template>
<div :style="{ cursor, userSelect }" class="fu-split-pane" ref="outerWrapper">
<div
:class="[`is-${direction}`, 'fu-split-pane__left']"
:style="{
[attr]: isReverse ? valueAnother : `${value}px`,
'padding-right': padding,
}"
>
<slot :name="isHorizontal ? 'left' : 'top'"></slot>
</div>
<div
:class="resizerClasses"
:style="{ [resizerAttr]: `${value}px`, ...resizerStyle }"
@mousedown="onMouseDown"
@mouseover="hover = true"
@mouseleave="hover = false"
>
<div class="icon" v-if="resizerType === 'resizer'">
<slot name="resizer">
<i class="el-icon-more"></i>
</slot>
</div>
</div>
<div
:class="[`is-${direction}`, 'fu-split-pane__right']"
:style="{
[attr]: isReverse ? `${value}px` : valueAnother,
'padding-left': padding,
}"
>
<slot :name="isHorizontal ? 'right' : 'bottom'"></slot>
</div>
</div>
</template>
<script>
export default {
name: "FuSplitPane",
props: {
min: {
type: [Number, String],
default: "10px",
},
left: [Number, String],
right: [Number, String],
top: [Number, String],
bottom: [Number, String],
direction: {
validator: (val) => ["vertical", "horizontal"].includes(val),
default: "horizontal",
},
localKey: String,
resizable: {
type: Boolean,
default: true,
},
resizerType: {
validator: (val) => ["resizer", "line"].includes(val),
default: "resizer",
},
resizerClass: String,
resizerStyle: Object,
resizerHoverClass: String,
},
watch: {
left: {
immediate: true,
handler: function (newValue, oldValue) {
if (newValue !== oldValue) {
this.$nextTick(() => {
this.value = this.defaultValue;
});
}
},
},
bottom: {
immediate: true,
handler: function (newValue, oldValue) {
if (newValue !== oldValue) {
this.$nextTick(() => {
this.value = this.defaultValue;
});
}
},
},
},
computed: {
isReverse() {
return this.right || this.bottom;
},
isHorizontal() {
return this.direction === "horizontal";
},
userSelect() {
return this.active ? "none" : "";
},
cursor() {
return this.active && this.resizable
? this.isHorizontal
? "col-resize"
: "row-resize"
: "";
},
outerWrapperSize() {
return this.$refs.outerWrapper[this.offsetSize];
},
offsetSize() {
return this.isHorizontal ? "offsetWidth" : "offsetHeight";
},
defaultValue() {
if (this.isHorizontal) {
return this.left
? this.getMin(this.percentToValue(this.left))
: (this.right && this.getMin(this.percentToValue(this.right))) ||
this.outerWrapperSize / 2;
} else {
return this.top
? this.getMin(this.percentToValue(this.top))
: (this.bottom && this.getMin(this.percentToValue(this.bottom))) ||
this.outerWrapperSize / 2;
}
},
valueAnother() {
return `calc(100% - ${this.value}px)`;
},
attr() {
return this.isHorizontal ? "width" : "height";
},
resizerAttr() {
return this.isHorizontal
? this.isReverse
? "right"
: "left"
: this.isReverse
? "bottom"
: "top";
},
saveKey({ localKey }) {
return "Fu-SP-" + localKey;
},
resizerClasses() {
const classes = [
`fu-split-pane__${this.resizerType}`,
`is-${this.direction}`,
this.resizable && "is-resizable",
this.resizerClass,
this.hover && (this.resizerHoverClass || "hover"),
];
return classes;
},
padding() {
return this.resizerType === "resizer" && "3px";
},
},
data() {
return {
active: false,
value: 0,
oldValue: 0,
initOffset: 0,
hover: false,
};
},
mounted() {
this.readValue();
},
methods: {
onMouseDown(e) {
this.initOffset = this.isHorizontal ? e.pageX : e.pageY;
this.oldValue = this.value;
this.active = true;
document.addEventListener("mousemove", this.onMouseMove);
document.addEventListener("mouseup", this.onMouseUp);
},
onMouseUp() {
this.active = false;
document.removeEventListener("mousemove", this.onMouseMove);
document.removeEventListener("mouseup", this.onMouseUp);
this.$emit("changeSplit", this.value);
},
onMouseMove(e) {
if (!this.resizable) return;
if (this.active) {
const currentPage = this.isHorizontal ? e.pageX : e.pageY;
const offset = currentPage - this.initOffset;
const value = this.isReverse
? this.oldValue - offset
: this.oldValue + offset;
if (
value > this.percentToValue(this.min) &&
value < this.outerWrapperSize - this.percentToValue(this.min)
) {
this.value = value;
this.writeValue();
}
}
},
// 百分比换算成像素
percentToValue(val) {
const size = this.$refs.outerWrapper[this.offsetSize];
if (typeof val === "string" && val.includes("%")) {
return (parseInt(val) / 100) * size;
} else {
return parseInt(val);
}
},
// 是否取最小值
getMin(val) {
return val < this.percentToValue(this.min)
? this.percentToValue(this.min)
: val;
},
// localStorage储存数值
writeValue() {
const obj = {
[this.resizerAttr]: this.value,
};
if (this.localKey) {
localStorage.setItem(this.saveKey, JSON.stringify(obj));
}
},
readValue() {
if (this.localKey) {
const local = localStorage.getItem(this.saveKey);
if (local && local[this.resizerAttr]) {
this.value = parseInt(local) || this.defaultValue;
} else {
this.value = this.defaultValue;
}
} else {
this.value = this.defaultValue;
}
},
},
};
</script>

2
frontend/src/views/dataset/add/AddApi.vue
View File

@ -220,11 +220,9 @@ import cancelMix from './cancelMix'
import msgCfm from '@/components/msgCfm/index'
import { pySort } from './util'
import { updateCacheTree } from '@/components/canvas/utils/utils'
import { UxGrid, UxTableColumn } from 'umy-ui'
export default {
name: 'AddApi',
components: { UxGrid, UxTableColumn },
mixins: [cancelMix, msgCfm],
props: {
param: {

3
frontend/src/views/dataset/add/AddCustom.vue
View File

@ -109,11 +109,10 @@ import { getTable, post } from '@/api/dataset/dataset'
import DatasetGroupSelector from '../common/DatasetGroupSelector'
import DatasetCustomField from '../common/DatasetCustomField'
import { updateCacheTree } from '@/components/canvas/utils/utils'
import { UxGrid, UxTableColumn } from 'umy-ui'
export default {
name: 'AddCustom',
components: { DatasetCustomField, DatasetGroupSelector, UxGrid, UxTableColumn },
components: { DatasetCustomField, DatasetGroupSelector },
props: {
param: {
type: Object,

2
frontend/src/views/dataset/add/AddDB.vue
View File

@ -228,11 +228,9 @@ import cancelMix from './cancelMix'
import { pySort } from './util'
import { updateCacheTree } from '@/components/canvas/utils/utils'
import { UxGrid, UxTableColumn } from 'umy-ui'
export default {
name: 'AddDB',
components: { UxGrid, UxTableColumn },
mixins: [msgCfm, cancelMix],
props: {
param: {

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

@ -239,7 +239,6 @@ import msgCfm from '@/components/msgCfm/index'
import cancelMix from './cancelMix'
import Config from "@/settings";
import { updateCacheTree } from '@/components/canvas/utils/utils'
import { UxGrid, UxTableColumn } from 'umy-ui'
const token = getToken()
const RefreshTokenKey = Config.RefreshTokenKey
@ -247,7 +246,6 @@ const RefreshTokenKey = Config.RefreshTokenKey
export default {
name: 'AddExcel',
mixins: [msgCfm, cancelMix],
components: { UxGrid, UxTableColumn },
props: {
param: {
type: Object,

2
frontend/src/views/dataset/add/union/UnionPreview.vue
View File

@ -23,11 +23,9 @@
<script>
import { post } from '@/api/dataset/dataset'
import _ from 'lodash'
import { UxGrid, UxTableColumn } from 'umy-ui'
export default {
name: 'UnionPreview',
components: { UxGrid, UxTableColumn },
props: {
table: {
type: Object,

2
frontend/src/views/dataset/common/DatasetTableData.vue
View File

@ -57,11 +57,9 @@
<script>
import { post } from '@/api/dataset/dataset'
import { UxGrid, UxTableColumn } from 'umy-ui'
export default {
name: 'DatasetTableData',
components: { UxGrid, UxTableColumn },
props: {
table: {
type: Object,

2
frontend/src/views/dataset/data/TabDataPreview.vue
View File

@ -81,10 +81,8 @@
<script>
import _ from 'lodash'
import { UxGrid, UxTableColumn } from 'umy-ui'
export default {
name: 'TabDataPreview',
components: { UxGrid, UxTableColumn },
props: {
table: {
type: Object,

6
frontend/src/views/panel/edit/index.vue
View File

@ -536,12 +536,6 @@ import TextAttr from '@/components/canvas/components/TextAttr'
import { userLoginInfo } from '@/api/systemInfo/userLogin'
import { activeWatermark } from '@/components/canvas/tools/watermark'
import PositionAdjust from '@/views/chart/view/PositionAdjust'
import fullscreen from 'vue-fullscreen'
import proportion from 'vue-proportion-directive'
import Vue from 'vue'
Vue.use(proportion)
Vue.use(fullscreen)
export default {
name: 'PanelEdit',
components: {

2
frontend/src/views/panel/filter/FilterDialog.vue
View File

@ -470,7 +470,7 @@ export default {
const stack = [...list]
while (stack.length) {
const item = stack.pop()
if (item.id === fieldId) {
if (fieldId.includes(item.id)) {
fieldValid = true
break
}

33
frontend/src/views/panel/filter/filterMain/FilterHead.vue
View File

@ -16,13 +16,20 @@
style="width:100%;height: 100%;margin:0 10px;border-radius: 4px;overflow-x: auto;display: flex;align-items: center;"
@end="end2"
>
<drag-item
:key="item.id"
:item="item"
:index="index"
<v-flex
v-for="(item,index) in element.options.attrs.dragItems"
@closeItem="closeItem"
/>
:key="item.id"
>
<drag-item
:key="item.id"
:item="item"
:index="index"
@closeItem="closeItem"
/>
</v-flex>
<span solt="footer">{{ $t('panel.drag_here') }}</span>
</draggable>
</el-row>
@ -127,20 +134,6 @@ export default {
padding: 4px 0 0 0;
height: 100%;
line-height: 100%;
.v-flex {
font-variant: tabular-nums;
font-feature-settings: "tnum";
text-rendering: optimizeLegibility;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, FangSong, SimHei, STHeiti, STKaiti, STSong, STFangsong sans-serif;
font-size: 14px;
word-break: break-all;
white-space: nowrap;
color: #9ea6b2;
line-height: 100%;
box-sizing: border-box;
margin: 0;
padding: 0;
}
}
}

3
frontend/src/views/panel/index.vue
View File

@ -19,9 +19,6 @@ import DeMainContainer from '@/components/dataease/DeMainContainer'
import DeContainer from '@/components/dataease/DeContainer'
import PanelMain from '@/views/panel/list/PanelMain'
import PanelEdit from '@/views/panel/edit'
import '@/components/canvas/customComponent' // 注册自定义组件
import '@/components/widget'
export default {
name: 'Panel',
components: { DeMainContainer, DeContainer, PanelMain, PanelEdit },

3
frontend/src/views/panel/list/PanelViewShow.vue
View File

@ -377,9 +377,6 @@
</el-row>
</template>
<script>
import Vue from 'vue'
import fullscreen from 'vue-fullscreen'
Vue.use(fullscreen)
import PDFPreExport from '@/views/panel/export/PDFPreExport'
import Preview from '@/components/canvas/components/editor/Preview'
import SaveToTemplate from '@/views/panel/list/SaveToTemplate'

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

@ -796,13 +796,11 @@ import ApiHttpRequestForm from '@/views/system/datasource/ApiHttpRequestForm'
import dePwd from '@/components/deCustomCm/DePwd.vue'
import msgCfm from '@/components/msgCfm'
import { Base64 } from 'js-base64'
import { UxGrid, UxTableColumn } from 'umy-ui'
export default {
name: 'DsConfiguration',
components: {
ApiHttpRequestForm,
dePwd,
UxGrid, UxTableColumn
dePwd
},
mixins: [msgCfm],
props: {

7
frontend/src/views/system/plugin/Dynamic.vue
View File

@ -47,18 +47,11 @@
</template>
<script>
import Vue from 'vue'
import Fit2CloudUI from 'fit2cloud-ui'
import DeLayoutContent from '@/components/business/DeLayoutContent'
import AsyncComponent from '@/components/asyncComponent'
import i18n from '@/lang'
import bus from '@/utils/bus'
import { execute } from '@/api/system/dynamic'
import RemarkEditor from '@/views/chart/components/componentStyle/dialog/RemarkEditor'
import DeRichText from '@/components/canvas/customComponent/DeRichText'
Vue.component('DeRichText', DeRichText)
Vue.component('RemarkEditor', RemarkEditor)
Vue.use(Fit2CloudUI)
export default {
name: 'Dynamic',

18
frontend/vue.config.js
View File

@ -1,7 +1,6 @@
'use strict'
const path = require('path')
const defaultSettings = require('./src/settings.js')
// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
const pkg = require('./package.json')
@ -57,7 +56,6 @@ module.exports = {
chunkFilename: `js/[name].[contenthash:8].${pkg.version}.js`
},
plugins: [
// new BundleAnalyzerPlugin(),
new CopyWebpackPlugin([
{
from: path.join(__dirname, 'static'),
@ -77,18 +75,7 @@ module.exports = {
// dll最终输出的目录
outputPath: './vendor'
})
],
optimization: {
splitChunks: {
cacheGroups: {
brace: {
name: 'chunk-brace',
priority: 20,
test: /[\\/]node_modules[\\/]brace/
}
}
},
},
]
},
chainWebpack: config => {
config.module.rules.delete('svg') // 删除默认配置中处理svg,
@ -124,9 +111,6 @@ module.exports = {
.options({
symbolId: '[name]'
})
// 删除预加载 针对请求 删除预加载 数进行优化
config.plugins.delete('prefetch-index')
config.plugins.delete('preload-index')
},
css: {
loaderOptions: {