From afaf9626bb9492155759d5f95c13f07fe0b4441a Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Thu, 8 Aug 2024 17:57:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E8=BF=87=E6=BB=A4=E5=99=A8=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=B8=8E=E8=AE=BE=E8=AE=A1=E4=B8=8D=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v-query/DynamicTimeForViewFilter.vue | 8 +++ .../components/editor/filter/TimeDialog.vue | 8 +-- .../editor/filter/auth-tree/FilterFiled.vue | 49 ++++++++++++++++++- 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/core/core-frontend/src/custom-component/v-query/DynamicTimeForViewFilter.vue b/core/core-frontend/src/custom-component/v-query/DynamicTimeForViewFilter.vue index 367ffff853..0f7d5c54e6 100644 --- a/core/core-frontend/src/custom-component/v-query/DynamicTimeForViewFilter.vue +++ b/core/core-frontend/src/custom-component/v-query/DynamicTimeForViewFilter.vue @@ -127,9 +127,17 @@ onBeforeMount(() => { + + diff --git a/core/core-frontend/src/views/chart/components/editor/filter/TimeDialog.vue b/core/core-frontend/src/views/chart/components/editor/filter/TimeDialog.vue index 67a50d9c26..7b90ba0184 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/TimeDialog.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/TimeDialog.vue @@ -231,7 +231,7 @@ defineExpose({ /> @@ -239,8 +239,8 @@ defineExpose({
预览
-
- +
+
@@ -280,7 +280,7 @@ defineExpose({ .setting-input { display: flex; - padding-left: 86px; + padding-left: 126px; justify-content: flex-end; align-items: center; &.range { diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue index ff5e4e35b6..532a8e6b27 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue @@ -197,14 +197,59 @@ const relativeToCurrentTypeMap = { const confirmTimeSelect = () => { item.value.dynamicTimeSetting = { ...timeDialog.value.curComponent } - const { timeGranularity, timeNum, relativeToCurrentType, around, arbitraryTime } = - item.value.dynamicTimeSetting + const { + timeGranularity, + timeNum, + relativeToCurrentType, + around, + arbitraryTime, + relativeToCurrent + } = item.value.dynamicTimeSetting + if (relativeToCurrent !== 'custom') { + item.value.timeValue = [ + { + label: '今年', + value: 'thisYear' + }, + { + label: '去年', + value: 'lastYear' + }, + { + label: '本月', + value: 'thisMonth' + }, + { + label: '上月', + value: 'lastMonth' + }, + { + label: '今天', + value: 'today' + }, + { + label: '昨天', + value: 'yesterday' + }, + { + label: '月初', + value: 'monthBeginning' + }, + { + label: '年初', + value: 'yearBeginning' + } + ].find(ele => ele.value === relativeToCurrent).label + dialogVisible.value = false + return + } item.value.timeValue = `${timeNum}${relativeToCurrentTypeMap[relativeToCurrentType]}${ around === 'f' ? '前' : '后' }` if (timeGranularity === 'datetime') { item.value.timeValue += new Date(arbitraryTime).toLocaleString().split(' ')[1] } + dialogVisible.value = false } From 87c17fc83ee894efd82d12902bbcdbfae1333fc1 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 8 Aug 2024 18:12:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E5=AD=97=E4=BD=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/i18n/core_zh_CN.properties | 1 + .../api/typeface/api/SysTypefaceApi.java | 40 +++++++++++++++++++ .../api/typeface/dto/SysTypefaceDto.java | 32 +++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/typeface/api/SysTypefaceApi.java create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/typeface/dto/SysTypefaceDto.java diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties index 92383858c6..c1e403287a 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties @@ -29,6 +29,7 @@ i18n_menu.plugin=\u63D2\u4EF6\u7BA1\u7406 i18n_menu.platform=\u5E73\u53F0\u5BF9\u63A5 i18n_menu.appearance=\u5916\u89C2\u914D\u7F6E i18n_menu.sysVariable=\u7CFB\u7EDF\u53D8\u91CF +i18n_menu.sysTypeface=\u5b57\u4f53\u7ba1\u7406 i18n_field_name_repeat=\u6709\u91CD\u590D\u5B57\u6BB5\u540D\uFF1A i18n_pid_not_eq_id=\u79FB\u52A8\u76EE\u6807\u4E0D\u80FD\u662F\u81EA\u5DF1\u6216\u5B50\u76EE\u5F55 i18n_ds_name_exists=\u8BE5\u5206\u7EC4\u4E0B\u540D\u79F0\u91CD\u590D diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/typeface/api/SysTypefaceApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/typeface/api/SysTypefaceApi.java new file mode 100644 index 0000000000..4bc2296ac6 --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/typeface/api/SysTypefaceApi.java @@ -0,0 +1,40 @@ +package io.dataease.api.typeface.api; + + +import com.github.xiaoymin.knife4j.annotations.ApiSupport; + +import io.dataease.api.typeface.dto.SysTypefaceDto; +import io.dataease.auth.DeApiPath; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +import static io.dataease.constant.AuthResourceEnum.SYSTEM; + +@Tag(name = "字体管理") +@ApiSupport(order = 881, author = "fit2cloud-someone") +@DeApiPath(value = "/sysTypeface", rt = SYSTEM) +public interface SysTypefaceApi { + + @Operation(summary = "创建") + @PostMapping("/create") + SysTypefaceDto create(@RequestBody SysTypefaceDto sysVariableDto); + + @Operation(summary = "编辑") + @PostMapping("/edit") + SysTypefaceDto edit(@RequestBody SysTypefaceDto sysVariableDto); + + @Operation(summary = "删除") + @PostMapping("/delete/{id}") + void delete(@PathVariable("id") Long id); + + @Operation(summary = "变更默认设置") + @PostMapping("/changeDefault/") + void changeDefault(@RequestBody SysTypefaceDto sysVariableDto); + +} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/typeface/dto/SysTypefaceDto.java b/sdk/api/api-base/src/main/java/io/dataease/api/typeface/dto/SysTypefaceDto.java new file mode 100644 index 0000000000..68fa23cdd6 --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/typeface/dto/SysTypefaceDto.java @@ -0,0 +1,32 @@ +package io.dataease.api.typeface.dto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; + +@Data +public class SysTypefaceDto { + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 字体名称 + */ + private String name; + + /** + * 文件名称 + */ + private String fileName; + + /** + * 文件转换名称 + */ + private String fileTransName; + + /** + * 是否默认 + */ + private Boolean isDefault; +} + From f4e7ba71afa6dfbb4e3e2ba9cbf174844ad6d624 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 8 Aug 2024 18:15:45 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E5=AD=97=E4=BD=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index 1690590b4e..d8b7e87661 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 1690590b4e0d2306500c93b8035bb477e190cb3f +Subproject commit d8b7e876618c903de276cb3dbcd569e25dd1aa5c From 018ade48c15fe21890b2f97448975e10c565f391 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 8 Aug 2024 18:23:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index d8b7e87661..cf8b4eec1f 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit d8b7e876618c903de276cb3dbcd569e25dd1aa5c +Subproject commit cf8b4eec1fc6a00116c50ff53589d0e33cf04aa5 From 164ae71ee399c269f83446197ddde3a9cf7365fc Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 8 Aug 2024 18:28:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?revert:=20=E8=A7=A3=E5=86=B3=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=8F=92=E4=BB=B6=E8=A2=AB=E8=AF=AF=E5=88=A0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/extensions/datasource/provider/Provider.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/Provider.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/Provider.java index ab7f5c9251..39f168150a 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/Provider.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/provider/Provider.java @@ -92,9 +92,13 @@ public abstract class Provider { */ public abstract void hidePW(DatasourceDTO datasourceDTO); - public abstract void exec(DatasourceRequest datasourceRequest) throws DEException; + public void exec(DatasourceRequest datasourceRequest) { - public abstract int executeUpdate(DatasourceRequest datasourceRequest) throws DEException; + } + + public int executeUpdate(DatasourceRequest datasourceRequest) { + return 0; + } @Getter From a5e8288dd9a367726c16276fe7ebbd8c639db8f4 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 8 Aug 2024 18:28:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?revert:=20=E8=A7=A3=E5=86=B3=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=8F=92=E4=BB=B6=E8=A2=AB=E8=AF=AF=E5=88=A0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index cf8b4eec1f..1afd0616e6 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit cf8b4eec1fc6a00116c50ff53589d0e33cf04aa5 +Subproject commit 1afd0616e6ba6a59bf93832217363e170374f05d