github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 12:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2555 from dataease/dev

Browse Source 
dev merge
This commit is contained in:
王嘉豪 2022-07-01 17:49:49 +08:00 committed by GitHub
commit 28b01bf588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/dataease/commons/utils/HttpClientUtil.java
View File

@ -86,9 +86,6 @@ public class HttpClientUtil {
for (String key : header.keySet()) {
httpGet.addHeader(key, header.get(key));
}
httpGet.addHeader(HTTP.CONTENT_ENCODING, config.getCharset());
HttpResponse response = httpClient.execute(httpGet);
return getResponseStr(response, config);
} catch (Exception e) {
@ -124,9 +121,6 @@ public class HttpClientUtil {
for (String key : header.keySet()) {
httpPost.addHeader(key, header.get(key));
}
httpPost.addHeader(HTTP.CONTENT_TYPE, "application/json");
httpPost.addHeader(HTTP.CONTENT_ENCODING, config.getCharset());
EntityBuilder entityBuilder = EntityBuilder.create();
entityBuilder.setText(json);
entityBuilder.setContentType(ContentType.APPLICATION_JSON);
@ -180,8 +174,6 @@ public class HttpClientUtil {
for (String key : header.keySet()) {
httpPost.addHeader(key, header.get(key));
}
httpPost.addHeader(HTTP.CONTENT_ENCODING, config.getCharset());
if (body != null && body.size() > 0) {
List<NameValuePair> nvps = new ArrayList<>();
for (String key : body.keySet()) {

6
backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
View File

@ -62,11 +62,11 @@ public class DorisDDLProvider extends DDLProviderImpl {
}
switch (datasetTableField.getDeExtractType()) {
case 0:
Column_Fields.append("varchar(length)".replace("length", String.valueOf(size))).append(",`");
Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
break;
case 1:
size = size < 50? 50 : size;
Column_Fields.append("varchar(length)".replace("length", String.valueOf(size))).append(",`");
Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
break;
case 2:
Column_Fields.append("bigint").append(",`");
@ -78,7 +78,7 @@ public class DorisDDLProvider extends DDLProviderImpl {
Column_Fields.append("TINYINT(length)".replace("length", String.valueOf(size))).append(",`");
break;
default:
Column_Fields.append("varchar(length)".replace("length", String.valueOf(size))).append(",`");
Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
break;
}
}

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

@ -3,7 +3,7 @@
ref="visualSelect"
v-model="selectValue"
:class="classId"
popper-class="VisualSelects"
popper-class="VisualSelects coustom-de-select"
no-match-text=" "
v-bind="$attrs"
v-on="$listeners"

5
frontend/src/components/canvas/components/Editor/EditBarView.vue
View File

@ -7,6 +7,9 @@
<span :title="$t('panel.details')">
<i class="icon iconfont icon-chakan" @click.stop="showViewDetails('details')" />
</span>
<span :title="$t('panel.enlarge')">
<i class="icon iconfont icon-fangda" @click.stop="showViewDetails('enlarge')" />
</span>
</div>
<div v-if="positionCheck('multiplexing')" style="margin-right: -1px;width: 18px;z-index: 5">
<el-checkbox v-model="multiplexingCheckModel" size="medium" @change="multiplexingCheck" />
@ -88,7 +91,7 @@ export default {
this.$emit('amRemoveItem')
},
showViewDetails(params) {
this.$emit('showViewDetails', params)
this.$emit('showViewDetails', { openType: params })
},
positionCheck(position) {
return this.showPosition.includes(position)

5
frontend/src/components/canvas/components/Editor/Preview.vue
View File

@ -185,8 +185,9 @@ export default {
return this.$store.state.panel.mainActiveName
},
showUnpublishedArea() {
// return this.panelInfo.status === 'unpublished'
if (this.panelInfo && this.panelInfo.showType === 'view') {
if (this.showPosition === 'edit') {
return false
} else if (this.panelInfo && this.panelInfo.showType === 'view') {
return false
} else if ((this.mainActiveName === 'PanelMain' && this.activeTab === 'PanelList') || this.showPosition.includes('multiplexing')) {
return this.panelInfo.status === 'unpublished' && !hasDataPermission('manage', this.panelInfo.privileges)

5
frontend/src/components/canvas/custom-component/UserViewDialog.vue
View File

@ -12,9 +12,10 @@
/>
<chart-component v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'" class="chart-class" :chart="mapChart || chart" />
<chart-component-g2 v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'antv'" class="chart-class" :chart="chart" />
<chart-component-s2 v-else-if="chart.type === 'table-pivot' && renderComponent() === 'antv'" class="chart-class" :chart="chart" />
<chart-component-s2 v-else-if="chart.type.includes('table') && renderComponent() === 'antv'" class="chart-class" :chart="chart" />
<label-normal v-else-if="chart.type.includes('text')" :chart="chart" class="table-class" />
<label-normal-text v-else-if="chart.type === 'label'" :chart="chart" class="table-class" />
<table-normal v-else-if="chart.type.includes('table') && renderComponent() === 'echarts'" :chart="chart" class="table-class" />
</div>
</div>
</de-main-container>
@ -67,7 +68,7 @@ export default {
},
computed: {
isAbsoluteContainer() {
return this.chart.type === 'symbol-map'
return this.showChartCanvas && this.chart.type === 'symbol-map'
},
showChartCanvas() {
return this.openType === 'enlarge'

1
frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
View File

@ -14,6 +14,7 @@ const dialogPanel = {
placeholder: 'denumberselect.placeholder',
datas: [],
viewIds: [],
parameters: [],
key: 'id',
label: 'text',
value: 'id',

2
frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
View File

@ -46,7 +46,7 @@
<el-input v-model="axisForm.axisValue.min" @blur="changeXAxisStyle('axisValue')" />
</el-form-item>
<el-form-item :label="$t('chart.axis_value_max')" class="form-item">
<el-input @blur="changeXAxisStyle('axisValue')" />
<el-input v-model="axisForm.axisValue.max" @blur="changeXAxisStyle('axisValue')" />
</el-form-item>
<el-form-item :label="$t('chart.axis_value_split_count')" class="form-item">
<el-input v-model="axisForm.axisValue.splitCount" @blur="changeXAxisStyle('axisValue')" />

5
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -49,10 +49,11 @@
</el-form>
</el-col>
<el-col :span="8">
<el-button type="text" size="mini" style="float: right;" @click="variableMgm">
<el-row style="float: right">
<el-button type="text" size="mini" @click="variableMgm">
{{ $t('sql_variable.variable_mgm') }}
</el-button>
</el-tooltip>
</el-row>
</el-col>
</el-row>
<el-row>

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

@ -269,6 +269,7 @@
:show-type="canvasStyleData.selfAdaption?'full':'width'"
:canvas-style-data="canvasStyleData"
:component-data="componentData"
show-position="edit"
/>
</fullscreen>
<input

1
frontend/src/views/panel/filter/filterMain/FilterControl.vue
View File

@ -75,7 +75,6 @@
class="de-checkbox"
>
<div class="span-div">
<svg-icon :icon-class="item.type" class="chart-icon" />
<span v-if="item.variableName && item.variableName.length <= 7" style="margin-left: 6px">{{ item.variableName }}</span>
<el-tooltip v-else class="item" effect="dark" :content="item.variableName" placement="left">
<span style="margin-left: 6px">{{ item.variableName }}</span>