Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

 Conflicts:

	README.md

	pom.xml

	ruoyi-admin/pom.xml

	ruoyi-admin/src/main/resources/application.yml

	ruoyi-common/pom.xml

	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

	ruoyi-framework/pom.xml

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

	ruoyi-generator/pom.xml

	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm

	ruoyi-job/pom.xml

	ruoyi-system/pom.xml

	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

	ruoyi-ui/README.md

	ruoyi-ui/bin/package.bat

	ruoyi-ui/package.json

	ruoyi-ui/src/views/index.vue

ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm

@@ -76,14 +76,23 @@
           v-hasPermi="['${moduleName}:${businessName}:add']"
         >新增</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Sort"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table
+      v-if="refreshTable"
       v-loading="loading"
       :data="${businessName}List"
       row-key="${treeCode}"
-      default-expand-all
+      :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
 #foreach($column in $columns)
@@ -282,6 +291,8 @@ const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const title = ref("");
+const isExpandAll = ref(true);
+const refreshTable = ref(true);
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
@@ -404,6 +415,15 @@ async function handleAdd(row) {
   title.value = "添加${functionName}";
 }
 
+/** 展开/折叠操作 */
+function toggleExpandAll() {
+  refreshTable.value = false;
+  isExpandAll.value = !isExpandAll.value;
+  nextTick(() => {
+    refreshTable.value = true;
+  });
+}
+
 /** 修改按钮操作 */
 async function handleUpdate(row) {
   loading.value = true;