From 4e54c152ad1386e8dee1a75c9f563a318669c45d Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 11 Jun 2021 14:04:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=8D=A1=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/components/normal/LabelNormal.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/chart/components/normal/LabelNormal.vue b/frontend/src/views/chart/components/normal/LabelNormal.vue index e859786e02..3d5d0a0496 100644 --- a/frontend/src/views/chart/components/normal/LabelNormal.vue +++ b/frontend/src/views/chart/components/normal/LabelNormal.vue @@ -6,13 +6,13 @@ id="label-content" :style="content_class" > -

- - {{ chart.data.series[0].name }} +

+ {{ item.data[0] }}

-

- {{ item.data[0] }} +

+ + {{ chart.data.series[0].name }}

From e53363d8286813c25504c4b36f2e2867e2bb6cd4 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 11 Jun 2021 14:23:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1):?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=BC=80=E5=A7=8B=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/job/sechedule/ScheduleManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java index fa7cdcf96f..e16cfc3aa8 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java +++ b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java @@ -74,9 +74,9 @@ public class ScheduleManager { triggerBuilder.withIdentity(triggerKey); Date nTimeByCron = getNTimeByCron(cron, startTime); - if (startTime.before(new Date())) { - triggerBuilder.startAt(nTimeByCron); - } +// if (startTime.before(new Date())) { + triggerBuilder.startAt(nTimeByCron); +// } if (endTime != null) { if (endTime.before(nTimeByCron)) { @@ -157,9 +157,9 @@ public class ScheduleManager { triggerBuilder.withIdentity(triggerKey);// 触发器名,触发器组 Date nTimeByCron = getNTimeByCron(cron, startTime); - if (startTime.before(new Date())) { - triggerBuilder.startAt(nTimeByCron); - } +// if (startTime.before(new Date())) { + triggerBuilder.startAt(nTimeByCron); +// } if (endTime != null) { if (endTime.before(nTimeByCron)) { From 2a7685c27448ceafb9cd5bf041bfe5a81a063373 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 11 Jun 2021 15:44:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dvue=E7=A9=BA?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=AF=BC=E8=87=B4=E5=88=A4=E6=96=AD=E5=B8=83?= =?UTF-8?q?=E5=B0=94=E6=9D=A1=E4=BB=B6=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/widget/DeWidget/DeSelect.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue index 269f68eee1..57853a8e67 100644 --- a/frontend/src/components/widget/DeWidget/DeSelect.vue +++ b/frontend/src/components/widget/DeWidget/DeSelect.vue @@ -48,13 +48,14 @@ export default { watch: { 'options.attrs.multiple': function(value) { const sourceValue = this.options.value + const sourceValid = !!sourceValue && Object.keys(sourceValue).length > 0 if (value) { - !sourceValue && (this.options.value = []) - sourceValue && !Array.isArray(sourceValue) && (this.options.value = sourceValue.split(',')) + !sourceValid && (this.options.value = []) + sourceValid && !Array.isArray(sourceValue) && (this.options.value = sourceValue.split(',')) !this.inDraw && (this.options.value = []) } else { - !sourceValue && (this.options.value = null) - sourceValue && Array.isArray(sourceValue) && (this.options.value = sourceValue[0]) + !sourceValid && (this.options.value = null) + sourceValid && Array.isArray(sourceValue) && (this.options.value = sourceValue[0]) !this.inDraw && (this.options.value = null) } } @@ -68,7 +69,7 @@ export default { // this.$nextTick(() => { // this.options && this.options.value && this.changeValue(this.options.value) // }) - this.options && this.options.value && this.changeValue(this.options.value) + this.options && this.options.value && Object.keys(this.options.value).length > 0 && this.changeValue(this.options.value) }, methods: { changeValue(value) { From ec0a1f95240b0e6e1351998167a5d1b897d1c2c3 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 11 Jun 2021 16:06:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E3=80=90ID1004304=E3=80=91=E5=85=A8?= =?UTF-8?q?=E6=96=B0=E5=AE=89=E8=A3=85=E7=9A=84=E7=8E=AF=E5=A2=83=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0license=E7=9A=84=E6=97=B6=E5=80=99=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=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/AboutService.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/AboutService.java b/backend/src/main/java/io/dataease/service/AboutService.java index 9568c4f6b9..5041719751 100644 --- a/backend/src/main/java/io/dataease/service/AboutService.java +++ b/backend/src/main/java/io/dataease/service/AboutService.java @@ -4,6 +4,7 @@ import io.dataease.commons.constants.AuthConstants; import io.dataease.commons.license.DefaultLicenseService; import io.dataease.commons.license.F2CLicenseResponse; import io.dataease.commons.utils.CommonBeanFactory; +import io.dataease.commons.utils.DateUtils; import io.dataease.commons.utils.LogUtil; import io.dataease.listener.util.CacheUtils; import org.apache.commons.io.FileUtils; @@ -27,11 +28,17 @@ public class AboutService { F2CLicenseResponse f2CLicenseResponse = defaultLicenseService.updateLicense(product, licenseKey); Optional.ofNullable(f2CLicenseResponse).ifPresent(resp -> { if (resp.getStatus() == F2CLicenseResponse.Status.valid){ - CacheUtils.updateLicCache(new Date(f2CLicenseResponse.getLicense().getExpired())); - - CacheUtils.removeAll(AuthConstants.USER_CACHE_NAME); - CacheUtils.removeAll(AuthConstants.USER_ROLE_CACHE_NAME); - CacheUtils.removeAll(AuthConstants.USER_PERMISSION_CACHE_NAME); + String dateStr = f2CLicenseResponse.getLicense().getExpired(); + LogUtil.info("update valid lic, expired date is {}", dateStr); + try { + Date date = DateUtils.getDate(dateStr); + CacheUtils.updateLicCache(date); + CacheUtils.removeAll(AuthConstants.USER_CACHE_NAME); + CacheUtils.removeAll(AuthConstants.USER_ROLE_CACHE_NAME); + CacheUtils.removeAll(AuthConstants.USER_PERMISSION_CACHE_NAME); + } catch (Exception e) { + LogUtil.error(e); + } } }); return f2CLicenseResponse; From 6c62ff00a6d33647b53f26389d41bdd02373ee02 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 11 Jun 2021 16:47:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20sql=20=E6=95=B0=E6=8D=AE=E9=9B=86=20?= =?UTF-8?q?=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/ExtractDataService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index a802d81b00..141366f4e6 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -199,17 +199,18 @@ public class ExtractDataService { extractData(datasetTable, "all_scope"); replaceTable(DorisTableUtils.dorisName(datasetTableId)); saveSucessLog(datasetTableTaskLog); + deleteFile("all_scope", datasetTableId); updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed); }catch (Exception e){ saveErrorLog(datasetTableId, taskId, e); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error); dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId))); + deleteFile("all_scope", datasetTableId); }finally { if (datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { datasetTableTask.setRate(ScheduleType.SIMPLE_COMPLETE.toString()); dataSetTableTaskService.update(datasetTableTask); } - deleteFile("all_scope", datasetTableId); } break; @@ -258,18 +259,20 @@ public class ExtractDataService { extractData(datasetTable, "incremental_delete"); } saveSucessLog(datasetTableTaskLog); + deleteFile("incremental_add", datasetTableId); + deleteFile("incremental_delete", datasetTableId); updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed); } }catch (Exception e){ saveErrorLog(datasetTableId, taskId, e); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error); + deleteFile("incremental_add", datasetTableId); + deleteFile("incremental_delete", datasetTableId); }finally { if (datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { datasetTableTask.setRate(ScheduleType.SIMPLE_COMPLETE.toString()); dataSetTableTaskService.update(datasetTableTask); } - deleteFile("incremental_add", datasetTableId); - deleteFile("incremental_delete", datasetTableId); } break; }