🎃 发布 4.8.1 稳定性增强修复部分bug

2025-11-10 19:23:43 +08:00 · 2023-09-25 10:42:58 +08:00
parent 8a692ed45a
commit a6f62ca86f
68 changed files with 409 additions and 284 deletions
--- a/ruoyi-ui-vue3/package.json
+++ b/ruoyi-ui-vue3/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ruoyi-vue-plus",
-  "version": "4.8.0",
+  "version": "4.8.1",
  "description": "RuoYi-Vue-Plus后台管理系统",
  "author": "LionLi",
  "license": "MIT",
@@ -38,6 +38,6 @@
    "vite": "3.2.3",
    "vite-plugin-compression": "0.5.1",
    "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-setup-extend": "0.4.0"
+    "unplugin-vue-setup-extend-plus": "0.4.9"
  }
 }
--- a/ruoyi-ui-vue3/src/components/DictTag/index.vue
+++ b/ruoyi-ui-vue3/src/components/DictTag/index.vue
@@ -3,7 +3,7 @@
    <template v-for="(item, index) in options">
      <template v-if="values.includes(item.value)">
        <span
-          v-if="item.elTagType == 'default' || item.elTagType == ''"
+          v-if="(item.elTagType == 'default' || item.elTagType == '') && (item.elTagClass == '' || item.elTagClass == null)"
          :key="item.value"
          :index="index"
          :class="item.elTagClass"
@@ -41,34 +41,30 @@ const props = defineProps({
    type: Boolean,
    default: true,
  },
+  separator: {
+    type: String,
+    default: ",",
+  }
 });

 const values = computed(() => {
-  if (props.value !== null && typeof props.value !== 'undefined') {
-    return Array.isArray(props.value) ? props.value : [String(props.value)];
-  } else {
-    return [];
-  }
+  if (props.value === null || typeof props.value === 'undefined' || props.value === '') return [];
+  return Array.isArray(props.value) ? props.value.map(item => '' + item) : String(props.value).split(props.separator);
 });

 const unmatch = computed(() => {
  unmatchArray.value = [];
-  if (props.value !== null && typeof props.value !== "undefined") {
-    // 传入值为非数组
-    if (!Array.isArray(props.value)) {
-      if (props.options.some((v) => v.value == props.value)) return false;
-      unmatchArray.value.push(props.value);
-      return true;
-    }
-    // 传入值为Array
-    props.value.forEach((item) => {
-      if (!props.options.some((v) => v.value == item))
-        unmatchArray.value.push(item);
-    });
-    return true;
-  }
  // 没有value不显示
-  return false;
+  if (props.value === null || typeof props.value === 'undefined' || props.value === '' || props.options.length === 0) return false
+  // 传入值为数组
+  let unmatch = false // 添加一个标志来判断是否有未匹配项
+  values.value.forEach(item => {
+    if (!props.options.some(v => v.value === item)) {
+      unmatchArray.value.push(item)
+      unmatch = true // 如果有未匹配项，将标志设置为true
+    }
+  })
+  return unmatch // 返回标志的值
 });

 function handleArray(array) {
--- a/ruoyi-ui-vue3/src/components/TopNav/index.vue
+++ b/ruoyi-ui-vue3/src/components/TopNav/index.vue
@@ -6,10 +6,12 @@
    :ellipsis="false"
  >
    <template v-for="(item, index) in topMenus">
-      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
-        ><svg-icon :icon-class="item.meta.icon" />
-        {{ item.meta.title }}</el-menu-item
-      >
+      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber">
+        <svg-icon
+        v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+        :icon-class="item.meta.icon"/>
+        {{ item.meta.title }}
+      </el-menu-item>
    </template>

    <!-- 顶部菜单超出数量折叠 -->
@@ -19,10 +21,12 @@
        <el-menu-item
          :index="item.path"
          :key="index"
-          v-if="index >= visibleNumber"
-          ><svg-icon :icon-class="item.meta.icon" />
-          {{ item.meta.title }}</el-menu-item
-        >
+          v-if="index >= visibleNumber">
+        <svg-icon
+          v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+          :icon-class="item.meta.icon"/>
+        {{ item.meta.title }}
+        </el-menu-item>
      </template>
    </el-sub-menu>
  </el-menu>
@@ -189,4 +193,22 @@ onMounted(() => {
  padding: 0 5px !important;
  margin: 0 10px !important;
 }
+
+/* 背景色隐藏 */
+.topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus, .topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover, .topmenu-container.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
+  background-color: #ffffff !important;
+}
+
+/* 图标右间距 */
+.topmenu-container .svg-icon {
+  margin-right: 4px;
+}
+
+/* topmenu more arrow */
+.topmenu-container .el-sub-menu .el-sub-menu__icon-arrow {
+  position: static;
+  vertical-align: middle;
+  margin-left: 8px;
+  margin-top: 0px;
+}
 </style>
--- a/ruoyi-ui-vue3/src/layout/components/Navbar.vue
+++ b/ruoyi-ui-vue3/src/layout/components/Navbar.vue
@@ -33,7 +33,7 @@
              <router-link to="/user/profile">
                <el-dropdown-item>个人中心</el-dropdown-item>
              </router-link>
-              <el-dropdown-item command="setLayout">
+              <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
                <span>布局设置</span>
              </el-dropdown-item>
              <el-dropdown-item divided command="logout">
--- a/ruoyi-ui-vue3/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui-vue3/src/layout/components/TagsView/index.vue
@@ -280,7 +280,7 @@ function handleScroll() {
          height: 8px;
          border-radius: 50%;
          position: relative;
-          margin-right: 2px;
+          margin-right: 5px;
        }
      }
    }
