Merge remote-tracking branch 'yudao/master'

src/components/Descriptions/src/Descriptions.vue

@@ -109,7 +109,13 @@ const toggleClick = () => {
             v-bind="getBindItemValue(item)"
           >
             <template #label>
-              <slot :name="`${item.field}-label`" :label="item.label">{{ item.label }}</slot>
+              <slot
+                :name="`${item.field}-label`"
+                :row="{
+                  label: item.label
+                }"
+                >{{ item.label }}</slot
+              >
             </template>
 
             <template #default>

src/hooks/web/useCrudSchemas.ts

@@ -282,7 +282,7 @@ const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[
 
 // 给options添加国际化
 const filterOptions = (options: Recordable, labelField?: string) => {
-  return options.map((v: Recordable) => {
+  return options?.map((v: Recordable) => {
     if (labelField) {
       v['labelField'] = t(v.labelField)
     } else {

src/layout/components/TagsView/src/TagsView.vue

@@ -409,7 +409,10 @@ watch(
         {
           icon: 'ep:close',
           label: t('common.closeTab'),
-          disabled: !!visitedViews?.length && selectedTag?.meta.affix
+           disabled: !!visitedViews?.length && selectedTag?.meta.affix,
+          command: () => {
+            closeSelectedTag(selectedTag!)
+          }
         },
         {
           divided: true,

src/layout/components/ThemeSwitch/src/ThemeSwitch.vue

@@ -37,3 +37,8 @@ const themeChange = (val: boolean) => {
     @change="themeChange"
   />
 </template>
+<style lang="scss" scoped>
+:deep(.el-switch__core .el-switch__inner .is-icon) {
+  overflow: visible;
+}
+</style>

src/main.ts

@@ -55,7 +55,7 @@ import 'highlight.js/styles/github.css' //导入代码高亮样式  新版
 import Logger from '@/utils/Logger'
 
 // 本地开发模式 全局引入 element-plus 样式，加快第一次进入速度
-if (isDevMode() == true) {
+if (isDevMode()) {
   import('element-plus/dist/index.css')
 }
 

src/styles/index.scss

@@ -6,6 +6,11 @@
   margin-left: 2px !important;
 }
 
+// 解决抽屉弹出时，body宽度变化的问题
+.el-popup-parent--hidden {
+  width: 100% !important;
+}
+
 /* nprogress 适配 element-plus 的主题色 */
 #nprogress {
   & .bar {

src/types/auto-components.d.ts

@@ -1,5 +1,7 @@
-// generated by unplugin-vue-components
-// We suggest you to commit this file into source control
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
 import '@vue/runtime-core'
 

src/types/auto-imports.d.ts

@@ -70,5 +70,5 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component,ComponentPublicInstance,ComputedRef,InjectionKey,PropType,Ref,VNode } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from 'vue'
 }

src/utils/env.ts

@@ -1,6 +1,6 @@
 export const isDevMode = () => {
   const dev = import.meta.env.VITE_DEV
-  if (dev && dev === true) {
+  if (dev && dev === 'true') {
     return true
   } else {
     return false