From f0041ac6498d4809ffcb65734a2f16c6d60d86b4 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 13 Sep 2022 13:37:18 +0800 Subject: [PATCH 01/23] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E5=8D=A1=E6=B2=A1=E6=9C=89=E6=95=B0=E5=80=BC=E6=97=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A8=AA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/components/normal/LabelNormal.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/views/chart/components/normal/LabelNormal.vue b/frontend/src/views/chart/components/normal/LabelNormal.vue index 155175ce78..707f6ca950 100644 --- a/frontend/src/views/chart/components/normal/LabelNormal.vue +++ b/frontend/src/views/chart/components/normal/LabelNormal.vue @@ -259,6 +259,10 @@ export default { resultFormat() { if (!this.chart.data) return const value = this.chart.data.series[0].data[0] + if (value === null || value === undefined) { + this.result = '-' + return + } let yAxis = [] try { yAxis = JSON.parse(this.chart.yaxis) From 64755229e99e8ef130f64311386f6a731b01f43b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 13 Sep 2022 18:19:53 +0800 Subject: [PATCH 02/23] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E5=9C=A8=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=86=E7=BB=84=E4=B8=8B?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=BB=BA=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8A=A5?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/DataSetGroupService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java index fe058b6184..28ff78c646 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java @@ -46,7 +46,7 @@ public class DataSetGroupService { @Resource private SysAuthService sysAuthService; -// @DeCleaner(value = DePermissionType.DATASET, key = "pid") + @DeCleaner(value = DePermissionType.DATASET, key = "pid") public DataSetGroupDTO save(DatasetGroup datasetGroup) throws Exception { checkName(datasetGroup); if (StringUtils.isEmpty(datasetGroup.getId())) { From 2b2385602dedb7f1d89421f9c3ab74f79a6264f9 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 14 Sep 2022 13:58:38 +0800 Subject: [PATCH 03/23] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5=E8=A1=A8?= =?UTF-8?q?=E8=BE=BE=E5=BC=8F=E6=A0=87=E7=82=B9=E7=AC=A6=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V40__1.15.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/src/main/resources/db/migration/V40__1.15.sql b/backend/src/main/resources/db/migration/V40__1.15.sql index a64c69a2ff..ec0e30912d 100644 --- a/backend/src/main/resources/db/migration/V40__1.15.sql +++ b/backend/src/main/resources/db/migration/V40__1.15.sql @@ -40,3 +40,7 @@ INSERT INTO `sys_menu` VALUES (800, 0, 0, 1, '数据集表单', 'dataset-form', INSERT INTO `sys_msg_channel` VALUES (3, 'webmsg.channel_wecom_msg', 'sendWecom'); INSERT INTO `sys_msg_channel` VALUES (4, 'webmsg.channel_dingtalk_msg', 'sendDingtalk'); INSERT INTO `sys_msg_channel` VALUES (5, 'webmsg.channel_lark_msg', 'sendLark'); + +UPDATE `dataset_table_function` SET `func` = 'CONCAT(s1,s2,...)' WHERE `id` = 29; +UPDATE `dataset_table_function` SET `func` = 'CONCAT(s1,s2,...)' WHERE `id` = 78; + From f03eaffa9e35982a134b3dc56e0c793bae244208 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 14 Sep 2022 13:59:56 +0800 Subject: [PATCH 04/23] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E8=BE=85?= =?UTF-8?q?=E5=8A=A9=E7=BA=BF=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/chart/common/common.js | 7 +- .../views/chart/chart/common/common_antv.js | 7 +- .../chart/components/senior/AssistLine.vue | 64 +++++++++++----- .../senior/dialog/AssistLineEdit.vue | 75 +++++++++++++++++-- frontend/src/views/chart/view/ChartEdit.vue | 7 +- 5 files changed, 133 insertions(+), 27 deletions(-) diff --git a/frontend/src/views/chart/chart/common/common.js b/frontend/src/views/chart/chart/common/common.js index f8b97be386..ccb98c70d6 100644 --- a/frontend/src/views/chart/chart/common/common.js +++ b/frontend/src/views/chart/chart/common/common.js @@ -231,7 +231,12 @@ export function seniorCfg(chart_option, chart) { if (customStyle.yAxis) { yAxis = JSON.parse(JSON.stringify(customStyle.yAxis)) } - senior.assistLine.forEach(ele => { + + const fixedLines = senior.assistLine.filter(ele => ele.field === '0') + const dynamicLines = chart.data.dynamicAssistLines + const lines = fixedLines.concat(dynamicLines) + + lines.forEach(ele => { if (chart.type.includes('horizontal')) { chart_option.series[0].markLine.data.push({ symbol: 'none', diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js index c2945b25af..9c736d0d8e 100644 --- a/frontend/src/views/chart/chart/common/common_antv.js +++ b/frontend/src/views/chart/chart/common/common_antv.js @@ -658,7 +658,12 @@ export function getAnalyse(chart) { const a = JSON.parse(JSON.stringify(customStyle.yAxis)) yAxisPosition = transAxisPosition(chart, a) } - senior.assistLine.forEach(ele => { + + const fixedLines = senior.assistLine.filter(ele => ele.field === '0') + const dynamicLines = chart.data.dynamicAssistLines + const lines = fixedLines.concat(dynamicLines) + + lines.forEach(ele => { const content = ele.name + ' : ' + parseFloat(ele.value) assistLine.push({ type: 'line', diff --git a/frontend/src/views/chart/components/senior/AssistLine.vue b/frontend/src/views/chart/components/senior/AssistLine.vue index da7b7fdcfd..e21665a93f 100644 --- a/frontend/src/views/chart/components/senior/AssistLine.vue +++ b/frontend/src/views/chart/components/senior/AssistLine.vue @@ -16,10 +16,14 @@ {{ $t('chart.field_fixed') }} + {{ $t('chart.field_dynamic') }} - + {{ item.value }} + + {{ item.curField.name + '(' + $t('chart.' + item.summary) + ')' }} + @@ -34,7 +38,7 @@ width="70%" class="dialog-css" > - +
{{ $t('chart.cancel') }} {{ $t('chart.confirm') }} @@ -52,13 +56,18 @@ export default { chart: { type: Object, required: true + }, + quotaData: { + type: Array, + required: true } }, data() { return { assistLine: [], editLineDialog: false, - lineArr: [] + lineArr: [], + quotaFields: [] } }, watch: { @@ -114,21 +123,40 @@ export default { }) return } - if (!ele.value) { - this.$message({ - message: this.$t('chart.value_can_not_empty'), - type: 'error', - showClose: true - }) - return - } - if (parseFloat(ele.value).toString() === 'NaN') { - this.$message({ - message: this.$t('chart.value_error'), - type: 'error', - showClose: true - }) - return + if (ele.field === '0') { + if (!ele.value) { + this.$message({ + message: this.$t('chart.value_can_not_empty'), + type: 'error', + showClose: true + }) + return + } + if (parseFloat(ele.value).toString() === 'NaN') { + this.$message({ + message: this.$t('chart.value_error'), + type: 'error', + showClose: true + }) + return + } + } else { + if (!ele.fieldId || ele.fieldId === '') { + this.$message({ + message: this.$t('chart.field_not_empty'), + type: 'error', + showClose: true + }) + return + } + if (!ele.summary || ele.summary === '') { + this.$message({ + message: this.$t('chart.summary_not_empty'), + type: 'error', + showClose: true + }) + return + } } } this.assistLine = JSON.parse(JSON.stringify(this.lineArr)) diff --git a/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue b/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue index 489cd0ae27..1fec0fc210 100644 --- a/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue +++ b/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue @@ -3,7 +3,7 @@
- + @@ -16,9 +16,37 @@ /> - + + + + + + + + + + + {{ quota.name }} + + + + + + + + + + + + + !ele.chartId && ele.id !== 'count') + }, init() { this.lineArr = JSON.parse(JSON.stringify(this.line)) }, @@ -91,6 +137,23 @@ export default { changeAssistLine() { this.$emit('onAssistLineChange', this.lineArr) + }, + changeAssistLineField(item) { + item.curField = this.getQuotaField(item.fieldId) + this.changeAssistLine() + }, + getQuotaField(id) { + if (!id) { + return {} + } + const fields = this.quotaData.filter(ele => { + return ele.id === id + }) + if (fields.length === 0) { + return {} + } else { + return fields[0] + } } } } @@ -119,7 +182,7 @@ span { .value-item { position: relative; display: inline-block; - width: 120px !important; + width: 100px !important; } .select-item { diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index f4450cf46a..d0e4dae9ab 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -803,6 +803,7 @@ :param="param" class="attr-selector" :chart="chart" + :quota-data="quotaData" @onAssistLineChange="onAssistLineChange" /> @@ -2029,7 +2030,7 @@ export default { onAssistLineChange(val) { this.view.senior.assistLine = val - this.calcStyle() + this.calcData() }, onThresholdChange(val) { @@ -2294,6 +2295,8 @@ export default { closeEditDsField() { this.editDsField = false this.initTableField(this.table.id) + // 因动态计算较多，更新字段后重新计算视图数据 + this.calcData() }, editChartField() { @@ -2751,6 +2754,8 @@ export default { this.editChartCalcField = false this.currEditField = {} this.initTableField(this.table.id) + // 因动态计算较多，更新字段后重新计算视图数据 + this.calcData() }, deleteChartCalcField(item) { this.$confirm(this.$t('dataset.confirm_delete'), this.$t('chart.tips'), { From 674abcb203b3de27f06eca9f14076bcffcb4d443 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 14 Sep 2022 16:33:47 +0800 Subject: [PATCH 05/23] =?UTF-8?q?feat:=20=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=A3=80=E6=B5=8B=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/constants/ParamConstants.java | 2 + .../controller/sys/response/BasicInfo.java | 4 + .../io/dataease/job/sechedule/Schedular.java | 4 +- .../listener/DataSourceInitStartListener.java | 2 + .../service/dataset/ExtractDataService.java | 1 + .../service/datasource/DatasourceService.java | 86 +++++++++++++++++++ .../system/SystemParameterService.java | 26 ++++-- .../main/resources/db/migration/V40__1.15.sql | 17 ++++ frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + .../views/system/SysParam/BasicSetting.vue | 55 +++++++++++- 12 files changed, 188 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java b/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java index 6b5c6aacd0..6eef4b8d2c 100644 --- a/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java +++ b/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java @@ -110,6 +110,8 @@ public interface ParamConstants { enum BASIC implements ParamConstants { FRONT_TIME_OUT("basic.frontTimeOut"), MSG_TIME_OUT("basic.msgTimeOut"), + DS_CHECK_INTERVAL("basic.dsCheckInterval"), + DS_CHECK_INTERVAL_TYPE("basic.dsCheckIntervalType"), DEFAULT_LOGIN_TYPE("basic.loginType"), OPEN_HOME_PAGE("ui.openHomePage"), diff --git a/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java b/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java index 4a4ca4f3b8..7038a03406 100644 --- a/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java +++ b/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java @@ -22,5 +22,9 @@ public class BasicInfo implements Serializable { private String templateAccessKey; @ApiModelProperty("显示模板市场") private String openMarketPage; + @ApiModelProperty("数据源检测时间间隔") + private String dsCheckInterval; + @ApiModelProperty("数据源检测时间间隔类型") + private String dsCheckIntervalType; } diff --git a/backend/src/main/java/io/dataease/job/sechedule/Schedular.java b/backend/src/main/java/io/dataease/job/sechedule/Schedular.java index 6a1693e6ff..c6575cc218 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/Schedular.java +++ b/backend/src/main/java/io/dataease/job/sechedule/Schedular.java @@ -22,9 +22,9 @@ public class Schedular { dataSetTableService.updateDatasetTableStatus(); } - @QuartzScheduled(cron = "0 0/30 * * * ?") + @QuartzScheduled(cron = "0 0/3 * * * ?") public void updateDatasourceStatus() { - datasourceService.updateDatasourceStatus(); + datasourceService.checkDatasourceJob(); } @QuartzScheduled(cron = "0 0/30 * * * ?") diff --git a/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java b/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java index d9c360d1a8..bc53c1b879 100644 --- a/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java +++ b/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java @@ -22,8 +22,10 @@ public class DataSourceInitStartListener implements ApplicationListener types() { Collection types = new ArrayList<>(); @@ -432,6 +447,24 @@ public class DatasourceService { } } + public void checkDatasourceJob() { + List qrtzSchedulerStates = qrtzSchedulerStateMapper.selectByExample(null); + List activeQrtzInstances = qrtzSchedulerStates.stream() + .filter(qrtzSchedulerState -> qrtzSchedulerState.getLastCheckinTime() + + qrtzSchedulerState.getCheckinInterval() + 1000 > utilMapper.currentTimestamp()) + .map(QrtzSchedulerStateKey::getInstanceName).collect(Collectors.toList()); + + + List taskInstances = extTaskInstanceMapper.select(); + taskInstances.forEach(taskInstance -> { + if (StringUtils.isNotEmpty(taskInstance.getQrtzInstance()) && !activeQrtzInstances.contains(taskInstance.getQrtzInstance().substring(0, taskInstance.getQrtzInstance().length() - 13))) { + TaskInstance update = new TaskInstance(); + update.setTaskId("Datasource_check_status"); + extTaskInstanceMapper.update(update); + } + }); + } + public void updateDatasourceStatus() { List datasources = datasourceMapper.selectByExampleWithBLOBs(new DatasourceExample()); datasources.forEach(datasource -> checkAndUpdateDatasourceStatus(datasource, true)); @@ -496,4 +529,57 @@ public class DatasourceService { DeMsgutil.sendMsg(userId, typeId, content, gson.toJson(param)); }); } + + public void updateDatasourceStatusJob(BasicInfo basicInfo, List parameters) { + String type = ""; + Integer interval = 30; + + boolean changeDsCheckTime = false; + basicInfo.getDsCheckInterval(); + basicInfo.getDsCheckIntervalType(); + for (SystemParameter parameter : parameters) { + if (parameter.getParamKey().equalsIgnoreCase("basic.dsCheckInterval") && !parameter.getParamValue().equalsIgnoreCase(basicInfo.getDsCheckInterval())) { + changeDsCheckTime = true; + interval = Integer.valueOf(parameter.getParamValue()); + } + if (parameter.getParamKey().equalsIgnoreCase("basic.dsCheckIntervalType") && !parameter.getParamValue().equalsIgnoreCase(basicInfo.getDsCheckInterval())) { + changeDsCheckTime = true; + type = parameter.getParamValue(); + } + } + if(!changeDsCheckTime){ + return; + } + addJob(type, interval); + } + + private void addJob(String type, Integer interval) { + String cron = ""; + switch (type){ + case "hour": + cron = "0 0 0/hour * * ? *".replace("hour", interval.toString()); + break; + default: + cron = "0 0/minute * * * ? *".replace("minute", interval.toString()); + } + + GlobalTaskEntity globalTask = new GlobalTaskEntity(); + globalTask.setCron(cron); + globalTask.setCreateTime(System.currentTimeMillis()); + globalTask.setJobKey("Datasource_check_status"); + globalTask.setTaskName("Datasource check status"); + globalTask.setTaskType("dsTaskHandler"); + globalTask.setStartTime(System.currentTimeMillis()); + try { + scheduleService.addSchedule(globalTask); + }catch (Exception e){ + e.printStackTrace(); + } + } + + public void initDsCheckJob(){ + BasicInfo basicInfo = systemParameterService.basicInfo(); + addJob(basicInfo.getDsCheckIntervalType(), Integer.valueOf(basicInfo.getDsCheckInterval())); + } + } diff --git a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java index 015858320e..0b70c4ccd1 100644 --- a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java +++ b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java @@ -8,7 +8,6 @@ import io.dataease.controller.sys.response.BasicInfo; import io.dataease.dto.SystemParameterDTO; import io.dataease.exception.DataEaseException; import io.dataease.plugins.common.base.domain.FileMetadata; -import io.dataease.plugins.common.base.domain.SysParamAssist; import io.dataease.plugins.common.base.domain.SystemParameter; import io.dataease.plugins.common.base.domain.SystemParameterExample; import io.dataease.plugins.common.base.mapper.SystemParameterMapper; @@ -17,10 +16,11 @@ import io.dataease.plugins.xpack.cas.dto.CasSaveResult; import io.dataease.plugins.xpack.cas.service.CasXpackService; import io.dataease.plugins.xpack.display.service.DisplayXpackService; import io.dataease.service.FileService; +import io.dataease.service.datasource.DatasourceService; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -29,7 +29,6 @@ import javax.annotation.Resource; import javax.imageio.ImageIO; import java.io.IOException; import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.util.*; import java.util.concurrent.atomic.AtomicReference; @@ -47,6 +46,9 @@ public class SystemParameterService { private ExtSystemParameterMapper extSystemParameterMapper; @Resource private FileService fileService; + @Resource + @Lazy + private DatasourceService datasourceService; public String searchEmail() { return extSystemParameterMapper.email(); @@ -86,7 +88,12 @@ public class SystemParameterService { if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.TEMPLATE_ACCESS_KEY.getValue())) { result.setTemplateAccessKey(param.getParamValue()); } - + if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.DS_CHECK_INTERVAL.getValue())) { + result.setDsCheckInterval(param.getParamValue()); + } + if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.DS_CHECK_INTERVAL_TYPE.getValue())) { + result.setDsCheckIntervalType(param.getParamValue()); + } } } return result; @@ -109,6 +116,7 @@ public class SystemParameterService { @Transactional public CasSaveResult editBasic(List parameters) { CasSaveResult casSaveResult = afterSwitchDefaultLogin(parameters); + BasicInfo basicInfo = basicInfo(); for (int i = 0; i < parameters.size(); i++) { SystemParameter parameter = parameters.get(i); SystemParameterExample example = new SystemParameterExample(); @@ -121,9 +129,11 @@ public class SystemParameterService { } example.clear(); } + datasourceService.updateDatasourceStatusJob(basicInfo, parameters); return casSaveResult; } + @Transactional public void resetCas() { Map beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((CasXpackService.class)); @@ -188,7 +198,6 @@ public class SystemParameterService { } - public String getVersion() { return System.getenv("MS_VERSION"); } @@ -302,10 +311,11 @@ public class SystemParameterService { } } - public BasicInfo templateMarketInfo(){ + + public BasicInfo templateMarketInfo() { BasicInfo basicInfo = new BasicInfo(); List result = this.getParamList("basic.template"); - if(CollectionUtils.isNotEmpty(result)){ + if (CollectionUtils.isNotEmpty(result)) { result.stream().forEach(param -> { if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.TEMPLATE_MARKET_ULR.getValue())) { basicInfo.setTemplateMarketUlr(param.getParamValue()); @@ -315,7 +325,7 @@ public class SystemParameterService { } }); } - if(StringUtils.isEmpty(basicInfo.getTemplateMarketUlr())|| StringUtils.isEmpty(basicInfo.getTemplateAccessKey())){ + if (StringUtils.isEmpty(basicInfo.getTemplateMarketUlr()) || StringUtils.isEmpty(basicInfo.getTemplateAccessKey())) { DataEaseException.throwException("Please check market setting info"); } return basicInfo; diff --git a/backend/src/main/resources/db/migration/V40__1.15.sql b/backend/src/main/resources/db/migration/V40__1.15.sql index e6b292b6ce..3df26b9c03 100644 --- a/backend/src/main/resources/db/migration/V40__1.15.sql +++ b/backend/src/main/resources/db/migration/V40__1.15.sql @@ -8,3 +8,20 @@ CREATE TABLE `sys_external_token` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci; UPDATE `sys_menu` set `component` = 'system/datasource/DsForm' where `component` = 'system/datasource/form'; + + +INSERT INTO `system_parameter`(`param_key`, `param_value`, `type`, `sort`) VALUES ('basic.dsCheckInterval', 20, 'text', 1); +INSERT INTO `system_parameter`(`param_key`, `param_value`, `type`, `sort`) VALUES ('basic.dsCheckIntervalType', 'minute', 'text', 1); + +CREATE TABLE `task_instance` ( + `task_id` VARCHAR(128) NOT NULL COMMENT '任务ID', + `execute_time` bigint(13) DEFAULT NULL COMMENT '执行时间', + `finish_time` bigint(13) DEFAULT NULL COMMENT '完成时间', + `status` VARCHAR(128) DEFAULT NULL COMMENT '状态', + `info` longtext COMMENT '执行信息', + `qrtz_instance` VARCHAR(128) DEFAULT NULL COMMENT '任务实例ID', + PRIMARY KEY (`task_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci; + +INSERT INTO `task_instance` (`task_id`) VALUES ('Datasource_check_status'); + diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 525f7fc76d..bba26d4a95 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -794,6 +794,7 @@ export default { no_more_than: 'Size no more than', request_timeout: 'Request timeout', message_retention_time: 'Message retention time', + ds_check_time: 'Data source detection interval', test_mail_recipient: 'Used only as a test mail recipient', to_enable_tsl: 'If the SMTP port is 587, you usually need to enable TSL', to_enable_ssl: 'If the SMTP port is 465, you usually need to enable SSL', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 679796403d..adf4c46c5d 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -794,6 +794,7 @@ export default { no_more_than: '大小不超過', request_timeout: '請求超時時間', message_retention_time: '消息保留時間', + ds_check_time: '数据源檢測時間間隔', test_mail_recipient: '僅用來作為測試郵件收件人', to_enable_tsl: '如果SMTP埠是587，通常需要啟用TSL', to_enable_ssl: '如果SMTP埠是465，通常需要啟用SSL', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 571df4bbf9..4347ac11ec 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -794,6 +794,7 @@ export default { no_more_than: '大小不超过', request_timeout: '请求超时时间', message_retention_time: '消息保留时间', + ds_check_time: '数据源检测时间间隔', test_mail_recipient: '仅用来作为测试邮件收件人', to_enable_tsl: '如果SMTP端口是587，通常需要启用TSL', to_enable_ssl: '如果SMTP端口是465，通常需要启用SSL', diff --git a/frontend/src/views/system/SysParam/BasicSetting.vue b/frontend/src/views/system/SysParam/BasicSetting.vue index 91309eaead..1185d9e152 100644 --- a/frontend/src/views/system/SysParam/BasicSetting.vue +++ b/frontend/src/views/system/SysParam/BasicSetting.vue @@ -31,6 +31,22 @@ slot="append">{{ $t('components.day') }} + + + + + + + + + + + + + + + + {{ @@ -175,6 +191,18 @@ export default { type: "text", sort: 3, }, + { + paramKey: "basic.dsCheckInterval", + paramValue: this.formInline.dsCheckInterval, + type: "text", + sort: 4, + }, + { + paramKey: "basic.dsCheckIntervalType", + paramValue: this.formInline.dsCheckIntervalType, + type: "text", + sort: 5, + }, { paramKey: "ui.openHomePage", paramValue: this.formInline.openHomePage, @@ -234,7 +262,7 @@ export default { window.location.reload(); } else { this.openMessageSuccess("commons.save_failed", 'error'); - } + } }); }, cancel() { @@ -244,6 +272,29 @@ export default { this.show = true; this.query(); }, + onSimpleCronChange() { + if (this.formInline.dsCheckIntervalType === 'minute') { + if (this.formInline.dsCheckInterval < 1 || this.formInline.dsCheckInterval > 59) { + this.$message({ message: this.$t('cron.minute_limit'), type: 'warning', showClose: true }) + this.taskForm.extraData.simple_cron_value = 59 + } + return + } + if (this.formInline.dsCheckIntervalType === 'hour') { + if (this.formInline.dsCheckInterval < 1 || this.formInline.dsCheckInterval > 23) { + this.$message({ message: this.$t('cron.hour_limit'), type: 'warning', showClose: true }) + this.taskForm.extraData.simple_cron_value = 23 + } + return + } + if (this.formInline.dsCheckIntervalType === 'day') { + if (this.formInline.dsCheckInterval < 1 || this.formInline.dsCheckInterval > 31) { + this.$message({ message: this.$t('cron.day_limit'), type: 'warning', showClose: true }) + this.taskForm.extraData.simple_cron_value = 31 + } + return + } + }, }, }; @@ -273,4 +324,4 @@ export default { margin-left: 2px; } } - \ No newline at end of file + From 3ac50f7d3997dea70d4f5df04b4655da354e82ef Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 14 Sep 2022 17:12:23 +0800 Subject: [PATCH 06/23] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=B8=A0=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/service/impl/ShiroServiceImpl.java | 3 +- .../sys/SystemParameterController.java | 28 ++++++++----------- frontend/src/lang/en.js | 5 ++++ frontend/src/lang/tw.js | 9 ++++-- frontend/src/lang/zh.js | 9 ++++-- 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java index f2f84c1b5b..6a32dff31a 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java @@ -68,7 +68,8 @@ public class ShiroServiceImpl implements ShiroService { filterChainDefinitionMap.put("/**/*.json", ANON); filterChainDefinitionMap.put("/system/ui/**", ANON); - filterChainDefinitionMap.put("/system/file/**", ANON); + filterChainDefinitionMap.put("/system/filedown/**", ANON); + filterChainDefinitionMap.put("/system/showpicture/**", ANON); filterChainDefinitionMap.put("/**/*.js", ANON); filterChainDefinitionMap.put("/**/*.css", ANON); filterChainDefinitionMap.put("/**/*.map", ANON); diff --git a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java index 144f12bdd9..773d5b0853 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java @@ -1,6 +1,6 @@ package io.dataease.controller.sys; -import io.dataease.plugins.common.base.domain.FileMetadata; + import io.dataease.plugins.common.base.domain.SystemParameter; import io.dataease.commons.constants.ParamConstants; import io.dataease.controller.sys.response.BasicInfo; @@ -8,6 +8,7 @@ import io.dataease.controller.sys.response.MailInfo; import io.dataease.dto.SystemParameterDTO; import io.dataease.listener.DatasetCheckListener; import io.dataease.listener.util.CacheUtils; +import io.dataease.plugins.common.util.GlobalFileUtil; import io.dataease.plugins.xpack.cas.dto.CasSaveResult; import io.dataease.service.FileService; import io.dataease.service.system.EmailService; @@ -22,7 +23,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.io.IOException; -import java.net.URLEncoder; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -108,21 +109,16 @@ public class SystemParameterController { return new ResponseEntity<>(bytes, headers, HttpStatus.OK); } - @GetMapping("/file/down/{fileId}/{fileName}") - public ResponseEntity down(@PathVariable("fileId") String fileId, @PathVariable("fileName") String fileName) throws Exception{ + @GetMapping("/filedown/{fileId}/{fileName}") + public ResponseEntity down(@PathVariable("fileId") String fileId, @PathVariable("fileName") String fileName) throws Exception { - FileMetadata fileMetadata = fileService.getFileMetadataById(fileId); - String type = fileMetadata.getType(); - if (!StringUtils.endsWith(fileName.toUpperCase(), type.toUpperCase())) { - fileName += ("." + type); - } - byte[] bytes = fileService.loadFileAsBytes(fileId); - ByteArrayResource bar = new ByteArrayResource(bytes); - final HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); - ContentDisposition contentDisposition = ContentDisposition.parse("attachment; filename=" + URLEncoder.encode(fileName, "UTF-8")); - headers.setContentDisposition(contentDisposition); - return new ResponseEntity<>(bar, headers, HttpStatus.OK); + return GlobalFileUtil.down(fileId, fileName); + } + + @GetMapping("/showpicture/{fileId}") + public ResponseEntity showPicture(@PathVariable("fileId") String fileId) throws Exception { + + return GlobalFileUtil.showPicture(fileId); } @PostMapping(value = "/save/ui", consumes = {"multipart/form-data"}) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index d0c4bd0a01..ed845ecfdd 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -2337,6 +2337,11 @@ export default { panel: 'Panel', content: 'Content', recipients: 'Recipients', + recisetting: 'channel', + email: 'Email', + wecom: 'Wecom', + dingtalk: 'Dingtalk', + lark: 'Lark', pixel: 'Pixel', default: 'Default', custom: 'Custom', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index d936474cd3..3f479940b4 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -2334,10 +2334,15 @@ export default { }, emailtask: { - title: '郵件主題', + title: '報告主題', panel: '儀錶闆', - content: '郵件正文', + content: '報告正文', recipients: '收件人', + recisetting: '接受設置', + email: '郵件', + wecom: '企業微信', + dingtalk: '釘釘', + lark: '飛書', pixel: '分辨率', default: '默認', custom: '自定義', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index d4c2c5da07..fac524b4ef 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -2334,10 +2334,15 @@ export default { }, emailtask: { - title: '邮件主题', + title: '报告主题', panel: '仪表板', - content: '邮件正文', + content: '报告正文', recipients: '收件人', + recisetting: '接受设置', + email: '邮件', + wecom: '企业微信', + dingtalk: '钉钉', + lark: '飞书', pixel: '分辨率', default: '默认', custom: '自定义', From fe4b706d0ec8b62c0691da20fe875d09dfa065ca Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 14 Sep 2022 17:15:23 +0800 Subject: [PATCH 07/23] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):=20=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=B8=A0=E9=81=93sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V40__1.15.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/main/resources/db/migration/V40__1.15.sql b/backend/src/main/resources/db/migration/V40__1.15.sql index abc372af1a..009ce8c3aa 100644 --- a/backend/src/main/resources/db/migration/V40__1.15.sql +++ b/backend/src/main/resources/db/migration/V40__1.15.sql @@ -58,3 +58,9 @@ INSERT INTO `sys_msg_channel` VALUES (5, 'webmsg.channel_lark_msg', 'sendLark'); UPDATE `dataset_table_function` SET `func` = 'CONCAT(s1,s2,...)' WHERE `id` = 29; UPDATE `dataset_table_function` SET `func` = 'CONCAT(s1,s2,...)' WHERE `id` = 78; + + +ALTER TABLE `sys_task_email` + ADD COLUMN `recisetting` varchar(255) NULL COMMENT '消息渠道' AFTER `view_ids`, + ADD COLUMN `conditions` longtext NULL COMMENT '仪表板条件' AFTER `recisetting`; + From 9554e06767348eb2d71acf14f1e7f2c92fd0a410 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 14 Sep 2022 18:17:56 +0800 Subject: [PATCH 08/23] =?UTF-8?q?perf(i18n):=20=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 8 ++++++-- frontend/src/lang/tw.js | 8 ++++++-- frontend/src/lang/zh.js | 8 ++++++-- .../chart/components/senior/dialog/AssistLineEdit.vue | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index cb18250a16..87cf5a7bf2 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1016,7 +1016,8 @@ export default { table_item_fontsize: 'Table font size', table_header_bg: 'Header Background', table_item_bg: 'Table Background', - table_item_font_color: 'Font Color', + table_header_font_color: 'Header Font', + table_item_font_color: 'Table Font', stripe: 'Zebra pattern', start_angle: 'Start Angle', end_angle: 'End Angle', @@ -1329,7 +1330,10 @@ export default { chart_group: 'Sub Type', chart_bar_group: 'Bar Group', field_dynamic: 'Dynamic', - aggregation: 'Aggregation' + aggregation: 'Aggregation', + filter_between: 'Between', + field_not_empty: 'Field can not be empty', + summary_not_empty: 'Summary can not be empty' }, dataset: { parse_filed: 'Parse Field', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 6c6f93e14f..4447e957a2 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1016,7 +1016,8 @@ export default { table_item_fontsize: '錶格字體大小', table_header_bg: '錶頭背景', table_item_bg: '錶格背景', - table_item_font_color: '字體顔色', + table_header_font_color: '表頭字體', + table_item_font_color: '表格字體', stripe: '斑馬紋', start_angle: '起始角度', end_angle: '結束角度', @@ -1329,7 +1330,10 @@ export default { chart_group: '子類別', chart_bar_group: '分組柱狀圖', field_dynamic: '動態值', - aggregation: '聚合方式' + aggregation: '聚合方式', + filter_between: '介於', + field_not_empty: '字段不能為空', + summary_not_empty: '聚合方式不能為空' }, dataset: { parse_filed: '解析字段', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index f603364a1f..d43377e106 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1016,7 +1016,8 @@ export default { table_item_fontsize: '表格字体大小', table_header_bg: '表头背景', table_item_bg: '表格背景', - table_item_font_color: '字体颜色', + table_header_font_color: '表头字体', + table_item_font_color: '表格字体', stripe: '斑马纹', start_angle: '起始角度', end_angle: '结束角度', @@ -1329,7 +1330,10 @@ export default { chart_group: '子类别', chart_bar_group: '分组柱状图', field_dynamic: '动态值', - aggregation: '聚合方式' + aggregation: '聚合方式', + filter_between: '介于', + field_not_empty: '字段不能为空', + summary_not_empty: '聚合方式不能为空' }, dataset: { parse_filed: '解析字段', diff --git a/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue b/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue index 1fec0fc210..4275be9218 100644 --- a/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue +++ b/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue @@ -36,7 +36,7 @@ {{ quota.name }} - + From 3f7a5d3bfd7999dc69956f818548826f5b836e0a Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 15 Sep 2022 10:20:08 +0800 Subject: [PATCH 09/23] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E5=AD=98?= =?UTF-8?q?=E9=87=8F=E8=A7=86=E5=9B=BE=E5=8D=B4=E5=B0=91=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E7=BA=BF=E5=8F=82=E6=95=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 4516b139c0..b0499d4bc2 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -1658,10 +1658,14 @@ public class ChartViewService { String senior = view.getSenior(); JSONObject jsonObject = JSONObject.parseObject(senior); JSONArray assistLine = jsonObject.getJSONArray("assistLine"); + List list = new ArrayList<>(); + if (ObjectUtils.isEmpty(assistLine) || StringUtils.isBlank(assistLine.toJSONString())) { + return list; + } List assistLines = gson.fromJson(assistLine.toJSONString(), new TypeToken>() { }.getType()); - List list = new ArrayList<>(); + for (ChartSeniorAssistDTO dto : assistLines) { if (StringUtils.equalsIgnoreCase(dto.getField(), "0")) { continue; From f61c196dec4ba9130a1275f7bc56750efb756a00 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 15 Sep 2022 11:07:11 +0800 Subject: [PATCH 10/23] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E8=A1=A8=E6=A0=BC=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=88=86=E5=BC=80=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/chart.js | 1 + .../views/chart/chart/common/common_table.js | 36 +++++++++---------- frontend/src/views/chart/chart/util.js | 5 +++ .../components/shape-attr/ColorSelector.vue | 4 +++ .../chart/components/table/TableNormal.vue | 14 ++++---- .../PanelStyle/PanelColorSelector.vue | 10 ++++-- 6 files changed, 42 insertions(+), 28 deletions(-) diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index 91de281b9b..65eea85321 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -18,6 +18,7 @@ export const DEFAULT_COLOR_CASE = { alpha: 100, tableHeaderBgColor: '#6D9A49', tableItemBgColor: '#FFFFFF', + tableHeaderFontColor: '#000000', tableFontColor: '#000000', tableStripe: true, dimensionColor: '#000000', diff --git a/frontend/src/views/chart/chart/common/common_table.js b/frontend/src/views/chart/chart/common/common_table.js index 32c26e808a..4a2e5bf44e 100644 --- a/frontend/src/views/chart/chart/common/common_table.js +++ b/frontend/src/views/chart/chart/common/common_table.js @@ -23,17 +23,17 @@ export function getCustomTheme(chart) { verticalBorderColor: borderColor }, text: { - fill: DEFAULT_COLOR_CASE.tableFontColor, + fill: DEFAULT_COLOR_CASE.tableHeaderFontColor, fontSize: DEFAULT_SIZE.tableTitleFontSize, textAlign: headerAlign }, bolderText: { - fill: DEFAULT_COLOR_CASE.tableFontColor, + fill: DEFAULT_COLOR_CASE.tableHeaderFontColor, fontSize: DEFAULT_SIZE.tableTitleFontSize, textAlign: headerAlign }, measureText: { - fill: DEFAULT_COLOR_CASE.tableFontColor, + fill: DEFAULT_COLOR_CASE.tableHeaderFontColor, fontSize: DEFAULT_SIZE.tableTitleFontSize, textAlign: headerAlign } @@ -45,17 +45,17 @@ export function getCustomTheme(chart) { verticalBorderColor: borderColor }, text: { - fill: DEFAULT_COLOR_CASE.tableFontColor, + fill: DEFAULT_COLOR_CASE.tableHeaderFontColor, fontSize: DEFAULT_SIZE.tableTitleFontSize, textAlign: headerAlign }, bolderText: { - fill: DEFAULT_COLOR_CASE.tableFontColor, + fill: DEFAULT_COLOR_CASE.tableHeaderFontColor, fontSize: DEFAULT_SIZE.tableTitleFontSize, textAlign: headerAlign }, measureText: { - fill: DEFAULT_COLOR_CASE.tableFontColor, + fill: DEFAULT_COLOR_CASE.tableHeaderFontColor, fontSize: DEFAULT_SIZE.tableTitleFontSize, textAlign: headerAlign } @@ -67,17 +67,17 @@ export function getCustomTheme(chart) { verticalBorderColor: borderColor }, text: { - fill: DEFAULT_COLOR_CASE.tableFontColor, + fill: DEFAULT_COLOR_CASE.tableHeaderFontColor, fontSize: DEFAULT_SIZE.tableTitleFontSize, textAlign: headerAlign }, bolderText: { - fill: DEFAULT_COLOR_CASE.tableFontColor, + fill: DEFAULT_COLOR_CASE.tableHeaderFontColor, fontSize: DEFAULT_SIZE.tableTitleFontSize, textAlign: headerAlign }, measureText: { - fill: DEFAULT_COLOR_CASE.tableFontColor, + fill: DEFAULT_COLOR_CASE.tableHeaderFontColor, fontSize: DEFAULT_SIZE.tableTitleFontSize, textAlign: headerAlign } @@ -121,23 +121,23 @@ export function getCustomTheme(chart) { theme.cornerCell.cell.backgroundColor = h_c theme.cornerCell.cell.horizontalBorderColor = b_c theme.cornerCell.cell.verticalBorderColor = b_c - theme.cornerCell.bolderText.fill = c.tableFontColor - theme.cornerCell.text.fill = c.tableFontColor - theme.cornerCell.measureText.fill = c.tableFontColor + theme.cornerCell.bolderText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor + theme.cornerCell.text.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor + theme.cornerCell.measureText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor theme.rowCell.cell.backgroundColor = h_c theme.rowCell.cell.horizontalBorderColor = b_c theme.rowCell.cell.verticalBorderColor = b_c - theme.rowCell.bolderText.fill = c.tableFontColor - theme.rowCell.text.fill = c.tableFontColor - theme.rowCell.measureText.fill = c.tableFontColor + theme.rowCell.bolderText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor + theme.rowCell.text.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor + theme.rowCell.measureText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor theme.colCell.cell.backgroundColor = h_c theme.colCell.cell.horizontalBorderColor = b_c theme.colCell.cell.verticalBorderColor = b_c - theme.colCell.bolderText.fill = c.tableFontColor - theme.colCell.text.fill = c.tableFontColor - theme.colCell.measureText.fill = c.tableFontColor + theme.colCell.bolderText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor + theme.colCell.text.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor + theme.colCell.measureText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor theme.dataCell.cell.backgroundColor = i_c theme.dataCell.cell.horizontalBorderColor = b_c diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index b44f3fa95a..e595f0e5a9 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -45,6 +45,7 @@ export const TYPE_CONFIGS = [ 'color-selector': [ 'tableHeaderBgColor', 'tableItemBgColor', + 'tableHeaderFontColor', 'tableFontColor', 'tableBorderColor', 'alpha' @@ -88,6 +89,7 @@ export const TYPE_CONFIGS = [ 'color-selector': [ 'tableHeaderBgColor', 'tableItemBgColor', + 'tableHeaderFontColor', 'tableFontColor', 'tableBorderColor', 'alpha' @@ -134,6 +136,7 @@ export const TYPE_CONFIGS = [ 'color-selector': [ 'tableHeaderBgColor', 'tableItemBgColor', + 'tableHeaderFontColor', 'tableFontColor', 'tableBorderColor', 'alpha' @@ -1463,6 +1466,7 @@ export const TYPE_CONFIGS = [ 'color-selector': [ 'tableHeaderBgColor', 'tableItemBgColor', + 'tableHeaderFontColor', 'tableFontColor', 'alpha' ], @@ -1499,6 +1503,7 @@ export const TYPE_CONFIGS = [ 'color-selector': [ 'tableHeaderBgColor', 'tableItemBgColor', + 'tableHeaderFontColor', 'tableFontColor', 'alpha' ], diff --git a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue index 493bf0d848..884ace0398 100644 --- a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue +++ b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue @@ -94,6 +94,9 @@ + + + @@ -300,6 +303,7 @@ export default { } this.colorForm.tableBorderColor = this.colorForm.tableBorderColor ? this.colorForm.tableBorderColor : DEFAULT_COLOR_CASE.tableBorderColor + this.colorForm.tableHeaderFontColor = this.colorForm.tableHeaderFontColor ? this.colorForm.tableHeaderFontColor : this.colorForm.tableFontColor this.initCustomColor() } diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue index 973b17a973..696918d516 100644 --- a/frontend/src/views/chart/components/table/TableNormal.vue +++ b/frontend/src/views/chart/components/table/TableNormal.vue @@ -200,12 +200,12 @@ export default { datas = [] this.resetPage() } - datas.forEach(item =>{ - Object.keys(item).forEach(key=> { - if(typeof item[key] === 'object'){ - item[key] = "" - } - }) + datas.forEach(item => { + Object.keys(item).forEach(key => { + if (typeof item[key] === 'object') { + item[key] = '' + } + }) }) this.$refs.plxTable.reloadData(datas) this.$nextTick(() => { @@ -257,7 +257,7 @@ export default { if (this.chart.customAttr) { const customAttr = JSON.parse(this.chart.customAttr) if (customAttr.color) { - this.table_header_class.color = customAttr.color.tableFontColor + this.table_header_class.color = customAttr.color.tableHeaderFontColor ? customAttr.color.tableHeaderFontColor : customAttr.color.tableFontColor this.table_header_class.background = hexColorToRGBA(customAttr.color.tableHeaderBgColor, customAttr.color.alpha) this.table_item_class.color = customAttr.color.tableFontColor this.table_item_class.background = hexColorToRGBA(customAttr.color.tableItemBgColor, customAttr.color.alpha) diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue index b0c1b8756c..17cbe24635 100644 --- a/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue +++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue @@ -67,6 +67,9 @@ + + + @@ -82,7 +85,7 @@