center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' into pr@dev_eslint_auto_fix

Browse Source
This commit is contained in:
dataeaseShu 2022-10-31 17:19:57 +08:00
commit 87beaa5445
14 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java
View File

@ -212,7 +212,7 @@ public class EmailTaskHandler extends TaskHandler implements Job {
List<String> viewIdList = Arrays.asList(viewIds.split(",")).stream().map(s -> s.trim()).filter(viewId -> StringUtils.isNotBlank(viewId) && viewOptionIdList.contains(viewId)).collect(Collectors.toList());
PermissionProxy proxy = new PermissionProxy();
proxy.setUserId(user.getUserId());
files = viewExportExcel.export(panelId, viewIdList, proxy, justExportView);
files = viewExportExcel.export(panelId, viewIdList, proxy, justExportView, taskInstance.getTaskId().toString());
}
List<String> channels = null;

4
backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
View File

@ -40,7 +40,7 @@ public class ViewExportExcel {
}.getType();
@DePermissionProxy(paramIndex = 2)
public List<File> export(String panelId, List<String> viewIds, PermissionProxy proxy, Boolean justView) throws Exception {
public List<File> export(String panelId, List<String> viewIds, PermissionProxy proxy, Boolean justView, String taskId) throws Exception {
if (CollectionUtils.isEmpty(viewIds)) {
return null;
}
@ -51,7 +51,7 @@ public class ViewExportExcel {
Map<String, ChartExtRequest> stringChartExtRequestMap = buildViewRequest(panelDto, justView);
List<File> results = new ArrayList<>();
List<ExcelSheetModel> sheets = viewIds.stream().map(viewId -> viewFiles(viewId, stringChartExtRequestMap.get(viewId))).collect(Collectors.toList());
File excelFile = ExcelUtils.exportExcel(sheets, panelDto.getName(), panelDto.getId());
File excelFile = ExcelUtils.exportExcel(sheets, panelDto.getName(), panelDto.getId() + "_" + taskId);
results.add(excelFile);
return results;
}

14
backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java
View File

@ -7,8 +7,10 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service("numberRangeWidget")
public class NumberRangeBuild extends FilterBuildTemplate {
@ -24,18 +26,22 @@ public class NumberRangeBuild extends FilterBuildTemplate {
Map<String, Object> options = null;
List<String> values = null;
if((optionObj = component.get("options")) != null && (valueObj = (options = (Map<String, Object>) optionObj).get("value")) != null && CollectionUtil.isNotEmpty((values = (List<String>) valueObj))) {
if ((optionObj = component.get("options")) != null && (valueObj = (options = (Map<String, Object>) optionObj).get("value")) != null) {
if (valueObj instanceof List) {
values = (List<String>) valueObj;
} else {
return result;
}
String min = values.get(0);
String max = null;
if(values.size() > 1) {
if (values.size() > 1) {
max = values.get(1);
}
result.setOperator("between");
result.getValue().set(0, min);
result.getValue().set(1, max);
if (StringUtils.isNotBlank(min) && StringUtils.isNotBlank(max)) {
result.setValue(values);
return result;
}

4
backend/src/main/resources/db/migration/V42__1.16.sql
View File

@ -281,3 +281,7 @@ RETURN 'success';
END
;;
delimiter ;
UPDATE `panel_subject`
SET `details` = '{\"width\":1600,\"height\":900,\"scale\":100,\"scaleWidth\":100,\"scaleHeight\":100,\"selfAdaption\":true,\"auxiliaryMatrix\":true,\"openCommonStyle\":true,\"panel\":{\"themeColor\":\"dark\",\"color\":\"#030B2E\",\"imageUrl\":{},\"backgroundType\":\"color\",\"gap\":\"yes\",\"resultMode\":\"all\",\"resultCount\":1000},\"aidedDesign\":{\"showGrid\":false,\"matrixBase\":4},\"refreshViewLoading\":true,\"refreshUnit\":\"minute\",\"refreshTime\":5,\"themeId\":\"f9f46a50-58f5-11ed-889b-91ab7371e877\",\"chartInfo\":{\"chartTitle\":{\"show\":true,\"fontSize\":\"18\",\"color\":\"#FFFFFF\",\"hPosition\":\"left\",\"vPosition\":\"top\",\"isItalic\":false,\"isBolder\":true,\"remarkShow\":false,\"remark\":\"\",\"remarkBackgroundColor\":\"#5A5C62\",\"fontFamily\":\"Microsoft YaHei\",\"letterSpace\":\"0\",\"fontShadow\":false},\"chartColor\":{\"value\":\"default\",\"colors\":[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\"],\"alpha\":100,\"tableHeaderBgColor\":\"#5470C6\",\"tableItemBgColor\":\"#131E42\",\"tableFontColor\":\"#ffffff\",\"tableStripe\":true,\"dimensionColor\":\"#ffffff\",\"quotaColor\":\"#5470C6\",\"tableBorderColor\":\"#CCCCCC\",\"seriesColors\":[],\"areaBorderColor\":\"#EBEEF5\",\"tableHeaderFontColor\":\"#ffffff\",\"modifyName\":\"colors\"},\"chartCommonStyle\":{\"backgroundColorSelect\":true,\"color\":\"#131E42\",\"alpha\":100,\"borderRadius\":5,\"innerPadding\":0},\"filterStyle\":{\"horizontal\":\"left\",\"vertical\":\"top\",\"color\":\"#FFFFFF\",\"brColor\":\"#4E4B4B\",\"wordColor\":\"#FFFFFF\",\"innerBgColor\":\"#131E42\"},\"tabStyle\":{\"headFontColor\":\"#FFFFFF\",\"headFontActiveColor\":\"#FFFFFF\",\"headBorderColor\":\"#FFFFFF\",\"headBorderActiveColor\":\"#FFFFFF\",\"headPosition\":\"left\"}}}'
WHERE `id` = 'system_2';

2
frontend/src/components/canvas/utils/style.js
View File

@ -8,7 +8,7 @@ export const LIGHT_THEME_PANEL_BACKGROUND = '#F1F3F5'
export const LIGHT_THEME_COMPONENT_BACKGROUND = '#FFFFFF'
export const DARK_THEME_COLOR_MAIN = '#FFFFFF'
export const DARK_THEME_COLOR_SLAVE1 = '#CCCCCC'
export const DARK_THEME_COLOR_SLAVE1 = '#858383'
export const DARK_THEME_PANEL_BACKGROUND = '#030B2E'
export const DARK_THEME_COMPONENT_BACKGROUND = '#131E42'
export const DARK_THEME_COMPONENT_BACKGROUND_BACK = '#5a5c62'

1
frontend/src/lang/en.js
View File

@ -913,6 +913,7 @@ export default {
password_input_error: 'Original password input error'
},
chart: {
chart_background: 'Component background',
solid_color: 'Solid color',
split_gradient: 'Split gradient',
continuous_gradient: 'Continuous gradient',

1
frontend/src/lang/tw.js
View File

@ -913,6 +913,7 @@ export default {
password_input_error: '原始密碼輸入錯誤'
},
chart: {
chart_background: '組件背景',
solid_color: '純色',
split_gradient: '分離漸變',
continuous_gradient: '連續漸變',

1
frontend/src/lang/zh.js
View File

@ -912,6 +912,7 @@ export default {
password_input_error: '原始密码输入错误'
},
chart: {
chart_background: '组件背景',
solid_color: '纯色',
split_gradient: '分离渐变',
continuous_gradient: '连续渐变',

10
frontend/src/views/chart/chart/chart.js
View File

@ -1,8 +1,8 @@
export const DEFAULT_TAB_COLOR_CASE_DARK = {
headFontColor: '#FFFFFF',
headFontActiveColor: '#FFFFFF',
headBorderColor: '#FFFFFF',
headBorderActiveColor: '#FFFFFF',
headBorderColor: '#131E42',
headBorderActiveColor: '#131E42',
headPosition: 'left'
}
@ -24,7 +24,7 @@ export const DEFAULT_COLOR_CASE = {
tableFontColor: '#000000',
tableStripe: true,
dimensionColor: '#000000',
quotaColor: '#4E81BB',
quotaColor: '#5470c6',
tableBorderColor: '#E6E7E4',
seriesColors: [], // 格式：{"name":"s1","color":"","isCustom":false}
areaBorderColor: '#303133'
@ -34,12 +34,12 @@ export const DEFAULT_COLOR_CASE_DARK = {
value: 'default',
colors: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'],
alpha: 100,
tableHeaderBgColor: '#4E81BB',
tableHeaderBgColor: '#5470c6',
tableItemBgColor: '#131E42',
tableFontColor: '#ffffff',
tableStripe: true,
dimensionColor: '#ffffff',
quotaColor: '#4E81BB',
quotaColor: '#5470c6',
tableBorderColor: '#CCCCCC',
seriesColors: [], // 格式：{"name":"s1","color":"","isCustom":false}
areaBorderColor: '#EBEEF5'

2
frontend/src/views/chart/components/ChartComponentG2.vue
View File

@ -18,7 +18,7 @@
:style="title_class"
style="cursor: default;display: block;"
>
<div style="padding:6px 4px 0;margin: 0;">
<div style="padding:6px 4px 0;margin: 0;display: flex;">
<chart-title-update :chart-info="chartInfo" />
<title-remark
v-if="remarkCfg.show"

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

@ -18,7 +18,7 @@
:style="title_class"
style="cursor: default;display: block;"
>
<div style="padding:6px 4px 0;margin: 0;">
<div style="padding:6px 4px 0;margin: 0;display: flex;">
<chart-title-update :chart-info="chartInfo" />
<title-remark
v-if="remarkCfg.show"

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

@ -10,7 +10,7 @@
:style="title_class"
style="cursor: default;display: block;"
>
<div>
<div style="display: flex;">
<chart-title-update :chart-info="chartInfo" />
<title-remark
v-if="chart.render && chart.render === 'antv' && remarkCfg.show"

2
frontend/src/views/chart/components/normal/LabelNormalText.vue
View File

@ -17,7 +17,7 @@
:style="title_class"
style="cursor: default;display: block;"
>
<div>
<div style="display: flex;">
<chart-title-update :chart-info="chartInfo" />
<title-remark
v-if="chart.render && chart.render === 'antv' && remarkCfg.show"

6
frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentStyle.vue
View File

@ -7,7 +7,7 @@
style="margin-right: 10px;float: right"
@change="themeChange('backgroundColorSelect')"
>
<span style="font-size: 12px">{{ $t('panel.color') }}</span>
<span style="font-size: 12px">{{ $t('chart.chart_background') }}</span>
</el-checkbox>
</el-col>
<el-col :span="10">
@ -100,10 +100,10 @@ export default {
font-size: 12px;
}
.custom-item{
width: 70px;
width: 90px;
}
.custom-item-value{
width: calc(100% - 70px);;
width: calc(100% - 90px);;
}
</style>