⚔ 发布 4.7.0 稳定性版本

2025-09-24 07:19:46 +08:00 · 2023-05-08 09:54:23 +08:00
parent 36ac478624
commit 6f6ac2c0cf
95 changed files with 953 additions and 368 deletions
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@ -4,14 +4,16 @@ VUE_APP_TITLE = RuoYi-Vue-Plus后台管理系统
 # 生产环境配置
 ENV = 'production'

+# 若依管理系统/生产环境
+VUE_APP_BASE_API = '/prod-api'
+
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'

 # 监控地址
 VUE_APP_MONITRO_ADMIN = '/admin/login'

-# 监控地址
+# xxl-job 控制台地址
 VUE_APP_XXL_JOB_ADMIN = '/xxl-job-admin'

-# 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@ -1,6 +1,6 @@
 {
  "name": "ruoyi-vue-plus",
-  "version": "4.6.0",
+  "version": "4.7.0",
  "description": "RuoYi-Vue-Plus后台管理系统",
  "author": "LionLi",
  "license": "MIT",
@ -32,7 +32,7 @@
  ],
  "repository": {
    "type": "git",
-    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
+    "url": "https://gitee.com/dromara/RuoYi-Vue-Plus.git"
  },
  "dependencies": {
    "@riophae/vue-treeselect": "0.4.0",
--- a/ruoyi-ui/public/favicon.ico
+++ b/ruoyi-ui/public/favicon.ico
--- a/ruoyi-ui/src/assets/images/login-background.jpg
+++ b/ruoyi-ui/src/assets/images/login-background.jpg
--- a/ruoyi-ui/src/assets/images/profile.jpg
+++ b/ruoyi-ui/src/assets/images/profile.jpg
--- a/ruoyi-ui/src/assets/logo/logo.png
+++ b/ruoyi-ui/src/assets/logo/logo.png
--- a/ruoyi-ui/src/assets/styles/index.scss
+++ b/ruoyi-ui/src/assets/styles/index.scss
@ -180,12 +180,3 @@ aside {
    margin-bottom: 10px;
  }
 }
-
-//refine vue-multiselect plugin
-.multiselect {
-  line-height: 16px;
-}
-
-.multiselect--active {
-  z-index: 1000 !important;
-}
--- a/ruoyi-ui/src/assets/styles/sidebar.scss
+++ b/ruoyi-ui/src/assets/styles/sidebar.scss
@ -1,7 +1,7 @@
 #app {

  .main-container {
-    min-height: 100%;
+    height: 100%;
    transition: margin-left .28s;
    margin-left: $base-sidebar-width;
    position: relative;
--- a/ruoyi-ui/src/assets/styles/transition.scss
+++ b/ruoyi-ui/src/assets/styles/transition.scss
@ -18,10 +18,6 @@
  transition: all .5s;
 }

-.fade-transform-leave-active {
-  position: absolute;
-}
-
 .fade-transform-enter {
  opacity: 0;
  transform: translateX(-30px);
--- a/ruoyi-ui/src/components/DictTag/index.vue
+++ b/ruoyi-ui/src/components/DictTag/index.vue
@ -7,7 +7,7 @@
          :key="item.value"
          :index="index"
          :class="item.raw.cssClass"
-          >{{ item.label }}</span
+          >{{ item.label + ' ' }}</span
        >
        <el-tag
          v-else
@ -17,10 +17,13 @@
          :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
          :class="item.raw.cssClass"
        >
-          {{ item.label }}
+          {{ item.label + ' ' }}
        </el-tag>
      </template>
    </template>
+    <template v-if="unmatch && showValue">
+      {{ unmatchArray | handleArray }}
+    </template>
  </div>
 </template>

@ -33,6 +36,16 @@ export default {
      default: null,
    },
    value: [Number, String, Array],
+    // 当未找到匹配的数据时，显示value
+    showValue: {
+      type: Boolean,
+      default: true,
+    }
+  },
+  data() {
+    return {
+      unmatchArray: [], // 记录未匹配的项
+    }
  },
  computed: {
    values() {
@ -42,11 +55,38 @@ export default {
        return [];
      }
    },
+    unmatch(){
+      this.unmatchArray = [];
+      if (this.value !== null && typeof this.value !== 'undefined') {
+        // 传入值为非数组
+        if(!Array.isArray(this.value)){
+          if(this.options.some(v=> v.value == this.value )) return false;
+          this.unmatchArray.push(this.value);
+          return true;
+        }
+        // 传入值为Array
+        this.value.forEach(item => {
+          if (!this.options.some(v=> v.value == item )) this.unmatchArray.push(item)
+        });
+        return true;
+      }
+      // 没有value不显示
+      return false;
+    },
+
  },
