Merge remote-tracking branch 'origin/dev' into dev

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
@@ -18,6 +19,7 @@ import org.jeecg.common.util.ImportExcelUtil;
 import org.jeecg.common.util.YouBianCodeUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
+import org.jeecg.modules.base.service.BaseCommonService;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.model.DepartIdModel;
@@ -65,6 +67,8 @@ public class SysDepartController {
 	private ISysUserService sysUserService;
 	@Autowired
 	private ISysUserDepartService sysUserDepartService;
+	@Autowired
+	private BaseCommonService baseCommonService  ;
 	/**
 	 * 查询数据 查出我的部门,并以树结构数据格式响应给前端
 	 *
@@ -388,6 +392,7 @@ public class SysDepartController {
 		return mv;
     }
 
+	@AutoLog
 	@RequestMapping(value = "/initializationImportExcel", method = RequestMethod.POST)
 	public Result<?> initializationImportExcel(HttpServletRequest request, HttpServletResponse response) {
 		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;

jeecgboot-vue3/.env.production

@@ -16,7 +16,7 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 VITE_GLOB_API_URL=/jeecgboot
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://jeecg-boot-gateway:9999
+VITE_GLOB_DOMAIN_URL=http://10.200.1.115:9999
 
 # 接口父路径前缀
 VITE_GLOB_API_URL_PREFIX=

jeecgboot-vue3/src/views/system/depart/components/DepartLeftTree.vue

@@ -264,6 +264,7 @@ import {inject, nextTick, ref, unref, watch} from 'vue';
     }
     const record = { parentId: data.id };
     openModal(true, { isUpdate: false, isChild: true, record });
+    isUnfold.value = false
   }
   //监听搜索框内值的变化
   watch(searchValue, (newVal) => {
@@ -285,6 +286,7 @@ import {inject, nextTick, ref, unref, watch} from 'vue';
         loading.value = false;
       }
     } else {
+      isUnfold.value = false
       loadRootTreeData();
     }
     searchKeyword.value = value;
@@ -400,6 +402,7 @@ import {inject, nextTick, ref, unref, watch} from 'vue';
       try {
         loading.value = true;
         await deleteBatchDepart({ ids: idList.join(',') }, confirm);
+        isUnfold.value = false
         await loadRootTreeData();
         await idList.forEach((id) => {
           let index = checkedKeys.value.indexOf(id);
@@ -438,11 +441,13 @@ import {inject, nextTick, ref, unref, watch} from 'vue';
 
   function onImportXls(d) {
     handleImportXls(d, Api.importExcelUrl, () => {
+      isUnfold.value = false
       loadRootTreeData();
     });
   }
   function onInitializationImportExcel(d) {
     handleImportXls(d, Api.initializationImportExcel, () => {
+      isUnfold.value = false
       loadRootTreeData();
     })
   }

jeecgboot-vue3/src/views/system/user/index.vue

@@ -600,7 +600,9 @@
    * 导出Excel
    */
   function handleExportExcel() {
-    handleExportXls("用户列表", getExportUrl, { queries: JSON.stringify(queries.value)})
+    console.log(selectedRowKeys.value)
+
+    handleExportXls("用户列表", getExportUrl, {queries: JSON.stringify(queries.value), selections: selectedRowKeys.value.toString()})
 
   }
   const cardBodyStyle = {

jeecgboot-vue3/src/views/system/user/user.data.ts

@@ -343,7 +343,10 @@ export const formPasswordSchema: FormSchema[] = [
     label: '用户账号',
     field: 'username',
     component: 'Input',
-    componentProps: { readOnly: true },
+    componentProps: {
+      readOnly: true,
+      allowClear: false
+    },
   },
   {
     label: '登录密码',