From c274aece5b1519c2dd41848573cd48fbeffadcfa Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 14 Oct 2021 14:40:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?main=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/commons/utils/ExcelReaderUtil.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java index 0f866bd233..d44ccbd1ce 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java @@ -1,9 +1,6 @@ package io.dataease.commons.utils; import com.google.gson.Gson; import io.dataease.datasource.dto.TableFiled; -import org.apache.poi.hssf.usermodel.HSSFCell; - -import java.io.FileInputStream; import java.io.InputStream; import java.util.List; @@ -70,10 +67,10 @@ public class ExcelReaderUtil { } } - public static void main(String[] args) throws Exception { + /* public static void main(String[] args) throws Exception { String file ="各省市GDP-表格_加内容.xlsx"; ExcelReaderUtil.readExcel(file, new FileInputStream("/Users/taojinlong/Desktop/" + file)); - } + } */ } From 74ec45a45856e6a12f8ef0aa69ce63adccae7302 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 14 Oct 2021 14:41:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=AE=BD=E5=BA=A6=E6=97=A0=E9=99=90=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/widget/DeWidget/DeSelect.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue index 2c8470b6b6..602711bbaa 100644 --- a/frontend/src/components/widget/DeWidget/DeSelect.vue +++ b/frontend/src/components/widget/DeWidget/DeSelect.vue @@ -10,13 +10,17 @@ :placeholder="$t(options.attrs.placeholder)" :popper-append-to-body="inScreen" @change="changeValue" + @focus="setOptionWidth" > + > + {{ item[options.attrs.label] }} + @@ -43,7 +47,8 @@ export default { data() { return { options: null, - showNumber: false + showNumber: false, + selectOptionWidth: 0 } }, computed: { @@ -119,6 +124,12 @@ export default { text: item } }) + }, + setOptionWidth(event) { + // 下拉框弹出时，设置弹框的宽度 + this.$nextTick(() => { + this.selectOptionWidth = event.srcElement.offsetWidth + 'px' + }) } } From 03ab93664d3b46d30cae6e3c1ff4a8a058b9e39c Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 14 Oct 2021 14:58:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E5=8D=A1=E6=9C=AA=E9=80=89=E6=8B=A9=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E6=97=B6=E6=8B=96=E5=8A=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/custom-component/UserView.vue | 5 ++++- frontend/src/components/widget/DeWidget/DeTabs.vue | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index f05cbdcffa..bb197ccc33 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -211,7 +211,10 @@ export default { created() { this.refId = uuid.v1 // this.filter.filter = this.$store.getters.conditions - this.getData(this.element.propValue.viewId) + if (this.element && this.element.propValue && this.element.propValue.viewId) { + this.getData(this.element.propValue.viewId) + } + // this.initAreas() }, mounted() { diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue index 18fa38d54a..fbeea71071 100644 --- a/frontend/src/components/widget/DeWidget/DeTabs.vue +++ b/frontend/src/components/widget/DeWidget/DeTabs.vue @@ -35,7 +35,7 @@
- +
From 238ce0f27a53ae6edc9dbc61ca1387dc23ef8774 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 14 Oct 2021 17:17:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20api=E6=96=87=E6=A1=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 8 +++++++- .../src/main/java/io/dataease/auth/api/dto/LoginDto.java | 2 +- .../java/io/dataease/config/Knife4jConfiguration.java | 8 +++----- .../java/io/dataease/controller/IndexController.java | 4 ++-- .../io/dataease/controller/sys/SysUserController.java | 5 ++--- backend/src/main/resources/application.properties | 2 +- pom.xml | 9 +++++++++ 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 56c47df966..649a9928ca 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -10,6 +10,7 @@ 4.0.0 backend + UTF-8 @@ -270,11 +271,16 @@ **/* - false + true + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + org.springframework.boot spring-boot-maven-plugin diff --git a/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java b/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java index 62af1ce003..20bae525ef 100644 --- a/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java +++ b/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java @@ -19,6 +19,6 @@ public class LoginDto implements Serializable { * 1：ldap登录 * 2：单点登录 */ - @ApiModelProperty(value = "登录方式", required = true, allowableValues = "0, 1, 2") + @ApiModelProperty(value = "登录方式{0:普通登录, 1:ldap登录}", required = true, allowableValues = "0, 1") private int loginType; } diff --git a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java index e696452ad3..ffd47c558f 100644 --- a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java +++ b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java @@ -1,9 +1,9 @@ package io.dataease.config; import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver; -import io.dataease.commons.condition.LicStatusCondition; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.annotation.*; import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration; import springfox.documentation.builders.*; @@ -12,19 +12,17 @@ import springfox.documentation.service.*; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.Docket; - -import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @EnableOpenApi @Configuration @Import(BeanValidatorPluginsConfiguration.class) -public class Knife4jConfiguration { +public class Knife4jConfiguration implements BeanPostProcessor{ private final OpenApiExtensionResolver openApiExtensionResolver; - @Value("${app.version}") + @Value("${version}") private String version; diff --git a/backend/src/main/java/io/dataease/controller/IndexController.java b/backend/src/main/java/io/dataease/controller/IndexController.java index 075555618e..38a716f0c0 100644 --- a/backend/src/main/java/io/dataease/controller/IndexController.java +++ b/backend/src/main/java/io/dataease/controller/IndexController.java @@ -43,8 +43,8 @@ public class IndexController { return "doc.html"; default: // DataEaseException.throwException("Invalid License."); - return "nolic.html"; - // return "doc.html"; + //return "nolic.html"; + return "doc.html"; } // return "index.html"; } diff --git a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java index fc8978f56c..ff0706a6c5 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java @@ -10,7 +10,6 @@ import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; import io.dataease.controller.sys.base.BaseGridRequest; -import io.dataease.controller.sys.request.LdapAddRequest; import io.dataease.controller.sys.request.SysUserCreateRequest; import io.dataease.controller.sys.request.SysUserPwdRequest; import io.dataease.controller.sys.request.SysUserStateRequest; @@ -130,11 +129,11 @@ public class SysUserController { } - @ApiOperation("同步用户") + /* @ApiOperation("同步用户") @PostMapping("/sync") public void importLdap(@RequestBody LdapAddRequest request) { sysUserService.saveLdapUsers(request); - } + } */ @ApiOperation("已同步用户") @PostMapping("/existLdapUsers") diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index d4f4111a23..c9076ac69d 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -34,7 +34,7 @@ knife4j.setting.enableSearch=false knife4j.setting.enableOpenApi=false knife4j.setting.enableAfterScript=false -app.version=@project.version@ +version=@project.version@ logging.file.path=/opt/dataease/logs/${spring.application.name} diff --git a/pom.xml b/pom.xml index 1e915295bf..e08a03d403 100644 --- a/pom.xml +++ b/pom.xml @@ -20,4 +20,13 @@ backend + + + + src/main/resources + true + + + +