+  filters: {
+    handleArray(array) {
+      if(array.length===0) return '';
+      return array.reduce((pre, cur) => {
+        return pre + ' ' + cur;
+      })
+    },
+  }
 };
 </script>
 <style scoped>
 .el-tag + .el-tag {
  margin-left: 10px;
 }
-</style>
+</style>
--- a/ruoyi-ui/src/components/IconSelect/index.vue
+++ b/ruoyi-ui/src/components/IconSelect/index.vue
@ -1,13 +1,17 @@
 <!-- @author zhengjie -->
 <template>
  <div class="icon-body">
-    <el-input v-model="name" style="position: relative;" clearable placeholder="请输入图标名称" @clear="filterIcons" @input.native="filterIcons">
+    <el-input v-model="name" class="icon-search" clearable placeholder="请输入图标名称" @clear="filterIcons" @input="filterIcons">
      <i slot="suffix" class="el-icon-search el-input__icon" />
    </el-input>
    <div class="icon-list">
-      <div v-for="(item, index) in iconList" :key="index" @click="selectedIcon(item)">
-        <svg-icon :icon-class="item" style="height: 30px;width: 16px;" />
-        <span>{{ item }}</span>
+      <div class="list-container">
+        <div v-for="(item, index) in iconList" class="icon-item-wrapper" :key="index" @click="selectedIcon(item)">
+          <div :class="['icon-item', { active: activeIcon === item }]">
+            <svg-icon :icon-class="item" class-name="icon" style="height: 25px;width: 16px;"/>
+            <span>{{ item }}</span>
+          </div>
+        </div>
      </div>
    </div>
  </div>
