发布 2.3.1

ruoyi-ui/src/views/demo/demo/index.vue

@@ -152,7 +152,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -168,6 +168,8 @@ export default {
   },
   data() {
     return {
+      //按钮loading
+      buttonLoading: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -277,9 +279,11 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.loading = true;
       this.reset();
       const id = row.id || this.ids
       getDemo(id).then(response => {
+        this.loading = false;
         this.form = response.data;
         this.open = true;
         this.title = "修改测试单表";
@@ -289,14 +293,17 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.buttonLoading = true;
           if (this.form.id != null) {
             updateDemo(this.form).then(response => {
+              this.buttonLoading = false;
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addDemo(this.form).then(response => {
+              this.buttonLoading = false;
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -312,9 +319,11 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(() => {
+        this.loading = true;
         return delDemo(ids);
       }).then(() => {
+        this.loading = false;
         this.getList();
         this.msgSuccess("删除成功");
       })

ruoyi-ui/src/views/demo/tree/index.vue

@@ -102,7 +102,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -121,6 +121,8 @@ export default {
   },
   data() {
     return {
+      //按钮loading
+      buttonLoading: false,
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -233,12 +235,14 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.loading = true;
       this.reset();
       this.getTreeselect();
       if (row != null) {
         this.form.parentId = row.id;
       }
       getTree(row.id).then(response => {
+        this.loading = false;
         this.form = response.data;
         this.open = true;
         this.title = "修改测试树表";
@@ -248,14 +252,17 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.buttonLoading = true;
           if (this.form.id != null) {
             updateTree(this.form).then(response => {
+              this.buttonLoading = false;
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addTree(this.form).then(response => {
+              this.buttonLoading = false;
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -270,9 +277,11 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(() => {
+        this.loading = true;
         return delTree(row.id);
       }).then(() => {
+        this.loading = false;
         this.getList();
         this.msgSuccess("删除成功");
       })

ruoyi-ui/src/views/index.vue

@@ -80,6 +80,18 @@
             <span>更新日志</span>
           </div>
           <el-collapse accordion>
+            <el-collapse-item title="v2.3.1 - 2021-6-4">
+              <ol>
+                <li>add 增加 redisson 分布式锁 注解与demo案例</li>
+                <li>add 增加 Oracle 分支</li>
+                <li>update 优化 redis 空密码兼容性</li>
+                <li>update 优化前端代码生成按钮增加 loading</li>
+                <li>fix 修复 redisson 不能批量删除的bug</li>
+                <li>fix 修复表单构建选择下拉选择控制台报错问题</li>
+                <li>fix 修复 vo 代码生成 主键列表显示 重复生成bug</li>
+                <li>fix 修复上传路径 win 打包编译为 win 路径, linux 报错bug</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v2.3.0 - 2021-6-1">
               <ol>
                 <li>add 升级 luttuce 为 redisson 性能更强 工具更全</li>
@@ -195,12 +207,14 @@
 </template>
 
 <script>
+import config from '../../package.json'
+
 export default {
   name: "index",
   data() {
     return {
       // 版本号
-      version: "2.3.0",
+      version: config.version,
     };
   },
   methods: {

ruoyi-ui/src/views/system/menu/index.vue

@@ -163,7 +163,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.menuType != 'M'" label="权限标识">
-              <el-input v-model="form.perms" placeholder="请权限标识" maxlength="50" />
+              <el-input v-model="form.perms" placeholder="请权限标识" maxlength="100" />
             </el-form-item>
           </el-col>
           <el-col :span="12">

ruoyi-ui/src/views/tool/build/RightPanel.vue

@@ -573,6 +573,7 @@
 
 <script>
 import { isArray } from 'util'
+import draggable from 'vuedraggable'
 import TreeNodeDialog from './TreeNodeDialog'
 import { isNumberStr } from '@/utils/index'
 import IconsDialog from './IconsDialog'
@@ -595,6 +596,7 @@ const dateTimeFormat = {
 
 export default {
   components: {
+    draggable,
     TreeNodeDialog,
     IconsDialog
   },