@@ -335,4 +335,4 @@ function handleScroll() {
    }
  }
 }
-</style>
+</style>
--- a/ruoyi-ui-vue3/src/settings.js
+++ b/ruoyi-ui-vue3/src/settings.js
@@ -10,7 +10,7 @@ export default {
  /**
   * 是否系统布局配置
   */
-  showSettings: false,
+  showSettings: true,

  /**
   * 是否显示顶部导航
--- a/ruoyi-ui-vue3/src/views/index.vue
+++ b/ruoyi-ui-vue3/src/views/index.vue
@@ -103,7 +103,7 @@
 </template>

 <script setup name="Index">
-const version = ref('4.8.0')
+const version = ref('4.8.1')

 function goTarget(url) {
  window.open(url, '__blank')
--- a/ruoyi-ui-vue3/src/views/register.vue
+++ b/ruoyi-ui-vue3/src/views/register.vue
@@ -3,11 +3,11 @@
    <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
      <h3 class="title">RuoYi-Vue-Plus后台管理系统</h3>
      <el-form-item prop="username">
-        <el-input 
-          v-model="registerForm.username" 
-          type="text" 
-          size="large" 
-          auto-complete="off" 
+        <el-input
+          v-model="registerForm.username"
+          type="text"
+          size="large"
+          auto-complete="off"
          placeholder="账号"
        >
          <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
@@ -17,7 +17,7 @@
        <el-input
          v-model="registerForm.password"
          type="password"
-          size="large" 
+          size="large"
          auto-complete="off"
          placeholder="密码"
          @keyup.enter="handleRegister"
@@ -29,7 +29,7 @@
        <el-input
          v-model="registerForm.confirmPassword"
          type="password"
-          size="large" 
+          size="large"
          auto-complete="off"
          placeholder="确认密码"
          @keyup.enter="handleRegister"
@@ -39,7 +39,7 @@
      </el-form-item>
      <el-form-item prop="code" v-if="captchaEnabled">
        <el-input
-          size="large" 
+          size="large"
          v-model="registerForm.code"
          auto-complete="off"
          placeholder="验证码"
@@ -55,7 +55,7 @@
      <el-form-item style="width:100%;">
        <el-button
          :loading="loading"
-          size="large" 
+          size="large"
          type="primary"
          style="width:100%;"
          @click.prevent="handleRegister"
@@ -143,10 +143,10 @@ function handleRegister() {

 function getCode() {
  getCodeImg().then(res => {
-    captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled;
+    captchaEnabled.value = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled;
    if (captchaEnabled.value) {
-      codeUrl.value = "data:image/gif;base64," + res.img;
-      registerForm.value.uuid = res.uuid;
+      codeUrl.value = "data:image/gif;base64," + res.data.img;
+      registerForm.value.uuid = res.data.uuid;
    }
  });
 }
--- a/ruoyi-ui-vue3/src/views/system/dict/data.vue
+++ b/ruoyi-ui-vue3/src/views/system/dict/data.vue
@@ -91,8 +91,8 @@
         <el-table-column label="字典编码" align="center" prop="dictCode" />
         <el-table-column label="字典标签" align="center" prop="dictLabel">
            <template #default="scope">
-               <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{ scope.row.dictLabel }}</span>
-               <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel }}</el-tag>
+              <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
+              <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
            </template>
         </el-table-column>
         <el-table-column label="字典键值" align="center" prop="dictValue" />
@@ -197,8 +197,8 @@ const typeOptions = ref([]);
 const route = useRoute();
 // 数据标签回显样式
 const listClassOptions = ref([
-  { value: "default", label: "默认" }, 
-  { value: "primary", label: "主要" }, 
+  { value: "default", label: "默认" },
+  { value: "primary", label: "主要" },
  { value: "success", label: "成功" },
  { value: "info", label: "信息" },
  { value: "warning", label: "警告" },
--- a/ruoyi-ui-vue3/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui-vue3/src/views/system/user/profile/index.vue
@@ -10,7 +10,7 @@
               </template>
               <div>
                  <div class="text-center">
-                     <userAvatar :user="state.user" />
+                     <userAvatar />
                  </div>
                  <ul class="list-group list-group-striped">
                     <li class="list-group-item">
--- a/ruoyi-ui-vue3/vite/plugins/setup-extend.js
+++ b/ruoyi-ui-vue3/vite/plugins/setup-extend.js
@@ -1,5 +1,5 @@
-import setupExtend from 'vite-plugin-vue-setup-extend'
+import setupExtend from 'unplugin-vue-setup-extend-plus/vite'

 export default function createSetupExtend() {
-    return setupExtend()
+    return setupExtend({})
 }