@ -17,6 +21,11 @@
 import icons from './requireIcons'
 export default {
  name: 'IconSelect',
+  props: {
+    activeIcon: {
+      type: String
+    }
+  },
  data() {
    return {
      name: '',
@ -46,22 +55,49 @@ export default {
  .icon-body {
    width: 100%;
    padding: 10px;
+    .icon-search {
+      position: relative;
+      margin-bottom: 5px;
+    }
    .icon-list {
      height: 200px;
-      overflow-y: scroll;
-      div {
-        height: 30px;
-        line-height: 30px;
-        margin-bottom: -5px;
-        cursor: pointer;
-        width: 33%;
-        float: left;
-      }
-      span {
-        display: inline-block;
-        vertical-align: -0.15em;
-        fill: currentColor;
-        overflow: hidden;
+      overflow: auto;
+      .list-container {
+        display: flex;
+        flex-wrap: wrap;
+        .icon-item-wrapper {
+          width: calc(100% / 3);
+          height: 25px;
+          line-height: 25px;
+          cursor: pointer;
+          display: flex;
+          .icon-item {
+            display: flex;
+            max-width: 100%;
+            height: 100%;
+            padding: 0 5px;
+            &:hover {
+              background: #ececec;
+              border-radius: 5px;
+            }
+            .icon {
+              flex-shrink: 0;
+            }
+            span {
+              display: inline-block;
+              vertical-align: -0.15em;
+              fill: currentColor;
+              padding-left: 2px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
+          }
+          .icon-item.active {
+            background: #ececec;
+            border-radius: 5px;
+          }
+        }
      }
    }
  }
--- a/ruoyi-ui/src/components/RuoYi/Doc/index.vue
+++ b/ruoyi-ui/src/components/RuoYi/Doc/index.vue
@ -9,7 +9,7 @@ export default {
  name: 'RuoYiDoc',
  data() {
    return {
-      url: 'https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages'
+      url: 'https://gitee.com/dromara/RuoYi-Vue-Plus/wikis/pages'
    }
  },
  methods: {
--- a/ruoyi-ui/src/components/RuoYi/Git/index.vue
+++ b/ruoyi-ui/src/components/RuoYi/Git/index.vue
@ -9,7 +9,7 @@ export default {
  name: 'RuoYiGit',
  data() {
    return {
-      url: 'https://gitee.com/JavaLionLi/RuoYi-Vue-Plus'
+      url: 'https://gitee.com/dromara/RuoYi-Vue-Plus'
    }
  },
  methods: {
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@ -127,7 +127,13 @@ export default {
        window.open(key, "_blank");
      } else if (!route || !route.children) {
        // 没有子路由路径内部打开
-        this.$router.push({ path: key });
+        const routeMenu = this.childrenMenus.find(item => item.path === key);
+        if (routeMenu && routeMenu.query) {
+          let query = JSON.parse(routeMenu.query);
+          this.$router.push({ path: key, query: query });
+        } else {
+          this.$router.push({ path: key });
+        }
        this.$store.dispatch('app/toggleSideBarHide', true);
      } else {
        // 显示左侧联动菜单
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@ -55,7 +55,21 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
  .fixed-header {
-    padding-right: 17px;
+    padding-right: 6px;
  }
 }
+
+::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+::-webkit-scrollbar-track {
+  background-color: #f1f1f1;
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: #c0c0c0;
+  border-radius: 3px;
+}
 </style>
--- a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
@ -87,7 +87,7 @@ export default {
      bottom: 0px;
    }
    .el-scrollbar__wrap {
-      height: 49px;
+      height: 39px;
    }
  }
 }
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@ -182,7 +182,7 @@ export default {
      })
    },
    closeOthersTags() {
-      this.$router.push(this.selectedTag).catch(()=>{});
+      this.$router.push(this.selectedTag.fullPath).catch(()=>{});
      this.$tab.closeOtherPage(this.selectedTag).then(() => {
        this.moveToCurrentTag()
      })
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@ -1,15 +1,15 @@
 <template>
  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <sidebar v-if="!sidebar.hide" class="sidebar-container" />
+    <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
      <div :class="{'fixed-header':fixedHeader}">
-        <navbar />
-        <tags-view v-if="needTagsView" />
+        <navbar/>
+        <tags-view v-if="needTagsView"/>
      </div>
-      <app-main />
+      <app-main/>
      <right-panel>
-        <settings />
+        <settings/>
      </right-panel>
    </div>
  </div>
--- a/ruoyi-ui/src/plugins/tab.js
+++ b/ruoyi-ui/src/plugins/tab.js
@ -32,8 +32,12 @@ export default {
  // 关闭指定tab页签
  closePage(obj) {
    if (obj === undefined) {
-      return store.dispatch('tagsView/delView', router.currentRoute).then(({ lastPath }) => {
-        return router.push(lastPath || '/');
+      return store.dispatch('tagsView/delView', router.currentRoute).then(({ visitedViews }) => {
+        const latestView = visitedViews.slice(-1)[0]
+        if (latestView) {
+          return router.push(latestView.fullPath)
+        }
+        return router.push('/');
      });
    }
    return store.dispatch('tagsView/delView', obj);
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@ -166,9 +166,15 @@ export const dynamicRoutes = [

 // 防止连续点击多次路由报错
 let routerPush = Router.prototype.push;
+let routerReplace = Router.prototype.replace;
+// push
 Router.prototype.push = function push(location) {
  return routerPush.call(this, location).catch(err => err)
 }
+// replace
+Router.prototype.replace = function push(location) {
+  return routerReplace.call(this, location).catch(err => err)
+}

 export default new Router({
  base: process.env.VUE_APP_CONTEXT_PATH,
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@ -48,7 +48,7 @@
            size="mini"
            icon="el-icon-cloudy"
            plain
-            @click="goTarget('https://gitee.com/JavaLionLi/RuoYi-Vue-Plus')"
+            @click="goTarget('https://gitee.com/dromara/RuoYi-Vue-Plus')"
            >访问码云</el-button
          >
          <el-button
@ -56,7 +56,7 @@
            size="mini"
            icon="el-icon-cloudy"
            plain
-            @click="goTarget('https://github.com/JavaLionLi/RuoYi-Vue-Plus')"
+            @click="goTarget('https://github.com/dromara/RuoYi-Vue-Plus')"
          >访问GitHub</el-button
          >
          <el-button
@ -64,7 +64,7 @@
            size="mini"
            icon="el-icon-cloudy"
            plain
-            @click="goTarget('https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4106467&doc_id=1469725')"
+            @click="goTarget('https://gitee.com/dromara/RuoYi-Vue-Plus/wikis/pages?sort_id=4106467&doc_id=1469725')"
          >更新日志</el-button
          >
        </p>
@ -114,7 +114,7 @@ export default {
  data() {
    return {
      // 版本号
-      version: "4.6.0",
+      version: "4.7.0",
    };
  },
  methods: {
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@ -56,7 +56,7 @@
    </el-form>
    <!--  底部  -->
    <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2023 疯狂的狮子Li All Rights Reserved.</span>
    </div>
  </div>
 </template>
--- a/ruoyi-ui/src/views/monitor/cache/list.vue
+++ b/ruoyi-ui/src/views/monitor/cache/list.vue
@ -187,7 +187,7 @@ export default {
    /** 清理指定名称缓存 */
    handleClearCacheName(row) {
      clearCacheName(row.cacheName).then(response => {
-        this.$modal.msgSuccess("清理缓存名称[" + this.nowCacheName + "]成功");
+        this.$modal.msgSuccess("清理缓存名称[" + row.cacheName + "]成功");
        this.getCacheKeys();
      });
    },
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@ -61,7 +61,7 @@
    </el-form>
    <!--  底部  -->
    <div class="el-register-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2023 疯狂的狮子Li All Rights Reserved.</span>
    </div>
  </div>
 </template>
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@ -134,14 +134,13 @@
                trigger="click"
                @show="$refs['iconSelect'].reset()"
              >
-                <IconSelect ref="iconSelect" @selected="selected" />
+                <IconSelect ref="iconSelect" @selected="selected" :active-icon="form.icon" />
                <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
                  <svg-icon
                    v-if="form.icon"
                    slot="prefix"
                    :icon-class="form.icon"
-                    class="el-input__icon"
-                    style="height: 32px;width: 16px;"
+                    style="width: 25px;"
                  />
                  <i v-else slot="prefix" class="el-icon-search el-input__icon" />
                </el-input>
--- a/ruoyi-ui/src/views/system/oss/index.vue
+++ b/ruoyi-ui/src/views/system/oss/index.vue
@ -406,9 +406,7 @@ export default {
      }).then(() => {
        this.getList()
        this.$modal.msgSuccess(text + "成功");
-      }).catch(() => {
-        this.previewListResource = previewListResource !== true;
-      })
+      }).catch(() => {})
    }
  }
 };
--- a/ruoyi-ui/src/views/tool/build/index.vue
+++ b/ruoyi-ui/src/views/tool/build/index.vue
@ -371,19 +371,6 @@ export default {
 </script>

 <style lang='scss'>
-body, html{
-  margin: 0;
-  padding: 0;
-  background: #fff;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;
-}
-
-input, textarea{
-  font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;
-}

 .editor-tabs{
  background: #121315;