Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

2025-05-02 14:15:19 +08:00 · 2025-05-02 14:15:19 +08:00 · 4f62d4b8ed
parent c9d5b55870 f1af9f8f6e
commit 4f62d4b8ed
14 changed files with 64 additions and 16 deletions
--- a/docs/src/components/common-ui/vben-drawer.md
+++ b/docs/src/components/common-ui/vben-drawer.md
@ -78,7 +78,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
 | --- | --- | --- | --- |
 | appendToMain | 是否挂载到内容区域（默认挂载到body） | `boolean` | `false` |
 | connectedComponent | 连接另一个Modal组件 | `Component` | - |
-| destroyOnClose | 关闭时销毁`connectedComponent` | `boolean` | `false` |
+| destroyOnClose | 关闭时销毁 | `boolean` | `false` |
 | title | 标题 | `string\|slot` | - |
 | titleTooltip | 标题提示信息 | `string\|slot` | - |
 | description | 描述信息 | `string\|slot` | - |
--- a/packages/@core/ui-kit/form-ui/package.json
+++ b/packages/@core/ui-kit/form-ui/package.json
@ -38,6 +38,7 @@
  },
  "dependencies": {
    "@vben-core/composables": "workspace:*",
+    "@vben-core/icons": "workspace:*",
    "@vben-core/shadcn-ui": "workspace:*",
    "@vben-core/shared": "workspace:*",
    "@vben-core/typings": "workspace:*",
--- a/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
+++ b/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
@ -5,6 +5,7 @@ import type { FormSchema, MaybeComponentProps } from '../types';

 import { computed, nextTick, onUnmounted, useTemplateRef, watch } from 'vue';

+import { CircleAlert } from '@vben-core/icons';
 import {
  FormControl,
  FormDescription,
@ -12,6 +13,7 @@ import {
  FormItem,
  FormMessage,
  VbenRenderContent,
+  VbenTooltip,
 } from '@vben-core/shadcn-ui';
 import { cn, isFunction, isObject, isString } from '@vben-core/shared/utils';

@ -356,6 +358,24 @@ onUnmounted(() => {
                </template>
                <!-- <slot></slot> -->
              </component>
+              <VbenTooltip
+                v-if="compact && isInValid"
+                :delay-duration="300"
+                side="left"
+              >
+                <template #trigger>
+                  <slot name="trigger">
+                    <CircleAlert
+                      :class="
+                        cn(
+                          'text-foreground/80 hover:text-foreground inline-flex size-5 cursor-pointer',
+                        )
+                      "
+                    />
+                  </slot>
+                </template>
+                <FormMessage />
+              </VbenTooltip>
            </slot>
          </FormControl>
          <!-- 自定义后缀 -->
@ -367,7 +387,7 @@ onUnmounted(() => {
          </FormDescription>
        </div>

-        <Transition name="slide-up">
+        <Transition name="slide-up" v-if="!compact">
          <FormMessage class="absolute bottom-1" />
        </Transition>
      </div>
--- a/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue
+++ b/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue
@ -35,7 +35,7 @@ interface Props extends DrawerProps {
 const props = withDefaults(defineProps<Props>(), {
  appendToMain: false,
  closeIconPlacement: 'right',
-  destroyOnClose: true,
+  destroyOnClose: false,
  drawerApi: undefined,
  submitting: false,
  zIndex: 1000,
--- a/packages/@core/ui-kit/popup-ui/src/drawer/use-drawer.ts
+++ b/packages/@core/ui-kit/popup-ui/src/drawer/use-drawer.ts
@ -21,9 +21,7 @@ import VbenDrawer from './drawer.vue';

 const USER_DRAWER_INJECT_KEY = Symbol('VBEN_DRAWER_INJECT');

-const DEFAULT_DRAWER_PROPS: Partial<DrawerProps> = {
-  destroyOnClose: true,
-};
+const DEFAULT_DRAWER_PROPS: Partial<DrawerProps> = {};

 export function setDefaultDrawerProps(props: Partial<DrawerProps>) {
  Object.assign(DEFAULT_DRAWER_PROPS, props);
--- a/packages/@core/ui-kit/popup-ui/src/modal/modal.vue
+++ b/packages/@core/ui-kit/popup-ui/src/modal/modal.vue
@ -34,7 +34,7 @@ interface Props extends ModalProps {

 const props = withDefaults(defineProps<Props>(), {
  appendToMain: false,
-  destroyOnClose: true,
+  destroyOnClose: false,
  modalApi: undefined,
 });

--- a/packages/@core/ui-kit/popup-ui/src/modal/use-modal.ts
+++ b/packages/@core/ui-kit/popup-ui/src/modal/use-modal.ts
@ -9,9 +9,7 @@ import VbenModal from './modal.vue';

 const USER_MODAL_INJECT_KEY = Symbol('VBEN_MODAL_INJECT');

-const DEFAULT_MODAL_PROPS: Partial<ModalProps> = {
-  destroyOnClose: true,
-};
+const DEFAULT_MODAL_PROPS: Partial<ModalProps> = {};

 export function setDefaultModalProps(props: Partial<ModalProps>) {
  Object.assign(DEFAULT_MODAL_PROPS, props);
--- a/packages/@core/ui-kit/shadcn-ui/src/components/popover/popover.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/popover/popover.vue
@ -21,6 +21,7 @@ interface Props extends PopoverRootProps {
  class?: ClassType;
  contentClass?: ClassType;
  contentProps?: PopoverContentProps;
+  triggerClass?: ClassType;
 }

 const props = withDefaults(defineProps<Props>(), {});
@ -32,6 +33,7 @@ const delegatedProps = computed(() => {
    class: _cls,
    contentClass: _,
    contentProps: _cProps,
+    triggerClass: _tClass,
    ...delegated
  } = props;

@ -43,7 +45,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);

 <template>
  <PopoverRoot v-bind="forwarded">
-    <PopoverTrigger>
+    <PopoverTrigger :class="triggerClass">
      <slot name="trigger"></slot>

      <PopoverContent
--- a/packages/effects/common-ui/src/components/icon-picker/icon-picker.vue
+++ b/packages/effects/common-ui/src/components/icon-picker/icon-picker.vue
@ -165,13 +165,18 @@ const searchInputProps = computed(() => {
  };
 });

+function updateCurrentSelect(v: string) {
+  currentSelect.value = v;
+}
+
 defineExpose({ toggleOpenState, open, close });
 </script>
 <template>
  <VbenPopover
    v-model:open="visible"
    :content-props="{ align: 'end', alignOffset: -11, sideOffset: 8 }"
-    content-class="p-0 pt-3"
+    content-class="p-0 pt-3 w-full"
+    trigger-class="w-full"
  >
    <template #trigger>
      <template v-if="props.type === 'input'">
@ -183,6 +188,7 @@ defineExpose({ toggleOpenState, open, close });
          role="combobox"
          :aria-label="$t('ui.iconPicker.placeholder')"
          aria-expanded="visible"
+          :[`onUpdate:${modelValueProp}`]="updateCurrentSelect"
          v-bind="$attrs"
        >
          <template #[iconSlot]>
--- a/packages/effects/common-ui/src/ui/authentication/login-expired-modal.vue
+++ b/packages/effects/common-ui/src/ui/authentication/login-expired-modal.vue
@ -35,6 +35,16 @@ const getZIndex = computed(() => {
  return props.zIndex || calcZIndex();
 });

+/**
+ * 排除ant-message和loading:9999的z-index
+ */
+const zIndexExcludeClass = ['ant-message', 'loading'];
+function isZIndexExcludeClass(element: Element) {
+  return zIndexExcludeClass.some((className) =>
+    element.classList.contains(className),
+  );
+}
+
 /**
 * 获取最大的zIndex值
 */
@ -44,7 +54,11 @@ function calcZIndex() {
  [...elements].forEach((element) => {
    const style = window.getComputedStyle(element);
    const zIndex = style.getPropertyValue('z-index');
-    if (zIndex && !Number.isNaN(Number.parseInt(zIndex))) {
+    if (
+      zIndex &&
+      !Number.isNaN(Number.parseInt(zIndex)) &&
+      !isZIndexExcludeClass(element)
+    ) {
      maxZ = Math.max(maxZ, Number.parseInt(zIndex));
    }
  });
--- a/packages/effects/layouts/src/widgets/preferences/blocks/layout/sidebar.vue
+++ b/packages/effects/layouts/src/widgets/preferences/blocks/layout/sidebar.vue
@ -79,14 +79,14 @@ const handleCheckboxChange = () => {
  </SwitchItem>
  <CheckboxItem
    :items="[
-      { label: '收缩按钮', value: 'collapsed' },
-      { label: '固定按钮', value: 'fixed' },
+      { label: $t('preferences.sidebar.buttonCollapsed'), value: 'collapsed' },
+      { label: $t('preferences.sidebar.buttonFixed'), value: 'fixed' },
    ]"
    multiple
    v-model="sidebarButtons"
    :on-btn-click="handleCheckboxChange"
  >
-    按钮配置
+    {{ $t('preferences.sidebar.buttons') }}
  </CheckboxItem>
  <NumberFieldItem
    v-model="sidebarWidth"
--- a/packages/locales/src/langs/en-US/preferences.json
+++ b/packages/locales/src/langs/en-US/preferences.json
@ -45,6 +45,9 @@
    "fixed": "Fixed"
  },
  "sidebar": {
+    "buttons": "Show Buttons",
+    "buttonFixed": "Fixed",
+    "buttonCollapsed": "Collapsed",
    "title": "Sidebar",
    "width": "Width",
    "visible": "Show Sidebar",
--- a/packages/locales/src/langs/zh-CN/preferences.json
+++ b/packages/locales/src/langs/zh-CN/preferences.json
@ -45,6 +45,9 @@
    "fixed": "固定"
  },
  "sidebar": {
+    "buttons": "显示按钮",
+    "buttonFixed": "固定按钮",
+    "buttonCollapsed": "折叠按钮",
    "title": "侧边栏",
    "width": "宽度",
    "visible": "显示侧边栏",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -1390,6 +1390,9 @@ importers:
      '@vben-core/composables':
        specifier: workspace:*
        version: link:../../composables
+      '@vben-core/icons':
+        specifier: workspace:*
+        version: link:../../base/icons
      '@vben-core/shadcn-ui':
        specifier: workspace:*
        version: link:../shadcn-ui