From 56517b650af223a97b65c5174fc81d5978cde71f Mon Sep 17 00:00:00 2001 From: zhuoda Date: Mon, 18 Nov 2024 20:36:03 +0800 Subject: [PATCH] =?UTF-8?q?v3.10.0=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?= =?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=A8=A1=E5=BC=8FModal=E7=AD=89=E7=BB=88?= =?UTF-8?q?=E6=9E=81=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9B=E3=80=90?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=91=E7=94=9F=E6=88=90=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B7=A8=E5=9F=9F=EF=BC=9B=E3=80=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=85=B6=E4=BB=96=E4=B8=80=E4=BA=9B=E5=B0=8F?= =?UTF-8?q?=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sa/base/config/CorsFilterConfig.java | 2 ++ .../domain/AddFormVariableService.java | 4 +-- .../domain/UpdateFormVariableService.java | 2 +- .../support/dict/service/DictService.java | 2 +- .../java/dao/Dao.java.vm | 4 +-- .../src/main/resources/dev/sa-base.yaml | 2 +- .../src/main/resources/prod/sa-base.yaml | 31 ++++++++----------- .../sa/base/config/CorsFilterConfig.java | 2 ++ .../support/dict/service/DictService.java | 2 +- .../java/dao/Dao.java.vm | 4 +-- .../src/main/resources/prod/sa-base.yaml | 5 +-- smart-admin-web-javascript/README.en.md | 0 smart-admin-web-javascript/README.md | 0 smart-admin-web-javascript/index.html | 14 --------- smart-admin-web-javascript/src/App.vue | 30 ------------------ .../support/table-operator/index.vue | 19 +++--------- .../src/layout/side-expand-layout.vue | 7 +++-- .../src/layout/side-layout.vue | 6 ++-- .../src/layout/top-layout.vue | 10 ++++-- smart-admin-web-typescript/README.md | 0 smart-admin-web-typescript/src/App.vue | 30 ------------------ .../support/table-operator/index.vue | 19 +++--------- .../src/layout/side-expand-layout.vue | 7 +++-- .../src/layout/side-layout.vue | 13 ++++++-- .../src/layout/top-layout.vue | 10 ++++-- 25 files changed, 77 insertions(+), 148 deletions(-) create mode 100644 smart-admin-web-javascript/README.en.md create mode 100644 smart-admin-web-javascript/README.md create mode 100644 smart-admin-web-typescript/README.md diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java index 33080cdd3..7ccccff42 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java @@ -2,6 +2,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; @@ -17,6 +18,7 @@ * @Copyright 1024创新实验室 */ @Configuration +@Conditional(SystemEnvironmentConfig.class) public class CorsFilterConfig { @Value("${access-control-allow-origin}") diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java index 1d29259a1..0df8d3326 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java @@ -96,8 +96,8 @@ public ImmutablePair, List>> getPackageListAndF if (Boolean.TRUE.equals(field.getRequiredFlag())) { String notEmptyPrefix = "String".equals(codeField.getJavaType()) ? "@NotBlank" : "@NotNull"; finalFieldMap.put("notEmpty", "\n " + notEmptyPrefix + "(message = \"" + codeField.getLabel() + " 不能为空\")"); - packageList.add("String".equals(codeField.getJavaType()) ? "import javax.validation.constraints.NotBlank;" - : "import javax.validation.constraints.NotNull;"); + packageList.add("String".equals(codeField.getJavaType()) ? "import jakarta.validation.constraints.NotBlank;" + : "import jakarta.validation.constraints.NotNull;"); } } diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java index 004e7670d..a3cfb4397 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java @@ -111,7 +111,7 @@ public ImmutablePair, List>> getPackageListAndF if (Boolean.TRUE.equals(field.getRequiredFlag())) { String notEmptyPrefix = "String".equals(codeField.getJavaType()) ? "@NotBlank" : "@NotNull"; finalFieldMap.put("notEmpty", "\n " + notEmptyPrefix + "(message = \"" + codeField.getLabel() + " 不能为空\")"); - packageList.add("String".equals(codeField.getJavaType()) ? "import javax.validation.constraints.NotBlank;" : "import javax.validation.constraints.NotNull;"); + packageList.add("String".equals(codeField.getJavaType()) ? "import jakarta.validation.constraints.NotBlank;" : "import jakarta.validation.constraints.NotNull;"); } } diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java index 122f2a753..9fba4d060 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java @@ -172,7 +172,7 @@ public ResponseDTO> keyQuery(DictKeyQueryForm queryForm) { * @return */ public List queryAllKey() { - return SmartBeanUtil.copyList(dictKeyDao.selectList(null), DictKeyVO.class); + return SmartBeanUtil.copyList(dictKeyDao.selectByDeletedFlag(false), DictKeyVO.class); } /** diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm index bd7a91a09..3fb0f52e7 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm @@ -37,14 +37,14 @@ public interface ${name.upperCamel}Dao extends BaseMapper<${name.upperCamel}Enti /** * 更新删除状态 */ - long updateDeleted(@Param("${primaryKeyFieldName}")${primaryKeyJavaType} ${primaryKeyFieldName},@Param("${deletedFlag}")boolean deletedFlag); + long updateDeleted(@Param("${primaryKeyFieldName}")${primaryKeyJavaType} ${primaryKeyFieldName},@Param("deletedFlag")boolean deletedFlag); #end #if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch") /** * 批量更新删除状态 */ - void batchUpdateDeleted(@Param("idList")List<${primaryKeyJavaType}> idList,@Param("${deletedFlag}")boolean deletedFlag); + void batchUpdateDeleted(@Param("idList")List<${primaryKeyJavaType}> idList,@Param("deletedFlag")boolean deletedFlag); #end #end diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml index 1600d3101..4b2c4094a 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml @@ -40,7 +40,7 @@ spring: host: smtp.163.com port: 465 username: lab1024@163.com - password: LAB1024LAB + password: ROIMSIQCEXHTQFTA properties: mail: smtp: diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml index b7429ba5a..1162a1ce9 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml @@ -21,26 +21,24 @@ spring: pointcut: net.lab1024.sa..*Service.* # redis 连接池配置信息 - data: - redis: - database: 1 - host: 127.0.0.1 - port: 6379 - password: - timeout: 10000ms - lettuce: - pool: - max-active: 5 - min-idle: 1 - max-idle: 3 - max-wait: 30000ms - + redis: + database: 1 + host: 127.0.0.1 + port: 6379 + password: + timeout: 10000ms + lettuce: + pool: + max-active: 100 + min-idle: 10 + max-idle: 50 + max-wait: 30000ms # 邮件，置以SSL的方式发送, 这个需要使用这种方式并且端口是465 mail: host: smtp.163.com port: 465 username: lab1024@163.com - password: LAB1024LAB + password: 1024lab properties: mail: smtp: @@ -119,9 +117,6 @@ http: write-timeout: 50000 keep-alive: 300000 -# 跨域配置 -access-control-allow-origin: 'https://preview.smartadmin.vip' - # 心跳配置 heart-beat: interval-seconds: 60 diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java index 33080cdd3..7ccccff42 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java @@ -2,6 +2,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; @@ -17,6 +18,7 @@ * @Copyright 1024创新实验室 */ @Configuration +@Conditional(SystemEnvironmentConfig.class) public class CorsFilterConfig { @Value("${access-control-allow-origin}") diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java index 21b454cc9..78a5ca9ac 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java @@ -172,7 +172,7 @@ public ResponseDTO> keyQuery(DictKeyQueryForm queryForm) { * @return */ public List queryAllKey() { - return SmartBeanUtil.copyList(dictKeyDao.selectList(null), DictKeyVO.class); + return SmartBeanUtil.copyList(dictKeyDao.selectByDeletedFlag(false), DictKeyVO.class); } /** diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm index 938b758ef..dd01bbc03 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm @@ -37,14 +37,14 @@ public interface ${name.upperCamel}Dao extends BaseMapper<${name.upperCamel}Enti /** * 更新删除状态 */ - long updateDeleted(@Param("${primaryKeyFieldName}")${primaryKeyJavaType} ${primaryKeyFieldName},@Param("${deletedFlag}")boolean deletedFlag); + long updateDeleted(@Param("${primaryKeyFieldName}")${primaryKeyJavaType} ${primaryKeyFieldName},@Param("deletedFlag")boolean deletedFlag); #end #if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch") /** * 批量更新删除状态 */ - void batchUpdateDeleted(@Param("idList")List<${primaryKeyJavaType}> idList,@Param("${deletedFlag}")boolean deletedFlag); + void batchUpdateDeleted(@Param("idList")List<${primaryKeyJavaType}> idList,@Param("deletedFlag")boolean deletedFlag); #end #end diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml index 2aed100cf..1162a1ce9 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml @@ -38,7 +38,7 @@ spring: host: smtp.163.com port: 465 username: lab1024@163.com - password: LAB1024LAB + password: 1024lab properties: mail: smtp: @@ -117,9 +117,6 @@ http: write-timeout: 50000 keep-alive: 300000 -# 跨域配置 -access-control-allow-origin: 'https://preview.smartadmin.vip' - # 心跳配置 heart-beat: interval-seconds: 60 diff --git a/smart-admin-web-javascript/README.en.md b/smart-admin-web-javascript/README.en.md new file mode 100644 index 000000000..e69de29bb diff --git a/smart-admin-web-javascript/README.md b/smart-admin-web-javascript/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/smart-admin-web-javascript/index.html b/smart-admin-web-javascript/index.html index 8e6a6ec8c..c88dce419 100644 --- a/smart-admin-web-javascript/index.html +++ b/smart-admin-web-javascript/index.html @@ -19,20 +19,6 @@
- diff --git a/smart-admin-web-javascript/src/App.vue b/smart-admin-web-javascript/src/App.vue index 972a9ba10..3c7370f72 100644 --- a/smart-admin-web-javascript/src/App.vue +++ b/smart-admin-web-javascript/src/App.vue @@ -32,7 +32,6 @@ }, }, }" - :getPopupContainer="getPopupContainer" > @@ -50,8 +49,6 @@ import { useSpinStore } from '/@/store/modules/system/spin'; import { theme } from 'ant-design-vue'; import { themeColors } from '/@/theme/color.js'; - import { SmartLoading } from '/@/components/framework/smart-loading/index.js'; - import { LAYOUT_ELEMENT_IDS } from '/@/layout/layout-const.js'; const antdLocale = computed(() => messages[useAppConfigStore().language].antdLocale); const dayjsLocale = computed(() => messages[useAppConfigStore().language].dayjsLocale); @@ -70,31 +67,4 @@ const borderRadius = computed(() => { return useAppConfigStore().borderRadius; }); - - function getPopupContainer(node, dialogContext) { - let fullScreenFlag = useAppConfigStore().$state.fullScreenFlag; - if(fullScreenFlag){ - return getFullScreenContainer(node, dialogContext); - }else{ - return getNotFullScreenContainer(node, dialogContext); - } - } - - function getFullScreenContainer(node, dialogContext) { - if (node === document.body) { - return document.getElementById(LAYOUT_ELEMENT_IDS.content); - }else if (node) { - return node.parentNode; - } else { - return document.getElementById(LAYOUT_ELEMENT_IDS.content); - } - } - - function getNotFullScreenContainer(node, dialogContext) { - if (node) { - return node.parentNode; - } else { - return document.body; - } - } diff --git a/smart-admin-web-javascript/src/components/support/table-operator/index.vue b/smart-admin-web-javascript/src/components/support/table-operator/index.vue index 174cf77ad..150bc5986 100644 --- a/smart-admin-web-javascript/src/components/support/table-operator/index.vue +++ b/smart-admin-web-javascript/src/components/support/table-operator/index.vue @@ -38,13 +38,13 @@ diff --git a/smart-admin-web-typescript/src/components/support/table-operator/index.vue b/smart-admin-web-typescript/src/components/support/table-operator/index.vue index fbad25b36..8da7c318e 100644 --- a/smart-admin-web-typescript/src/components/support/table-operator/index.vue +++ b/smart-admin-web-typescript/src/components/support/table-operator/index.vue @@ -38,13 +38,13 @@