From 31b54531e3bafc98273d92e70869e469c165c632 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Thu, 7 Apr 2022 23:14:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91nacos?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=B1=BB=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8CBanner=E4=BF=AE=E6=94=B9=20=E3=80=90=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91=E5=AD=97=E5=85=B8=E5=A4=9A=E9=80=89=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=9B=9E=E6=98=BEBug=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97=E7=9A=84edit?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E7=A1=AE=E4=BF=9D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/banner.txt | 15 +++++++-------- ...plication.java => JeroNacosApplication.java} | 4 ++-- .../src/components/dict/JMultiSelectTag.vue | 3 ++- jero-web/src/views/system/modules/UserModal.vue | 17 +++++------------ 4 files changed, 16 insertions(+), 23 deletions(-) rename jero-boot/jero-cloud-module/jero-cloud-nacos/src/main/java/com/alibaba/nacos/{JeecgNacosApplication.java => JeroNacosApplication.java} (90%) diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/banner.txt b/jero-boot/jero-boot-single-startup/src/main/resources/banner.txt index bf9441c3..febb3b3b 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/banner.txt +++ b/jero-boot/jero-boot-single-startup/src/main/resources/banner.txt @@ -1,14 +1,13 @@ ${AnsiColor.BRIGHT_BLUE} - (_) | | | | - _ ___ ___ ___ __ _ ______| |__ ___ ___ | |_ - | |/ _ \/ _ \/ __/ _` |______| '_ \ / _ \ / _ \| __| - | | __/ __/ (_| (_| | | |_) | (_) | (_) | |_ - | |\___|\___|\___\__, | |_.__/ \___/ \___/ \__| - _/ | __/ | - |__/ |___/ + ____. __________ __ + | | ___________ ____ \______ \ ____ _____/ |_ + | |/ __ \_ __ \/ _ \ ______ | | _// _ \ / _ \ __\ +/\__| \ ___/| | \( <_> ) /_____/ | | ( <_> | <_> ) | +\________|\___ >__| \____/ |______ /\____/ \____/|__| + \/ \/ ${AnsiColor.BRIGHT_GREEN} -jero Boot Version: 2.4.6 +Jero Boot Version: 2.4.6 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} ${AnsiColor.BLACK} diff --git a/jero-boot/jero-cloud-module/jero-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java b/jero-boot/jero-cloud-module/jero-cloud-nacos/src/main/java/com/alibaba/nacos/JeroNacosApplication.java similarity index 90% rename from jero-boot/jero-cloud-module/jero-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java rename to jero-boot/jero-cloud-module/jero-cloud-nacos/src/main/java/com/alibaba/nacos/JeroNacosApplication.java index 1b6a46d7..ed8f469f 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java +++ b/jero-boot/jero-cloud-module/jero-cloud-nacos/src/main/java/com/alibaba/nacos/JeroNacosApplication.java @@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication(scanBasePackages = "com.alibaba.nacos") @ServletComponentScan @EnableScheduling -public class JeecgNacosApplication { +public class JeroNacosApplication { /** * 是否单机模式启动 @@ -32,6 +32,6 @@ public class JeecgNacosApplication { System.setProperty("server.tomcat.basedir","logs"); //自定义启动端口号 System.setProperty("server.port","8848"); - SpringApplication.run(JeecgNacosApplication.class, args); + SpringApplication.run(JeroNacosApplication.class, args); } } diff --git a/jero-web/src/components/dict/JMultiSelectTag.vue b/jero-web/src/components/dict/JMultiSelectTag.vue index 66f9ba9d..b089ccbc 100644 --- a/jero-web/src/components/dict/JMultiSelectTag.vue +++ b/jero-web/src/components/dict/JMultiSelectTag.vue @@ -103,7 +103,8 @@ }, onChange (selectedValue) { - this.$emit('change', selectedValue.join(this.spliter)); + this.value = selectedValue.join(this.spliter); + this.$emit('change', this.value); }, setCurrentDictOptions(dictOptions){ this.dictOptions = dictOptions diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index d79d5be6..e6d35b45 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -84,7 +84,6 @@ :disabled="disableSubmit" v-model="model.departIds" :options="nextDepartOptions" - @change="nextDepartChange" placeholder="请选择负责部门"> @@ -108,11 +107,9 @@ - + + + @@ -216,7 +213,6 @@ import { JSEncrypt } from 'jsencrypt' that.visible = true; //根据屏幕宽度自适应抽屉宽度 this.resetScreenSize(); - that.userId = record.id; that.model = Object.assign({},{selectedroles:'',selecteddeparts:''}, record); //身份为上级显示负责部门，否则不显示 if(this.model.userIdentity==2){ @@ -226,6 +222,7 @@ import { JSEncrypt } from 'jsencrypt' } if(record.hasOwnProperty("id")){ + that.userId = record.id; that.getUserRoles(record.id); that.getUserDeparts(record.id); } @@ -504,11 +501,7 @@ import { JSEncrypt } from 'jsencrypt' }else{ this.departIdShow=true; } - }, - nextDepartChange(e){ - console.log("11", e) - console.log("22", this.model.departIds) - }, + } } }