diff --git a/easyflow-ui-admin/app/src/bootstrap.ts b/easyflow-ui-admin/app/src/bootstrap.ts
index 5381a14..f3cfe54 100644
--- a/easyflow-ui-admin/app/src/bootstrap.ts
+++ b/easyflow-ui-admin/app/src/bootstrap.ts
@@ -8,7 +8,10 @@ import {
 } from 'vue-element-plus-x';
 
 import { registerAccessDirective } from '@easyflow/access';
-import { registerLoadingDirective } from '@easyflow/common-ui';
+import {
+  registerLoadingDirective,
+  setDefaultModalProps,
+} from '@easyflow/common-ui';
 import { preferences } from '@easyflow/preferences';
 import { initStores } from '@easyflow/stores';
 import '@easyflow/styles';
@@ -31,10 +34,12 @@ async function bootstrap(namespace: string) {
   // 初始化表单组件
   await initSetupEasyFlowForm();
 
-  // // 设置弹窗的默认配置
-  // setDefaultModalProps({
-  //   fullscreenButton: false,
-  // });
+  // 设置弹窗的默认配置
+  setDefaultModalProps({
+    bordered: true,
+    fullscreenButton: false,
+    overlayBlur: 0,
+  });
   // // 设置抽屉的默认配置
   // setDefaultDrawerProps({
   //   zIndex: 2000,
diff --git a/easyflow-ui-admin/app/src/components/headerSearch/HeaderSearch.vue b/easyflow-ui-admin/app/src/components/headerSearch/HeaderSearch.vue
index c4e5e56..33df232 100644
--- a/easyflow-ui-admin/app/src/components/headerSearch/HeaderSearch.vue
+++ b/easyflow-ui-admin/app/src/components/headerSearch/HeaderSearch.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { computed, ref } from 'vue';
 
-import { ArrowDown } from '@element-plus/icons-vue';
+import { ArrowDown, Search } from '@element-plus/icons-vue';
 import {
   ElButton,
   ElDropdown,
@@ -14,9 +14,7 @@ import {
 import { hasPermission } from '#/api/common/hasPermission.ts';
 import { $t } from '#/locales';
 
-// 定义组件属性
 const props = defineProps({
-  // 按钮配置数组
   buttons: {
     type: Array,
     default: () => [],
@@ -29,40 +27,43 @@ const props = defineProps({
       });
     },
   },
-  // 最大显示按钮数量（不包括下拉菜单）
   maxVisibleButtons: {
     type: Number,
     default: 3,
   },
-  // 搜索框占位符
   searchPlaceholder: {
     type: String,
     default: $t('common.searchPlaceholder'),
   },
 });
 
-const emit = defineEmits(['search', 'button-click', 'buttonClick']);
+const emit = defineEmits(['search', 'buttonClick']);
 
-// 搜索值
 const searchValue = ref('');
 
-// 计算显示的按钮
-const visibleButtons = computed(() => {
-  return props.buttons.slice(0, props.maxVisibleButtons);
-});
-
-// 计算下拉菜单中的按钮
-const dropdownButtons = computed(() => {
-  const dropdownButtonsTemp = props.buttons.slice(props.maxVisibleButtons);
-  if (dropdownButtonsTemp.length === 0) {
-    return [];
-  }
-  return dropdownButtonsTemp.value.filter((action) => {
-    return hasPermission([action.permission]);
+const filterButtonsByPermission = (buttons) => {
+  return buttons.filter((button) => {
+    return !button.permission || hasPermission([button.permission]);
   });
+};
+
+const visibleButtons = computed(() => {
+  return filterButtonsByPermission(props.buttons).slice(
+    0,
+    props.maxVisibleButtons,
+  );
 });
 
-// 处理搜索
+const dropdownButtons = computed(() => {
+  return filterButtonsByPermission(props.buttons).slice(
+    props.maxVisibleButtons,
+  );
+});
+
+const emitButtonEvent = (payload) => {
+  emit('buttonClick', payload);
+};
+
 const handleSearch = () => {
   emit('search', searchValue.value);
 };
@@ -72,9 +73,8 @@ const handleReset = () => {
   emit('search', '');
 };
 
-// 处理按钮点击
 const handleButtonClick = (button) => {
-  emit('buttonClick', {
+  emitButtonEvent({
     type: 'button',
     key: button.key,
     button,
@@ -82,9 +82,8 @@ const handleButtonClick = (button) => {
   });
 };
 
-// 处理下拉菜单点击
 const handleDropdownClick = (button) => {
-  emit('buttonClick', {
+  emitButtonEvent({
     type: 'dropdown',
     key: button.key,
     button,
@@ -95,34 +94,34 @@ const handleDropdownClick = (button) => {
 
 <template>
   <div class="custom-header">
-    <!-- 左侧搜索区域 -->
     <div class="header-left">
-      <div class="search-container">
-        <div>
-          <ElInput
-            v-model="searchValue"
-            :placeholder="$t('common.searchPlaceholder')"
-            class="search-input"
-            @keyup.enter="handleSearch"
-            clearable
-          />
-        </div>
-        <div>
-          <ElButton type="primary" auto-insert-space @click="handleSearch">
-            {{ $t('button.query') }}
-          </ElButton>
-        </div>
-        <div>
-          <ElButton auto-insert-space @click="handleReset">
-            {{ $t('button.reset') }}
-          </ElButton>
-        </div>
+      <div class="search-group">
+        <ElInput
+          v-model="searchValue"
+          :placeholder="searchPlaceholder"
+          class="search-input"
+          clearable
+          @keyup.enter="handleSearch"
+        >
+          <template #prefix>
+            <ElIcon class="search-prefix">
+              <Search />
+            </ElIcon>
+          </template>
+        </ElInput>
+        <ElButton type="primary" auto-insert-space @click="handleSearch">
+          {{ $t('button.query') }}
+        </ElButton>
+        <ElButton auto-insert-space @click="handleReset">
+          {{ $t('button.reset') }}
+        </ElButton>
       </div>
     </div>
 
-    <!-- 右侧按钮区域 -->
-    <div class="header-right">
-      <!-- 显示的按钮（最多3个） -->
+    <div
+      v-if="visibleButtons.length > 0 || dropdownButtons.length > 0"
+      class="header-right"
+    >
       <template
         v-for="(button, index) in visibleButtons"
         :key="button.key || index"
@@ -138,14 +137,13 @@ const handleDropdownClick = (button) => {
         </ElButton>
       </template>
 
-      <!-- 下拉菜单（隐藏的按钮） -->
       <ElDropdown
         v-if="dropdownButtons.length > 0"
         @command="handleDropdownClick"
       >
         <ElButton>
-          {{ $t('button.more')
-          }}<ElIcon class="el-icon--right"><ArrowDown /></ElIcon>
+          {{ $t('button.more') }}
+          <ElIcon class="el-icon--right"><ArrowDown /></ElIcon>
         </ElButton>
         <template #dropdown>
           <ElDropdownMenu>
@@ -158,7 +156,7 @@ const handleDropdownClick = (button) => {
               <ElIcon v-if="button.icon">
                 <component :is="button.icon" />
               </ElIcon>
-              <span style="margin-left: 8px">{{ button.text }}</span>
+              <span class="dropdown-label">{{ button.text }}</span>
             </ElDropdownItem>
           </ElDropdownMenu>
         </template>
@@ -168,54 +166,109 @@ const handleDropdownClick = (button) => {
 </template>
 
 <style scoped>
-/* 响应式设计 */
-@media (max-width: 768px) {
-  .custom-header {
-    flex-direction: column;
-    gap: 16px;
-    padding: 12px 16px;
-  }
-
-  .header-left,
-  .header-right {
-    justify-content: center;
-    width: 100%;
-  }
-
-  .search-container {
-    width: 100%;
-  }
-
-  .header-right {
-    flex-wrap: wrap;
-  }
-}
-
 .custom-header {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  gap: 16px;
   width: 100%;
 }
 
-.header-left {
+.header-left,
+.header-right {
   display: flex;
   align-items: center;
+  min-width: 0;
 }
 
-.search-container {
+.header-left {
+  flex: 1;
+}
+
+.search-group {
   display: flex;
+  flex: 1;
+  flex-wrap: wrap;
+  align-items: center;
   gap: 12px;
 }
 
 .search-input {
-  width: 300px;
-  border-radius: 4px;
+  width: min(360px, 100%);
+}
+
+.search-input :deep(.el-input__wrapper) {
+  min-height: 40px;
+  background: hsl(var(--surface-contrast-soft) / 0.92);
+  border-radius: 14px;
+  box-shadow:
+    inset 0 1px 0 hsl(var(--glass-border) / 0.44),
+    0 10px 24px -24px hsl(var(--foreground) / 0.24);
+}
+
+.search-input :deep(.el-input__wrapper:hover),
+.search-input :deep(.el-input__wrapper.is-focus) {
+  background: hsl(var(--surface-subtle) / 0.98);
+  box-shadow:
+    inset 0 1px 0 hsl(var(--glass-border) / 0.56),
+    0 0 0 3px hsl(var(--primary) / 0.08),
+    0 12px 24px -24px hsl(var(--foreground) / 0.24);
+}
+
+.search-prefix {
+  color: hsl(var(--text-muted));
 }
 
 .header-right {
-  display: flex;
+  flex-shrink: 0;
+  flex-wrap: wrap;
+  justify-content: flex-end;
   gap: 12px;
-  align-items: center;
+}
+
+.header-right :deep(.el-button),
+.search-group :deep(.el-button) {
+  min-width: 64px;
+  height: 32px;
+  min-height: 32px;
+  padding-inline: 18px;
+  border-radius: 10px;
+  border-color: transparent;
+  box-shadow: none;
+}
+
+.header-right :deep(.el-button:not(.el-button--primary)),
+.search-group :deep(.el-button:not(.el-button--primary)) {
+  color: hsl(var(--text-strong));
+  background: hsl(var(--surface-contrast-soft) / 0.86);
+  border-color: transparent;
+  box-shadow:
+    inset 0 1px 0 hsl(var(--glass-border) / 0.34),
+    0 10px 24px -24px hsl(var(--foreground) / 0.2);
+}
+
+.header-right :deep(.el-button--primary),
+.search-group :deep(.el-button--primary) {
+  box-shadow: 0 16px 28px -22px hsl(var(--primary) / 0.48);
+}
+
+.dropdown-label {
+  margin-left: 8px;
+}
+
+@media (max-width: 768px) {
+  .custom-header {
+    flex-direction: column;
+    align-items: stretch;
+    gap: 12px;
+  }
+
+  .header-right {
+    justify-content: flex-start;
+  }
+
+  .search-input {
+    width: 100%;
+  }
 }
 </style>
diff --git a/easyflow-ui-admin/app/src/components/page/ListPageShell.vue b/easyflow-ui-admin/app/src/components/page/ListPageShell.vue
new file mode 100644
index 0000000..490224d
--- /dev/null
+++ b/easyflow-ui-admin/app/src/components/page/ListPageShell.vue
@@ -0,0 +1,227 @@
+<script setup lang="ts">
+import type { CSSProperties } from 'vue';
+
+import { computed, useSlots } from 'vue';
+
+interface Props {
+  contentPadding?: number | string;
+  dense?: boolean;
+  stickyToolbar?: boolean;
+  surface?: 'panel' | 'subtle';
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  contentPadding: 0,
+  dense: false,
+  stickyToolbar: false,
+  surface: 'panel',
+});
+
+const slots = useSlots();
+
+const hasToolbar = computed(() => Boolean(slots.filters || slots.actions));
+
+const contentStyle = computed((): CSSProperties => {
+  const padding =
+    typeof props.contentPadding === 'number'
+      ? `${props.contentPadding}px`
+      : props.contentPadding;
+
+  return padding ? { '--list-page-shell-content-padding': padding } : {};
+});
+</script>
+
+<template>
+  <section
+    :class="[
+      'list-page-shell',
+      `is-${surface}`,
+      {
+        'is-dense': dense,
+      },
+    ]"
+  >
+    <div
+      v-if="hasToolbar"
+      :class="[
+        'list-page-shell__toolbar',
+        {
+          'is-sticky': stickyToolbar,
+        },
+      ]"
+    >
+      <div v-if="$slots.filters" class="list-page-shell__filters">
+        <slot name="filters"></slot>
+      </div>
+      <div v-if="$slots.actions" class="list-page-shell__actions">
+        <slot name="actions"></slot>
+      </div>
+    </div>
+
+    <div class="list-page-shell__content" :style="contentStyle">
+      <slot></slot>
+      <slot name="empty"></slot>
+    </div>
+  </section>
+</template>
+
+<style scoped>
+.list-page-shell {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  min-height: 0;
+  gap: 16px;
+}
+
+.list-page-shell.is-dense {
+  gap: 12px;
+}
+
+.list-page-shell__toolbar {
+  position: relative;
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  padding: 8px 6px 2px;
+  background: transparent;
+  border: none;
+  border-radius: 0;
+}
+
+.list-page-shell__toolbar.is-sticky {
+  position: sticky;
+  top: 12px;
+  z-index: 5;
+  padding: 10px 10px 6px;
+  background: hsl(var(--glass-tint) / 0.7);
+  border: 1px solid hsl(var(--glass-border) / 0.44);
+  border-radius: 20px;
+  box-shadow: var(--shadow-toolbar);
+  backdrop-filter: blur(var(--glass-blur)) saturate(155%);
+}
+
+.list-page-shell__filters,
+.list-page-shell__actions {
+  min-width: 0;
+}
+
+.list-page-shell__filters {
+  flex: 1;
+}
+
+.list-page-shell__content {
+  --list-page-shell-content-padding: 0px;
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  min-height: 0;
+  padding: var(--list-page-shell-content-padding);
+  background: hsl(var(--surface-panel));
+  border: none;
+  border-radius: 24px;
+  box-shadow: var(--shadow-subtle);
+}
+
+.list-page-shell.is-subtle .list-page-shell__content {
+  background: hsl(var(--surface-contrast-soft));
+  box-shadow: none;
+}
+
+.list-page-shell__content :deep(.page-data-container) {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  min-height: 0;
+}
+
+.list-page-shell__content :deep(.el-empty) {
+  margin: auto;
+}
+
+.list-page-shell__content :deep(.el-table) {
+  --el-table-bg-color: transparent;
+  --el-table-tr-bg-color: transparent;
+  --el-table-header-bg-color: hsl(var(--table-header-bg));
+  --el-table-border-color: hsl(var(--table-row-border));
+  --el-table-current-row-bg-color: hsl(var(--table-row-hover));
+  --el-fill-color-blank: transparent;
+  background: transparent;
+}
+
+.list-page-shell__content :deep(.el-table--border),
+.list-page-shell__content :deep(.el-table__inner-wrapper),
+.list-page-shell__content :deep(.el-table__header-wrapper),
+.list-page-shell__content :deep(.el-table__body-wrapper) {
+  border: none;
+}
+
+.list-page-shell__content :deep(.el-table__inner-wrapper::before),
+.list-page-shell__content :deep(.el-table--border::before),
+.list-page-shell__content :deep(.el-table--border::after) {
+  display: none;
+}
+
+.list-page-shell__content :deep(.el-table th.el-table__cell) {
+  padding: 12px 0;
+  font-size: 13px;
+  font-weight: 600;
+  color: hsl(var(--text-strong));
+  background: hsl(var(--table-header-bg) / 0.86);
+  border-bottom: 1px solid hsl(var(--divider-faint) / 0.38);
+}
+
+.list-page-shell__content :deep(.el-table th.el-table__cell:first-child) {
+  border-top-left-radius: 12px;
+}
+
+.list-page-shell__content :deep(.el-table th.el-table__cell:last-child) {
+  border-top-right-radius: 12px;
+}
+
+.list-page-shell__content :deep(.el-table td.el-table__cell),
+.list-page-shell__content :deep(.el-table--border .el-table__cell) {
+  padding: 14px 0;
+  border-right: none;
+  border-bottom: 1px solid hsl(var(--divider-faint) / 0.46);
+}
+
+.list-page-shell__content :deep(.el-table__row:hover > td.el-table__cell) {
+  background: hsl(var(--table-row-hover)) !important;
+}
+
+.list-page-shell__content :deep(.el-tag) {
+  border-color: transparent;
+  box-shadow: none;
+}
+
+.list-page-shell__content :deep(.el-pagination) {
+  padding: 0 2px;
+}
+
+.list-page-shell__content :deep(.el-pagination button),
+.list-page-shell__content :deep(.el-pager li) {
+  border-radius: 10px;
+}
+
+.list-page-shell__toolbar :deep(.custom-header) {
+  width: 100%;
+}
+
+@media (max-width: 768px) {
+  .list-page-shell {
+    gap: 12px;
+  }
+
+  .list-page-shell__toolbar {
+    flex-direction: column;
+    align-items: stretch;
+    padding: 2px 0 0;
+  }
+
+  .list-page-shell__actions {
+    width: 100%;
+  }
+}
+</style>
diff --git a/easyflow-ui-admin/app/src/components/page/PageData.vue b/easyflow-ui-admin/app/src/components/page/PageData.vue
index 1f07bcc..24562b3 100644
--- a/easyflow-ui-admin/app/src/components/page/PageData.vue
+++ b/easyflow-ui-admin/app/src/components/page/PageData.vue
@@ -23,7 +23,7 @@ const props = withDefaults(defineProps<PageDataProps>(), {
 // 响应式数据
 const pageList = ref([]);
 const loading = ref(false);
-const queryParams = ref({});
+const queryParams = ref<Record<string, any>>({});
 
 const pageInfo = reactive({
   pageNumber: 1,
@@ -32,7 +32,7 @@ const pageInfo = reactive({
 });
 
 // 模拟 API 调用 - 这里需要根据你的实际 API 调用方式调整
-const doGet = async (params: any) => {
+const doGet = async (params: Record<string, any>) => {
   loading.value = true;
   try {
     // 这里替换为你的实际 API 调用
@@ -76,7 +76,7 @@ const handleCurrentChange = (newPage: number) => {
 };
 
 // 暴露给父组件的方法 (替代 useImperativeHandle)
-const setQuery = (newQueryParams: string) => {
+const setQuery = (newQueryParams: Record<string, any>) => {
   pageInfo.pageNumber = 1;
   pageInfo.pageSize = props.pageSize;
   queryParams.value = newQueryParams;
@@ -85,6 +85,7 @@ const setQuery = (newQueryParams: string) => {
 
 // 暴露方法给父组件
 defineExpose({
+  reload: getPageList,
   setQuery,
 });
 
@@ -106,10 +107,13 @@ onMounted(() => {
 <template>
   <div class="page-data-container" v-loading="loading">
     <template v-if="pageList.length > 0">
-      <div>
+      <div class="page-data-container__body">
         <slot :page-list="pageList"></slot>
       </div>
-      <div v-if="pageInfo.total > pageInfo.pageSize" class="mx-auto mt-8 w-fit">
+      <div
+        v-if="pageInfo.total > pageInfo.pageSize"
+        class="page-data-container__pagination mx-auto mt-6 w-fit"
+      >
         <ElPagination
           v-model:current-page="pageInfo.pageNumber"
           v-model:page-size="pageInfo.pageSize"
@@ -121,9 +125,36 @@ onMounted(() => {
         />
       </div>
     </template>
-    <ElEmpty
-      :image="`/empty${preferences.theme.mode === 'dark' ? '-dark' : ''}.png`"
-      v-else
-    />
+    <slot v-else name="empty">
+      <ElEmpty
+        :image="`/empty${preferences.theme.mode === 'dark' ? '-dark' : ''}.png`"
+      />
+    </slot>
   </div>
 </template>
+
+<style scoped>
+.page-data-container {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  min-height: 0;
+  padding: 18px 20px 18px;
+}
+
+.page-data-container__body {
+  flex: 1;
+  min-height: 0;
+}
+
+.page-data-container__pagination {
+  flex-shrink: 0;
+  padding-top: 4px;
+}
+
+@media (max-width: 768px) {
+  .page-data-container {
+    padding: 14px 14px 12px;
+  }
+}
+</style>
diff --git a/easyflow-ui-admin/app/src/components/upload/UploadAvatar.vue b/easyflow-ui-admin/app/src/components/upload/UploadAvatar.vue
index fec20ad..710f96a 100644
--- a/easyflow-ui-admin/app/src/components/upload/UploadAvatar.vue
+++ b/easyflow-ui-admin/app/src/components/upload/UploadAvatar.vue
@@ -25,6 +25,18 @@ const props = defineProps({
     default: () => ['image/gif', 'image/jpeg', 'image/png', 'image/webp'],
   },
   modelValue: { type: String, default: '' },
+  shape: {
+    type: String,
+    default: 'circle',
+  },
+  size: {
+    type: Number,
+    default: 100,
+  },
+  theme: {
+    type: String,
+    default: 'default',
+  },
 });
 
 const emit = defineEmits(['success', 'update:modelValue']);
@@ -77,6 +89,11 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
 <template>
   <ElUpload
     class="avatar-uploader"
+    :class="[
+      `avatar-uploader--${props.theme}`,
+      { 'avatar-uploader--rounded': props.shape === 'rounded' },
+    ]"
+    :style="{ '--avatar-size': `${props.size}px` }"
     :action="`${apiURL}${props.action}`"
     :headers="headers"
     :show-file-list="false"
@@ -96,30 +113,65 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
 <style scoped>
 .avatar-uploader .avatar {
   display: block;
-  width: 100px;
-  height: 100px;
+  width: var(--avatar-size);
+  height: var(--avatar-size);
 }
 </style>
 
 <style>
 .avatar-uploader .el-upload {
+  width: var(--avatar-size);
+  height: var(--avatar-size);
+  display: flex;
+  align-items: center;
+  justify-content: center;
   position: relative;
   overflow: hidden;
   cursor: pointer;
-  border: 1px solid #e6e9ee;
+  border: 1px solid hsl(var(--input) / 0.92);
   border-radius: 50%;
-  transition: var(--el-transition-duration-fast);
+  background: hsl(var(--modal-surface-strong) / 0.92);
+  box-shadow:
+    inset 0 1px 0 hsl(0 0% 100% / 0.72),
+    0 16px 28px -24px hsl(var(--foreground) / 0.24);
+  transition:
+    transform var(--el-transition-duration-fast),
+    border-color var(--el-transition-duration-fast),
+    box-shadow var(--el-transition-duration-fast);
 }
 
 .avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
+  border-color: hsl(var(--primary) / 0.52);
+  transform: translateY(-1px);
+  box-shadow:
+    inset 0 1px 0 hsl(0 0% 100% / 0.76),
+    0 20px 36px -26px hsl(var(--modal-preview-glow) / 0.3);
+}
+
+.avatar-uploader--soft-panel .el-upload {
+  background:
+    radial-gradient(
+      circle at top,
+      hsl(var(--modal-preview-glow) / 0.14),
+      transparent 60%
+    ),
+    linear-gradient(
+      145deg,
+      hsl(var(--modal-preview-surface) / 0.98),
+      hsl(var(--modal-preview-surface-strong) / 0.9)
+    );
+  border-color: hsl(var(--modal-preview-border) / 0.9);
+}
+
+.avatar-uploader--rounded .el-upload {
+  border-radius: 26px;
 }
 
 .el-icon.avatar-uploader-icon {
-  width: 100px;
-  height: 100px;
+  width: var(--avatar-size);
+  height: var(--avatar-size);
   font-size: 28px;
-  color: var(--el-text-color-secondary);
+  color: hsl(var(--text-muted));
   text-align: center;
 }
 </style>
diff --git a/easyflow-ui-admin/app/src/locales/langs/en-US/bot.json b/easyflow-ui-admin/app/src/locales/langs/en-US/bot.json
index b321963..a41ceb5 100644
--- a/easyflow-ui-admin/app/src/locales/langs/en-US/bot.json
+++ b/easyflow-ui-admin/app/src/locales/langs/en-US/bot.json
@@ -45,6 +45,25 @@
   "publicChatCopySuccess": "Copied",
   "publicChatCopyFail": "Copy failed",
   "basicInfo": "Basic Info",
+  "modal": {
+    "createDescription": "Set the assistant appearance, identity and base availability.",
+    "editDescription": "Update the assistant presentation and base availability.",
+    "previewEyebrow": "Assistant Preview",
+    "previewTitleFallback": "Untitled Assistant",
+    "previewAliasFallback": "The alias will appear here after it is filled in",
+    "previewDescriptionFallback": "Describe the tasks this assistant is good at in one sentence.",
+    "previewStatusEnabled": "Enabled",
+    "previewStatusDisabled": "Disabled",
+    "sectionAppearanceTitle": "Basic Info",
+    "sectionAppearanceDescription": "Define the avatar, name and category.",
+    "sectionIdentityTitle": "Identity",
+    "sectionIdentityDescription": "Configure a stable alias and an external description.",
+    "sectionPublishTitle": "Availability",
+    "sectionPublishDescription": "Control whether the assistant is currently available.",
+    "aliasHint": "Use letters, numbers or hyphens for a stable access identifier.",
+    "descriptionHint": "This summary helps teammates understand when to use the assistant.",
+    "statusHint": "When disabled, the assistant configuration is kept but shown as inactive."
+  },
   "placeholder": {
     "welcome": "Please enter welcome message",
     "prompt": "You are an AI assistant. Please provide clear and accurate answers based on the user's questions.",
diff --git a/easyflow-ui-admin/app/src/locales/langs/zh-CN/bot.json b/easyflow-ui-admin/app/src/locales/langs/zh-CN/bot.json
index 0866280..7c050a8 100644
--- a/easyflow-ui-admin/app/src/locales/langs/zh-CN/bot.json
+++ b/easyflow-ui-admin/app/src/locales/langs/zh-CN/bot.json
@@ -45,6 +45,25 @@
   "publicChatCopySuccess": "复制成功",
   "publicChatCopyFail": "复制失败",
   "basicInfo": "基础信息",
+  "modal": {
+    "createDescription": "设置助手的外观、标识和基础发布状态。",
+    "editDescription": "更新助手的展示信息与基础状态。",
+    "previewEyebrow": "助手预览",
+    "previewTitleFallback": "未命名助手",
+    "previewAliasFallback": "填写别名后会展示访问标识",
+    "previewDescriptionFallback": "用一句话描述这个助手擅长处理的问题场景。",
+    "previewStatusEnabled": "启用中",
+    "previewStatusDisabled": "未启用",
+    "sectionAppearanceTitle": "基础信息",
+    "sectionAppearanceDescription": "确定助手头像、名称和所属分类。",
+    "sectionIdentityTitle": "标识信息",
+    "sectionIdentityDescription": "配置稳定的访问别名与对外说明。",
+    "sectionPublishTitle": "发布设置",
+    "sectionPublishDescription": "控制助手当前是否对外可用。",
+    "aliasHint": "建议使用英文、数字或短横线，便于作为访问标识。",
+    "descriptionHint": "这段介绍会帮助成员快速判断助手适用的任务。",
+    "statusHint": "关闭后助手配置会保留，但不会作为启用状态展示。"
+  },
   "placeholder": {
     "welcome": "请输入欢迎语",
     "prompt": "你是一个AI助手，请根据用户的问题给出清晰、准确的回答。",
diff --git a/easyflow-ui-admin/app/src/views/ai/bots/index.vue b/easyflow-ui-admin/app/src/views/ai/bots/index.vue
index 5b65238..1015205 100644
--- a/easyflow-ui-admin/app/src/views/ai/bots/index.vue
+++ b/easyflow-ui-admin/app/src/views/ai/bots/index.vue
@@ -8,12 +8,11 @@ import type { ActionButton } from '#/components/page/CardList.vue';
 import { computed, markRaw, onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
 import { $t } from '@easyflow/locales';
 
 import { Delete, Edit, Plus, Setting } from '@element-plus/icons-vue';
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElInput,
@@ -299,16 +298,21 @@ const getSideList = async () => {
     <!-- 创建&编辑Bot弹窗 -->
     <Modal ref="modalRef" @success="pageDataRef.setQuery({})" />
 
-    <ElDialog
-      v-model="dialogVisible"
+    <EasyFlowFormModal
+      v-model:open="dialogVisible"
+      :closable="!saveLoading"
       :title="formData.id ? `${$t('button.edit')}` : `${$t('button.add')}`"
-      :close-on-click-modal="false"
+      :confirm-loading="saveLoading"
+      :confirm-text="$t('button.confirm')"
+      :submitting="saveLoading"
+      @confirm="handleSubmit"
     >
       <ElForm
         ref="formRef"
         :model="formData"
         :rules="formRules"
-        label-width="120px"
+        label-position="top"
+        class="easyflow-modal-form easyflow-modal-form--compact"
       >
         <!-- 动态生成表单项 -->
         <ElFormItem
@@ -330,15 +334,6 @@ const getSideList = async () => {
           />
         </ElFormItem>
       </ElForm>
-
-      <template #footer>
-        <ElButton @click="dialogVisible = false">
-          {{ $t('button.cancel') }}
-        </ElButton>
-        <ElButton type="primary" @click="handleSubmit" :loading="saveLoading">
-          {{ $t('button.confirm') }}
-        </ElButton>
-      </template>
-    </ElDialog>
+    </EasyFlowFormModal>
   </div>
 </template>
diff --git a/easyflow-ui-admin/app/src/views/ai/bots/modal.vue b/easyflow-ui-admin/app/src/views/ai/bots/modal.vue
index ed782d6..a152e05 100644
--- a/easyflow-ui-admin/app/src/views/ai/bots/modal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/bots/modal.vue
@@ -3,18 +3,12 @@ import type { BotInfo } from '@easyflow/types';
 
 import type { SaveBotParams, UpdateBotParams } from '#/api/ai/bot';
 
-import { ref } from 'vue';
+import { computed, nextTick, ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
 import { $t } from '@easyflow/locales';
 
-import {
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-} from 'element-plus';
+import { ElForm, ElFormItem, ElInput, ElMessage } from 'element-plus';
 import { tryit } from 'radash';
 
 import { saveBot, updateBotApi } from '#/api/ai/bot';
@@ -23,98 +17,334 @@ import UploadAvatar from '#/components/upload/UploadAvatar.vue';
 
 const emit = defineEmits(['success']);
 
-const initialFormData = {
-  icon: '',
-  title: '',
+const createInitialFormData = (): SaveBotParams => ({
   alias: '',
-  description: '',
   categoryId: '',
+  description: '',
+  icon: '',
   status: 1,
-};
+  title: '',
+});
+
 const dialogVisible = ref(false);
 const dialogType = ref<'create' | 'edit'>('create');
 const formRef = ref<InstanceType<typeof ElForm>>();
-const formData = ref<SaveBotParams | UpdateBotParams>(initialFormData);
-const rules = {
-  title: [{ required: true, message: $t('message.required'), trigger: 'blur' }],
-  alias: [{ required: true, message: $t('message.required'), trigger: 'blur' }],
-};
+const formData = ref<SaveBotParams | UpdateBotParams>(createInitialFormData());
 const loading = ref(false);
 
-const handleSubmit = async () => {
+const rules = {
+  alias: [{ required: true, message: $t('message.required'), trigger: 'blur' }],
+  title: [{ required: true, message: $t('message.required'), trigger: 'blur' }],
+};
+
+const dialogTitle = computed(() => {
+  return `${$t(`button.${dialogType.value}`)}${$t('bot.chatAssistant')}`;
+});
+
+const dialogDescription = computed(() => {
+  return dialogType.value === 'create'
+    ? $t('bot.modal.createDescription')
+    : $t('bot.modal.editDescription');
+});
+
+async function handleSubmit() {
+  const valid = await formRef.value?.validate().catch(() => false);
+  if (!valid) {
+    return;
+  }
+
   loading.value = true;
 
   const [err, res] = await tryit(
     dialogType.value === 'create' ? saveBot : updateBotApi,
-  )(formData.value as any);
+  )(formData.value as SaveBotParams & UpdateBotParams);
 
   if (!err && res.errorCode === 0) {
     emit('success');
-    ElMessage.success($t('message.saveOkMessage'));
+    ElMessage.success(res.message || $t('message.saveOkMessage'));
     dialogVisible.value = false;
+    loading.value = false;
+    return;
   }
+
+  ElMessage.error(res?.message || $t('message.saveFail'));
   loading.value = false;
-};
+}
+
+async function open(type: 'create' | 'edit', bot?: BotInfo) {
+  formData.value = bot
+    ? {
+        ...createInitialFormData(),
+        alias: bot.alias,
+        categoryId: bot.categoryId,
+        description: bot.description,
+        icon: bot.icon,
+        id: bot.id,
+        status: bot.status,
+        title: bot.title,
+      }
+    : createInitialFormData();
+  dialogType.value = type;
+  dialogVisible.value = true;
+
+  await nextTick();
+  formRef.value?.clearValidate();
+}
 
 defineExpose({
-  open(type: typeof dialogType.value, bot?: BotInfo) {
-    formData.value = bot
-      ? {
-          id: bot.id,
-          icon: bot.icon,
-          title: bot.title,
-          alias: bot.alias,
-          description: bot.description,
-          categoryId: bot.categoryId,
-          status: bot.status,
-        }
-      : initialFormData;
-    dialogType.value = type;
-    dialogVisible.value = true;
-  },
+  open,
 });
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    :title="`${$t(`button.${dialogType}`)}${$t('bot.chatAssistant')}`"
-    draggable
-    align-center
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :confirm-loading="loading"
+    :confirm-text="$t('button.save')"
+    :description="dialogDescription"
+    :submitting="loading"
+    :title="dialogTitle"
+    width="lg"
+    @confirm="handleSubmit"
   >
-    <ElForm ref="formRef" :model="formData" :rules="rules" label-width="150px">
-      <ElFormItem :label="$t('common.avatar')" prop="icon">
-        <UploadAvatar v-model="formData.icon" />
-      </ElFormItem>
-      <ElFormItem prop="categoryId" :label="$t('aiWorkflow.categoryId')">
-        <DictSelect v-model="formData.categoryId" dict-code="aiBotCategory" />
-      </ElFormItem>
-      <ElFormItem :label="$t('aiWorkflow.title')" prop="title">
-        <ElInput v-model="formData.title" />
-      </ElFormItem>
-      <ElFormItem :label="$t('plugin.alias')" prop="alias">
-        <ElInput v-model="formData.alias" />
-      </ElFormItem>
-      <ElFormItem :label="$t('plugin.description')" prop="description">
-        <ElInput type="textarea" :rows="3" v-model="formData.description" />
-      </ElFormItem>
-      <ElFormItem prop="status" :label="$t('aiWorkflow.status')">
-        <DictSelect v-model="formData.status" dict-code="showOrNot" />
-      </ElFormItem>
-    </ElForm>
+    <ElForm
+      ref="formRef"
+      :model="formData"
+      :rules="rules"
+      class="bot-modal-form"
+      label-position="top"
+      status-icon
+    >
+      <section class="bot-modal-section">
+        <header class="bot-modal-section__header">
+          <div>
+            <h4 class="bot-modal-section__title">
+              {{ $t('bot.modal.sectionAppearanceTitle') }}
+            </h4>
+            <p class="bot-modal-section__description">
+              {{ $t('bot.modal.sectionAppearanceDescription') }}
+            </p>
+          </div>
+        </header>
 
-    <template #footer>
-      <ElButton @click="dialogVisible = false">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        :loading="loading"
-        :disabled="loading"
-        @click="handleSubmit"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+        <div class="bot-modal-appearance-grid">
+          <ElFormItem
+            class="bot-modal-avatar-field"
+            :label="$t('common.avatar')"
+            prop="icon"
+          >
+            <UploadAvatar
+              v-model="formData.icon"
+              :size="88"
+              theme="soft-panel"
+            />
+          </ElFormItem>
+
+          <div class="bot-modal-appearance-fields">
+            <ElFormItem :label="$t('aiWorkflow.title')" prop="title">
+              <ElInput v-model="formData.title" />
+            </ElFormItem>
+
+            <ElFormItem :label="$t('aiWorkflow.categoryId')" prop="categoryId">
+              <DictSelect
+                v-model="formData.categoryId"
+                dict-code="aiBotCategory"
+              />
+            </ElFormItem>
+
+            <ElFormItem
+              class="bot-modal-grid__full"
+              :label="$t('plugin.alias')"
+              prop="alias"
+            >
+              <ElInput v-model="formData.alias" />
+              <div class="bot-modal-field-tip">
+                {{ $t('bot.modal.aliasHint') }}
+              </div>
+            </ElFormItem>
+          </div>
+        </div>
+      </section>
+
+      <section class="bot-modal-section bot-modal-section--compact">
+        <header class="bot-modal-section__header">
+          <div>
+            <h4 class="bot-modal-section__title">
+              {{ $t('bot.modal.sectionPublishTitle') }}
+            </h4>
+            <p class="bot-modal-section__description">
+              {{ $t('bot.modal.sectionPublishDescription') }}
+            </p>
+          </div>
+        </header>
+
+        <div class="bot-modal-publish-grid">
+          <ElFormItem :label="$t('plugin.description')" prop="description">
+            <ElInput v-model="formData.description" :rows="3" type="textarea" />
+            <div class="bot-modal-field-tip">
+              {{ $t('bot.modal.descriptionHint') }}
+            </div>
+          </ElFormItem>
+
+          <ElFormItem
+            class="bot-modal-publish-field"
+            :label="$t('aiWorkflow.status')"
+            prop="status"
+          >
+            <DictSelect v-model="formData.status" dict-code="showOrNot" />
+            <div class="bot-modal-field-tip">
+              {{ $t('bot.modal.statusHint') }}
+            </div>
+          </ElFormItem>
+        </div>
+      </section>
+    </ElForm>
+  </EasyFlowFormModal>
 </template>
+
+<style scoped>
+.bot-modal-form {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.bot-modal-section {
+  border-radius: 14px;
+  border: 1px solid hsl(var(--modal-divider));
+  background: hsl(var(--modal-content-surface-strong));
+  box-shadow: none;
+  padding: 14px;
+}
+
+.bot-modal-section--compact {
+  padding-bottom: 12px;
+}
+
+.bot-modal-section__header {
+  margin-bottom: 10px;
+}
+
+.bot-modal-section__title {
+  margin: 0;
+  color: hsl(var(--text-strong));
+  font-size: 14px;
+  font-weight: 700;
+  line-height: 1.4;
+}
+
+.bot-modal-section__description {
+  margin: 3px 0 0;
+  color: hsl(var(--text-muted));
+  font-size: 11px;
+  line-height: 1.45;
+}
+
+.bot-modal-appearance-grid {
+  display: grid;
+  grid-template-columns: 112px minmax(0, 1fr);
+  gap: 14px 16px;
+  align-items: start;
+}
+
+.bot-modal-appearance-fields {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 14px 16px;
+}
+
+.bot-modal-grid__full {
+  grid-column: 1 / -1;
+}
+
+.bot-modal-publish-grid {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) minmax(0, 220px);
+  gap: 14px 16px;
+  align-items: start;
+}
+
+.bot-modal-publish-field {
+  margin-bottom: 0;
+}
+
+.bot-modal-avatar-field {
+  align-items: flex-start;
+  margin-bottom: 0;
+}
+
+.bot-modal-avatar-field :deep(.el-form-item__content) {
+  display: block;
+}
+
+.bot-modal-field-tip {
+  margin-top: 4px;
+  color: hsl(var(--text-muted));
+  font-size: 11px;
+  line-height: 1.5;
+}
+
+.bot-modal-form :deep(.el-form-item) {
+  margin-bottom: 0;
+}
+
+.bot-modal-form :deep(.el-form-item__label) {
+  padding-bottom: 6px;
+  color: hsl(var(--text-strong));
+  font-size: 12px;
+  font-weight: 600;
+  line-height: 1.4;
+}
+
+.bot-modal-form :deep(.el-input__wrapper),
+.bot-modal-form :deep(.el-select__wrapper),
+.bot-modal-form :deep(.el-textarea__inner) {
+  border-radius: 12px;
+  background: hsl(var(--input-background));
+  box-shadow: inset 0 0 0 1px hsl(var(--input) / 0.92);
+  transition:
+    box-shadow 0.2s ease,
+    transform 0.2s ease,
+    border-color 0.2s ease;
+}
+
+.bot-modal-form :deep(.el-input__wrapper),
+.bot-modal-form :deep(.el-select__wrapper) {
+  min-height: 42px;
+}
+
+.bot-modal-form :deep(.el-input__wrapper:hover),
+.bot-modal-form :deep(.el-select__wrapper:hover),
+.bot-modal-form :deep(.el-textarea__inner:hover) {
+  box-shadow: inset 0 0 0 1px hsl(var(--primary) / 0.18);
+}
+
+.bot-modal-form :deep(.el-input__wrapper.is-focus),
+.bot-modal-form :deep(.el-select__wrapper.is-focused),
+.bot-modal-form :deep(.el-textarea__inner:focus) {
+  box-shadow:
+    inset 0 0 0 1px hsl(var(--primary) / 0.72),
+    0 0 0 4px hsl(var(--primary) / 0.12);
+}
+
+.bot-modal-form :deep(.el-textarea__inner) {
+  min-height: 88px;
+  padding: 10px 12px;
+}
+
+.bot-modal-form :deep(.el-form-item.is-error .el-input__wrapper),
+.bot-modal-form :deep(.el-form-item.is-error .el-select__wrapper),
+.bot-modal-form :deep(.el-form-item.is-error .el-textarea__inner) {
+  box-shadow:
+    inset 0 0 0 1px hsl(var(--destructive) / 0.8),
+    0 0 0 4px hsl(var(--destructive) / 0.08);
+}
+
+@media (max-width: 768px) {
+  .bot-modal-appearance-grid,
+  .bot-modal-appearance-fields,
+  .bot-modal-publish-grid {
+    grid-template-columns: 1fr;
+  }
+}
+</style>
diff --git a/easyflow-ui-admin/app/src/views/ai/bots/pages/setting/PromptChoreChatModal.vue b/easyflow-ui-admin/app/src/views/ai/bots/pages/setting/PromptChoreChatModal.vue
index 7f3a174..8944942 100644
--- a/easyflow-ui-admin/app/src/views/ai/bots/pages/setting/PromptChoreChatModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/bots/pages/setting/PromptChoreChatModal.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 
+import { EasyFlowPanelModal } from '@easyflow/common-ui';
 import { $t } from '@easyflow/locales';
 
-import { ElButton, ElDialog, ElForm, ElFormItem, ElInput } from 'element-plus';
+import { ElButton, ElForm, ElFormItem, ElInput } from 'element-plus';
 
 import { sseClient } from '#/api/request';
 
@@ -58,14 +59,21 @@ defineExpose({
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
+  <EasyFlowPanelModal
+    v-model:open="dialogVisible"
     :title="$t('bot.aiOptimizedPrompts')"
-    draggable
-    align-center
     width="550px"
+    :centered="true"
+    :show-cancel-button="false"
+    :show-confirm-button="false"
   >
-    <ElForm ref="formRef" :model="formData" :rules="rules">
+    <ElForm
+      ref="formRef"
+      :model="formData"
+      :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
+    >
       <ElFormItem prop="prompt">
         <ElInput type="textarea" :rows="20" v-model="formData.prompt" />
       </ElFormItem>
@@ -87,5 +95,5 @@ defineExpose({
         {{ loading ? $t('button.optimizing') : $t('button.regenerate') }}
       </ElButton>
     </template>
-  </ElDialog>
+  </EasyFlowPanelModal>
 </template>
diff --git a/easyflow-ui-admin/app/src/views/ai/documentCollection/ChunkDocumentTable.vue b/easyflow-ui-admin/app/src/views/ai/documentCollection/ChunkDocumentTable.vue
index fc3889b..ed9f25b 100644
--- a/easyflow-ui-admin/app/src/views/ai/documentCollection/ChunkDocumentTable.vue
+++ b/easyflow-ui-admin/app/src/views/ai/documentCollection/ChunkDocumentTable.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
 import { $t } from '@easyflow/locales';
 
 import { Delete, MoreFilled } from '@element-plus/icons-vue';
 import {
   ElButton,
-  ElDialog,
   ElDropdown,
   ElDropdownItem,
   ElDropdownMenu,
@@ -129,30 +129,27 @@ const form = ref({
         </ElTable>
       </template>
     </PageData>
-    <ElDialog v-model="dialogVisible" :title="$t('button.edit')" width="50%">
+    <EasyFlowFormModal
+      v-model:open="dialogVisible"
+      :closable="!btnLoading"
+      :title="$t('button.edit')"
+      width="50%"
+      :confirm-loading="btnLoading"
+      :confirm-text="$t('button.save')"
+      :submitting="btnLoading"
+      @confirm="save"
+    >
       <ElForm
         ref="basicFormRef"
-        style="width: 100%; margin-top: 20px"
         :model="form"
+        label-position="top"
+        class="easyflow-modal-form easyflow-modal-form--compact"
       >
         <ElFormItem>
           <ElInput v-model="form.content" :rows="20" type="textarea" />
         </ElFormItem>
       </ElForm>
-      <template #footer>
-        <ElButton @click="closeDialog">
-          {{ $t('button.cancel') }}
-        </ElButton>
-        <ElButton
-          type="primary"
-          @click="save"
-          :loading="btnLoading"
-          :disabled="btnLoading"
-        >
-          {{ $t('button.save') }}
-        </ElButton>
-      </template>
-    </ElDialog>
+    </EasyFlowFormModal>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/ai/documentCollection/DocumentCollection.vue b/easyflow-ui-admin/app/src/views/ai/documentCollection/DocumentCollection.vue
index 43f2400..0ffb7a3 100644
--- a/easyflow-ui-admin/app/src/views/ai/documentCollection/DocumentCollection.vue
+++ b/easyflow-ui-admin/app/src/views/ai/documentCollection/DocumentCollection.vue
@@ -1,8 +1,16 @@
 <script setup lang="ts">
-import type {FormInstance} from 'element-plus';
+import type { FormInstance } from 'element-plus';
+
+import type { ActionButton } from '#/components/page/CardList.vue';
+
+import { computed, onMounted, ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+import { $t } from '@easyflow/locales';
+
+import { Delete, Edit, Notebook, Plus, Search } from '@element-plus/icons-vue';
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElInput,
@@ -10,21 +18,12 @@ import {
   ElMessage,
   ElMessageBox,
 } from 'element-plus';
+import { tryit } from 'radash';
 
-import type {ActionButton} from '#/components/page/CardList.vue';
-import CardPage from '#/components/page/CardList.vue';
-
-import {computed, onMounted, ref} from 'vue';
-import {useRouter} from 'vue-router';
-
-import {$t} from '@easyflow/locales';
-
-import {Delete, Edit, Notebook, Plus, Search} from '@element-plus/icons-vue';
-import {tryit} from 'radash';
-
-import {api} from '#/api/request';
+import { api } from '#/api/request';
 import defaultIcon from '#/assets/ai/knowledge/book.svg';
 import HeaderSearch from '#/components/headerSearch/HeaderSearch.vue';
+import CardPage from '#/components/page/CardList.vue';
 import PageData from '#/components/page/PageData.vue';
 import PageSide from '#/components/page/PageSide.vue';
 import DocumentCollectionModal from '#/views/ai/documentCollection/DocumentCollectionModal.vue';
@@ -321,16 +320,21 @@ function changeCategory(category: any) {
         </PageData>
       </div>
     </div>
-    <ElDialog
-      v-model="dialogVisible"
+    <EasyFlowFormModal
+      v-model:open="dialogVisible"
+      :closable="!saveLoading"
       :title="formData.id ? `${$t('button.edit')}` : `${$t('button.add')}`"
-      :close-on-click-modal="false"
+      :confirm-loading="saveLoading"
+      :confirm-text="$t('button.confirm')"
+      :submitting="saveLoading"
+      @confirm="handleSubmit"
     >
       <ElForm
         ref="formRef"
         :model="formData"
         :rules="formRules"
-        label-width="120px"
+        label-position="top"
+        class="easyflow-modal-form easyflow-modal-form--compact"
       >
         <!-- 动态生成表单项 -->
         <ElFormItem
@@ -352,16 +356,7 @@ function changeCategory(category: any) {
           />
         </ElFormItem>
       </ElForm>
-
-      <template #footer>
-        <ElButton @click="dialogVisible = false">
-          {{ $t('button.cancel') }}
-        </ElButton>
-        <ElButton type="primary" @click="handleSubmit" :loading="saveLoading">
-          {{ $t('button.confirm') }}
-        </ElButton>
-      </template>
-    </ElDialog>
+    </EasyFlowFormModal>
 
     <!--    新增知识库模态框-->
     <DocumentCollectionModal ref="aiKnowledgeModalRef" @reload="handleSearch" />
diff --git a/easyflow-ui-admin/app/src/views/ai/documentCollection/DocumentCollectionModal.vue b/easyflow-ui-admin/app/src/views/ai/documentCollection/DocumentCollectionModal.vue
index e2221d7..e315e75 100644
--- a/easyflow-ui-admin/app/src/views/ai/documentCollection/DocumentCollectionModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/documentCollection/DocumentCollectionModal.vue
@@ -1,8 +1,12 @@
 <script setup lang="ts">
-import type {FormInstance} from 'element-plus';
+import type { FormInstance } from 'element-plus';
+
+import { onMounted, ref } from 'vue';
+
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
+import { InfoFilled } from '@element-plus/icons-vue';
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElIcon,
@@ -14,14 +18,10 @@ import {
   ElTooltip,
 } from 'element-plus';
 
-import {onMounted, ref} from 'vue';
-
-import {InfoFilled} from '@element-plus/icons-vue';
-
-import {api} from '#/api/request';
+import { api } from '#/api/request';
 import DictSelect from '#/components/dict/DictSelect.vue';
 import UploadAvatar from '#/components/upload/UploadAvatar.vue';
-import {$t} from '#/locales';
+import { $t } from '#/locales';
 
 const emit = defineEmits(['reload']);
 const embeddingLlmList = ref<any>([]);
@@ -93,7 +93,7 @@ const defaultEntity = {
 const normalizeEntity = (raw: any = {}) => {
   const options = {
     canUpdateEmbeddingModel: true,
-    ...(raw.options || {}),
+    ...raw.options,
   };
   if (options.rerankEnable === undefined || options.rerankEnable === null) {
     options.rerankEnable = !!raw.rerankModelId;
@@ -203,20 +203,24 @@ defineExpose({
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
-    align-center
+    :centered="true"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    width="xl"
+    @confirm="save"
   >
     <ElForm
-      label-width="150px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem
         prop="icon"
@@ -413,20 +417,7 @@ defineExpose({
         <ElSwitch v-model="entity.searchEngineEnable" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqCategoryDialog.vue b/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqCategoryDialog.vue
index a483b58..b507e72 100644
--- a/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqCategoryDialog.vue
+++ b/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqCategoryDialog.vue
@@ -1,16 +1,10 @@
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
 import { $t } from '@easyflow/locales';
 
-import {
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElTreeSelect,
-} from 'element-plus';
+import { ElForm, ElFormItem, ElInput, ElTreeSelect } from 'element-plus';
 
 const props = defineProps({
   modelValue: {
@@ -97,14 +91,22 @@ const handleSubmit = () => {
 </script>
 
 <template>
-  <ElDialog
-    :model-value="modelValue"
+  <EasyFlowFormModal
+    :open="modelValue"
     :title="title"
     width="520px"
-    :close-on-click-modal="false"
-    @close="closeDialog"
+    :confirm-text="$t('button.save')"
+    @update:open="emit('update:modelValue', $event)"
+    @cancel="closeDialog"
+    @confirm="handleSubmit"
   >
-    <ElForm ref="formRef" :model="form" :rules="rules" label-position="top">
+    <ElForm
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
+    >
       <ElFormItem
         :label="$t('documentCollection.faq.categoryName')"
         prop="categoryName"
@@ -130,12 +132,5 @@ const handleSubmit = () => {
         />
       </ElFormItem>
     </ElForm>
-
-    <template #footer>
-      <ElButton @click="closeDialog">{{ $t('button.cancel') }}</ElButton>
-      <ElButton type="primary" @click="handleSubmit">
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
diff --git a/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqEditDialog.vue b/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqEditDialog.vue
index 711909c..ef531a6 100644
--- a/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqEditDialog.vue
+++ b/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqEditDialog.vue
@@ -3,13 +3,12 @@ import type { IDomEditor } from '@wangeditor/editor';
 
 import { nextTick, onBeforeUnmount, ref, shallowRef, watch } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
 import { $t } from '@easyflow/locales';
 
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import DOMPurify from 'dompurify';
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElInput,
@@ -189,15 +188,20 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-  <ElDialog
+  <EasyFlowFormModal
     class="faq-edit-dialog"
-    :model-value="modelValue"
+    :open="modelValue"
     :title="form.id ? $t('button.edit') : $t('button.add')"
     width="min(920px, 92vw)"
-    :close-on-click-modal="false"
-    @close="closeDialog"
+    :confirm-text="$t('button.save')"
+    @update:open="emit('update:modelValue', $event)"
+    @cancel="closeDialog"
+    @confirm="handleSubmit"
   >
-    <ElForm class="faq-form" label-position="top">
+    <ElForm
+      class="faq-form easyflow-modal-form easyflow-modal-form--compact"
+      label-position="top"
+    >
       <ElFormItem :label="$t('documentCollection.faq.category')">
         <ElTreeSelect
           v-model="form.categoryId"
@@ -233,17 +237,7 @@ onBeforeUnmount(() => {
         </div>
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <div class="dialog-footer">
-        <ElButton class="footer-btn" @click="closeDialog">
-          {{ $t('button.cancel') }}
-        </ElButton>
-        <ElButton class="footer-btn" type="primary" @click="handleSubmit">
-          {{ $t('button.save') }}
-        </ElButton>
-      </div>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped>
diff --git a/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqImportDialog.vue b/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqImportDialog.vue
index a678558..f33a5f7 100644
--- a/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqImportDialog.vue
+++ b/easyflow-ui-admin/app/src/views/ai/documentCollection/FaqImportDialog.vue
@@ -3,8 +3,10 @@ import type { UploadFile } from 'element-plus';
 
 import { computed, ref, watch } from 'vue';
 
+import { EasyFlowPanelModal } from '@easyflow/common-ui';
 import { $t } from '@easyflow/locales';
 import { downloadFileFromBlob } from '@easyflow/utils';
+
 import {
   CircleCloseFilled,
   Document,
@@ -16,7 +18,6 @@ import {
 } from '@element-plus/icons-vue';
 import {
   ElButton,
-  ElDialog,
   ElIcon,
   ElMessage,
   ElTable,
@@ -128,12 +129,15 @@ const handleImport = async () => {
 </script>
 
 <template>
-  <ElDialog
+  <EasyFlowPanelModal
     :model-value="modelValue"
     width="min(980px, 92vw)"
     :title="$t('documentCollection.faq.import.title')"
     :close-on-click-modal="true"
-    @close="closeDialog"
+    :show-cancel-button="false"
+    :show-confirm-button="false"
+    @update:model-value="emit('update:modelValue', $event)"
+    @cancel="closeDialog"
   >
     <div class="faq-import-dialog">
       <ElUpload
@@ -148,12 +152,18 @@ const handleImport = async () => {
         :show-file-list="false"
         class="faq-upload-area"
       >
-        <div class="upload-box flex flex-col items-center justify-center p-8 text-center">
-          <ElIcon class="text-4xl text-gray-400 mb-4"><UploadFilled /></ElIcon>
-          <div class="upload-title text-[15px] font-semibold text-[var(--el-text-color-primary)] mb-2">
+        <div
+          class="upload-box flex flex-col items-center justify-center p-8 text-center"
+        >
+          <ElIcon class="mb-4 text-4xl text-gray-400"><UploadFilled /></ElIcon>
+          <div
+            class="upload-title mb-2 text-[15px] font-semibold text-[var(--el-text-color-primary)]"
+          >
             {{ $t('documentCollection.faq.import.uploadTitle') }}
           </div>
-          <div class="upload-desc text-[13px] text-[var(--el-text-color-secondary)]">
+          <div
+            class="upload-desc text-[13px] text-[var(--el-text-color-secondary)]"
+          >
             {{ $t('documentCollection.faq.import.uploadDesc') }}
           </div>
         </div>
@@ -183,7 +193,10 @@ const handleImport = async () => {
             >
               <WarningFilled />
             </ElIcon>
-            <ElIcon v-else class="result-state-icon text-[var(--el-color-success)]">
+            <ElIcon
+              v-else
+              class="result-state-icon text-[var(--el-color-success)]"
+            >
               <SuccessFilled />
             </ElIcon>
             <span class="result-title-text">
@@ -193,15 +206,23 @@ const handleImport = async () => {
         </div>
         <div class="result-stats">
           <div class="stat-item">
-            <div class="stat-label">{{ $t('documentCollection.faq.import.totalCount') }}</div>
+            <div class="stat-label">
+              {{ $t('documentCollection.faq.import.totalCount') }}
+            </div>
             <div class="stat-value">{{ importResult.totalCount || 0 }}</div>
           </div>
           <div class="stat-item">
-            <div class="stat-label">{{ $t('documentCollection.faq.import.successCount') }}</div>
-            <div class="stat-value success-text">{{ importResult.successCount || 0 }}</div>
+            <div class="stat-label">
+              {{ $t('documentCollection.faq.import.successCount') }}
+            </div>
+            <div class="stat-value success-text">
+              {{ importResult.successCount || 0 }}
+            </div>
           </div>
           <div class="stat-item">
-            <div class="stat-label">{{ $t('documentCollection.faq.import.errorCount') }}</div>
+            <div class="stat-label">
+              {{ $t('documentCollection.faq.import.errorCount') }}
+            </div>
             <div class="stat-value" :class="hasErrors ? 'danger-text' : ''">
               {{ importResult.errorCount || 0 }}
             </div>
@@ -263,7 +284,7 @@ const handleImport = async () => {
         </ElButton>
       </div>
     </template>
-  </ElDialog>
+  </EasyFlowPanelModal>
 </template>
 
 <style scoped>
diff --git a/easyflow-ui-admin/app/src/views/ai/mcp/Mcp.vue b/easyflow-ui-admin/app/src/views/ai/mcp/Mcp.vue
index 35037d4..bdac563 100644
--- a/easyflow-ui-admin/app/src/views/ai/mcp/Mcp.vue
+++ b/easyflow-ui-admin/app/src/views/ai/mcp/Mcp.vue
@@ -19,6 +19,7 @@ import {
 
 import { api } from '#/api/request';
 import HeaderSearch from '#/components/headerSearch/HeaderSearch.vue';
+import ListPageShell from '#/components/page/ListPageShell.vue';
 import PageData from '#/components/page/PageData.vue';
 import { $t } from '#/locales';
 
@@ -107,12 +108,14 @@ const refreshLoadingMap = ref<Record<number | string, boolean>>({});
 <template>
   <div class="flex h-full flex-col gap-6 p-6">
     <McpModal ref="saveDialog" @reload="reset" />
-    <HeaderSearch
-      :buttons="headerButtons"
-      @search="handleSearch"
-      @button-click="handleHeaderButtonClick"
-    />
-    <div class="bg-background border-border flex-1 rounded-lg border p-5">
+    <ListPageShell>
+      <template #filters>
+        <HeaderSearch
+          :buttons="headerButtons"
+          @search="handleSearch"
+          @button-click="handleHeaderButtonClick"
+        />
+      </template>
       <PageData ref="pageDataRef" page-url="/api/v1/mcp/page" :page-size="10">
         <template #default="{ pageList }">
           <ElTable :data="pageList" border>
@@ -198,7 +201,7 @@ const refreshLoadingMap = ref<Record<number | string, boolean>>({});
           </ElTable>
         </template>
       </PageData>
-    </div>
+    </ListPageShell>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/ai/mcp/McpModal.vue b/easyflow-ui-admin/app/src/views/ai/mcp/McpModal.vue
index 30b04f4..4a6e8b5 100644
--- a/easyflow-ui-admin/app/src/views/ai/mcp/McpModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/mcp/McpModal.vue
@@ -3,9 +3,9 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
+import { EasyFlowPanelModal } from '@easyflow/common-ui';
+
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElInput,
@@ -149,21 +149,25 @@ const activeName = ref('config');
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowPanelModal
+    v-model:open="dialogVisible"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    width="xl"
+    @confirm="save"
   >
     <ElTabs v-model="activeName" class="demo-tabs">
       <ElTabPane :label="$t('mcp.modal.config')" name="config">
         <ElForm
-          label-width="120px"
           ref="saveForm"
           :model="entity"
           status-icon
           :rules="rules"
+          label-position="top"
+          class="easyflow-modal-form easyflow-modal-form--compact"
         >
           <ElFormItem prop="title" :label="$t('mcp.title')">
             <ElInput v-model.trim="entity.title" />
@@ -176,7 +180,8 @@ const activeName = ref('config');
               type="textarea"
               :rows="15"
               v-model.trim="entity.configJson"
-              :placeholder="$t('mcp.example') + jsonPlaceholder" />
+              :placeholder="$t('mcp.example') + jsonPlaceholder"
+            />
           </ElFormItem>
           <ElFormItem prop="status" :label="$t('mcp.status')">
             <ElSwitch v-model="entity.status" />
@@ -249,20 +254,7 @@ const activeName = ref('config');
         </ElTabPane>
       </div>
     </ElTabs>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowPanelModal>
 </template>
 
 <style scoped>
diff --git a/easyflow-ui-admin/app/src/views/ai/model/AddModelModal.vue b/easyflow-ui-admin/app/src/views/ai/model/AddModelModal.vue
index 052b2dc..c8d627a 100644
--- a/easyflow-ui-admin/app/src/views/ai/model/AddModelModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/model/AddModelModal.vue
@@ -3,15 +3,9 @@ import type { ModelAbilityItem } from '#/views/ai/model/modelUtils/model-ability
 
 import { reactive, ref, watch } from 'vue';
 
-import {
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-  ElTag,
-} from 'element-plus';
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
+import { ElForm, ElFormItem, ElInput, ElMessage, ElTag } from 'element-plus';
 
 import { api } from '#/api/request';
 import { $t } from '#/locales';
@@ -274,21 +268,25 @@ const showMoreFields = ref(false);
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :centered="true"
+    :closable="!btnLoading"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
-    align-center
     width="482"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
     <ElForm
-      label-width="100px"
       ref="formDataRef"
       :model="formData"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem prop="title" :label="$t('llm.title')">
         <ElInput v-model.trim="formData.title" />
@@ -340,20 +338,7 @@ const showMoreFields = ref(false);
         <ElInput v-model.trim="formData.requestPath" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped>
diff --git a/easyflow-ui-admin/app/src/views/ai/model/AddModelProviderModal.vue b/easyflow-ui-admin/app/src/views/ai/model/AddModelProviderModal.vue
index a4a547d..f0dc272 100644
--- a/easyflow-ui-admin/app/src/views/ai/model/AddModelProviderModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/model/AddModelProviderModal.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { reactive, ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElInput,
@@ -111,21 +111,25 @@ const handleChangeProvider = (val: string) => {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :centered="true"
+    :closable="!btnLoading"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
-    align-center
     width="482"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
     <ElForm
-      label-width="100px"
       ref="formDataRef"
       :model="formData"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem
         prop="icon"
@@ -138,7 +142,10 @@ const handleChangeProvider = (val: string) => {
         <ElInput v-model.trim="formData.providerName" />
       </ElFormItem>
       <ElFormItem prop="provider" :label="$t('llmProvider.apiType')">
-        <ElSelect v-model="formData.providerType" @change="handleChangeProvider">
+        <ElSelect
+          v-model="formData.providerType"
+          @change="handleChangeProvider"
+        >
           <ElOption
             v-for="item in providerOptions"
             :key="item.value"
@@ -163,20 +170,7 @@ const handleChangeProvider = (val: string) => {
         <ElInput v-model.trim="formData.embedPath" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped>
diff --git a/easyflow-ui-admin/app/src/views/ai/model/ManageModelModal.vue b/easyflow-ui-admin/app/src/views/ai/model/ManageModelModal.vue
index 5dbfc3d..4677552 100644
--- a/easyflow-ui-admin/app/src/views/ai/model/ManageModelModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/model/ManageModelModal.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import { nextTick, reactive, ref } from 'vue';
 
+import { EasyFlowPanelModal } from '@easyflow/common-ui';
+
 import {
   CirclePlus,
   Loading,
@@ -10,7 +12,6 @@ import {
 import {
   ElCollapse,
   ElCollapseItem,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElIcon,
@@ -215,14 +216,13 @@ const handleRefresh = () => {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowPanelModal
+    v-model:open="dialogVisible"
+    :centered="true"
     :title="`${providerInfo?.providerName}${$t('llmProvider.model')}`"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
-    align-center
     width="762"
+    :show-footer="false"
   >
     <div class="manage-llm-container">
       <div class="form-container">
@@ -311,7 +311,7 @@ const handleRefresh = () => {
         </ElTabs>
       </div>
     </div>
-  </ElDialog>
+  </EasyFlowPanelModal>
 </template>
 
 <style scoped>
diff --git a/easyflow-ui-admin/app/src/views/ai/model/ModelVerifyConfig.vue b/easyflow-ui-admin/app/src/views/ai/model/ModelVerifyConfig.vue
index c60ca4c..ed11e36 100644
--- a/easyflow-ui-admin/app/src/views/ai/model/ModelVerifyConfig.vue
+++ b/easyflow-ui-admin/app/src/views/ai/model/ModelVerifyConfig.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { reactive, ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElMessage,
@@ -65,9 +65,6 @@ const save = async () => {
     });
 };
 const btnLoading = ref(false);
-const closeDialog = () => {
-  dialogVisible.value = false;
-};
 const getModelInfo = (id: string) => {
   options.value.forEach((item: any) => {
     if (item.id === id) {
@@ -78,15 +75,25 @@ const getModelInfo = (id: string) => {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :centered="true"
+    :closable="!btnLoading"
     :title="$t('llm.verifyLlmTitle')"
-    :close-on-click-modal="false"
-    align-center
     width="482"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.confirm')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
-    <ElForm ref="formDataRef" :model="formData" status-icon :rules="rules">
+    <ElForm
+      ref="formDataRef"
+      :model="formData"
+      status-icon
+      :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
+    >
       <ElFormItem prop="llmId" :label="$t('llm.modelToBeTested')">
         <ElSelect v-model="formData.llmId" @change="getModelInfo">
           <ElOption
@@ -105,20 +112,7 @@ const getModelInfo = (id: string) => {
         {{ vectorDimension }}
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.confirm') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped>
diff --git a/easyflow-ui-admin/app/src/views/ai/plugin/AddPluginModal.vue b/easyflow-ui-admin/app/src/views/ai/plugin/AddPluginModal.vue
index ea1915a..d2d82e6 100644
--- a/easyflow-ui-admin/app/src/views/ai/plugin/AddPluginModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/plugin/AddPluginModal.vue
@@ -3,10 +3,10 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
 import { Plus, Remove } from '@element-plus/icons-vue';
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElIcon,
@@ -156,20 +156,24 @@ function removeHeader(index: number) {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
     align-center
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    width="lg"
+    @confirm="save"
   >
     <ElForm
-      label-width="150px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem
         prop="icon"
@@ -251,20 +255,7 @@ function removeHeader(index: number) {
         <ElInput v-model.trim="entity.tokenValue" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped>
diff --git a/easyflow-ui-admin/app/src/views/ai/plugin/AiPluginToolModal.vue b/easyflow-ui-admin/app/src/views/ai/plugin/AiPluginToolModal.vue
index 4984421..204ac55 100644
--- a/easyflow-ui-admin/app/src/views/ai/plugin/AiPluginToolModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/plugin/AiPluginToolModal.vue
@@ -3,14 +3,9 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, reactive, ref } from 'vue';
 
-import {
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-} from 'element-plus';
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
+import { ElForm, ElFormItem, ElInput, ElMessage } from 'element-plus';
 
 import { api } from '#/api/request';
 import { $t } from '#/locales';
@@ -150,21 +145,24 @@ defineExpose({
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :closable="!btnLoading"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
     width="600px"
-    @closed="closeDialog"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
     <ElForm
       ref="saveForm"
       :model="entity"
       :rules="rules"
-      label-width="80px"
       status-icon
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem :label="$t('pluginItem.name')" prop="name">
         <ElInput v-model.trim="entity.name" />
@@ -176,21 +174,7 @@ defineExpose({
         <ElInput v-model.trim="entity.description" type="textarea" :rows="4" />
       </ElFormItem>
     </ElForm>
-
-    <template #footer>
-      <ElButton @click="closeDialog" :disabled="btnLoading">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-        @click="save"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/ai/plugin/CategoryPluginModal.vue b/easyflow-ui-admin/app/src/views/ai/plugin/CategoryPluginModal.vue
index 33f60e0..8bd32dc 100644
--- a/easyflow-ui-admin/app/src/views/ai/plugin/CategoryPluginModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/plugin/CategoryPluginModal.vue
@@ -3,9 +3,9 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElMessage,
@@ -87,16 +87,25 @@ function closeDialog() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :centered="true"
+    :closable="!btnLoading"
     width="500px"
     :title="$t('plugin.placeholder.categorize')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
-    align-center
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
-    <ElForm ref="saveForm" :model="entity" status-icon>
+    <ElForm
+      ref="saveForm"
+      :model="entity"
+      status-icon
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
+    >
       <ElFormItem prop="authType" :label="$t('plugin.category')">
         <ElSelect
           v-model="entity.categoryIds"
@@ -114,20 +123,7 @@ function closeDialog() {
         </ElSelect>
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/ai/plugin/Plugin.vue b/easyflow-ui-admin/app/src/views/ai/plugin/Plugin.vue
index ff73c25..499b588 100644
--- a/easyflow-ui-admin/app/src/views/ai/plugin/Plugin.vue
+++ b/easyflow-ui-admin/app/src/views/ai/plugin/Plugin.vue
@@ -4,12 +4,11 @@ import type { ActionButton } from '#/components/page/CardList.vue';
 import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
 import { $t } from '@easyflow/locales';
 
 import { Delete, Edit, Plus } from '@element-plus/icons-vue';
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElInput,
@@ -276,27 +275,24 @@ const handleClickCategory = (item: PluginCategory) => {
     </div>
     <AddPluginModal ref="aiPluginModalRef" @reload="handleSearch" />
     <CategoryPluginModal ref="categoryCategoryModal" @reload="handleSearch" />
-    <ElDialog
+    <EasyFlowFormModal
       :title="isEdit ? `${$t('button.edit')}` : `${$t('button.add')}`"
-      v-model="dialogVisible"
+      v-model:open="dialogVisible"
+      :confirm-text="$t('button.confirm')"
       width="500px"
-      :close-on-click-modal="false"
+      @confirm="handleSubmit"
     >
-      <ElForm :model="formData" status-icon>
+      <ElForm
+        :model="formData"
+        status-icon
+        label-position="top"
+        class="easyflow-modal-form easyflow-modal-form--compact"
+      >
         <ElFormItem>
           <ElInput v-model.trim="formData.name" />
         </ElFormItem>
       </ElForm>
-
-      <template #footer>
-        <ElButton @click="dialogVisible = false">
-          {{ $t('button.cancel') }}
-        </ElButton>
-        <ElButton type="primary" @click="handleSubmit">
-          {{ $t('button.confirm') }}
-        </ElButton>
-      </template>
-    </ElDialog>
+    </EasyFlowFormModal>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/ai/plugin/PluginRunTestModal.vue b/easyflow-ui-admin/app/src/views/ai/plugin/PluginRunTestModal.vue
index ee7ecab..0b47117 100644
--- a/easyflow-ui-admin/app/src/views/ai/plugin/PluginRunTestModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/plugin/PluginRunTestModal.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue';
 
+import { EasyFlowPanelModal } from '@easyflow/common-ui';
 import { $t } from '@easyflow/locales';
 import { preferences } from '@easyflow/preferences';
 
 import { VideoPlay } from '@element-plus/icons-vue';
-import { ElButton, ElDialog, ElMenu, ElMenuItem } from 'element-plus';
+import { ElButton, ElMenu, ElMenuItem } from 'element-plus';
 import { JsonViewer } from 'vue3-json-viewer';
 
 import { api } from '#/api/request';
@@ -77,14 +78,13 @@ function handleSubmitRun() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
-    :close-on-click-modal="false"
+  <EasyFlowPanelModal
+    v-model:open="dialogVisible"
     width="80%"
     align-center
     class="run-test-dialog"
     :title="$t('pluginItem.pluginToolEdit.trialRun')"
+    :before-close="() => (dialogVisible = false)"
   >
     <div class="run-test-container">
       <div class="run-test-params">
@@ -147,7 +147,7 @@ function handleSubmitRun() {
         {{ $t('pluginItem.pluginToolEdit.run') }}
       </ElButton>
     </template>
-  </ElDialog>
+  </EasyFlowPanelModal>
 </template>
 
 <style scoped>
diff --git a/easyflow-ui-admin/app/src/views/ai/resource/ChooseResource.vue b/easyflow-ui-admin/app/src/views/ai/resource/ChooseResource.vue
index 110ae80..c08efa4 100644
--- a/easyflow-ui-admin/app/src/views/ai/resource/ChooseResource.vue
+++ b/easyflow-ui-admin/app/src/views/ai/resource/ChooseResource.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue';
 
-import { ElButton, ElDialog } from 'element-plus';
+import { EasyFlowPanelModal } from '@easyflow/common-ui';
+
+import { ElButton } from 'element-plus';
 
 import PageData from '#/components/page/PageData.vue';
 import { $t } from '#/locales';
@@ -40,14 +42,11 @@ watch(
 
 <template>
   <div>
-    <ElDialog
-      v-model="dialogVisible"
-      draggable
+    <EasyFlowPanelModal
+      v-model:open="dialogVisible"
       :title="$t('aiResource.choose')"
       :before-close="closeDialog"
-      :close-on-click-modal="false"
       width="80%"
-      destroy-on-close
     >
       <PageData
         ref="pageDataRef"
@@ -67,7 +66,7 @@ watch(
           {{ $t('button.confirm') }}
         </ElButton>
       </template>
-    </ElDialog>
+    </EasyFlowPanelModal>
     <ElButton @click="openDialog()">
       {{ $t('button.choose') }}
     </ElButton>
diff --git a/easyflow-ui-admin/app/src/views/ai/resource/PreviewModal.vue b/easyflow-ui-admin/app/src/views/ai/resource/PreviewModal.vue
index e8c09f7..eea47e7 100644
--- a/easyflow-ui-admin/app/src/views/ai/resource/PreviewModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/resource/PreviewModal.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 
-import { ElDialog, ElImage } from 'element-plus';
+import { EasyFlowPanelModal } from '@easyflow/common-ui';
+
+import { ElImage } from 'element-plus';
 
 defineExpose({
   openDialog,
@@ -18,13 +20,12 @@ function closeDialog() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowPanelModal
+    v-model:open="dialogVisible"
     :title="$t('message.preview')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
-    destroy-on-close
+    width="md"
+    :show-footer="false"
   >
     <div class="flex justify-center">
       <ElImage
@@ -41,7 +42,7 @@ function closeDialog() {
         {{ $t('message.notAudio') }}
       </audio>
     </div>
-  </ElDialog>
+  </EasyFlowPanelModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/ai/resource/ResourceList.vue b/easyflow-ui-admin/app/src/views/ai/resource/ResourceList.vue
index 311a79c..1d78696 100644
--- a/easyflow-ui-admin/app/src/views/ai/resource/ResourceList.vue
+++ b/easyflow-ui-admin/app/src/views/ai/resource/ResourceList.vue
@@ -3,6 +3,7 @@ import type { FormInstance } from 'element-plus';
 
 import { computed, onMounted, ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
 import { formatBytes } from '@easyflow/utils';
 
 import {
@@ -15,7 +16,6 @@ import {
 import {
   ElAvatar,
   ElButton,
-  ElDialog,
   ElDropdown,
   ElDropdownItem,
   ElDropdownMenu,
@@ -418,16 +418,21 @@ const getSideList = async () => {
         </PageData>
       </div>
     </div>
-    <ElDialog
-      v-model="sideDialogVisible"
+    <EasyFlowFormModal
+      v-model:open="sideDialogVisible"
+      :closable="!sideSaveLoading"
       :title="sideFormData.id ? `${$t('button.edit')}` : `${$t('button.add')}`"
-      :close-on-click-modal="false"
+      :confirm-loading="sideSaveLoading"
+      :confirm-text="$t('button.confirm')"
+      :submitting="sideSaveLoading"
+      @confirm="handleSideSubmit"
     >
       <ElForm
         ref="sideFormRef"
         :model="sideFormData"
         :rules="sideFormRules"
-        label-width="120px"
+        label-position="top"
+        class="easyflow-modal-form easyflow-modal-form--compact"
       >
         <!-- 动态生成表单项 -->
         <ElFormItem
@@ -449,19 +454,6 @@ const getSideList = async () => {
           />
         </ElFormItem>
       </ElForm>
-
-      <template #footer>
-        <ElButton @click="sideDialogVisible = false">
-          {{ $t('button.cancel') }}
-        </ElButton>
-        <ElButton
-          type="primary"
-          @click="handleSideSubmit"
-          :loading="sideSaveLoading"
-        >
-          {{ $t('button.confirm') }}
-        </ElButton>
-      </template>
-    </ElDialog>
+    </EasyFlowFormModal>
   </div>
 </template>
diff --git a/easyflow-ui-admin/app/src/views/ai/resource/ResourceModal.vue b/easyflow-ui-admin/app/src/views/ai/resource/ResourceModal.vue
index 49b9eb1..eb2744c 100644
--- a/easyflow-ui-admin/app/src/views/ai/resource/ResourceModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/resource/ResourceModal.vue
@@ -3,16 +3,10 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
 import { getResourceType } from '@easyflow/utils';
 
-import {
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-} from 'element-plus';
+import { ElForm, ElFormItem, ElInput, ElMessage } from 'element-plus';
 
 import { api } from '#/api/request';
 import DictSelect from '#/components/dict/DictSelect.vue';
@@ -116,19 +110,23 @@ function uploadSuccess(res: any) {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    width="md"
+    @confirm="save"
   >
     <ElForm
-      label-width="120px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem prop="resourceUrl" :label="$t('aiResource.resourceUrl')">
         <Upload @before-upload="beforeUpload" @success="uploadSuccess" />
@@ -149,20 +147,7 @@ function uploadSuccess(res: any) {
         />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/ai/workflow/WorkflowList.vue b/easyflow-ui-admin/app/src/views/ai/workflow/WorkflowList.vue
index c4e1289..97012de 100644
--- a/easyflow-ui-admin/app/src/views/ai/workflow/WorkflowList.vue
+++ b/easyflow-ui-admin/app/src/views/ai/workflow/WorkflowList.vue
@@ -5,6 +5,8 @@ import type { ActionButton } from '#/components/page/CardList.vue';
 
 import { computed, markRaw, onMounted, ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
 import {
   CopyDocument,
   Delete,
@@ -16,8 +18,6 @@ import {
   VideoPlay,
 } from '@element-plus/icons-vue';
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElInput,
@@ -404,16 +404,21 @@ function handleHeaderButtonClick(data: any) {
       </div>
     </div>
 
-    <ElDialog
-      v-model="dialogVisible"
+    <EasyFlowFormModal
+      v-model:open="dialogVisible"
+      :closable="!saveLoading"
       :title="formData.id ? `${$t('button.edit')}` : `${$t('button.add')}`"
-      :close-on-click-modal="false"
+      :confirm-loading="saveLoading"
+      :confirm-text="$t('button.confirm')"
+      :submitting="saveLoading"
+      @confirm="handleSubmit"
     >
       <ElForm
         ref="formRef"
         :model="formData"
         :rules="formRules"
-        label-width="120px"
+        label-position="top"
+        class="easyflow-modal-form easyflow-modal-form--compact"
       >
         <!-- 动态生成表单项 -->
         <ElFormItem
@@ -435,16 +440,7 @@ function handleHeaderButtonClick(data: any) {
           />
         </ElFormItem>
       </ElForm>
-
-      <template #footer>
-        <ElButton @click="dialogVisible = false">
-          {{ $t('button.cancel') }}
-        </ElButton>
-        <ElButton type="primary" @click="handleSubmit" :loading="saveLoading">
-          {{ $t('button.confirm') }}
-        </ElButton>
-      </template>
-    </ElDialog>
+    </EasyFlowFormModal>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/ai/workflow/WorkflowModal.vue b/easyflow-ui-admin/app/src/views/ai/workflow/WorkflowModal.vue
index 815b582..3db1b3c 100644
--- a/easyflow-ui-admin/app/src/views/ai/workflow/WorkflowModal.vue
+++ b/easyflow-ui-admin/app/src/views/ai/workflow/WorkflowModal.vue
@@ -3,15 +3,9 @@ import type { FormInstance, UploadInstance, UploadProps } from 'element-plus';
 
 import { computed, onMounted, ref } from 'vue';
 
-import {
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-  ElUpload,
-} from 'element-plus';
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
+import { ElForm, ElFormItem, ElInput, ElMessage, ElUpload } from 'element-plus';
 
 import { api } from '#/api/request';
 import DictSelect from '#/components/dict/DictSelect.vue';
@@ -148,9 +142,8 @@ function closeDialog() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
     :title="
       isImport
         ? $t('button.import')
@@ -159,14 +152,19 @@ function closeDialog() {
           : $t('button.edit')
     "
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    width="xl"
+    @confirm="save"
   >
     <ElForm
-      label-width="120px"
       ref="saveForm"
       :model="isImport ? { ...entity, jsonFile: jsonFileModel } : entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem v-if="isImport" prop="jsonFile" label="JSON文件" required>
         <ElUpload
@@ -212,20 +210,7 @@ function closeDialog() {
         <DictSelect v-model="entity.status" dict-code="showOrNot" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKey.vue b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKey.vue
index a97256e..3efceba 100644
--- a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKey.vue
+++ b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKey.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 
-import { ElDialog } from 'element-plus';
+import { EasyFlowPanelModal } from '@easyflow/common-ui';
 
 import SysApiKeyList from '#/views/config/apikey/SysApiKeyList.vue';
 import SysApiKeyResourcePermissionList from '#/views/config/apikey/SysApiKeyResourcePermissionList.vue';
@@ -11,14 +11,14 @@ const dialogVisible = ref(false);
 <template>
   <div class="sys-apikey-container">
     <SysApiKeyList />
-    <ElDialog
-      v-model="dialogVisible"
-      draggable
-      :close-on-click-modal="false"
-      align-center
+    <EasyFlowPanelModal
+      v-model:open="dialogVisible"
+      :centered="true"
+      width="xl"
+      :show-footer="false"
     >
       <SysApiKeyResourcePermissionList />
-    </ElDialog>
+    </EasyFlowPanelModal>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyList.vue b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyList.vue
index f6fa1f2..9dffbe9 100644
--- a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyList.vue
+++ b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyList.vue
@@ -3,10 +3,11 @@ import type { FormInstance } from 'element-plus';
 
 import { markRaw, ref } from 'vue';
 
+import { EasyFlowPanelModal } from '@easyflow/common-ui';
+
 import { Delete, MoreFilled, Plus } from '@element-plus/icons-vue';
 import {
   ElButton,
-  ElDialog,
   ElDropdown,
   ElDropdownItem,
   ElDropdownMenu,
@@ -19,6 +20,7 @@ import {
 
 import { api } from '#/api/request';
 import HeaderSearch from '#/components/headerSearch/HeaderSearch.vue';
+import ListPageShell from '#/components/page/ListPageShell.vue';
 import PageData from '#/components/page/PageData.vue';
 import { $t } from '#/locales';
 import SysApiKeyResourcePermissionList from '#/views/config/apikey/SysApiKeyResourcePermissionList.vue';
@@ -112,13 +114,14 @@ function addNewApiKey() {
 <template>
   <div class="flex h-full flex-col gap-6 p-6">
     <SysApiKeyModal ref="saveDialog" @reload="reset" />
-    <HeaderSearch
-      :buttons="headerButtons"
-      @search="handleSearch"
-      @button-click="headerButtonClick"
-    />
-
-    <div class="bg-background border-border flex-1 rounded-lg border p-5">
+    <ListPageShell>
+      <template #filters>
+        <HeaderSearch
+          :buttons="headerButtons"
+          @search="handleSearch"
+          @button-click="headerButtonClick"
+        />
+      </template>
       <PageData
         ref="pageDataRef"
         page-url="/api/v1/sysApiKey/page"
@@ -188,14 +191,15 @@ function addNewApiKey() {
           </ElTable>
         </template>
       </PageData>
-    </div>
-    <ElDialog
-      v-model="dialogVisible"
+    </ListPageShell>
+    <EasyFlowPanelModal
+      v-model:open="dialogVisible"
       :title="$t('sysApiKeyResourcePermission.addPermission')"
-      draggable
-      :close-on-click-modal="false"
+      :centered="true"
+      width="xl"
+      :show-footer="false"
     >
       <SysApiKeyResourcePermissionList />
-    </ElDialog>
+    </EasyFlowPanelModal>
   </div>
 </template>
diff --git a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyModal.vue b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyModal.vue
index d3130f2..ae48649 100644
--- a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyModal.vue
+++ b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyModal.vue
@@ -3,13 +3,13 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
 import {
   ElAlert,
-  ElButton,
   ElCheckbox,
   ElCheckboxGroup,
   ElDatePicker,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElMessage,
@@ -157,21 +157,23 @@ defineExpose({
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
     width="50%"
+    @confirm="save"
   >
     <ElForm
-      label-width="120px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
-      class="form-container"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact form-container"
     >
       <!-- 状态选择 -->
       <ElFormItem prop="status" :label="$t('sysApiKey.status')">
@@ -217,21 +219,7 @@ defineExpose({
         </ElCheckboxGroup>
       </ElFormItem>
     </ElForm>
-
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped>
diff --git a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionList.vue b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionList.vue
index 5065726..fadbc68 100644
--- a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionList.vue
+++ b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionList.vue
@@ -19,6 +19,7 @@ import {
 } from 'element-plus';
 
 import { api } from '#/api/request';
+import ListPageShell from '#/components/page/ListPageShell.vue';
 import PageData from '#/components/page/PageData.vue';
 import { $t } from '#/locales';
 
@@ -77,81 +78,83 @@ function remove(row: any) {
 <template>
   <div class="page-container !m-0 !pl-0">
     <SysApiKeyResourcePermissionModal ref="saveDialog" @reload="reset" />
-    <div class="flex items-center justify-between">
-      <ElForm ref="formRef" :inline="true" :model="formInline">
-        <ElFormItem prop="title" class="!mr-3">
-          <ElInput
-            v-model="formInline.title"
-            :placeholder="$t('sysApiKeyResourcePermission.title')"
-          />
-        </ElFormItem>
-        <ElFormItem>
-          <ElButton @click="search(formRef)" type="primary">
-            {{ $t('button.query') }}
+    <ListPageShell dense>
+      <template #filters>
+        <div class="flex items-center justify-between gap-4">
+          <ElForm ref="formRef" :inline="true" :model="formInline">
+            <ElFormItem prop="title" class="!mr-3">
+              <ElInput
+                v-model="formInline.title"
+                :placeholder="$t('sysApiKeyResourcePermission.title')"
+              />
+            </ElFormItem>
+            <ElFormItem>
+              <ElButton @click="search(formRef)" type="primary">
+                {{ $t('button.query') }}
+              </ElButton>
+              <ElButton @click="reset(formRef)">
+                {{ $t('button.reset') }}
+              </ElButton>
+            </ElFormItem>
+          </ElForm>
+          <ElButton @click="showDialog({})" type="primary">
+            <ElIcon class="mr-1">
+              <Plus />
+            </ElIcon>
+            {{ $t('button.add') }}
           </ElButton>
-          <ElButton @click="reset(formRef)">
-            {{ $t('button.reset') }}
-          </ElButton>
-        </ElFormItem>
-      </ElForm>
-      <div class="mb-5">
-        <ElButton @click="showDialog({})" type="primary">
-          <ElIcon class="mr-1">
-            <Plus />
-          </ElIcon>
-          {{ $t('button.add') }}
-        </ElButton>
-      </div>
-    </div>
-    <PageData
-      ref="pageDataRef"
-      page-url="/api/v1/sysApiKeyResourcePermission/page"
-      :page-size="10"
-    >
-      <template #default="{ pageList }">
-        <ElTable :data="pageList" border>
-          <ElTableColumn
-            prop="requestInterface"
-            :label="$t('sysApiKeyResourcePermission.requestInterface')"
-          >
-            <template #default="{ row }">
-              {{ row.requestInterface }}
-            </template>
-          </ElTableColumn>
-          <ElTableColumn
-            prop="title"
-            :label="$t('sysApiKeyResourcePermission.title')"
-          >
-            <template #default="{ row }">
-              {{ row.title }}
-            </template>
-          </ElTableColumn>
-          <ElTableColumn :label="$t('common.handle')" width="90" align="right">
-            <template #default="{ row }">
-              <div class="flex items-center gap-3">
-                <ElButton link type="primary" @click="showDialog(row)">
-                  {{ $t('button.edit') }}
-                </ElButton>
-
-                <ElDropdown>
-                  <ElButton link :icon="MoreFilled" />
-
-                  <template #dropdown>
-                    <ElDropdownMenu>
-                      <ElDropdownItem @click="remove(row)">
-                        <ElButton link :icon="Delete" type="danger">
-                          {{ $t('button.delete') }}
-                        </ElButton>
-                      </ElDropdownItem>
-                    </ElDropdownMenu>
-                  </template>
-                </ElDropdown>
-              </div>
-            </template>
-          </ElTableColumn>
-        </ElTable>
+        </div>
       </template>
-    </PageData>
+      <PageData
+        ref="pageDataRef"
+        page-url="/api/v1/sysApiKeyResourcePermission/page"
+        :page-size="10"
+      >
+        <template #default="{ pageList }">
+          <ElTable :data="pageList" border>
+            <ElTableColumn
+              prop="requestInterface"
+              :label="$t('sysApiKeyResourcePermission.requestInterface')"
+            >
+              <template #default="{ row }">
+                {{ row.requestInterface }}
+              </template>
+            </ElTableColumn>
+            <ElTableColumn
+              prop="title"
+              :label="$t('sysApiKeyResourcePermission.title')"
+            >
+              <template #default="{ row }">
+                {{ row.title }}
+              </template>
+            </ElTableColumn>
+            <ElTableColumn :label="$t('common.handle')" width="90" align="right">
+              <template #default="{ row }">
+                <div class="flex items-center gap-3">
+                  <ElButton link type="primary" @click="showDialog(row)">
+                    {{ $t('button.edit') }}
+                  </ElButton>
+
+                  <ElDropdown>
+                    <ElButton link :icon="MoreFilled" />
+
+                    <template #dropdown>
+                      <ElDropdownMenu>
+                        <ElDropdownItem @click="remove(row)">
+                          <ElButton link :icon="Delete" type="danger">
+                            {{ $t('button.delete') }}
+                          </ElButton>
+                        </ElDropdownItem>
+                      </ElDropdownMenu>
+                    </template>
+                  </ElDropdown>
+                </div>
+              </template>
+            </ElTableColumn>
+          </ElTable>
+        </template>
+      </PageData>
+    </ListPageShell>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionModal.vue b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionModal.vue
index ff1a365..d4510f9 100644
--- a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionModal.vue
+++ b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionModal.vue
@@ -3,14 +3,9 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
-import {
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-} from 'element-plus';
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
+import { ElForm, ElFormItem, ElInput, ElMessage } from 'element-plus';
 
 import { api } from '#/api/request';
 import { $t } from '#/locales';
@@ -73,19 +68,23 @@ function closeDialog() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :closable="!btnLoading"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
     <ElForm
-      label-width="120px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem
         prop="requestInterface"
@@ -97,20 +96,7 @@ function closeDialog() {
         <ElInput v-model.trim="entity.title" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionSelectModal.vue b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionSelectModal.vue
index 350b479..aa3aebf 100644
--- a/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionSelectModal.vue
+++ b/easyflow-ui-admin/app/src/views/config/apikey/SysApiKeyResourcePermissionSelectModal.vue
@@ -1,24 +1,17 @@
 <script setup lang="ts">
 import type { FormInstance } from 'element-plus';
 
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 
-import {
-  ElButton,
-  ElDatePicker,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElMessage,
-} from 'element-plus';
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
+import { ElDatePicker, ElForm, ElFormItem, ElMessage } from 'element-plus';
 
 import { api } from '#/api/request';
 import DictSelect from '#/components/dict/DictSelect.vue';
 import { $t } from '#/locales';
 
 const emit = defineEmits(['reload']);
-// vue
-onMounted(() => {});
 defineExpose({
   openDialog,
 });
@@ -74,35 +67,26 @@ function closeDialog() {
   entity.value = {};
   dialogVisible.value = false;
 }
-const resourcePermissionList = ref([]);
-function getResourcePermissionList() {
-  api.get('/api/v1/sysApiKeyResourcePermission/list').then((res) => {
-    console.log('资源');
-    console.log(res);
-    if (res.errorCode === 0) {
-      resourcePermissionList.value = res.data;
-    }
-  });
-}
-onMounted(() => {
-  getResourcePermissionList();
-});
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :closable="!btnLoading"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
     <ElForm
-      label-width="120px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem prop="status" :label="$t('sysApiKey.status')">
         <DictSelect v-model="entity.status" dict-code="dataStatus" />
@@ -111,20 +95,7 @@ onMounted(() => {
         <ElDatePicker v-model="entity.expiredAt" type="datetime" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/datacenter/BatchImportModal.vue b/easyflow-ui-admin/app/src/views/datacenter/BatchImportModal.vue
index 850dd0a..7877296 100644
--- a/easyflow-ui-admin/app/src/views/datacenter/BatchImportModal.vue
+++ b/easyflow-ui-admin/app/src/views/datacenter/BatchImportModal.vue
@@ -3,15 +3,10 @@ import type { UploadFile } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
+import { EasyFlowPanelModal } from '@easyflow/common-ui';
 import { downloadFileFromBlob } from '@easyflow/utils';
 
-import {
-  ElButton,
-  ElDialog,
-  ElMessage,
-  ElMessageBox,
-  ElUpload,
-} from 'element-plus';
+import { ElButton, ElMessage, ElMessageBox, ElUpload } from 'element-plus';
 
 import { api } from '#/api/request';
 import uploadIcon from '#/assets/datacenter/upload.png';
@@ -99,12 +94,13 @@ function handleUpload() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowPanelModal
+    v-model:open="dialogVisible"
+    :closable="!btnLoading"
     :title="props.title"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :show-cancel-button="false"
+    :show-confirm-button="false"
   >
     <ElUpload
       :file-list="fileList"
@@ -148,7 +144,7 @@ function handleUpload() {
         </ElButton>
       </div>
     </template>
-  </ElDialog>
+  </EasyFlowPanelModal>
 </template>
 
 <style scoped>
diff --git a/easyflow-ui-admin/app/src/views/datacenter/DatacenterTableList.vue b/easyflow-ui-admin/app/src/views/datacenter/DatacenterTableList.vue
index 03890ba..0437bc5 100644
--- a/easyflow-ui-admin/app/src/views/datacenter/DatacenterTableList.vue
+++ b/easyflow-ui-admin/app/src/views/datacenter/DatacenterTableList.vue
@@ -17,6 +17,7 @@ import {
 
 import { api } from '#/api/request';
 import HeaderSearch from '#/components/headerSearch/HeaderSearch.vue';
+import ListPageShell from '#/components/page/ListPageShell.vue';
 import PageData from '#/components/page/PageData.vue';
 import { $t } from '#/locales';
 import { router } from '#/router';
@@ -95,13 +96,14 @@ function toDetailPage(row: any) {
 <template>
   <div class="flex h-full flex-col gap-6 p-6">
     <DatacenterTableModal ref="saveDialog" @reload="reset" />
-    <HeaderSearch
-      :buttons="headerButtons"
-      @search="handleSearch"
-      @button-click="showDialog({})"
-    />
-
-    <div class="bg-background border-border flex-1 rounded-lg border p-5">
+    <ListPageShell>
+      <template #filters>
+        <HeaderSearch
+          :buttons="headerButtons"
+          @search="handleSearch"
+          @button-click="showDialog({})"
+        />
+      </template>
       <PageData
         ref="pageDataRef"
         page-url="/api/v1/datacenterTable/page"
@@ -168,7 +170,7 @@ function toDetailPage(row: any) {
           </ElTable>
         </template>
       </PageData>
-    </div>
+    </ListPageShell>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/datacenter/DatacenterTableModal.vue b/easyflow-ui-admin/app/src/views/datacenter/DatacenterTableModal.vue
index 5d70d0c..2339d26 100644
--- a/easyflow-ui-admin/app/src/views/datacenter/DatacenterTableModal.vue
+++ b/easyflow-ui-admin/app/src/views/datacenter/DatacenterTableModal.vue
@@ -3,10 +3,11 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref, watch } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
 import { Plus } from '@element-plus/icons-vue';
 import {
   ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElIcon,
@@ -184,20 +185,24 @@ function getYesOrNo() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :closable="!btnLoading"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
     width="800px"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
     <ElForm
-      label-width="100px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem prop="tableName" :label="$t('datacenterTable.tableName')">
         <ElInput :disabled="!isAdd" v-model.trim="entity.tableName" />
@@ -205,7 +210,7 @@ function getYesOrNo() {
       <ElFormItem prop="tableDesc" :label="$t('datacenterTable.tableDesc')">
         <ElInput v-model.trim="entity.tableDesc" />
       </ElFormItem>
-      <ElFormItem prop="fields" label-width="0">
+      <ElFormItem prop="fields" :label="$t('datacenterTable.fields')">
         <div v-loading="loadFields" class="w-full">
           <ElTable :data="fieldsData">
             <ElTableColumn :label="$t('datacenterTable.fieldName')">
@@ -261,20 +266,7 @@ function getYesOrNo() {
         </div>
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/datacenter/RecordModal.vue b/easyflow-ui-admin/app/src/views/datacenter/RecordModal.vue
index 62e696f..e3630ad 100644
--- a/easyflow-ui-admin/app/src/views/datacenter/RecordModal.vue
+++ b/easyflow-ui-admin/app/src/views/datacenter/RecordModal.vue
@@ -3,10 +3,10 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
 import {
-  ElButton,
   ElDatePicker,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElInput,
@@ -80,20 +80,24 @@ function closeDialog() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :closable="!btnLoading"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
     width="800px"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
     <ElForm
-      label-width="100px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem
         v-for="item in props.formItems"
@@ -135,20 +139,7 @@ function closeDialog() {
         />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/system/sysAccount/SysAccountList.vue b/easyflow-ui-admin/app/src/views/system/sysAccount/SysAccountList.vue
index bfec70d..21db836 100644
--- a/easyflow-ui-admin/app/src/views/system/sysAccount/SysAccountList.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysAccount/SysAccountList.vue
@@ -19,6 +19,7 @@ import {
 import { api } from '#/api/request';
 import defaultAvatar from '#/assets/defaultUserAvatar.png';
 import HeaderSearch from '#/components/headerSearch/HeaderSearch.vue';
+import ListPageShell from '#/components/page/ListPageShell.vue';
 import PageData from '#/components/page/PageData.vue';
 import { $t } from '#/locales';
 import { useDictStore } from '#/store';
@@ -91,13 +92,14 @@ function isAdmin(data: any) {
 <template>
   <div class="flex h-full flex-col gap-6 p-6">
     <SysAccountModal ref="saveDialog" @reload="reset" />
-    <HeaderSearch
-      :buttons="headerButtons"
-      @search="handleSearch"
-      @button-click="showDialog({})"
-    />
-
-    <div class="bg-background border-border flex-1 rounded-lg border p-5">
+    <ListPageShell>
+      <template #filters>
+        <HeaderSearch
+          :buttons="headerButtons"
+          @search="handleSearch"
+          @button-click="showDialog({})"
+        />
+      </template>
       <PageData
         ref="pageDataRef"
         page-url="/api/v1/sysAccount/page"
@@ -207,7 +209,7 @@ function isAdmin(data: any) {
           </ElTable>
         </template>
       </PageData>
-    </div>
+    </ListPageShell>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/system/sysAccount/SysAccountModal.vue b/easyflow-ui-admin/app/src/views/system/sysAccount/SysAccountModal.vue
index 52994b0..f969d11 100644
--- a/easyflow-ui-admin/app/src/views/system/sysAccount/SysAccountModal.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysAccount/SysAccountModal.vue
@@ -3,14 +3,9 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
-import {
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-} from 'element-plus';
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
+import { ElForm, ElFormItem, ElInput, ElMessage } from 'element-plus';
 
 import { api } from '#/api/request';
 import DictSelect from '#/components/dict/DictSelect.vue';
@@ -101,19 +96,23 @@ function closeDialog() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    width="xl"
+    @confirm="save"
   >
     <ElForm
-      label-width="120px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem prop="avatar" :label="$t('sysAccount.avatar')">
         <!-- <Cropper v-model="entity.avatar" crop /> -->
@@ -151,23 +150,14 @@ function closeDialog() {
         <DictSelect multiple v-model="entity.roleIds" dict-code="sysRole" />
       </ElFormItem>
       <ElFormItem prop="positionIds" :label="$t('sysAccount.positionIds')">
-        <DictSelect multiple v-model="entity.positionIds" dict-code="sysPosition" />
+        <DictSelect
+          multiple
+          v-model="entity.positionIds"
+          dict-code="sysPosition"
+        />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/system/sysDept/SysDeptModal.vue b/easyflow-ui-admin/app/src/views/system/sysDept/SysDeptModal.vue
index bdd440e..ec40a2d 100644
--- a/easyflow-ui-admin/app/src/views/system/sysDept/SysDeptModal.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysDept/SysDeptModal.vue
@@ -3,14 +3,9 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
-import {
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-} from 'element-plus';
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
+import { ElForm, ElFormItem, ElInput, ElMessage } from 'element-plus';
 
 import { api } from '#/api/request';
 import DictSelect from '#/components/dict/DictSelect.vue';
@@ -87,19 +82,23 @@ function closeDialog() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :closable="!btnLoading"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
     <ElForm
-      label-width="120px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem prop="parentId" :label="$t('sysDept.parentId')">
         <DictSelect
@@ -125,20 +124,7 @@ function closeDialog() {
         <ElInput v-model.trim="entity.remark" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/system/sysFeedback/sysFeedbackList.vue b/easyflow-ui-admin/app/src/views/system/sysFeedback/sysFeedbackList.vue
index 6a07f19..394961d 100644
--- a/easyflow-ui-admin/app/src/views/system/sysFeedback/sysFeedbackList.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysFeedback/sysFeedbackList.vue
@@ -24,6 +24,7 @@ import { tryit } from 'radash';
 
 import { api } from '#/api/request';
 import DictSelect from '#/components/dict/DictSelect.vue';
+import ListPageShell from '#/components/page/ListPageShell.vue';
 import PageData from '#/components/page/PageData.vue';
 import { $t } from '#/locales';
 import { router } from '#/router';
@@ -102,41 +103,42 @@ async function markStatus(row: any, status: number) {
 
 <template>
   <div class="flex h-full flex-col gap-1.5 p-6">
-    <ElForm ref="formRef" inline :model="formData">
-      <ElFormItem prop="feedbackType" class="!mr-3">
-        <ElSelect
-          v-model="formData.feedbackType"
-          :options="feedbackTypeOptions"
-          :placeholder="$t('sysFeedback.feedbackType')"
-          clearable
-          filterable
-          immediate
-        />
-      </ElFormItem>
-      <ElFormItem prop="status" class="!mr-3">
-        <DictSelect
-          v-model="formData.status"
-          dict-code="feedbackType"
-          :placeholder="$t('sysFeedback.processingStatus')"
-        />
-      </ElFormItem>
-      <ElFormItem prop="feedbackContent" class="!mr-3">
-        <ElInput
-          v-model="formData.feedbackContent"
-          :placeholder="$t('common.searchPlaceholder')"
-        />
-      </ElFormItem>
-      <ElFormItem>
-        <ElButton @click="search(formRef)" type="primary">
-          {{ $t('button.query') }}
-        </ElButton>
-        <ElButton @click="reset(formRef)">
-          {{ $t('button.reset') }}
-        </ElButton>
-      </ElFormItem>
-    </ElForm>
-
-    <div class="bg-background border-border flex-1 rounded-lg border p-5">
+    <ListPageShell>
+      <template #filters>
+        <ElForm ref="formRef" inline :model="formData">
+          <ElFormItem prop="feedbackType" class="!mr-3">
+            <ElSelect
+              v-model="formData.feedbackType"
+              :options="feedbackTypeOptions"
+              :placeholder="$t('sysFeedback.feedbackType')"
+              clearable
+              filterable
+              immediate
+            />
+          </ElFormItem>
+          <ElFormItem prop="status" class="!mr-3">
+            <DictSelect
+              v-model="formData.status"
+              dict-code="feedbackType"
+              :placeholder="$t('sysFeedback.processingStatus')"
+            />
+          </ElFormItem>
+          <ElFormItem prop="feedbackContent" class="!mr-3">
+            <ElInput
+              v-model="formData.feedbackContent"
+              :placeholder="$t('common.searchPlaceholder')"
+            />
+          </ElFormItem>
+          <ElFormItem>
+            <ElButton @click="search(formRef)" type="primary">
+              {{ $t('button.query') }}
+            </ElButton>
+            <ElButton @click="reset(formRef)">
+              {{ $t('button.reset') }}
+            </ElButton>
+          </ElFormItem>
+        </ElForm>
+      </template>
       <PageData
         ref="pageDataRef"
         page-url="/api/v1/sysUserFeedback/page"
@@ -236,6 +238,6 @@ async function markStatus(row: any, status: number) {
           </ElTable>
         </template>
       </PageData>
-    </div>
+    </ListPageShell>
   </div>
 </template>
diff --git a/easyflow-ui-admin/app/src/views/system/sysJob/SysJobList.vue b/easyflow-ui-admin/app/src/views/system/sysJob/SysJobList.vue
index 4e187c0..4cae9a2 100644
--- a/easyflow-ui-admin/app/src/views/system/sysJob/SysJobList.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysJob/SysJobList.vue
@@ -24,6 +24,7 @@ import {
 
 import { api } from '#/api/request';
 import HeaderSearch from '#/components/headerSearch/HeaderSearch.vue';
+import ListPageShell from '#/components/page/ListPageShell.vue';
 import PageData from '#/components/page/PageData.vue';
 import { $t } from '#/locales';
 import { router } from '#/router';
@@ -149,13 +150,14 @@ function toLogPage(row: any) {
 <template>
   <div class="flex h-full flex-col gap-6 p-6">
     <SysJobModal ref="saveDialog" @reload="reset" />
-    <HeaderSearch
-      :buttons="headerButtons"
-      @search="handleSearch"
-      @button-click="showDialog({})"
-    />
-
-    <div class="bg-background border-border flex-1 rounded-lg border p-5">
+    <ListPageShell>
+      <template #filters>
+        <HeaderSearch
+          :buttons="headerButtons"
+          @search="handleSearch"
+          @button-click="showDialog({})"
+        />
+      </template>
       <PageData
         ref="pageDataRef"
         page-url="/api/v1/sysJob/page"
@@ -271,7 +273,7 @@ function toLogPage(row: any) {
           </ElTable>
         </template>
       </PageData>
-    </div>
+    </ListPageShell>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/system/sysJob/SysJobModal.vue b/easyflow-ui-admin/app/src/views/system/sysJob/SysJobModal.vue
index a21d611..56245b3 100644
--- a/easyflow-ui-admin/app/src/views/system/sysJob/SysJobModal.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysJob/SysJobModal.vue
@@ -3,15 +3,9 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
-import {
-  ElAlert,
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-} from 'element-plus';
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
+import { ElAlert, ElForm, ElFormItem, ElInput, ElMessage } from 'element-plus';
 
 import { api } from '#/api/request';
 import CronPicker from '#/components/cron/CronPicker.vue';
@@ -139,20 +133,24 @@ const str = '"param"';
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :closable="!btnLoading"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
     <ElForm
       v-loading="paramsLoading"
-      label-width="120px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem prop="jobName" :label="$t('sysJob.jobName')">
         <ElInput v-model.trim="entity.jobName" />
@@ -225,20 +223,7 @@ const str = '"param"';
         <ElInput v-model.trim="entity.remark" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/system/sysLog/SysLogList.vue b/easyflow-ui-admin/app/src/views/system/sysLog/SysLogList.vue
index e777506..04d26d4 100644
--- a/easyflow-ui-admin/app/src/views/system/sysLog/SysLogList.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysLog/SysLogList.vue
@@ -6,6 +6,7 @@ import { ref } from 'vue';
 import { ElTable, ElTableColumn } from 'element-plus';
 
 import HeaderSearch from '#/components/headerSearch/HeaderSearch.vue';
+import ListPageShell from '#/components/page/ListPageShell.vue';
 import PageData from '#/components/page/PageData.vue';
 import { $t } from '#/locales';
 
@@ -25,9 +26,10 @@ function reset(formEl?: FormInstance) {
 <template>
   <div class="flex h-full flex-col gap-6 p-6">
     <SysLogModal ref="saveDialog" @reload="reset" />
-    <HeaderSearch @search="handleSearch" />
-
-    <div class="bg-background border-border flex-1 rounded-lg border p-5">
+    <ListPageShell>
+      <template #filters>
+        <HeaderSearch @search="handleSearch" />
+      </template>
       <PageData
         ref="pageDataRef"
         page-url="/api/v1/sysLog/page"
@@ -76,7 +78,7 @@ function reset(formEl?: FormInstance) {
           </ElTable>
         </template>
       </PageData>
-    </div>
+    </ListPageShell>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/system/sysLog/SysLogModal.vue b/easyflow-ui-admin/app/src/views/system/sysLog/SysLogModal.vue
index a216b32..dd0e913 100644
--- a/easyflow-ui-admin/app/src/views/system/sysLog/SysLogModal.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysLog/SysLogModal.vue
@@ -3,14 +3,9 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
-import {
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-} from 'element-plus';
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
+import { ElForm, ElFormItem, ElInput, ElMessage } from 'element-plus';
 
 import { api } from '#/api/request';
 import { $t } from '#/locales';
@@ -79,19 +74,23 @@ function closeDialog() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    width="lg"
+    @confirm="save"
   >
     <ElForm
-      label-width="120px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem prop="accountId" :label="$t('sysLog.accountId')">
         <ElInput v-model.trim="entity.accountId" />
@@ -124,20 +123,7 @@ function closeDialog() {
         <ElInput v-model.trim="entity.status" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/system/sysMenu/SysMenuModal.vue b/easyflow-ui-admin/app/src/views/system/sysMenu/SysMenuModal.vue
index fd1004d..815a27b 100644
--- a/easyflow-ui-admin/app/src/views/system/sysMenu/SysMenuModal.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysMenu/SysMenuModal.vue
@@ -3,11 +3,9 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
-import { IconPicker } from '@easyflow/common-ui';
+import { EasyFlowFormModal, IconPicker } from '@easyflow/common-ui';
 
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElInput,
@@ -103,20 +101,24 @@ function closeDialog() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :closable="!btnLoading"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
     :z-index="1999"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
     <ElForm
-      label-width="120px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem prop="parentId" :label="$t('sysMenu.parentId')">
         <DictSelect
@@ -168,20 +170,7 @@ function closeDialog() {
         <ElInput v-model.trim="entity.remark" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/system/sysPosition/SysPositionList.vue b/easyflow-ui-admin/app/src/views/system/sysPosition/SysPositionList.vue
index c4fdcb3..9db1a9e 100644
--- a/easyflow-ui-admin/app/src/views/system/sysPosition/SysPositionList.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysPosition/SysPositionList.vue
@@ -17,6 +17,7 @@ import {
 
 import { api } from '#/api/request';
 import HeaderSearch from '#/components/headerSearch/HeaderSearch.vue';
+import ListPageShell from '#/components/page/ListPageShell.vue';
 import PageData from '#/components/page/PageData.vue';
 import { $t } from '#/locales';
 import { useDictStore } from '#/store';
@@ -124,13 +125,14 @@ function remove(row: any) {
 <template>
   <div class="flex h-full flex-col gap-6 p-6">
     <SysPositionModal ref="saveDialog" @reload="reset" />
-    <HeaderSearch
-      :buttons="headerButtons"
-      @search="handleSearch"
-      @button-click="showDialog({})"
-    />
-
-    <div class="bg-background border-border flex-1 rounded-lg border p-5">
+    <ListPageShell>
+      <template #filters>
+        <HeaderSearch
+          :buttons="headerButtons"
+          @search="handleSearch"
+          @button-click="showDialog({})"
+        />
+      </template>
       <PageData
         ref="pageDataRef"
         page-url="/api/v1/sysPosition/page"
@@ -231,7 +233,7 @@ function remove(row: any) {
           </ElTable>
         </template>
       </PageData>
-    </div>
+    </ListPageShell>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/system/sysPosition/SysPositionModal.vue b/easyflow-ui-admin/app/src/views/system/sysPosition/SysPositionModal.vue
index 7a8acc6..43448e6 100644
--- a/easyflow-ui-admin/app/src/views/system/sysPosition/SysPositionModal.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysPosition/SysPositionModal.vue
@@ -3,9 +3,9 @@ import type { FormInstance } from 'element-plus';
 
 import { ref } from 'vue';
 
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
 import {
-  ElButton,
-  ElDialog,
   ElForm,
   ElFormItem,
   ElInput,
@@ -94,20 +94,24 @@ function closeDialog() {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
+    :closable="!btnLoading"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
     width="500px"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    @confirm="save"
   >
     <ElForm
-      label-width="100px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem
         prop="positionName"
@@ -142,20 +146,7 @@ function closeDialog() {
         <ElInput v-model.trim="entity.remark" type="textarea" :rows="3" />
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/app/src/views/system/sysRole/SysRoleList.vue b/easyflow-ui-admin/app/src/views/system/sysRole/SysRoleList.vue
index f8f6337..2cff697 100644
--- a/easyflow-ui-admin/app/src/views/system/sysRole/SysRoleList.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysRole/SysRoleList.vue
@@ -17,6 +17,7 @@ import {
 
 import { api } from '#/api/request';
 import HeaderSearch from '#/components/headerSearch/HeaderSearch.vue';
+import ListPageShell from '#/components/page/ListPageShell.vue';
 import PageData from '#/components/page/PageData.vue';
 import { $t } from '#/locales';
 import { useDictStore } from '#/store';
@@ -89,13 +90,14 @@ function remove(row: any) {
 <template>
   <div class="flex h-full flex-col gap-6 p-6">
     <SysRoleModal ref="saveDialog" @reload="reset" />
-    <HeaderSearch
-      :buttons="headerButtons"
-      @search="handleSearch"
-      @button-click="showDialog({ menuCheckStrictly: true })"
-    />
-
-    <div class="bg-background border-border flex-1 rounded-lg border p-5">
+    <ListPageShell>
+      <template #filters>
+        <HeaderSearch
+          :buttons="headerButtons"
+          @search="handleSearch"
+          @button-click="showDialog({ menuCheckStrictly: true })"
+        />
+      </template>
       <PageData
         ref="pageDataRef"
         page-url="/api/v1/sysRole/page"
@@ -160,7 +162,7 @@ function remove(row: any) {
           </ElTable>
         </template>
       </PageData>
-    </div>
+    </ListPageShell>
   </div>
 </template>
 
diff --git a/easyflow-ui-admin/app/src/views/system/sysRole/SysRoleModal.vue b/easyflow-ui-admin/app/src/views/system/sysRole/SysRoleModal.vue
index b85e69d..f132adc 100644
--- a/easyflow-ui-admin/app/src/views/system/sysRole/SysRoleModal.vue
+++ b/easyflow-ui-admin/app/src/views/system/sysRole/SysRoleModal.vue
@@ -3,15 +3,9 @@ import type { FormInstance } from 'element-plus';
 
 import { onMounted, ref } from 'vue';
 
-import {
-  ElButton,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-  ElSwitch,
-} from 'element-plus';
+import { EasyFlowFormModal } from '@easyflow/common-ui';
+
+import { ElForm, ElFormItem, ElInput, ElMessage, ElSwitch } from 'element-plus';
 
 import { api } from '#/api/request';
 import DictSelect from '#/components/dict/DictSelect.vue';
@@ -95,19 +89,23 @@ function getDeptIds(roleId: any) {
 </script>
 
 <template>
-  <ElDialog
-    v-model="dialogVisible"
-    draggable
+  <EasyFlowFormModal
+    v-model:open="dialogVisible"
     :title="isAdd ? $t('button.add') : $t('button.edit')"
     :before-close="closeDialog"
-    :close-on-click-modal="false"
+    :confirm-loading="btnLoading"
+    :confirm-text="$t('button.save')"
+    :submitting="btnLoading"
+    width="xl"
+    @confirm="save"
   >
     <ElForm
-      label-width="120px"
       ref="saveForm"
       :model="entity"
       status-icon
       :rules="rules"
+      label-position="top"
+      class="easyflow-modal-form easyflow-modal-form--compact"
     >
       <ElFormItem prop="roleName" :label="$t('sysRole.roleName')">
         <ElInput v-model.trim="entity.roleName" />
@@ -157,20 +155,7 @@ function getDeptIds(roleId: any) {
         </div>
       </ElFormItem>
     </ElForm>
-    <template #footer>
-      <ElButton @click="closeDialog">
-        {{ $t('button.cancel') }}
-      </ElButton>
-      <ElButton
-        type="primary"
-        @click="save"
-        :loading="btnLoading"
-        :disabled="btnLoading"
-      >
-        {{ $t('button.save') }}
-      </ElButton>
-    </template>
-  </ElDialog>
+  </EasyFlowFormModal>
 </template>
 
 <style scoped></style>
diff --git a/easyflow-ui-admin/packages/@core/base/design/src/css/global.css b/easyflow-ui-admin/packages/@core/base/design/src/css/global.css
index fb32b21..2703dbc 100644
--- a/easyflow-ui-admin/packages/@core/base/design/src/css/global.css
+++ b/easyflow-ui-admin/packages/@core/base/design/src/css/global.css
@@ -149,6 +149,109 @@
   .card-box {
     @apply bg-card text-card-foreground border-border rounded-xl border;
   }
+
+  .easyflow-modal-form {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+  }
+
+  .easyflow-modal-form--compact {
+    gap: 10px;
+  }
+
+  .easyflow-modal-section {
+    background: hsl(var(--modal-content-surface-strong));
+    border: 1px solid hsl(var(--modal-divider));
+    border-radius: 14px;
+    box-shadow: none;
+    padding: 14px;
+  }
+
+  .easyflow-modal-grid {
+    display: grid;
+    gap: 14px 16px;
+  }
+
+  .easyflow-modal-grid--2 {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+
+  .easyflow-modal-field-tip {
+    color: hsl(var(--text-muted));
+    font-size: 11px;
+    line-height: 1.5;
+    margin-top: 4px;
+  }
+
+  .easyflow-modal-form .el-form-item {
+    margin-bottom: 0;
+  }
+
+  .easyflow-modal-form .el-form-item__label {
+    color: hsl(var(--text-strong));
+    font-size: 12px;
+    font-weight: 600;
+    line-height: 1.4;
+    padding-bottom: 6px;
+  }
+
+  .easyflow-modal-form .el-input__wrapper,
+  .easyflow-modal-form .el-select__wrapper,
+  .easyflow-modal-form .el-textarea__inner,
+  .easyflow-modal-form .el-date-editor.el-input__wrapper {
+    background: hsl(var(--input-background));
+    border-radius: 12px;
+    box-shadow: inset 0 0 0 1px hsl(var(--input) / 0.92);
+    transition:
+      box-shadow 0.2s ease,
+      border-color 0.2s ease,
+      transform 0.2s ease;
+  }
+
+  .easyflow-modal-form .el-input__wrapper,
+  .easyflow-modal-form .el-select__wrapper,
+  .easyflow-modal-form .el-date-editor.el-input__wrapper {
+    min-height: 42px;
+  }
+
+  .easyflow-modal-form .el-textarea__inner {
+    min-height: 96px;
+    padding: 10px 12px;
+  }
+
+  .easyflow-modal-form .el-input__wrapper:hover,
+  .easyflow-modal-form .el-select__wrapper:hover,
+  .easyflow-modal-form .el-textarea__inner:hover,
+  .easyflow-modal-form .el-date-editor.el-input__wrapper:hover {
+    box-shadow: inset 0 0 0 1px hsl(var(--primary) / 0.18);
+  }
+
+  .easyflow-modal-form .el-input__wrapper.is-focus,
+  .easyflow-modal-form .el-select__wrapper.is-focused,
+  .easyflow-modal-form .el-textarea__inner:focus,
+  .easyflow-modal-form .el-date-editor.el-input__wrapper.is-focus {
+    box-shadow:
+      inset 0 0 0 1px hsl(var(--primary) / 0.72),
+      0 0 0 4px hsl(var(--primary) / 0.12);
+  }
+
+  .easyflow-modal-form .el-form-item.is-error .el-input__wrapper,
+  .easyflow-modal-form .el-form-item.is-error .el-select__wrapper,
+  .easyflow-modal-form .el-form-item.is-error .el-textarea__inner,
+  .easyflow-modal-form
+    .el-form-item.is-error
+    .el-date-editor.el-input__wrapper {
+    box-shadow:
+      inset 0 0 0 1px hsl(var(--destructive) / 0.8),
+      0 0 0 4px hsl(var(--destructive) / 0.08);
+  }
+
+  @media (max-width: 768px) {
+    .easyflow-modal-grid--2 {
+      grid-template-columns: 1fr;
+    }
+  }
 }
 
 html.invert-mode {
diff --git a/easyflow-ui-admin/packages/@core/base/design/src/design-tokens/dark.css b/easyflow-ui-admin/packages/@core/base/design/src/design-tokens/dark.css
index 792b2e1..95b804f 100644
--- a/easyflow-ui-admin/packages/@core/base/design/src/design-tokens/dark.css
+++ b/easyflow-ui-admin/packages/@core/base/design/src/design-tokens/dark.css
@@ -2,11 +2,11 @@
 .dark[data-theme='custom'],
 .dark[data-theme='default'] {
   /* Default background color of <body />...etc */
-  --background: 222.34deg 10.43% 12.27%;
+  --background: 222 16% 10.5%;
 
   /* 主体区域背景色 */
-  --background-deep: 220deg 13.06% 9%;
-  --foreground: 0 0% 95%;
+  --background-deep: 220 18% 8.6%;
+  --foreground: 210 18% 95%;
 
   /* Background color for <Card /> */
   --card: 222.34deg 10.43% 12.27%;
@@ -73,12 +73,12 @@
   --heavy-foreground: var(--accent-foreground);
 
   /* Default border color */
-  --border: 240 3.7% 22%;
+  --border: 220 10% 21%;
 
   /* Border color for inputs such as <Input />, <Select />, <Textarea /> */
-  --input: 0deg 0% 100% / 10%;
-  --input-placeholder: 218deg 11% 65%;
-  --input-background: 0deg 0% 100% / 5%;
+  --input: 220 10% 22%;
+  --input-placeholder: 218 10% 66%;
+  --input-background: 220 10% 16%;
 
   /* Used for focus ring */
   --ring: 222.2 84% 4.9%;
@@ -97,20 +97,75 @@
 
   /* =============component & UI============= */
 
-  --sidebar: 222.34deg 10.43% 12.27%;
-  --sidebar-deep: 220deg 13.06% 9%;
+  --sidebar: 220 14% 12%;
+  --sidebar-deep: 220 18% 9.5%;
   --menu: var(--sidebar);
 
   /* header */
-  --header: 222.34deg 10.43% 12.27%;
+  --header: 220 18% 12.5%;
+  --nav-surface: 220 18% 12.5%;
+  --nav-surface-subtle: 219 18% 15.4%;
+  --nav-border: 217 18% 23%;
+  --nav-item-hover: 217 28% 18.8%;
+  --nav-item-active: 216 46% 24%;
+  --nav-item-active-foreground: 210 96% 92%;
+  --nav-item-muted-foreground: 218 15% 78%;
+  --nav-indicator: var(--primary);
+  --nav-tool-bg: 217 34% 17%;
+  --nav-tool-hover: 216 42% 21%;
+  --breadcrumb-muted: 218 12% 72%;
+  --breadcrumb-current: 210 96% 92%;
+  --surface-canvas: 220 18% 9%;
+  --surface-panel: 220 14% 12.8%;
+  --surface-subtle: 220 11% 15.8%;
+  --surface-elevated: 220 14% 14.5%;
+  --surface-glass: 218 24% 16.2%;
+  --surface-contrast-soft: 220 11% 17.2%;
+  --line-subtle: 220 9% 21%;
+  --divider-faint: 220 10% 23%;
+  --table-row-hover: 218 16% 18%;
+  --table-row-border: 220 9% 22%;
+  --table-header-bg: 220 11% 15.5%;
+  --toolbar-bg: 220 16% 14%;
+  --toolbar-border: 220 9% 23%;
+  --text-strong: 0 0% 96%;
+  --text-muted: 218 10% 70%;
+  --glass-tint: 218 26% 16.2%;
+  --glass-border: 210 100% 98%;
+  --glass-blur: 22px;
+  --radius-modal: 20px;
+  --modal-surface: 220 14% 13%;
+  --modal-surface-strong: 220 14% 13%;
+  --modal-content-surface: 220 14% 13%;
+  --modal-content-surface-strong: 220 14% 13%;
+  --modal-footer-surface: 220 13% 12%;
+  --modal-border: 218 16% 24%;
+  --modal-divider: 218 18% 24%;
+  --modal-shadow: 0 24px 60px -30px hsl(212 60% 2% / 0.58);
+  --modal-shell-highlight: 0 0% 100% / 0;
+  --modal-shell-border-soft: 218 16% 24% / 0.96;
+  --modal-shell-shadow-near: 212 50% 2% / 0.38;
+  --modal-shell-shadow-far: 212 46% 2% / 0.42;
+  --modal-overlay: 220 18% 10%;
+  --modal-overlay-opacity: 0.48;
+  --modal-preview-surface: 217 28% 18.5%;
+  --modal-preview-surface-strong: 219 23% 14.5%;
+  --modal-preview-border: 214 44% 31%;
+  --modal-preview-glow: 211 100% 62%;
+  --nav-ambient: 214 100% 44%;
+  --nav-ambient-secondary: 194 82% 40%;
+  --nav-sheen: 210 100% 96%;
+  --shadow-subtle: 0 18px 42px -30px hsl(212 100% 5% / 0.48);
+  --shadow-toolbar: 0 28px 54px -36px hsl(212 100% 4% / 0.58);
+  --shadow-float: 0 34px 70px -38px hsl(212 100% 3% / 0.68);
   --bot-back-item: hsl(0deg 0% 91.76%);
   --bot-collapse-itme-back: hsl(var(--background-deep));
   --bot-chat-message-container: hsl(var(--background-deep));
   --bot-chat-message-item-back: hsl(0deg 0% 100%);
   --common-font-placeholder-color: hsl(220deg 1.45% 59.41%);
-  --table-header-text-color: hsl(0deg 0% 91.76%);
-  --table-header-bg-color: hsl(231.43, 7.87%, 17.45%);
-  --table-cell-shadow-color: hsl(231.43, 7.87%, 17.45%);
+  --table-header-text-color: hsl(var(--text-strong));
+  --table-header-bg-color: hsl(var(--table-header-bg));
+  --table-cell-shadow-color: hsl(var(--table-row-border));
   --bot-select-data-item-back: hsl(0deg 0% 98.04%);
   color-scheme: dark;
 }
diff --git a/easyflow-ui-admin/packages/@core/base/design/src/design-tokens/default.css b/easyflow-ui-admin/packages/@core/base/design/src/design-tokens/default.css
index e9ec371..ce1d1b7 100644
--- a/easyflow-ui-admin/packages/@core/base/design/src/design-tokens/default.css
+++ b/easyflow-ui-admin/packages/@core/base/design/src/design-tokens/default.css
@@ -10,8 +10,8 @@
   --background: 0 0% 100%;
 
   /* 主体区域背景色 */
-  --background-deep: 220 33.33% 98.24%;
-  --foreground: 210 6% 21%;
+  --background-deep: 220 32% 96.9%;
+  --foreground: 215 20% 18%;
 
   /* Background color for <Card /> */
   --card: 0 0% 100%;
@@ -31,7 +31,7 @@
 
   /* 主题颜色 */
 
-  --primary: 216 100% 50%;
+  --primary: 211 100% 50%;
   --primary-foreground: 0 0% 98%;
 
   /* Used for destructive actions such as <Button variant="destructive"> */
@@ -72,12 +72,12 @@
   --heavy-foreground: var(--accent-foreground);
 
   /* Default border color */
-  --border: 0 0% 94.12%;
+  --border: 216 18% 90%;
 
   /* Border color for inputs such as <Input />, <Select />, <Textarea /> */
-  --input: 240deg 5.88% 90%;
-  --input-placeholder: 217 10.6% 65%;
-  --input-background: 0 0% 100%;
+  --input: 216 18% 90%;
+  --input-placeholder: 215 12% 58%;
+  --input-background: 210 33% 98.4%;
 
   /* Used for focus ring */
   --ring: 222.2 84% 4.9%;
@@ -97,12 +97,67 @@
   /* =============component & UI============= */
 
   /* menu */
-  --sidebar: 0 0% 100%;
-  --sidebar-deep: 0 0% 100%;
+  --sidebar: 210 33% 99.4%;
+  --sidebar-deep: 210 28% 98%;
   --menu: var(--sidebar);
 
   /* header */
-  --header: 0 0% 100%;
+  --header: 212 100% 98.7%;
+  --nav-surface: 212 100% 98.7%;
+  --nav-surface-subtle: 211 84% 97.3%;
+  --nav-border: 214 34% 89%;
+  --nav-item-hover: 211 100% 96.3%;
+  --nav-item-active: 211 100% 93.8%;
+  --nav-item-active-foreground: 213 78% 41%;
+  --nav-item-muted-foreground: 215 18% 34%;
+  --nav-indicator: var(--primary);
+  --nav-tool-bg: 212 88% 96.1%;
+  --nav-tool-hover: 211 100% 94%;
+  --breadcrumb-muted: 215 12% 48%;
+  --breadcrumb-current: 213 78% 41%;
+  --surface-canvas: 216 32% 97%;
+  --surface-panel: 0 0% 100%;
+  --surface-subtle: 210 24% 98.4%;
+  --surface-elevated: 210 33% 99.5%;
+  --surface-glass: 212 100% 98.9%;
+  --surface-contrast-soft: 210 26% 95.8%;
+  --line-subtle: 214 18% 91%;
+  --divider-faint: 215 22% 90%;
+  --table-row-hover: 212 55% 97%;
+  --table-row-border: 214 16% 92%;
+  --table-header-bg: 210 28% 97%;
+  --toolbar-bg: 210 36% 98.5%;
+  --toolbar-border: 214 18% 90%;
+  --text-strong: 216 22% 19%;
+  --text-muted: 215 10% 49%;
+  --glass-tint: 212 100% 98.9%;
+  --glass-border: 0 0% 100%;
+  --glass-blur: 20px;
+  --radius-modal: 20px;
+  --modal-surface: 0 0% 100%;
+  --modal-surface-strong: 0 0% 100%;
+  --modal-content-surface: 0 0% 100%;
+  --modal-content-surface-strong: 0 0% 100%;
+  --modal-footer-surface: 210 20% 98.4%;
+  --modal-border: 214 22% 86%;
+  --modal-divider: 214 22% 89%;
+  --modal-shadow: 0 22px 54px -28px hsl(215 28% 18% / 0.18);
+  --modal-shell-highlight: 0 0% 100% / 0;
+  --modal-shell-border-soft: 214 22% 86% / 0.94;
+  --modal-shell-shadow-near: 216 30% 18% / 0.08;
+  --modal-shell-shadow-far: 216 34% 18% / 0.12;
+  --modal-overlay: 220 18% 8%;
+  --modal-overlay-opacity: 0.24;
+  --modal-preview-surface: 211 100% 97.3%;
+  --modal-preview-surface-strong: 0 0% 100%;
+  --modal-preview-border: 212 84% 88%;
+  --modal-preview-glow: 211 100% 56%;
+  --nav-ambient: 212 100% 84%;
+  --nav-ambient-secondary: 194 93% 82%;
+  --nav-sheen: 0 0% 100%;
+  --shadow-subtle: 0 18px 42px -30px hsl(211 78% 48% / 0.16);
+  --shadow-toolbar: 0 28px 54px -34px hsl(211 78% 48% / 0.2);
+  --shadow-float: 0 34px 68px -38px hsl(211 78% 48% / 0.24);
 
   accent-color: var(--primary);
   color-scheme: light;
@@ -112,9 +167,9 @@
   --bot-chat-message-container: hsl(228deg 33.33% 97.06%);
   --bot-chat-message-item-back: hsl(0deg 0% 100%);
   --common-font-placeholder-color: hsl(220deg 1.45% 59.41%);
-  --table-header-text-color: hsl(240, 0.99%, 19.8%);
-  --table-header-bg-color: hsl(220 60% 98.04%);
-  --table-cell-shadow-color: hsl(225, 18.18%, 95.69%);
+  --table-header-text-color: hsl(var(--text-strong));
+  --table-header-bg-color: hsl(var(--table-header-bg));
+  --table-cell-shadow-color: hsl(var(--table-row-border));
   --bot-select-data-item-back: hsl(0deg 0% 98.04%);
 }
 
diff --git a/easyflow-ui-admin/packages/@core/preferences/src/config.ts b/easyflow-ui-admin/packages/@core/preferences/src/config.ts
index 73fc047..c2b6829 100644
--- a/easyflow-ui-admin/packages/@core/preferences/src/config.ts
+++ b/easyflow-ui-admin/packages/@core/preferences/src/config.ts
@@ -37,7 +37,7 @@ const defaultPreferences: Preferences = {
     enable: true,
     hideOnlyOne: false,
     showHome: false,
-    showIcon: true,
+    showIcon: false,
     styleType: 'normal',
   },
   copyright: {
@@ -56,7 +56,7 @@ const defaultPreferences: Preferences = {
   },
   header: {
     enable: true,
-    height: 50,
+    height: 56,
     hidden: false,
     menuAlign: 'start',
     mode: 'fixed',
@@ -99,7 +99,7 @@ const defaultPreferences: Preferences = {
   tabbar: {
     draggable: true,
     enable: true,
-    height: 38,
+    height: 32,
     keepAlive: true,
     maxCount: 0,
     middleClickToClose: false,
@@ -107,7 +107,7 @@ const defaultPreferences: Preferences = {
     showIcon: true,
     showMaximize: true,
     showMore: true,
-    styleType: 'chrome',
+    styleType: 'plain',
     wheelable: true,
   },
   theme: {
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-content.vue b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-content.vue
index 9f2a0da..8eb90b2 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-content.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-content.vue
@@ -55,7 +55,11 @@ const style = computed((): CSSProperties => {
 </script>
 
 <template>
-  <main ref="contentElement" :style="style" class="bg-background-deep relative">
+  <main
+    ref="contentElement"
+    :style="style"
+    class="relative overflow-hidden bg-[radial-gradient(circle_at_top,hsl(var(--glass-tint))/0.34,transparent_40%),linear-gradient(180deg,hsl(var(--surface-canvas)),hsl(var(--background-deep)))]"
+  >
     <Slot :style="overlayStyle">
       <slot name="overlay"></slot>
     </Slot>
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-header.vue b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-header.vue
index 534e416..acd4d92 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-header.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-header.vue
@@ -47,6 +47,11 @@ const style = computed((): CSSProperties => {
   const right = !show || !fullWidth ? undefined : 0;
 
   return {
+    backgroundColor: 'hsl(var(--nav-surface) / 0.86)',
+    backgroundImage:
+      'linear-gradient(180deg, hsl(var(--nav-surface) / 0.96), hsl(var(--glass-tint) / 0.82))',
+    backdropFilter: 'blur(var(--glass-blur)) saturate(160%)',
+    boxShadow: 'var(--shadow-subtle)',
     height: `${height}px`,
     marginTop: show ? 0 : `-${height}px`,
     right,
@@ -58,20 +63,30 @@ const logoStyle = computed((): CSSProperties => {
     minWidth: `${props.isMobile ? 40 : props.sidebarWidth}px`,
   };
 });
+const ambientStyle: CSSProperties = {
+  backgroundImage:
+    'radial-gradient(circle at left top, hsl(var(--nav-ambient) / 0.42) 0%, hsl(var(--nav-ambient) / 0.18) 22%, transparent 56%), radial-gradient(circle at 20% 0%, hsl(var(--nav-ambient-secondary) / 0.22) 0%, transparent 40%), linear-gradient(180deg, hsl(var(--nav-sheen) / 0.22), transparent 48%)',
+};
 </script>
 
 <template>
   <header
     :class="theme"
     :style="style"
-    class="border-border bg-header top-0 flex w-full flex-[0_0_auto] items-center border-b pl-2 transition-[margin-top] duration-200"
+    class="relative top-0 flex w-full flex-[0_0_auto] items-center gap-1 overflow-x-hidden overflow-y-visible px-3 transition-[margin-top,background-color,box-shadow] duration-200"
   >
-    <div v-if="slots.logo" :style="logoStyle">
+    <div :style="ambientStyle" class="pointer-events-none absolute inset-0"></div>
+
+    <div v-if="slots.logo" :style="logoStyle" class="relative z-10">
       <slot name="logo"></slot>
     </div>
 
-    <slot name="toggle-button"> </slot>
+    <div class="relative z-10">
+      <slot name="toggle-button"> </slot>
+    </div>
 
-    <slot></slot>
+    <div class="relative z-10 flex min-w-0 flex-1 items-center">
+      <slot></slot>
+    </div>
   </header>
 </template>
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
index dcca160..0e6707c 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
@@ -90,7 +90,7 @@ interface Props {
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  collapseHeight: 42,
+  collapseHeight: 96,
   collapseWidth: 48,
   domVisible: true,
   fixedExtra: false,
@@ -122,7 +122,13 @@ const style = computed((): CSSProperties => {
   const { isSidebarMixed, marginTop, paddingTop, zIndex } = props;
 
   return {
-    '--scroll-shadow': 'var(--sidebar)',
+    '--scroll-shadow': 'var(--surface-elevated)',
+    backgroundColor: 'hsl(var(--nav-surface-subtle) / 0.44)',
+    backgroundImage:
+      'linear-gradient(180deg, hsl(var(--nav-surface) / 0.66) 0%, hsl(var(--nav-surface-subtle) / 0.5) 28%, hsl(var(--glass-tint) / 0.36) 100%)',
+    backdropFilter: 'blur(calc(var(--glass-blur) * 1.5)) saturate(188%)',
+    boxShadow:
+      '0 26px 64px -42px hsl(var(--primary) / 0.28), inset 0 1px 0 hsl(var(--nav-sheen) / 0.42), inset -1px 0 0 hsl(var(--nav-sheen) / 0.14)',
     ...calcMenuWidthStyle(false),
     height: `calc(100% - ${marginTop}px)`,
     marginTop: `${marginTop}px`,
@@ -136,17 +142,31 @@ const extraStyle = computed((): CSSProperties => {
   const { extraWidth, show, width, zIndex } = props;
 
   return {
+    backgroundColor: 'hsl(var(--nav-surface-subtle) / 0.4)',
+    backgroundImage:
+      'linear-gradient(180deg, hsl(var(--nav-surface-subtle) / 0.62) 0%, hsl(var(--glass-tint) / 0.34) 100%)',
+    backdropFilter: 'blur(calc(var(--glass-blur) * 1.34)) saturate(182%)',
+    boxShadow:
+      '0 26px 64px -42px hsl(var(--primary) / 0.24), inset 0 1px 0 hsl(var(--nav-sheen) / 0.34), inset -1px 0 0 hsl(var(--nav-sheen) / 0.1)',
     left: `${width}px`,
     width: extraVisible.value && show ? `${extraWidth}px` : 0,
     zIndex,
   };
 });
+const shellAmbientStyle: CSSProperties = {
+  backgroundImage:
+    'radial-gradient(circle at left top, hsl(var(--nav-ambient) / 0.58) 0%, hsl(var(--nav-ambient) / 0.22) 20%, transparent 56%), radial-gradient(circle at 14% 0%, hsl(var(--nav-ambient-secondary) / 0.24) 0%, transparent 34%), linear-gradient(180deg, hsl(var(--nav-sheen) / 0.34), transparent 16%)',
+};
+const extraAmbientStyle: CSSProperties = {
+  backgroundImage:
+    'radial-gradient(circle at left top, hsl(var(--nav-ambient) / 0.42) 0%, hsl(var(--nav-ambient) / 0.16) 18%, transparent 44%), linear-gradient(180deg, hsl(var(--nav-sheen) / 0.28), transparent 16%)',
+};
 
 const extraTitleStyle = computed((): CSSProperties => {
   const { headerHeight } = props;
 
   return {
-    height: `${headerHeight - 1}px`,
+    height: `${Math.max(headerHeight - 1, 0)}px`,
   };
 });
 
@@ -163,7 +183,7 @@ const contentStyle = computed((): CSSProperties => {
 
   return {
     height: `calc(100% - ${headerHeight + collapseHeight}px)`,
-    paddingTop: '8px',
+    paddingTop: headerHeight > 0 ? '10px' : '52px',
     ...contentWidthStyle.value,
   };
 });
@@ -173,7 +193,7 @@ const headerStyle = computed((): CSSProperties => {
 
   return {
     ...(isSidebarMixed ? { display: 'flex', justifyContent: 'center' } : {}),
-    height: `${headerHeight - 1}px`,
+    height: `${Math.max(headerHeight - 1, 0)}px`,
     ...contentWidthStyle.value,
   };
 });
@@ -182,12 +202,13 @@ const extraContentStyle = computed((): CSSProperties => {
   const { collapseHeight, headerHeight } = props;
   return {
     height: `calc(100% - ${headerHeight + collapseHeight}px)`,
+    paddingTop: headerHeight > 0 ? '10px' : '52px',
   };
 });
 
-const collapseStyle = computed((): CSSProperties => {
+const toolStyle = computed((): CSSProperties => {
   return {
-    height: `${props.collapseHeight}px`,
+    top: `${Math.max(10, (props.headerHeight - 36) / 2)}px`,
   };
 });
 
@@ -263,60 +284,70 @@ function handleMouseleave() {
     :class="[
       theme,
       {
-        'bg-sidebar-deep': isSidebarMixed,
-        'bg-sidebar border-border border-r': !isSidebarMixed,
+        'bg-[hsl(var(--glass-tint))/0.72]': isSidebarMixed,
+        'bg-[hsl(var(--glass-tint))/0.82]': !isSidebarMixed,
       },
     ]"
     :style="style"
-    class="fixed left-0 top-0 h-full transition-all duration-150"
+    class="fixed left-0 top-0 h-full overflow-hidden transition-all duration-150"
     @mouseenter="handleMouseenter"
     @mouseleave="handleMouseleave"
   >
-    <SidebarFixedButton
-      v-if="!collapse && !isSidebarMixed && showFixedButton"
-      v-model:expand-on-hover="expandOnHover"
-    />
-    <div v-if="slots.logo" :style="headerStyle">
+    <div :style="shellAmbientStyle" class="pointer-events-none absolute inset-0"></div>
+    <div
+      v-if="slots.logo"
+      :style="headerStyle"
+      class="relative z-10 px-2 pt-2"
+    >
       <slot name="logo"></slot>
     </div>
-    <EasyFlowScrollbar :style="contentStyle" shadow shadow-border>
+    <EasyFlowScrollbar :style="contentStyle" class="relative z-10">
       <slot></slot>
     </EasyFlowScrollbar>
 
-    <div :style="collapseStyle"></div>
-    <SidebarCollapseButton
-      v-if="showCollapseButton && !isSidebarMixed"
-      v-model:collapsed="collapse"
-    />
+    <div
+      v-if="!isSidebarMixed && !collapse && showFixedButton"
+      :style="toolStyle"
+      class="absolute right-3 z-20 flex"
+    >
+      <SidebarFixedButton
+        v-model:expand-on-hover="expandOnHover"
+      />
+    </div>
     <div
       v-if="isSidebarMixed"
       ref="asideRef"
-      :class="{
-        'border-l': extraVisible,
-      }"
       :style="extraStyle"
-      class="border-border bg-sidebar fixed top-0 h-full overflow-hidden border-r transition-all duration-200"
+      class="fixed top-0 h-full overflow-hidden transition-all duration-200"
     >
-      <SidebarCollapseButton
-        v-if="isSidebarMixed && expandOnHover"
-        v-model:collapsed="extraCollapse"
-      />
-
-      <SidebarFixedButton
+      <div :style="extraAmbientStyle" class="pointer-events-none absolute inset-0"></div>
+      <div
         v-if="!extraCollapse"
-        v-model:expand-on-hover="expandOnHover"
-      />
-      <div v-if="!extraCollapse" :style="extraTitleStyle" class="pl-2">
+        :style="extraTitleStyle"
+        class="relative z-10 px-3"
+      >
         <slot name="extra-title"></slot>
       </div>
       <EasyFlowScrollbar
         :style="extraContentStyle"
-        class="border-border py-2"
-        shadow
-        shadow-border
+        class="relative z-10 py-2"
       >
         <slot name="extra"></slot>
       </EasyFlowScrollbar>
+      <div
+      v-if="expandOnHover || !extraCollapse"
+      :style="toolStyle"
+      class="absolute right-3 z-20 flex flex-col gap-2"
+    >
+        <SidebarCollapseButton
+          v-if="expandOnHover"
+          v-model:collapsed="extraCollapse"
+        />
+        <SidebarFixedButton
+          v-if="!extraCollapse"
+          v-model:expand-on-hover="expandOnHover"
+        />
+      </div>
     </div>
   </aside>
 </template>
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-tabbar.vue b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-tabbar.vue
index e588e61..d1ce79b 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-tabbar.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/layout-tabbar.vue
@@ -15,16 +15,28 @@ const props = withDefaults(defineProps<Props>(), {});
 const style = computed((): CSSProperties => {
   const { height } = props;
   return {
+    backgroundColor: 'hsl(var(--glass-tint) / 0.68)',
+    backgroundImage:
+      'linear-gradient(180deg, hsl(var(--nav-surface-subtle) / 0.92), hsl(var(--glass-tint) / 0.74))',
+    backdropFilter: 'blur(calc(var(--glass-blur) * 0.9)) saturate(155%)',
+    boxShadow: '0 18px 36px -30px hsl(var(--primary) / 0.12)',
     height: `${height}px`,
   };
 });
+const ambientStyle: CSSProperties = {
+  backgroundImage:
+    'radial-gradient(circle at left top, hsl(var(--nav-ambient) / 0.24) 0%, transparent 38%), linear-gradient(180deg, hsl(var(--nav-sheen) / 0.14), transparent 62%)',
+};
 </script>
 
 <template>
   <section
     :style="style"
-    class="border-border bg-background flex w-full border-b transition-all"
+    class="relative flex w-full overflow-hidden transition-all"
   >
-    <slot></slot>
+    <div :style="ambientStyle" class="pointer-events-none absolute inset-0"></div>
+    <div class="relative z-10 flex w-full">
+      <slot></slot>
+    </div>
   </section>
 </template>
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/widgets/sidebar-collapse-button.vue b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/widgets/sidebar-collapse-button.vue
index a564389..2ca6bc7 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/widgets/sidebar-collapse-button.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/widgets/sidebar-collapse-button.vue
@@ -1,7 +1,16 @@
 <script setup lang="ts">
+import type { CSSProperties } from 'vue';
+
 import { ChevronsLeft, ChevronsRight } from '@easyflow-core/icons';
 
 const collapsed = defineModel<boolean>('collapsed');
+const buttonStyle: CSSProperties = {
+  backgroundColor: 'hsl(var(--nav-tool-bg) / 0.92)',
+  backgroundImage:
+    'linear-gradient(180deg, hsl(var(--nav-tool-bg) / 0.96), hsl(var(--glass-tint) / 0.82))',
+  border: '1px solid transparent',
+  boxShadow: '0 18px 36px -28px hsl(var(--primary) / 0.24)',
+};
 
 function handleCollapsed() {
   collapsed.value = !collapsed.value;
@@ -9,11 +18,13 @@ function handleCollapsed() {
 </script>
 
 <template>
-  <div
-    class="flex-center hover:text-foreground text-foreground/60 hover:bg-accent-hover bg-accent absolute bottom-2 left-3 z-10 cursor-pointer rounded-sm p-1"
+  <button
+    aria-label="切换侧边栏折叠状态"
+    :style="buttonStyle"
+    class="flex-center h-9 w-9 rounded-2xl text-[hsl(var(--nav-item-muted-foreground))] backdrop-blur-xl transition-[background-color,color,transform,box-shadow,border-color] duration-200 hover:-translate-y-0.5 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[hsl(var(--primary))/0.2]"
     @click.stop="handleCollapsed"
   >
     <ChevronsRight v-if="collapsed" class="size-4" />
     <ChevronsLeft v-else class="size-4" />
-  </div>
+  </button>
 </template>
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/widgets/sidebar-fixed-button.vue b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/widgets/sidebar-fixed-button.vue
index 3ed2896..47d7fcb 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/widgets/sidebar-fixed-button.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/components/widgets/sidebar-fixed-button.vue
@@ -1,7 +1,16 @@
 <script setup lang="ts">
+import type { CSSProperties } from 'vue';
+
 import { Pin, PinOff } from '@easyflow-core/icons';
 
 const expandOnHover = defineModel<boolean>('expandOnHover');
+const buttonStyle: CSSProperties = {
+  backgroundColor: 'hsl(var(--nav-tool-bg) / 0.92)',
+  backgroundImage:
+    'linear-gradient(180deg, hsl(var(--nav-tool-bg) / 0.96), hsl(var(--glass-tint) / 0.82))',
+  border: '1px solid transparent',
+  boxShadow: '0 18px 36px -28px hsl(var(--primary) / 0.24)',
+};
 
 function toggleFixed() {
   expandOnHover.value = !expandOnHover.value;
@@ -9,11 +18,13 @@ function toggleFixed() {
 </script>
 
 <template>
-  <div
-    class="flex-center hover:text-foreground text-foreground/60 hover:bg-accent-hover bg-accent absolute bottom-2 right-3 z-10 cursor-pointer rounded-sm p-[5px] transition-all duration-300"
+  <button
+    aria-label="切换侧边栏固定状态"
+    :style="buttonStyle"
+    class="flex-center h-9 w-9 rounded-2xl text-[hsl(var(--nav-item-muted-foreground))] backdrop-blur-xl transition-[background-color,color,transform,box-shadow,border-color] duration-200 hover:-translate-y-0.5 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[hsl(var(--primary))/0.2]"
     @click="toggleFixed"
   >
     <PinOff v-if="!expandOnHover" class="size-3.5" />
     <Pin v-else class="size-3.5" />
-  </div>
+  </button>
 </template>
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/easyflow-layout.vue b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/easyflow-layout.vue
index 530bbd7..1163554 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/easyflow-layout.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/layout-ui/src/easyflow-layout.vue
@@ -31,6 +31,24 @@ defineOptions({
   name: 'EasyFlowLayout',
 });
 
+const headerToggleButtonClass =
+  'my-0 mr-1 flex h-9 w-9 items-center justify-center rounded-2xl text-[hsl(var(--nav-item-muted-foreground))] backdrop-blur-xl transition-[background-color,color,transform,box-shadow,border-color] hover:-translate-y-0.5 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[hsl(var(--primary))/0.2]';
+const headerToggleButtonStyle: CSSProperties = {
+  backgroundColor: 'hsl(var(--nav-tool-bg) / 0.92)',
+  backgroundImage:
+    'linear-gradient(180deg, hsl(var(--nav-tool-bg) / 0.96), hsl(var(--glass-tint) / 0.8))',
+  border: '1px solid hsl(var(--glass-border) / 0.2)',
+  boxShadow: '0 18px 36px -28px hsl(var(--primary) / 0.24)',
+};
+const layoutAmbientLeftStyle: CSSProperties = {
+  backgroundImage:
+    'radial-gradient(circle at left top, hsl(var(--nav-ambient) / 0.34) 0%, hsl(var(--nav-ambient) / 0.14) 28%, transparent 72%)',
+};
+const layoutAmbientRightStyle: CSSProperties = {
+  backgroundImage:
+    'radial-gradient(circle at left top, hsl(var(--nav-ambient-secondary) / 0.14) 0%, transparent 72%)',
+};
+
 const props = withDefaults(defineProps<Props>(), {
   contentCompact: 'wide',
   contentCompactWidth: 1200,
@@ -482,6 +500,10 @@ const idMainContent = ELEMENT_ID_MAIN_CONTENT;
 
 <template>
   <div class="relative flex min-h-full w-full">
+    <div class="pointer-events-none absolute inset-0 overflow-hidden">
+      <div :style="layoutAmbientLeftStyle" class="absolute -left-16 top-0 h-[320px] w-[320px] rounded-full blur-3xl"></div>
+      <div :style="layoutAmbientRightStyle" class="absolute right-[-120px] top-[-40px] h-[260px] w-[320px] rounded-full blur-3xl"></div>
+    </div>
     <LayoutSidebar
       v-if="sidebarEnableState"
       v-model:collapse="sidebarCollapse"
@@ -526,12 +548,12 @@ const idMainContent = ELEMENT_ID_MAIN_CONTENT;
 
     <div
       ref="contentRef"
-      class="flex flex-1 flex-col overflow-hidden transition-all duration-300 ease-in"
+      class="relative z-[1] flex flex-1 flex-col overflow-hidden transition-all duration-300 ease-in"
     >
       <div
         :class="[
           {
-            'shadow-[0_16px_24px_hsl(var(--background))]': scrollY > 20,
+            'shadow-[var(--shadow-toolbar)]': scrollY > 20,
           },
           SCROLL_FIXED_CLASS,
         ]"
@@ -556,7 +578,8 @@ const idMainContent = ELEMENT_ID_MAIN_CONTENT;
           <template #toggle-button>
             <EasyFlowIconButton
               v-if="showHeaderToggleButton"
-              class="my-0 mr-1 rounded-md"
+              :class="headerToggleButtonClass"
+              :style="headerToggleButtonStyle"
               @click="handleHeaderToggle"
             >
               <IconifyIcon v-if="showSidebar" icon="ep:fold" />
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue b/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue
index 75399c8..3fe62a0 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue
@@ -70,6 +70,15 @@ function handleClick() {
   emit('click', item);
 }
 
+function handleKeydown(event: KeyboardEvent) {
+  if (event.key !== 'Enter' && event.key !== ' ') {
+    return;
+  }
+
+  event.preventDefault();
+  handleClick();
+}
+
 onMounted(() => {
   subMenu?.addSubMenu?.(item);
   rootMenu?.addMenuItem?.(item);
@@ -90,7 +99,9 @@ onBeforeUnmount(() => {
       is('collapse-show-title', collapseShowTitle),
     ]"
     role="menuitem"
+    :tabindex="disabled ? -1 : 0"
     @click.stop="handleClick"
+    @keydown="handleKeydown"
   >
     <EasyFlowTooltip
       v-if="showTooltip"
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/menu.vue b/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/menu.vue
index 06e7bbe..9486046 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/menu.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/menu.vue
@@ -377,12 +377,13 @@ $namespace: easyflow;
   text-decoration: none;
   cursor: pointer;
   background: var(--menu-item-active-background-color);
+  box-shadow: var(--menu-item-shadow);
 }
 
 @mixin menu-item {
   position: relative;
   display: flex;
-  // gap: 12px;
+  gap: 10px;
   align-items: center;
   height: var(--menu-item-height);
   padding: var(--menu-item-padding-y) var(--menu-item-padding-x);
@@ -401,7 +402,13 @@ $namespace: easyflow;
     background 0.15s ease,
     color 0.15s ease,
     padding 0.15s ease,
-    border-color 0.15s ease;
+    border-color 0.15s ease,
+    box-shadow 0.15s ease,
+    transform 0.15s ease;
+
+  &::before {
+    display: none;
+  }
 
   &.is-disabled {
     cursor: not-allowed;
@@ -425,6 +432,12 @@ $namespace: easyflow;
     outline: none;
   }
 
+  &:focus-visible {
+    box-shadow:
+      0 0 0 1px hsl(var(--glass-border) / 0.72),
+      0 0 0 4px hsl(var(--ring) / 0.16);
+  }
+
   * {
     vertical-align: bottom;
   }
@@ -445,68 +458,106 @@ $namespace: easyflow;
 .#{$namespace}-menu__popup-container,
 .#{$namespace}-menu {
   --menu-title-width: 140px;
-  --menu-item-icon-size: 16px;
-  --menu-item-height: 38px;
-  --menu-item-padding-y: 21px;
-  --menu-item-padding-x: 12px;
-  --menu-item-popup-padding-y: 20px;
-  --menu-item-popup-padding-x: 12px;
-  --menu-item-margin-y: 2px;
-  --menu-item-margin-x: 0px;
-  --menu-item-collapse-padding-y: 23.5px;
+  --menu-item-icon-size: 18px;
+  --menu-item-height: 40px;
+  --menu-item-padding-y: 0px;
+  --menu-item-padding-x: 14px;
+  --menu-item-popup-padding-y: 0px;
+  --menu-item-popup-padding-x: 14px;
+  --menu-item-margin-y: 4px;
+  --menu-item-margin-x: 8px;
+  --menu-item-collapse-padding-y: 0px;
   --menu-item-collapse-padding-x: 0px;
   --menu-item-collapse-margin-y: 4px;
-  --menu-item-collapse-margin-x: 0px;
-  --menu-item-radius: 0px;
-  --menu-item-indent: 16px;
+  --menu-item-collapse-margin-x: 8px;
+  --menu-item-radius: 14px;
+  --menu-item-shadow:
+    inset 0 1px 0 hsl(var(--nav-sheen) / 0.54),
+    0 22px 40px -30px hsl(var(--primary) / 0.24);
+  --menu-item-indent: 18px;
   --menu-font-size: 14px;
+  --menu-item-indicator-width: 0px;
 
   &.is-dark {
-    --menu-background-color: hsl(var(--menu));
-    // --menu-submenu-opened-background-color: hsl(var(--menu-opened-dark));
-    --menu-item-background-color: var(--menu-background-color);
-    --menu-item-color: hsl(216.92, 15.12%, 33.73% / 80%);
-    --menu-item-hover-color: hsl(var(--accent-foreground));
-    --menu-item-hover-background-color: hsl(var(--accent));
-    --menu-item-active-color: hsl(var(--accent-foreground));
-    --menu-item-active-background-color: hsl(var(--accent));
+    --menu-background-color: hsl(var(--nav-surface));
+    --menu-item-background-color: transparent;
+    --menu-item-color: hsl(var(--nav-item-muted-foreground));
+    --menu-item-hover-color: hsl(var(--foreground));
+    --menu-item-hover-background-color: linear-gradient(
+      180deg,
+      hsl(var(--nav-item-hover) / 0.78),
+      hsl(var(--glass-tint) / 0.46)
+    );
+    --menu-item-active-color: hsl(var(--nav-item-active-foreground));
+    --menu-item-active-background-color: linear-gradient(
+      135deg,
+      hsl(var(--nav-item-active) / 0.92) 0%,
+      hsl(var(--nav-item-hover) / 0.72) 54%,
+      hsl(var(--glass-tint) / 0.52) 100%
+    );
     --menu-submenu-hover-color: hsl(var(--foreground));
-    --menu-submenu-hover-background-color: hsl(var(--accent));
-    --menu-submenu-active-color: hsl(var(--foreground));
-    --menu-submenu-active-background-color: transparent;
+    --menu-submenu-hover-background-color: linear-gradient(
+      180deg,
+      hsl(var(--nav-item-hover) / 0.78),
+      hsl(var(--glass-tint) / 0.46)
+    );
+    --menu-submenu-active-color: hsl(var(--nav-item-active-foreground));
+    --menu-submenu-active-background-color: linear-gradient(
+      135deg,
+      hsl(var(--nav-item-active) / 0.92) 0%,
+      hsl(var(--nav-item-hover) / 0.72) 54%,
+      hsl(var(--glass-tint) / 0.52) 100%
+    );
     --menu-submenu-background-color: var(--menu-background-color);
   }
 
   &.is-light {
-    --menu-background-color: hsl(var(--menu));
-    // --menu-submenu-opened-background-color: hsl(var(--menu-opened));
-    --menu-item-background-color: var(--menu-background-color);
-    --menu-item-color: hsl(216.92, 15.12%, 33.73%);
-    --menu-item-hover-color: var(--menu-item-color);
-    --menu-item-hover-background-color: hsl(var(--accent));
-    --menu-item-active-color: hsl(var(--primary));
-    --menu-item-active-background-color: hsl(var(--primary) / 15%);
-    --menu-submenu-hover-color: hsl(var(--primary));
-    --menu-submenu-hover-background-color: hsl(var(--accent));
-    --menu-submenu-active-color: hsl(var(--primary));
-    --menu-submenu-active-background-color: transparent;
+    --menu-background-color: hsl(var(--nav-surface));
+    --menu-item-background-color: transparent;
+    --menu-item-color: hsl(var(--nav-item-muted-foreground));
+    --menu-item-hover-color: hsl(var(--foreground));
+    --menu-item-hover-background-color: linear-gradient(
+      180deg,
+      hsl(var(--nav-item-hover) / 0.78),
+      hsl(var(--glass-tint) / 0.46)
+    );
+    --menu-item-active-color: hsl(var(--nav-item-active-foreground));
+    --menu-item-active-background-color: linear-gradient(
+      135deg,
+      hsl(var(--nav-item-active) / 0.92) 0%,
+      hsl(var(--nav-item-hover) / 0.72) 54%,
+      hsl(var(--glass-tint) / 0.52) 100%
+    );
+    --menu-submenu-hover-color: hsl(var(--foreground));
+    --menu-submenu-hover-background-color: linear-gradient(
+      180deg,
+      hsl(var(--nav-item-hover) / 0.78),
+      hsl(var(--glass-tint) / 0.46)
+    );
+    --menu-submenu-active-color: hsl(var(--nav-item-active-foreground));
+    --menu-submenu-active-background-color: linear-gradient(
+      135deg,
+      hsl(var(--nav-item-active) / 0.92) 0%,
+      hsl(var(--nav-item-hover) / 0.72) 54%,
+      hsl(var(--glass-tint) / 0.52) 100%
+    );
     --menu-submenu-background-color: var(--menu-background-color);
   }
 
   &.is-rounded {
     --menu-item-margin-x: 8px;
-    --menu-item-collapse-margin-x: 6px;
-    --menu-item-radius: 8px;
+    --menu-item-collapse-margin-x: 8px;
+    --menu-item-radius: 10px;
   }
 
   &.is-horizontal:not(.is-rounded) {
     --menu-item-height: 40px;
-    --menu-item-radius: 6px;
+    --menu-item-radius: 14px;
   }
 
   &.is-horizontal.is-rounded {
     --menu-item-height: 40px;
-    --menu-item-radius: 6px;
+    --menu-item-radius: 14px;
     --menu-item-padding-x: 12px;
   }
 
@@ -519,25 +570,61 @@ $namespace: easyflow;
     --menu-background-color: transparent;
 
     &.is-dark {
-      --menu-item-hover-color: hsl(var(--accent-foreground));
-      --menu-item-hover-background-color: hsl(var(--accent));
-      --menu-item-active-color: hsl(var(--accent-foreground));
-      --menu-item-active-background-color: hsl(var(--accent));
-      --menu-submenu-active-color: hsl(var(--foreground));
-      --menu-submenu-active-background-color: hsl(var(--accent));
-      --menu-submenu-hover-color: hsl(var(--accent-foreground));
-      --menu-submenu-hover-background-color: hsl(var(--accent));
+      --menu-item-hover-color: hsl(var(--foreground));
+      --menu-item-hover-background-color: linear-gradient(
+        180deg,
+        hsl(var(--nav-item-hover) / 0.98),
+        hsl(var(--nav-surface-subtle) / 0.84)
+      );
+      --menu-item-active-color: hsl(var(--nav-item-active-foreground));
+      --menu-item-active-background-color: linear-gradient(
+        135deg,
+        hsl(var(--nav-item-active)) 0%,
+        hsl(var(--nav-item-hover) / 0.98) 55%,
+        hsl(var(--glass-tint) / 0.98) 100%
+      );
+      --menu-submenu-active-color: hsl(var(--nav-item-active-foreground));
+      --menu-submenu-active-background-color: linear-gradient(
+        135deg,
+        hsl(var(--nav-item-active)) 0%,
+        hsl(var(--nav-item-hover) / 0.98) 55%,
+        hsl(var(--glass-tint) / 0.98) 100%
+      );
+      --menu-submenu-hover-color: hsl(var(--foreground));
+      --menu-submenu-hover-background-color: linear-gradient(
+        180deg,
+        hsl(var(--nav-item-hover) / 0.98),
+        hsl(var(--nav-surface-subtle) / 0.84)
+      );
     }
 
     &.is-light {
-      --menu-item-active-color: hsl(var(--primary));
-      --menu-item-active-background-color: hsl(var(--primary) / 15%);
-      --menu-item-hover-background-color: hsl(var(--accent));
-      --menu-item-hover-color: hsl(var(--primary));
-      --menu-submenu-active-color: hsl(var(--primary));
-      --menu-submenu-active-background-color: hsl(var(--primary) / 15%);
-      --menu-submenu-hover-color: hsl(var(--primary));
-      --menu-submenu-hover-background-color: hsl(var(--accent));
+      --menu-item-active-color: hsl(var(--nav-item-active-foreground));
+      --menu-item-active-background-color: linear-gradient(
+        135deg,
+        hsl(var(--nav-item-active)) 0%,
+        hsl(var(--nav-item-hover) / 0.98) 55%,
+        hsl(var(--glass-tint) / 0.98) 100%
+      );
+      --menu-item-hover-background-color: linear-gradient(
+        180deg,
+        hsl(var(--nav-item-hover) / 0.98),
+        hsl(var(--nav-surface-subtle) / 0.84)
+      );
+      --menu-item-hover-color: hsl(var(--foreground));
+      --menu-submenu-active-color: hsl(var(--nav-item-active-foreground));
+      --menu-submenu-active-background-color: linear-gradient(
+        135deg,
+        hsl(var(--nav-item-active)) 0%,
+        hsl(var(--nav-item-hover) / 0.98) 55%,
+        hsl(var(--glass-tint) / 0.98) 100%
+      );
+      --menu-submenu-hover-color: hsl(var(--foreground));
+      --menu-submenu-hover-background-color: linear-gradient(
+        180deg,
+        hsl(var(--nav-item-hover) / 0.98),
+        hsl(var(--nav-surface-subtle) / 0.84)
+      );
     }
   }
 }
@@ -674,6 +761,10 @@ $namespace: easyflow;
       &.is-active {
         background: var(--menu-item-active-background-color) !important;
         border-radius: var(--menu-item-radius);
+
+        &::before {
+          left: 8px;
+        }
       }
     }
 
@@ -719,7 +810,7 @@ $namespace: easyflow;
     flex-shrink: 0;
     width: var(--menu-item-icon-size);
     height: var(--menu-item-icon-size);
-    margin-right: 8px;
+    margin-right: 0;
     vertical-align: middle;
     text-align: center;
   }
@@ -741,6 +832,7 @@ $namespace: easyflow;
     align-items: center;
     width: 100%;
     height: var(--menu-item-height);
+    gap: 10px;
 
     span {
       @include menu-title;
@@ -775,6 +867,8 @@ $namespace: easyflow;
     text-decoration: none;
     cursor: pointer;
     background: var(--menu-item-hover-background-color) !important;
+    box-shadow: 0 18px 34px -30px hsl(var(--primary) / 0.18);
+    transform: translateX(2px);
   }
 
   .#{$namespace}-menu-tooltip__trigger {
@@ -809,8 +903,20 @@ $namespace: easyflow;
       cursor: pointer;
       background: var(--menu-submenu-active-background-color);
       fill: var(--menu-submenu-active-color);
+      box-shadow: var(--menu-item-shadow);
     }
   }
+
+  &:focus-visible {
+    outline: none;
+  }
+
+  &:focus-visible > .#{$namespace}-sub-menu-content,
+  &:focus-within > .#{$namespace}-sub-menu-content {
+    box-shadow:
+      0 0 0 1px hsl(var(--glass-border) / 0.72),
+      0 0 0 4px hsl(var(--ring) / 0.16);
+  }
 }
 
 .#{$namespace}-sub-menu-content {
@@ -833,6 +939,7 @@ $namespace: easyflow;
 
   &__title {
     @include menu-title;
+    font-weight: 500;
   }
 
   &.is-collapse-show-title {
@@ -866,10 +973,13 @@ $namespace: easyflow;
     text-decoration: none;
     cursor: pointer;
     background: var(--menu-submenu-hover-background-color) !important;
-
-    // svg {
-    //   fill: var(--menu-submenu-hover-color);
-    // }
+    box-shadow: 0 18px 34px -30px hsl(var(--primary) / 0.18);
+    transform: translateX(2px);
   }
 }
+
+.#{$namespace}-sub-menu .#{$namespace}-menu-item,
+.#{$namespace}-sub-menu .#{$namespace}-sub-menu-content {
+  font-size: 13px;
+}
 </style>
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue b/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue
index 8afda82..e335079 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue
@@ -120,6 +120,15 @@ function handleClick() {
   });
 }
 
+function handleKeydown(event: KeyboardEvent) {
+  if (event.key !== 'Enter' && event.key !== ' ') {
+    return;
+  }
+
+  event.preventDefault();
+  handleClick();
+}
+
 function handleMouseenter(event: FocusEvent | MouseEvent, showTimeout = 300) {
   if (event.type === 'focus') {
     return;
@@ -197,9 +206,11 @@ onBeforeUnmount(() => {
       is('active', active),
       is('disabled', disabled),
     ]"
+    :tabindex="disabled ? -1 : 0"
     @focus="handleMouseenter"
     @mouseenter="handleMouseenter"
     @mouseleave="() => handleMouseleave()"
+    @keydown="handleKeydown"
   >
     <template v-if="rootMenu.isMenuPopup">
       <EasyFlowHoverCard
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue b/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue
index a13b166..fc3c1db 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue
@@ -184,7 +184,7 @@ const getForceMount = computed(() => {
     <SheetContent
       :append-to="getAppendTo"
       :class="
-        cn('flex w-[520px] flex-col', drawerClass, {
+        cn('flex w-[520px] flex-col overflow-hidden border border-[hsl(var(--glass-border))/0.18] bg-[hsl(var(--glass-tint))/0.84] shadow-[var(--shadow-float)] supports-[backdrop-filter]:bg-[hsl(var(--glass-tint))/0.62]', drawerClass, {
           '!w-full': isMobile || placement === 'bottom' || placement === 'top',
           'max-h-[100vh]': placement === 'bottom' || placement === 'top',
           hidden: isClosed,
@@ -209,7 +209,7 @@ const getForceMount = computed(() => {
         v-if="showHeader"
         :class="
           cn(
-            '!flex flex-row items-center justify-between border-b px-6 py-5',
+            '!flex flex-row items-center justify-between border-b border-[hsl(var(--divider-faint))/0.32] px-6 py-5',
             headerClass,
             {
               'px-4 py-3': closable,
@@ -223,7 +223,7 @@ const getForceMount = computed(() => {
             v-if="closable && closeIconPlacement === 'left'"
             as-child
             :disabled="submitting"
-            class="data-[state=open]:bg-secondary ml-[2px] cursor-pointer rounded-full opacity-80 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none"
+            class="data-[state=open]:bg-[hsl(var(--surface-contrast-soft))/0.92] ml-[2px] cursor-pointer rounded-full opacity-84 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none"
           >
             <slot name="close-icon">
               <EasyFlowIconButton>
@@ -264,7 +264,7 @@ const getForceMount = computed(() => {
             v-if="closable && closeIconPlacement === 'right'"
             as-child
             :disabled="submitting"
-            class="data-[state=open]:bg-secondary ml-[2px] cursor-pointer rounded-full opacity-80 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none"
+            class="data-[state=open]:bg-[hsl(var(--surface-contrast-soft))/0.92] ml-[2px] cursor-pointer rounded-full opacity-84 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none"
           >
             <slot name="close-icon">
               <EasyFlowIconButton>
@@ -295,7 +295,7 @@ const getForceMount = computed(() => {
         v-if="showFooter"
         :class="
           cn(
-            'w-full flex-row items-center justify-end border-t p-2 px-3',
+            'w-full flex-row items-center justify-end border-t border-[hsl(var(--divider-faint))/0.32] p-2 px-3',
             footerClass,
           )
         "
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal-api.ts b/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal-api.ts
index 2997b50..68734d3 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal-api.ts
+++ b/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal-api.ts
@@ -59,7 +59,7 @@ export class ModalApi {
       showCancelButton: true,
       showConfirmButton: true,
       title: '',
-      animationType: 'slide',
+      animationType: 'scale',
     };
 
     this.store = new Store<ModalState>(
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal.ts b/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal.ts
index bd7af9c..23a8285 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal.ts
+++ b/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal.ts
@@ -7,7 +7,7 @@ import type { ModalApi } from './modal-api';
 export interface ModalProps {
   /**
    * 动画类型
-   * @default 'slide'
+   * @default 'scale'
    */
   animationType?: 'scale' | 'slide';
   /**
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal.vue b/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal.vue
index e19e97b..27feac1 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/popup-ui/src/modal/modal.vue
@@ -231,12 +231,13 @@ function handleClosed() {
       :append-to="getAppendTo"
       :class="
         cn(
-          'left-0 right-0 top-[10vh] mx-auto flex max-h-[80%] w-[520px] flex-col p-0',
-          shouldFullscreen ? 'sm:rounded-none' : 'sm:rounded-[var(--radius)]',
+          'left-0 right-0 top-[10vh] mx-auto flex max-h-[80%] w-[520px] flex-col overflow-hidden border border-[hsl(var(--modal-shell-border-soft))] bg-[hsl(var(--modal-surface))] p-0',
+          shouldFullscreen
+            ? 'sm:rounded-none'
+            : 'sm:rounded-[var(--radius-modal)]',
           modalClass,
           {
-            'border-border border': bordered,
-            'shadow-3xl': !bordered,
+            'border-[hsl(var(--modal-shell-border-soft))]': bordered,
             'left-0 top-0 size-full max-h-full !translate-x-0 !translate-y-0':
               shouldFullscreen,
             'top-1/2 !-translate-y-1/2': centered && !shouldFullscreen,
@@ -248,6 +249,16 @@ function handleClosed() {
       :force-mount="getForceMount"
       :modal="modal"
       :open="state?.isOpen"
+      :overlay-style="{
+        backgroundColor:
+          'hsl(var(--modal-overlay) / var(--modal-overlay-opacity))',
+      }"
+      :content-style="{
+        backdropFilter: 'none',
+        WebkitBackdropFilter: 'none',
+        backgroundColor: 'hsl(var(--modal-surface))',
+        boxShadow: 'var(--modal-shadow)',
+      }"
       :show-close="closable"
       :animation-type="animationType"
       :z-index="zIndex"
@@ -267,9 +278,8 @@ function handleClosed() {
         ref="headerRef"
         :class="
           cn(
-            'px-5 py-4',
+            'px-5 py-4 sm:px-6 sm:py-5',
             {
-              'border-b': bordered,
               hidden: !header,
               'cursor-move select-none': shouldDraggable,
             },
@@ -301,9 +311,13 @@ function handleClosed() {
       <div
         ref="wrapperRef"
         :class="
-          cn('relative min-h-40 flex-1 overflow-y-auto p-3', contentClass, {
-            'pointer-events-none': showLoading || submitting,
-          })
+          cn(
+            'relative min-h-0 flex-1 overflow-y-auto bg-[hsl(var(--modal-content-surface))] px-5 pb-5 pt-4 sm:px-6 sm:pb-6',
+            contentClass,
+            {
+              'pointer-events-none': showLoading || submitting,
+            },
+          )
         "
       >
         <slot></slot>
@@ -311,7 +325,7 @@ function handleClosed() {
       <EasyFlowLoading v-if="showLoading || submitting" spinning />
       <EasyFlowIconButton
         v-if="fullscreenButton"
-        class="hover:bg-accent hover:text-accent-foreground text-foreground/80 flex-center absolute right-10 top-3 hidden size-6 rounded-full px-1 text-lg opacity-70 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none sm:block"
+        class="text-foreground/80 flex-center opacity-78 absolute right-11 top-4 hidden size-8 rounded-full bg-[hsl(var(--modal-preview-surface-strong))/0.76] px-1 text-lg shadow-[0_16px_28px_-24px_hsl(var(--foreground)/0.4)] transition-all hover:-translate-y-0.5 hover:opacity-100 focus:outline-none disabled:pointer-events-none sm:block"
         @click="handleFullscreen"
       >
         <Shrink v-if="fullscreen" class="size-3.5" />
@@ -323,9 +337,9 @@ function handleClosed() {
         ref="footerRef"
         :class="
           cn(
-            'flex-row items-center justify-end p-2',
+            'flex-row items-center justify-end gap-3 bg-[hsl(var(--modal-footer-surface))] px-5 py-4 sm:px-6',
             {
-              'border-t': bordered,
+              'border-t border-[hsl(var(--modal-divider))]': bordered,
             },
             footerClass,
           )
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue
index 17d2cb9..1ff3124 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue
@@ -35,7 +35,7 @@ function handleClick(path?: string) {
 </script>
 <template>
   <Breadcrumb>
-    <BreadcrumbList>
+    <BreadcrumbList class="easyflow-breadcrumb flex-nowrap">
       <TransitionGroup name="breadcrumb-transition">
         <template
           v-for="(item, index) in breadcrumbs"
@@ -44,10 +44,10 @@ function handleClick(path?: string) {
           <BreadcrumbItem>
             <div v-if="item.items?.length ?? 0 > 0">
               <DropdownMenu>
-                <DropdownMenuTrigger class="flex items-center gap-1">
-                  <EasyFlowIcon v-if="showIcon" :icon="item.icon" class="size-5" />
-                  {{ item.title }}
-                  <ChevronDown class="size-4" />
+                <DropdownMenuTrigger class="easyflow-breadcrumb__link">
+                  <EasyFlowIcon v-if="showIcon" :icon="item.icon" class="size-4" />
+                  <span class="max-w-[180px] truncate">{{ item.title }}</span>
+                  <ChevronDown class="size-3.5" />
                 </DropdownMenuTrigger>
                 <DropdownMenuContent align="start">
                   <template
@@ -63,32 +63,37 @@ function handleClick(path?: string) {
             </div>
             <BreadcrumbLink
               v-else-if="index !== breadcrumbs.length - 1"
+              class="easyflow-breadcrumb__link"
               href="javascript:void 0"
               @click.stop="handleClick(item.path)"
             >
-              <div class="flex-center">
+              <div class="flex items-center">
                 <EasyFlowIcon
                   v-if="showIcon"
                   :class="{ 'size-5': item.isHome }"
                   :icon="item.icon"
                   class="mr-1 size-4"
                 />
-                {{ item.title }}
+                <span class="max-w-[180px] truncate">{{ item.title }}</span>
               </div>
             </BreadcrumbLink>
-            <BreadcrumbPage v-else>
-              <div class="flex-center">
+            <BreadcrumbPage
+              v-else
+              class="easyflow-breadcrumb__current"
+            >
+              <div class="flex items-center">
                 <EasyFlowIcon
                   v-if="showIcon"
                   :class="{ 'size-5': item.isHome }"
                   :icon="item.icon"
                   class="mr-1 size-4"
                 />
-                {{ item.title }}
+                <span class="max-w-[220px] truncate">{{ item.title }}</span>
               </div>
             </BreadcrumbPage>
             <BreadcrumbSeparator
               v-if="index < breadcrumbs.length - 1 && !item.isHome"
+              class="easyflow-breadcrumb__separator"
             />
           </BreadcrumbItem>
         </template>
@@ -96,3 +101,60 @@ function handleClick(path?: string) {
     </BreadcrumbList>
   </Breadcrumb>
 </template>
+
+<style scoped>
+.easyflow-breadcrumb {
+  gap: 4px;
+  color: hsl(var(--breadcrumb-muted));
+  font-size: 13px;
+}
+
+.easyflow-breadcrumb__link {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  min-width: 0;
+  padding: 4px 8px;
+  border-radius: 999px;
+  color: hsl(var(--breadcrumb-muted));
+  transition:
+    color 0.16s ease,
+    background-color 0.16s ease,
+    transform 0.16s ease;
+}
+
+.easyflow-breadcrumb__link:hover {
+  background: hsl(var(--nav-item-hover) / 0.7);
+  color: hsl(var(--nav-item-active-foreground));
+  transform: translateY(-0.5px);
+}
+
+.easyflow-breadcrumb__current {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  min-width: 0;
+  padding: 4px 10px;
+  color: hsl(var(--breadcrumb-current));
+  font-weight: 600;
+  letter-spacing: 0.01em;
+  background: linear-gradient(
+    135deg,
+    hsl(var(--nav-item-active) / 0.88),
+    hsl(var(--glass-tint) / 0.92)
+  );
+  border-radius: 999px;
+  box-shadow:
+    inset 0 1px 0 hsl(var(--nav-sheen) / 0.42),
+    0 10px 22px -18px hsl(var(--primary) / 0.22);
+}
+
+.easyflow-breadcrumb__separator {
+  color: hsl(var(--breadcrumb-muted) / 0.72);
+}
+
+.easyflow-breadcrumb__separator :deep(svg) {
+  width: 12px;
+  height: 12px;
+}
+</style>
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogContent.vue b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogContent.vue
index 2f68bc4..04e92b1 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogContent.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/alert-dialog/AlertDialogContent.vue
@@ -72,12 +72,16 @@ defineExpose({
     </Transition>
     <AlertDialogContent
       ref="contentRef"
-      :style="{ ...(zIndex ? { zIndex } : {}), position: 'fixed' }"
+      :style="{
+        ...(zIndex ? { zIndex } : {}),
+        position: 'fixed',
+        backdropFilter: 'blur(var(--glass-blur)) saturate(170%)',
+      }"
       @animationend="onAnimationEnd"
       v-bind="forwarded"
       :class="
         cn(
-          'z-popup bg-background p-6 shadow-lg outline-none sm:rounded-xl',
+          'z-popup border border-[hsl(var(--glass-border))/0.18] bg-[hsl(var(--glass-tint))/0.84] p-6 shadow-[var(--shadow-float)] outline-none supports-[backdrop-filter]:bg-[hsl(var(--glass-tint))/0.62] sm:rounded-[22px]',
           'data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
           'data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95',
           {
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue
index 2ad4014..1eb4734 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import type { DialogContentEmits, DialogContentProps } from 'reka-ui';
 
+import type { CSSProperties } from 'vue';
+
 import type { ClassType } from '@easyflow-core/typings';
 
 import { computed, ref } from 'vue';
@@ -20,16 +22,19 @@ const props = withDefaults(
       class?: ClassType;
       closeClass?: ClassType;
       closeDisabled?: boolean;
+      contentStyle?: CSSProperties;
       modal?: boolean;
       open?: boolean;
       overlayBlur?: number;
+      overlayClass?: ClassType;
+      overlayStyle?: CSSProperties;
       showClose?: boolean;
       zIndex?: number;
     }
   >(),
   {
     appendTo: 'body',
-    animationType: 'slide',
+    animationType: 'scale',
     closeDisabled: false,
     showClose: true,
   },
@@ -41,8 +46,11 @@ const emits = defineEmits<
 const delegatedProps = computed(() => {
   const {
     class: _,
+    contentStyle: _contentStyle,
     modal: _modal,
     open: _open,
+    overlayClass: _overlayClass,
+    overlayStyle: _overlayStyle,
     showClose: __,
     animationType: ___,
     ...delegated
@@ -86,9 +94,11 @@ defineExpose({
     <Transition name="fade">
       <DialogOverlay
         v-if="open && modal"
+        :class="props.overlayClass"
         :style="{
           ...(zIndex ? { zIndex } : {}),
           position,
+          ...props.overlayStyle,
           backdropFilter:
             overlayBlur && overlayBlur > 0 ? `blur(${overlayBlur}px)` : 'none',
         }"
@@ -97,14 +107,18 @@ defineExpose({
     </Transition>
     <DialogContent
       ref="contentRef"
-      :style="{ ...(zIndex ? { zIndex } : {}), position }"
+      :style="{
+        ...(zIndex ? { zIndex } : {}),
+        position,
+        ...props.contentStyle,
+      }"
       @animationend="onAnimationEnd"
       v-bind="forwarded"
       :class="
         cn(
-          'z-popup bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 w-full p-6 shadow-lg outline-none sm:rounded-xl',
+          'z-popup data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=open]:duration-220 data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 w-full border border-[hsl(var(--glass-border))/0.18] bg-[hsl(var(--glass-tint))/0.84] p-6 shadow-[var(--shadow-float)] outline-none data-[state=closed]:duration-150 data-[state=closed]:ease-in data-[state=open]:ease-out supports-[backdrop-filter]:bg-[hsl(var(--glass-tint))/0.62] sm:rounded-[22px]',
           {
-            'data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-top-[48%]':
+            'data-[state=closed]:slide-out-to-top-2 data-[state=open]:slide-in-from-top-4':
               animationType === 'slide',
           },
           props.class,
@@ -118,7 +132,7 @@ defineExpose({
         :disabled="closeDisabled"
         :class="
           cn(
-            'data-[state=open]:bg-accent data-[state=open]:text-muted-foreground hover:bg-accent hover:text-accent-foreground text-foreground/80 flex-center absolute right-3 top-3 h-6 w-6 rounded-full px-1 text-lg opacity-70 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none',
+            'data-[state=open]:text-muted-foreground hover:text-accent-foreground text-foreground/80 flex-center opacity-78 absolute right-3 top-3 h-7 w-7 rounded-full px-1 text-lg shadow-[0_10px_24px_-24px_hsl(var(--foreground)/0.34)] transition-opacity hover:bg-[hsl(var(--surface-contrast-soft))/0.98] hover:opacity-100 focus:outline-none disabled:pointer-events-none data-[state=open]:bg-[hsl(var(--surface-contrast-soft))/0.92]',
             props.closeClass,
           )
         "
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogOverlay.vue b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogOverlay.vue
index ab7f575..28b3c80 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogOverlay.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogOverlay.vue
@@ -1,11 +1,29 @@
 <script setup lang="ts">
-import { inject } from 'vue';
+import { computed, inject, useAttrs } from 'vue';
 
 import { useScrollLock } from '@easyflow-core/composables';
+import { cn } from '@easyflow-core/shared/utils';
+
+defineOptions({
+  inheritAttrs: false,
+});
 
 useScrollLock();
+
+const attrs = useAttrs();
 const id = inject('DISMISSABLE_MODAL_ID');
+const overlayClass = computed(() => {
+  const customClass = attrs.class as string | undefined;
+  return cn(
+    customClass ? 'z-popup inset-0' : 'bg-overlay z-popup inset-0',
+    customClass,
+  );
+});
 </script>
 <template>
-  <div :data-dismissable-modal="id" class="bg-overlay z-popup inset-0"></div>
+  <div
+    :data-dismissable-modal="id"
+    :class="overlayClass"
+    :style="$attrs.style"
+  ></div>
 </template>
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue
index 36a25f9..5833713 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue
@@ -91,6 +91,7 @@ function onAnimationEnd(event: AnimationEvent) {
       :style="{
         ...(zIndex ? { zIndex } : {}),
         position,
+        backdropFilter: 'blur(var(--glass-blur)) saturate(170%)',
       }"
       @animationend="onAnimationEnd"
       v-bind="{ ...forwarded, ...$attrs }"
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/sheet.ts b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/sheet.ts
index badf311..7462c78 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/sheet.ts
+++ b/easyflow-ui-admin/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/sheet.ts
@@ -3,7 +3,7 @@ import type { VariantProps } from 'class-variance-authority';
 import { cva } from 'class-variance-authority';
 
 export const sheetVariants = cva(
-  'bg-background shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500 border-border',
+  'border-[hsl(var(--glass-border))/0.18] bg-[hsl(var(--glass-tint))/0.84] shadow-[var(--shadow-float)] transition ease-in-out supports-[backdrop-filter]:bg-[hsl(var(--glass-tint))/0.62] data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500',
   {
     defaultVariants: {
       side: 'right',
@@ -11,11 +11,11 @@ export const sheetVariants = cva(
     variants: {
       side: {
         bottom:
-          'inset-x-0 bottom-0 border-t border-border data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom',
-        left: 'inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left ',
+          'inset-x-0 bottom-0 border-t border-[hsl(var(--divider-faint))/0.3] data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom',
+        left: 'inset-y-0 left-0 h-full w-3/4 border-r border-[hsl(var(--divider-faint))/0.3] data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left ',
         right:
-          'inset-y-0 right-0 w-3/4 border-l  data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right',
-        top: 'inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top',
+          'inset-y-0 right-0 w-3/4 border-l border-[hsl(var(--divider-faint))/0.3] data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right',
+        top: 'inset-x-0 top-0 border-b border-[hsl(var(--divider-faint))/0.3] data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top',
       },
     },
   },
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue
index 1abddf9..fe5927c 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue
@@ -18,7 +18,7 @@ defineOptions({
 const props = withDefaults(defineProps<Props>(), {
   contentClass: 'easyflow-tabs-content',
   contextMenus: () => [],
-  gap: 7,
+  gap: 8,
   tabs: () => [],
 });
 
@@ -76,7 +76,7 @@ function onMouseDown(e: MouseEvent, tab: TabConfig) {
     ref="contentRef"
     :class="contentClass"
     :style="style"
-    class="tabs-chrome !flex h-full w-max overflow-y-hidden pr-6"
+    class="tabs-chrome !flex h-full w-max items-center gap-1 overflow-y-hidden px-2"
   >
     <TransitionGroup name="slide-left">
       <div
@@ -92,7 +92,7 @@ function onMouseDown(e: MouseEvent, tab: TabConfig) {
         ]"
         :data-active-tab="active"
         :data-index="i"
-        class="tabs-chrome__item draggable translate-all group relative -mr-3 flex h-full select-none items-center"
+        class="tabs-chrome__item draggable translate-all group relative flex h-full min-w-0 select-none items-center"
         data-tab-item="true"
         @click="active = tab.key"
         @mousedown="onMouseDown($event, tab)"
@@ -103,63 +103,45 @@ function onMouseDown(e: MouseEvent, tab: TabConfig) {
           :modal="false"
           item-class="pr-6"
         >
-          <div class="relative size-full px-1">
+          <div class="relative size-full">
             <!-- divider -->
-            <div
-              v-if="i !== 0 && tab.key !== active"
-              class="tabs-chrome__divider bg-border absolute left-[var(--gap)] top-1/2 z-0 h-4 w-[1px] translate-y-[-50%] transition-all"
-            ></div>
             <!-- background -->
             <div
-              class="tabs-chrome__background absolute z-[-1] size-full px-[calc(var(--gap)-1px)] py-0 transition-opacity duration-150"
+              class="tabs-chrome__background absolute inset-0 z-[-1] px-0 py-0 transition-opacity duration-150"
             >
               <div
-                class="tabs-chrome__background-content group-[.is-active]:bg-primary/15 dark:group-[.is-active]:bg-accent h-full rounded-tl-[var(--gap)] rounded-tr-[var(--gap)] duration-150"
+                class="tabs-chrome__background-content h-[calc(100%-8px)] rounded-2xl bg-transparent transition-all duration-150 group-[.is-active]:bg-[hsl(var(--glass-tint))/0.74] group-[.is-active]:shadow-[0_16px_28px_-24px_hsl(var(--foreground)/0.34)]"
               ></div>
-              <svg
-                class="tabs-chrome__background-before group-[.is-active]:fill-primary/15 dark:group-[.is-active]:fill-accent absolute bottom-0 left-[-1px] fill-transparent transition-all duration-150"
-                height="7"
-                width="7"
-              >
-                <path d="M 0 7 A 7 7 0 0 0 7 0 L 7 7 Z" />
-              </svg>
-              <svg
-                class="tabs-chrome__background-after group-[.is-active]:fill-primary/15 dark:group-[.is-active]:fill-accent absolute bottom-0 right-[-1px] fill-transparent transition-all duration-150"
-                height="7"
-                width="7"
-              >
-                <path d="M 0 0 A 7 7 0 0 0 7 7 L 0 7 Z" />
-              </svg>
             </div>
 
             <!-- extra -->
             <div
-              class="tabs-chrome__extra absolute right-[var(--gap)] top-1/2 z-[3] size-4 translate-y-[-50%]"
+              class="tabs-chrome__extra absolute right-2 top-1/2 z-[3] size-4 -translate-y-1/2"
             >
               <!-- close-icon -->
               <X
                 v-show="!tab.affixTab && tabsView.length > 1 && tab.closable"
-                class="hover:bg-accent stroke-accent-foreground/80 hover:stroke-accent-foreground text-accent-foreground/80 group-[.is-active]:text-accent-foreground mt-[2px] size-3 cursor-pointer rounded-full transition-all"
+                class="mt-[2px] size-3 cursor-pointer rounded-full stroke-[hsl(var(--nav-item-muted-foreground))] transition-all hover:bg-[hsl(var(--surface-contrast-soft))/0.92] hover:stroke-[hsl(var(--foreground))] group-[.is-active]:stroke-[hsl(var(--nav-item-active-foreground))]"
                 @click.stop="() => emit('close', tab.key)"
               />
               <Pin
                 v-show="tab.affixTab && tabsView.length > 1 && tab.closable"
-                class="hover:text-accent-foreground text-accent-foreground/80 group-[.is-active]:text-accent-foreground mt-[1px] size-3.5 cursor-pointer rounded-full transition-all"
+                class="mt-[1px] size-3.5 cursor-pointer rounded-full stroke-[hsl(var(--nav-item-muted-foreground))] transition-all hover:bg-[hsl(var(--surface-contrast-soft))/0.92] hover:stroke-[hsl(var(--foreground))] group-[.is-active]:stroke-[hsl(var(--nav-item-active-foreground))]"
                 @click.stop="() => emit('unpin', tab)"
               />
             </div>
 
             <!-- tab-item-main -->
             <div
-              class="tabs-chrome__item-main group-[.is-active]:text-primary dark:group-[.is-active]:text-accent-foreground text-accent-foreground z-[2] mx-[calc(var(--gap)*2)] my-0 flex h-full items-center overflow-hidden rounded-tl-[5px] rounded-tr-[5px] pl-2 pr-4 duration-150"
+              class="tabs-chrome__item-main z-[2] mx-3 my-0 flex h-full min-w-0 items-center overflow-hidden pl-2 pr-5 text-[hsl(var(--nav-item-muted-foreground))] duration-150 group-[.is-active]:font-medium group-[.is-active]:text-[hsl(var(--nav-item-active-foreground))]"
             >
               <EasyFlowIcon
                 v-if="showIcon"
                 :icon="tab.icon"
-                class="mr-1 flex size-4 items-center overflow-hidden"
+                class="mr-2 flex size-[15px] items-center overflow-hidden"
               />
 
-              <span class="flex-1 overflow-hidden whitespace-nowrap text-sm">
+              <span class="flex-1 overflow-hidden whitespace-nowrap text-[13px]">
                 {{ tab.title }}
               </span>
             </div>
@@ -187,10 +169,8 @@ function onMouseDown(e: MouseEvent, tab: TabConfig) {
       }
 
       .tabs-chrome__background {
-        @apply pb-[2px];
-
         &-content {
-          @apply bg-accent mx-[2px] rounded-md;
+          @apply bg-[hsl(var(--nav-item-hover))];
         }
       }
     }
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/tabs/tabs.vue b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/tabs/tabs.vue
index ec790e5..aefae00 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/tabs/tabs.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/tabs/tabs.vue
@@ -38,7 +38,7 @@ const typeWithClass = computed(() => {
     },
     plain: {
       content:
-        'h-full [&:not(:first-child)]:border-l last:border-r border-border',
+        "h-[calc(100%-8px)] rounded-2xl border border-transparent bg-transparent transition-all duration-150 [&.is-active]:bg-[hsl(var(--glass-tint))/0.72] [&.is-active]:shadow-[0_16px_28px_-24px_hsl(var(--foreground)/0.34)] [&:not(.is-active)]:hover:bg-[hsl(var(--nav-item-hover))/0.9]",
     },
   };
 
@@ -81,7 +81,7 @@ function onMouseDown(e: MouseEvent, tab: TabConfig) {
 <template>
   <div
     :class="contentClass"
-    class="relative !flex h-full w-max items-center overflow-hidden pr-6"
+    class="relative !flex h-full w-max items-center gap-1 overflow-hidden pr-3"
   >
     <TransitionGroup name="slide-left">
       <div
@@ -89,14 +89,14 @@ function onMouseDown(e: MouseEvent, tab: TabConfig) {
         :key="tab.key"
         :class="[
           {
-            'is-active dark:bg-accent bg-primary/15': tab.key === active,
+            'is-active': tab.key === active,
             draggable: !tab.affixTab,
             'affix-tab': tab.affixTab,
           },
           typeWithClass.content,
         ]"
         :data-index="i"
-        class="tab-item [&:not(.is-active)]:hover:bg-accent translate-all group relative flex cursor-pointer select-none"
+        class="tab-item translate-all group relative flex min-w-0 cursor-pointer select-none"
         data-tab-item="true"
         @click="active = tab.key"
         @mousedown="onMouseDown($event, tab)"
@@ -115,28 +115,28 @@ function onMouseDown(e: MouseEvent, tab: TabConfig) {
               <!-- close-icon -->
               <X
                 v-show="!tab.affixTab && tabsView.length > 1 && tab.closable"
-                class="hover:bg-accent stroke-accent-foreground/80 hover:stroke-accent-foreground dark:group-[.is-active]:text-accent-foreground group-[.is-active]:text-primary size-3 cursor-pointer rounded-full transition-all"
+                class="size-3 cursor-pointer rounded-full stroke-[hsl(var(--nav-item-muted-foreground))] transition-all hover:bg-[hsl(var(--surface-contrast-soft))/0.92] hover:stroke-[hsl(var(--foreground))] group-[.is-active]:stroke-[hsl(var(--nav-item-active-foreground))]"
                 @click.stop="() => emit('close', tab.key)"
               />
               <Pin
                 v-show="tab.affixTab && tabsView.length > 1 && tab.closable"
-                class="hover:bg-accent hover:stroke-accent-foreground group-[.is-active]:text-primary dark:group-[.is-active]:text-accent-foreground mt-[1px] size-3.5 cursor-pointer rounded-full transition-all"
+                class="mt-[1px] size-3.5 cursor-pointer rounded-full stroke-[hsl(var(--nav-item-muted-foreground))] transition-all hover:bg-[hsl(var(--surface-contrast-soft))/0.92] hover:stroke-[hsl(var(--foreground))] group-[.is-active]:stroke-[hsl(var(--nav-item-active-foreground))]"
                 @click.stop="() => emit('unpin', tab)"
               />
             </div>
 
             <!-- tab-item-main -->
             <div
-              class="text-accent-foreground group-[.is-active]:text-primary dark:group-[.is-active]:text-accent-foreground mx-3 mr-4 flex h-full items-center overflow-hidden rounded-tl-[5px] rounded-tr-[5px] pr-3 transition-all duration-300"
+              class="mx-3 mr-4 flex h-full items-center overflow-hidden pr-3 text-[hsl(var(--nav-item-muted-foreground))] transition-all duration-150 group-[.is-active]:font-medium group-[.is-active]:text-[hsl(var(--nav-item-active-foreground))]"
             >
               <EasyFlowIcon
                 v-if="showIcon"
                 :icon="tab.icon"
-                class="mr-2 flex size-4 items-center overflow-hidden"
+                class="mr-2 flex size-[15px] items-center overflow-hidden"
                 fallback
               />
 
-              <span class="flex-1 overflow-hidden whitespace-nowrap text-sm">
+              <span class="flex-1 overflow-hidden whitespace-nowrap text-[13px]">
                 {{ tab.title }}
               </span>
             </div>
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/widgets/tool-more.vue b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/widgets/tool-more.vue
index 0c7d4eb..c2e42ac 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/widgets/tool-more.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/widgets/tool-more.vue
@@ -10,7 +10,7 @@ defineProps<DropdownMenuProps>();
 <template>
   <EasyFlowDropdownMenu :menus="menus" :modal="false">
     <div
-      class="flex-center hover:bg-muted hover:text-foreground text-muted-foreground border-border h-full cursor-pointer border-l px-2 text-lg font-semibold"
+      class="flex-center mr-1 h-8 w-8 cursor-pointer rounded-2xl border border-transparent bg-[hsl(var(--glass-tint))/0.52] text-[hsl(var(--nav-item-muted-foreground))] shadow-[0_10px_24px_-24px_hsl(var(--foreground)/0.3)] backdrop-blur-xl transition-[background-color,color,transform] hover:-translate-y-0.5 hover:bg-[hsl(var(--surface-contrast-soft))/0.92] hover:text-foreground"
     >
       <ChevronDown class="size-4" />
     </div>
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/widgets/tool-screen.vue b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/widgets/tool-screen.vue
index ff22745..59be417 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/widgets/tool-screen.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/components/widgets/tool-screen.vue
@@ -10,7 +10,7 @@ function toggleScreen() {
 
 <template>
   <div
-    class="flex-center hover:bg-muted hover:text-foreground text-muted-foreground border-border h-full cursor-pointer border-l px-2 text-lg font-semibold"
+    class="flex-center h-8 w-8 cursor-pointer rounded-2xl border border-transparent bg-[hsl(var(--glass-tint))/0.52] text-[hsl(var(--nav-item-muted-foreground))] shadow-[0_10px_24px_-24px_hsl(var(--foreground)/0.3)] backdrop-blur-xl transition-[background-color,color,transform] hover:-translate-y-0.5 hover:bg-[hsl(var(--surface-contrast-soft))/0.92] hover:text-foreground"
     @click="toggleScreen"
   >
     <Minimize2 v-if="screen" class="size-4" />
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/tabs-view.vue b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/tabs-view.vue
index c91b840..4abf3bd 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/tabs-view.vue
+++ b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/tabs-view.vue
@@ -53,10 +53,10 @@ useTabsDrag(props, emit);
     <span
       v-show="showScrollButton"
       :class="{
-        'hover:bg-muted text-muted-foreground cursor-pointer': !scrollIsAtLeft,
+        'cursor-pointer text-[hsl(var(--nav-item-muted-foreground))] hover:bg-[hsl(var(--surface-contrast-soft))] hover:text-foreground': !scrollIsAtLeft,
         'pointer-events-none opacity-30': scrollIsAtLeft,
       }"
-      class="border-r px-2"
+      class="mx-1 my-1 flex items-center rounded-2xl border border-transparent bg-[hsl(var(--glass-tint))/0.44] px-2 shadow-[0_10px_24px_-24px_hsl(var(--foreground)/0.3)] backdrop-blur-xl transition-[background-color,color,transform]"
       @click="scrollDirection('left')"
     >
       <ChevronLeft class="size-4 h-full" />
@@ -64,7 +64,7 @@ useTabsDrag(props, emit);
 
     <div
       :class="{
-        'pt-[3px]': styleType === 'chrome',
+        'pt-[2px]': styleType === 'chrome',
       }"
       class="size-full flex-1 overflow-hidden"
     >
@@ -94,10 +94,10 @@ useTabsDrag(props, emit);
     <span
       v-show="showScrollButton"
       :class="{
-        'hover:bg-muted text-muted-foreground cursor-pointer': !scrollIsAtRight,
+        'cursor-pointer text-[hsl(var(--nav-item-muted-foreground))] hover:bg-[hsl(var(--surface-contrast-soft))] hover:text-foreground': !scrollIsAtRight,
         'pointer-events-none opacity-30': scrollIsAtRight,
       }"
-      class="hover:bg-muted text-muted-foreground cursor-pointer border-l px-2"
+      class="mx-1 my-1 flex items-center rounded-2xl border border-transparent bg-[hsl(var(--glass-tint))/0.44] px-2 shadow-[0_10px_24px_-24px_hsl(var(--foreground)/0.3)] backdrop-blur-xl transition-[background-color,color,transform]"
       @click="scrollDirection('right')"
     >
       <ChevronRight class="size-4 h-full" />
diff --git a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/use-tabs-view-scroll.ts b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/use-tabs-view-scroll.ts
index 3661591..bec66d4 100644
--- a/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/use-tabs-view-scroll.ts
+++ b/easyflow-ui-admin/packages/@core/ui-kit/tabs-ui/src/use-tabs-view-scroll.ts
@@ -1,5 +1,7 @@
 import type { TabsProps } from './types';
 
+import type { ComponentPublicInstance } from 'vue';
+
 import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
 
 import { EasyFlowScrollbar } from '@easyflow-core/shadcn-ui';
@@ -7,12 +9,13 @@ import { EasyFlowScrollbar } from '@easyflow-core/shadcn-ui';
 import { useDebounceFn } from '@vueuse/core';
 
 type DomElement = Element | null | undefined;
+type ScrollbarInstance = ComponentPublicInstance & { $el: HTMLElement };
 
 export function useTabsViewScroll(props: TabsProps) {
   let resizeObserver: null | ResizeObserver = null;
   let mutationObserver: MutationObserver | null = null;
   let tabItemCount = 0;
-  const scrollbarRef = ref<InstanceType<typeof EasyFlowScrollbar> | null>(null);
+  const scrollbarRef = ref<ScrollbarInstance | null>(null);
   const scrollViewportEl = ref<DomElement>(null);
   const showScrollButton = ref(false);
   const scrollIsAtLeft = ref(true);
diff --git a/easyflow-ui-admin/packages/effects/common-ui/src/ui/form-modal/__tests__/form-modal.test.ts b/easyflow-ui-admin/packages/effects/common-ui/src/ui/form-modal/__tests__/form-modal.test.ts
new file mode 100644
index 0000000..5d2d729
--- /dev/null
+++ b/easyflow-ui-admin/packages/effects/common-ui/src/ui/form-modal/__tests__/form-modal.test.ts
@@ -0,0 +1,72 @@
+import { mount } from '@vue/test-utils';
+import { nextTick } from 'vue';
+
+import { describe, expect, it } from 'vitest';
+
+import { EasyFlowFormModal } from '..';
+
+describe('easyFlowFormModal', () => {
+  it('renders title, preview and body content when opened', async () => {
+    const wrapper = mount(EasyFlowFormModal, {
+      global: {
+        stubs: {
+          teleport: true,
+        },
+      },
+      props: {
+        cancelText: '取消',
+        confirmText: '保存',
+        description: '描述信息',
+        open: true,
+        showPreview: true,
+        title: '测试弹窗',
+      },
+      slots: {
+        default: '<div>表单内容</div>',
+        preview: '<div>预览内容</div>',
+      },
+    });
+
+    await nextTick();
+    await nextTick();
+
+    expect(wrapper.text()).toContain('测试弹窗');
+    expect(wrapper.text()).toContain('描述信息');
+    expect(wrapper.text()).toContain('预览内容');
+    expect(wrapper.text()).toContain('表单内容');
+  });
+
+  it('emits confirm and cancel actions', async () => {
+    const wrapper = mount(EasyFlowFormModal, {
+      global: {
+        stubs: {
+          teleport: true,
+        },
+      },
+      props: {
+        cancelText: '取消',
+        confirmText: '保存',
+        description: '描述信息',
+        open: true,
+        title: '测试弹窗',
+      },
+      slots: {
+        default: '<div>表单内容</div>',
+      },
+    });
+
+    await nextTick();
+    await nextTick();
+
+    const buttons = wrapper.findAll('button');
+    const cancelButton = buttons.find((button) => button.text() === '取消');
+    const confirmButton = buttons.find((button) => button.text() === '保存');
+
+    await cancelButton?.trigger('click');
+    await confirmButton?.trigger('click');
+
+    expect(wrapper.emitted('cancel')).toHaveLength(1);
+    expect(wrapper.emitted('confirm')).toHaveLength(1);
+    expect(wrapper.emitted('update:open')?.at(-1)).toEqual([false]);
+  });
+});
diff --git a/easyflow-ui-admin/packages/effects/common-ui/src/ui/form-modal/form-modal.vue b/easyflow-ui-admin/packages/effects/common-ui/src/ui/form-modal/form-modal.vue
new file mode 100644
index 0000000..e2ba4f5
--- /dev/null
+++ b/easyflow-ui-admin/packages/effects/common-ui/src/ui/form-modal/form-modal.vue
@@ -0,0 +1,177 @@
+<script lang="ts" setup>
+import { computed, watch } from 'vue';
+
+import { $t } from '@easyflow/locales';
+
+import { useEasyFlowModal } from '@easyflow-core/popup-ui';
+import { EasyFlowButton } from '@easyflow-core/shadcn-ui';
+import { cn } from '@easyflow-core/shared/utils';
+
+type BeforeClose = () => boolean | Promise<boolean | void> | void;
+
+interface Props {
+  beforeClose?: BeforeClose;
+  cancelText?: string;
+  centered?: boolean;
+  closable?: boolean;
+  closeOnClickModal?: boolean;
+  confirmLoading?: boolean;
+  confirmText?: string;
+  description?: string;
+  draggable?: boolean;
+  modelValue?: boolean;
+  open?: boolean;
+  showCancelButton?: boolean;
+  showConfirmButton?: boolean;
+  showFooter?: boolean;
+  showPreview?: boolean;
+  submitting?: boolean;
+  title: string;
+  width?: 'lg' | 'md' | 'xl' | number | string;
+}
+
+defineOptions({
+  name: 'EasyFlowFormModal',
+});
+
+const props = withDefaults(defineProps<Props>(), {
+  beforeClose: undefined,
+  cancelText: '',
+  centered: false,
+  closable: true,
+  closeOnClickModal: false,
+  confirmLoading: false,
+  confirmText: '',
+  description: '',
+  draggable: false,
+  modelValue: undefined,
+  open: undefined,
+  showCancelButton: true,
+  showConfirmButton: true,
+  showFooter: true,
+  showPreview: false,
+  submitting: false,
+  width: 'lg',
+});
+
+const emit = defineEmits<{
+  cancel: [];
+  confirm: [];
+  'update:modelValue': [boolean];
+  'update:open': [boolean];
+}>();
+
+const [Modal, modalApi] = useEasyFlowModal({
+  async onBeforeClose() {
+    const result = await props.beforeClose?.();
+    return result !== false;
+  },
+  onOpenChange(isOpen) {
+    emit('update:modelValue', isOpen);
+    emit('update:open', isOpen);
+  },
+});
+
+const widthClassMap: Record<string, string> = {
+  '482': 'sm:w-[482px]',
+  '482px': 'sm:w-[482px]',
+  '50%': 'sm:w-[min(50vw,720px)]',
+  '500px': 'sm:w-[500px]',
+  '520px': 'sm:w-[520px]',
+  '550px': 'sm:w-[550px]',
+  '600px': 'sm:w-[600px]',
+  '762': 'sm:w-[762px]',
+  '762px': 'sm:w-[762px]',
+  '800px': 'sm:w-[800px]',
+  '80%': 'sm:w-[min(80vw,1120px)]',
+  'min(920px, 92vw)': 'sm:w-[min(92vw,920px)]',
+  'min(980px, 92vw)': 'sm:w-[min(92vw,980px)]',
+  md: 'sm:w-[560px]',
+  lg: 'sm:w-[720px]',
+  xl: 'sm:w-[960px]',
+};
+
+const modalClass = computed(() => {
+  const widthKey = String(props.width);
+  return cn(
+    'w-[calc(100vw-24px)] max-w-[calc(100vw-24px)] sm:max-w-[min(calc(100vw-48px),960px)]',
+    widthClassMap[widthKey] || widthClassMap.lg,
+  );
+});
+
+watch(
+  () => props.open ?? props.modelValue ?? false,
+  (value) => {
+    modalApi.setState({ isOpen: value });
+  },
+  { immediate: true },
+);
+
+function handleCancel() {
+  emit('cancel');
+  modalApi.close();
+}
+
+function handleConfirm() {
+  emit('confirm');
+}
+</script>
+
+<template>
+  <Modal
+    :bordered="false"
+    :class="modalClass"
+    :centered="centered"
+    :closable="closable"
+    :close-on-click-modal="closeOnClickModal"
+    :confirm-loading="confirmLoading"
+    content-class="p-0"
+    :description="description"
+    :draggable="draggable"
+    :footer="showFooter"
+    :fullscreen-button="false"
+    :show-cancel-button="false"
+    :show-confirm-button="false"
+    :submitting="submitting"
+    :title="title"
+  >
+    <div class="flex flex-col">
+      <section
+        v-if="showPreview && $slots.preview"
+        class="bg-[linear-gradient(135deg,hsl(var(--modal-preview-surface))/0.96),hsl(var(--modal-preview-surface-strong))/0.88)] border-b border-[hsl(var(--modal-divider))/0.9] px-5 py-4 sm:px-6"
+      >
+        <slot name="preview"></slot>
+      </section>
+
+      <div class="px-5 pb-5 pt-4 sm:px-6 sm:pb-6 sm:pt-5">
+        <slot></slot>
+      </div>
+    </div>
+
+    <template v-if="showFooter" #footer>
+      <div class="flex w-full items-center justify-between gap-3">
+        <div class="min-w-0 flex-1">
+          <slot name="footer-extra"></slot>
+        </div>
+        <div class="flex items-center gap-3">
+          <EasyFlowButton
+            v-if="showCancelButton"
+            variant="ghost"
+            :disabled="submitting"
+            @click="handleCancel"
+          >
+            {{ cancelText || $t('button.cancel') }}
+          </EasyFlowButton>
+          <EasyFlowButton
+            v-if="showConfirmButton"
+            :disabled="submitting"
+            :loading="confirmLoading || submitting"
+            @click="handleConfirm"
+          >
+            {{ confirmText || $t('button.confirm') }}
+          </EasyFlowButton>
+        </div>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/easyflow-ui-admin/packages/effects/common-ui/src/ui/form-modal/index.ts b/easyflow-ui-admin/packages/effects/common-ui/src/ui/form-modal/index.ts
new file mode 100644
index 0000000..039fb44
--- /dev/null
+++ b/easyflow-ui-admin/packages/effects/common-ui/src/ui/form-modal/index.ts
@@ -0,0 +1 @@
+export { default as EasyFlowFormModal } from './form-modal.vue';
diff --git a/easyflow-ui-admin/packages/effects/common-ui/src/ui/index.ts b/easyflow-ui-admin/packages/effects/common-ui/src/ui/index.ts
index 8b1db55..931dec8 100644
--- a/easyflow-ui-admin/packages/effects/common-ui/src/ui/index.ts
+++ b/easyflow-ui-admin/packages/effects/common-ui/src/ui/index.ts
@@ -2,4 +2,6 @@ export * from './about';
 export * from './authentication';
 export * from './dashboard';
 export * from './fallback';
+export * from './form-modal';
+export * from './panel-modal';
 export * from './profile';
diff --git a/easyflow-ui-admin/packages/effects/common-ui/src/ui/panel-modal/__tests__/panel-modal.test.ts b/easyflow-ui-admin/packages/effects/common-ui/src/ui/panel-modal/__tests__/panel-modal.test.ts
new file mode 100644
index 0000000..010ac7b
--- /dev/null
+++ b/easyflow-ui-admin/packages/effects/common-ui/src/ui/panel-modal/__tests__/panel-modal.test.ts
@@ -0,0 +1,75 @@
+import { mount } from '@vue/test-utils';
+import { nextTick } from 'vue';
+
+import { describe, expect, it } from 'vitest';
+
+import { EasyFlowPanelModal } from '..';
+
+describe('easyFlowPanelModal', () => {
+  it('renders title, description and body content when opened', async () => {
+    const wrapper = mount(EasyFlowPanelModal, {
+      global: {
+        stubs: {
+          teleport: true,
+        },
+      },
+      props: {
+        cancelText: '取消',
+        confirmText: '确认',
+        description: '描述信息',
+        open: true,
+        title: '面板弹窗',
+      },
+      slots: {
+        default: '<div>弹窗内容</div>',
+      },
+    });
+
+    await nextTick();
+    await nextTick();
+
+    expect(wrapper.text()).toContain('面板弹窗');
+    expect(wrapper.text()).toContain('描述信息');
+    expect(wrapper.text()).toContain('弹窗内容');
+  });
+
+  it('supports default footer actions and hide footer', async () => {
+    const wrapper = mount(EasyFlowPanelModal, {
+      global: {
+        stubs: {
+          teleport: true,
+        },
+      },
+      props: {
+        cancelText: '取消',
+        confirmText: '确认',
+        description: '描述信息',
+        open: true,
+        title: '面板弹窗',
+      },
+      slots: {
+        default: '<div>弹窗内容</div>',
+      },
+    });
+
+    await nextTick();
+    await nextTick();
+
+    const buttons = wrapper.findAll('button');
+    const cancelButton = buttons.find((button) => button.text() === '取消');
+    const confirmButton = buttons.find((button) => button.text() === '确认');
+
+    await cancelButton?.trigger('click');
+    await confirmButton?.trigger('click');
+
+    expect(wrapper.emitted('cancel')).toHaveLength(1);
+    expect(wrapper.emitted('confirm')).toHaveLength(1);
+    expect(wrapper.emitted('update:open')?.at(-1)).toEqual([false]);
+
+    await wrapper.setProps({ showFooter: false });
+    await nextTick();
+
+    expect(wrapper.text()).not.toContain('取消');
+    expect(wrapper.text()).not.toContain('确认');
+  });
+});
diff --git a/easyflow-ui-admin/packages/effects/common-ui/src/ui/panel-modal/index.ts b/easyflow-ui-admin/packages/effects/common-ui/src/ui/panel-modal/index.ts
new file mode 100644
index 0000000..603b507
--- /dev/null
+++ b/easyflow-ui-admin/packages/effects/common-ui/src/ui/panel-modal/index.ts
@@ -0,0 +1 @@
+export { default as EasyFlowPanelModal } from './panel-modal.vue';
diff --git a/easyflow-ui-admin/packages/effects/common-ui/src/ui/panel-modal/panel-modal.vue b/easyflow-ui-admin/packages/effects/common-ui/src/ui/panel-modal/panel-modal.vue
new file mode 100644
index 0000000..463e031
--- /dev/null
+++ b/easyflow-ui-admin/packages/effects/common-ui/src/ui/panel-modal/panel-modal.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup>
+import { computed, useAttrs, watch } from 'vue';
+
+import { $t } from '@easyflow/locales';
+
+import { useEasyFlowModal } from '@easyflow-core/popup-ui';
+import { EasyFlowButton } from '@easyflow-core/shadcn-ui';
+import { cn } from '@easyflow-core/shared/utils';
+
+type BeforeClose = () => boolean | Promise<boolean | void> | void;
+
+interface Props {
+  alignCenter?: boolean;
+  beforeClose?: BeforeClose;
+  cancelText?: string;
+  centered?: boolean;
+  closable?: boolean;
+  closeOnClickModal?: boolean;
+  confirmLoading?: boolean;
+  confirmText?: string;
+  description?: string;
+  destroyOnClose?: boolean;
+  draggable?: boolean;
+  modelValue?: boolean;
+  open?: boolean;
+  showCancelButton?: boolean;
+  showConfirmButton?: boolean;
+  showFooter?: boolean;
+  submitting?: boolean;
+  title: string;
+  width?: 'lg' | 'md' | 'xl' | number | string;
+}
+
+defineOptions({
+  name: 'EasyFlowPanelModal',
+});
+
+const props = withDefaults(defineProps<Props>(), {
+  alignCenter: false,
+  beforeClose: undefined,
+  cancelText: '',
+  centered: false,
+  closable: true,
+  closeOnClickModal: false,
+  confirmLoading: false,
+  confirmText: '',
+  description: '',
+  destroyOnClose: true,
+  draggable: false,
+  modelValue: undefined,
+  open: undefined,
+  showCancelButton: true,
+  showConfirmButton: true,
+  showFooter: true,
+  submitting: false,
+  width: 'lg',
+});
+
+const emit = defineEmits<{
+  cancel: [];
+  confirm: [];
+  'update:modelValue': [boolean];
+  'update:open': [boolean];
+}>();
+
+const attrs = useAttrs();
+
+const [Modal, modalApi] = useEasyFlowModal({
+  async onBeforeClose() {
+    const result = await props.beforeClose?.();
+    return result !== false;
+  },
+  onOpenChange(isOpen) {
+    emit('update:modelValue', isOpen);
+    emit('update:open', isOpen);
+  },
+});
+
+const widthClassMap: Record<string, string> = {
+  '482': 'sm:w-[482px]',
+  '482px': 'sm:w-[482px]',
+  '50%': 'sm:w-[min(50vw,720px)]',
+  '500px': 'sm:w-[500px]',
+  '520px': 'sm:w-[520px]',
+  '550px': 'sm:w-[550px]',
+  '600px': 'sm:w-[600px]',
+  '762': 'sm:w-[762px]',
+  '762px': 'sm:w-[762px]',
+  '800px': 'sm:w-[800px]',
+  '80%': 'sm:w-[min(80vw,1120px)]',
+  'min(920px, 92vw)': 'sm:w-[min(92vw,920px)]',
+  'min(980px, 92vw)': 'sm:w-[min(92vw,980px)]',
+  md: 'sm:w-[560px]',
+  lg: 'sm:w-[720px]',
+  xl: 'sm:w-[960px]',
+};
+
+const modalClass = computed(() => {
+  const widthKey = String(props.width);
+  return cn(
+    'w-[calc(100vw-24px)] max-w-[calc(100vw-24px)] sm:max-w-[min(calc(100vw-48px),1120px)]',
+    widthClassMap[widthKey] || widthClassMap.lg,
+    attrs.class,
+  );
+});
+
+watch(
+  () => props.open ?? props.modelValue ?? false,
+  (value) => {
+    modalApi.setState({ isOpen: value });
+  },
+  { immediate: true },
+);
+
+function handleCancel() {
+  emit('cancel');
+  modalApi.close();
+}
+
+function handleConfirm() {
+  emit('confirm');
+}
+</script>
+
+<template>
+  <Modal
+    :class="modalClass"
+    :centered="centered || alignCenter"
+    :closable="closable"
+    :close-on-click-modal="closeOnClickModal"
+    :confirm-loading="confirmLoading"
+    :description="description"
+    :destroy-on-close="destroyOnClose"
+    :draggable="draggable"
+    :footer="showFooter"
+    :fullscreen-button="false"
+    :show-cancel-button="false"
+    :show-confirm-button="false"
+    :submitting="submitting"
+    :title="title"
+  >
+    <slot></slot>
+
+    <template v-if="showFooter" #footer>
+      <slot name="footer">
+        <div class="flex w-full items-center justify-between gap-3">
+          <div class="min-w-0 flex-1">
+            <slot name="footer-extra"></slot>
+          </div>
+          <div class="flex items-center gap-3">
+            <EasyFlowButton
+              v-if="showCancelButton"
+              variant="ghost"
+              :disabled="submitting"
+              @click="handleCancel"
+            >
+              {{ cancelText || $t('button.cancel') }}
+            </EasyFlowButton>
+            <EasyFlowButton
+              v-if="showConfirmButton"
+              :disabled="submitting"
+              :loading="confirmLoading || submitting"
+              @click="handleConfirm"
+            >
+              {{ confirmText || $t('button.confirm') }}
+            </EasyFlowButton>
+          </div>
+        </div>
+      </slot>
+    </template>
+  </Modal>
+</template>
diff --git a/easyflow-ui-admin/packages/effects/layouts/src/basic/header/header.vue b/easyflow-ui-admin/packages/effects/layouts/src/basic/header/header.vue
index de59a66..e9ec1d7 100644
--- a/easyflow-ui-admin/packages/effects/layouts/src/basic/header/header.vue
+++ b/easyflow-ui-admin/packages/effects/layouts/src/basic/header/header.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { CSSProperties } from 'vue';
+
 import { computed, useSlots } from 'vue';
 
 import { useRefresh } from '@easyflow/hooks';
@@ -34,6 +36,26 @@ withDefaults(defineProps<Props>(), {
 const emit = defineEmits<{ clearPreferencesAndLogout: [] }>();
 
 const REFERENCE_VALUE = 50;
+const toolbarButtonClass =
+  'mr-1 flex h-9 w-9 items-center justify-center rounded-2xl text-[hsl(var(--nav-item-muted-foreground))] backdrop-blur-xl transition-[background-color,color,transform,box-shadow,border-color] hover:-translate-y-0.5 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[hsl(var(--primary))/0.2]';
+const toolbarButtonStyle: CSSProperties = {
+  backgroundColor: 'hsl(var(--nav-tool-bg) / 0.92)',
+  backgroundImage:
+    'linear-gradient(180deg, hsl(var(--nav-tool-bg) / 0.96), hsl(var(--glass-tint) / 0.8))',
+  border: '1px solid transparent',
+  boxShadow: '0 18px 36px -28px hsl(var(--primary) / 0.24)',
+};
+const breadcrumbShellStyle: CSSProperties = {
+  backgroundColor: 'hsl(var(--glass-tint) / 0.66)',
+  backgroundImage:
+    'linear-gradient(180deg, hsl(var(--glass-tint) / 0.8), hsl(var(--nav-surface-subtle) / 0.58))',
+  border: '1px solid transparent',
+  boxShadow:
+    'inset 0 1px 0 hsl(var(--nav-sheen) / 0.42), 0 18px 36px -30px hsl(var(--primary) / 0.14)',
+};
+const rightShellStyle: CSSProperties = {
+  backgroundColor: 'hsl(var(--glass-tint) / 0.28)',
+};
 
 const accessStore = useAccessStore();
 const { globalSearchShortcutKey, preferencesButtonPosition } = usePreferences();
@@ -120,61 +142,61 @@ function clearPreferencesAndLogout() {
 </script>
 
 <template>
-  <template
-    v-for="slot in leftSlots.filter((item) => item.index < REFERENCE_VALUE)"
-    :key="slot.name"
+  <div
+    v-if="$slots.breadcrumb"
+    :style="breadcrumbShellStyle"
+    class="hidden min-w-0 max-w-[min(520px,46vw)] items-center rounded-full px-3 py-1.5 lg:flex"
   >
+    <slot name="breadcrumb"></slot>
+  </div>
+  <template v-for="slot in leftSlots" :key="slot.name">
     <slot :name="slot.name">
       <template v-if="slot.name === 'refresh'">
-        <EasyFlowIconButton class="my-0 mr-1 rounded-md" @click="refresh">
+        <EasyFlowIconButton
+          :class="toolbarButtonClass"
+          :style="toolbarButtonStyle"
+          @click="refresh"
+        >
           <RotateCw class="size-4" />
         </EasyFlowIconButton>
       </template>
     </slot>
   </template>
-  <div class="flex-center hidden lg:block">
-    <slot name="breadcrumb"></slot>
-  </div>
-  <template
-    v-for="slot in leftSlots.filter((item) => item.index > REFERENCE_VALUE)"
-    :key="slot.name"
-  >
-    <slot :name="slot.name"></slot>
-  </template>
   <div
     :class="`menu-align-${preferences.header.menuAlign}`"
-    class="flex h-full min-w-0 flex-1 items-center"
+    class="flex h-full min-w-0 flex-1 items-center px-3"
   >
     <slot name="menu"></slot>
   </div>
-  <div class="flex h-full min-w-0 flex-shrink-0 items-center">
+  <div :style="rightShellStyle" class="flex h-full min-w-0 flex-shrink-0 items-center gap-1 rounded-full px-2 py-1 pl-2">
     <template v-for="slot in rightSlots" :key="slot.name">
       <slot :name="slot.name">
         <template v-if="slot.name === 'global-search'">
           <GlobalSearch
             :enable-shortcut-key="globalSearchShortcutKey"
             :menus="accessStore.accessMenus"
-            class="mr-1 sm:mr-4"
+            class="mr-0"
           />
         </template>
 
         <template v-else-if="slot.name === 'preferences'">
           <PreferencesButton
-            class="mr-1"
+            :class="toolbarButtonClass"
+            :style="toolbarButtonStyle"
             @clear-preferences-and-logout="clearPreferencesAndLogout"
           />
         </template>
         <template v-else-if="slot.name === 'theme-toggle'">
-          <ThemeToggle class="mr-1 mt-[2px]" />
+          <ThemeToggle :class="toolbarButtonClass" :style="toolbarButtonStyle" />
         </template>
         <template v-else-if="slot.name === 'language-toggle'">
-          <LanguageToggle class="mr-1" />
+          <LanguageToggle :class="toolbarButtonClass" :style="toolbarButtonStyle" />
         </template>
         <template v-else-if="slot.name === 'fullscreen'">
-          <EasyFlowFullScreen class="mr-1" />
+          <EasyFlowFullScreen :class="toolbarButtonClass" :style="toolbarButtonStyle" />
         </template>
         <template v-else-if="slot.name === 'timezone'">
-          <TimezoneButton class="mr-1 mt-[2px]" />
+          <TimezoneButton :class="toolbarButtonClass" :style="toolbarButtonStyle" />
         </template>
       </slot>
     </template>
diff --git a/easyflow-ui-admin/packages/effects/layouts/src/basic/layout.vue b/easyflow-ui-admin/packages/effects/layouts/src/basic/layout.vue
index 498e825..16581a5 100644
--- a/easyflow-ui-admin/packages/effects/layouts/src/basic/layout.vue
+++ b/easyflow-ui-admin/packages/effects/layouts/src/basic/layout.vue
@@ -283,7 +283,7 @@ const headerSlots = computed(() => {
           <Breadcrumb
             :hide-when-only-one="preferences.breadcrumb.hideOnlyOne"
             :show-home="preferences.breadcrumb.showHome"
-            :show-icon="preferences.breadcrumb.showIcon"
+            :show-icon="false"
             :type="preferences.breadcrumb.styleType"
           />
         </template>
diff --git a/easyflow-ui-admin/packages/effects/layouts/src/basic/tabbar/tabbar.vue b/easyflow-ui-admin/packages/effects/layouts/src/basic/tabbar/tabbar.vue
index 1d84b56..fdacb4d 100644
--- a/easyflow-ui-admin/packages/effects/layouts/src/basic/tabbar/tabbar.vue
+++ b/easyflow-ui-admin/packages/effects/layouts/src/basic/tabbar/tabbar.vue
@@ -63,7 +63,7 @@ if (!preferences.tabbar.persist) {
     @unpin="unpinTab"
     @update:active="handleClick"
   />
-  <div class="flex-center h-full">
+  <div class="flex-center h-full gap-1 pr-2">
     <TabsToolMore v-if="preferences.tabbar.showMore" :menus="menus" />
     <TabsToolScreen
       v-if="preferences.tabbar.showMaximize"
diff --git a/easyflow-ui-admin/packages/effects/layouts/src/widgets/breadcrumb.vue b/easyflow-ui-admin/packages/effects/layouts/src/widgets/breadcrumb.vue
index 68f44fe..c09e797 100644
--- a/easyflow-ui-admin/packages/effects/layouts/src/widgets/breadcrumb.vue
+++ b/easyflow-ui-admin/packages/effects/layouts/src/widgets/breadcrumb.vue
@@ -56,7 +56,7 @@ const breadcrumbs = computed((): IBreadcrumb[] => {
     return [];
   }
 
-  return resultBreadcrumb;
+  return resultBreadcrumb.slice(-2);
 });
 
 function handleSelect(path: string) {
@@ -68,7 +68,7 @@ function handleSelect(path: string) {
     :breadcrumbs="breadcrumbs"
     :show-icon="showIcon"
     :style-type="type"
-    class="ml-2"
+    class="min-w-0"
     @select="handleSelect"
   />
 </template>
diff --git a/easyflow-ui-admin/packages/effects/layouts/src/widgets/global-search/global-search.vue b/easyflow-ui-admin/packages/effects/layouts/src/widgets/global-search/global-search.vue
index 4a57c35..8775f81 100644
--- a/easyflow-ui-admin/packages/effects/layouts/src/widgets/global-search/global-search.vue
+++ b/easyflow-ui-admin/packages/effects/layouts/src/widgets/global-search/global-search.vue
@@ -1,21 +1,15 @@
 <script setup lang="ts">
+import type { CSSProperties } from 'vue';
+
 import type { MenuRecordRaw } from '@easyflow/types';
 
 import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
 
-import {
-  ArrowDown,
-  ArrowUp,
-  CornerDownLeft,
-  MdiKeyboardEsc,
-  Search,
-} from '@easyflow/icons';
+import { Search, X } from '@easyflow/icons';
 import { $t } from '@easyflow/locales';
 import { isWindowsOs } from '@easyflow/utils';
 
-import { useEasyFlowModal } from '@easyflow-core/popup-ui';
-
-import { useMagicKeys, whenever } from '@vueuse/core';
+import { onClickOutside, useMagicKeys, whenever } from '@vueuse/core';
 
 import SearchPanel from './search-panel.vue';
 
@@ -32,39 +26,127 @@ const props = withDefaults(
 );
 
 const keyword = ref('');
+const isOpen = ref(false);
+const hasResults = ref(false);
+const searchRootRef = ref<HTMLElement>();
+const searchPanelRef = ref<HTMLElement>();
 const searchInputRef = ref<HTMLInputElement>();
+const panelStyle = ref<CSSProperties>({});
+const shouldMountPanel = ref(false);
 
-const [Modal, modalApi] = useEasyFlowModal({
-  onCancel() {
-    modalApi.close();
-  },
-  onOpenChange(isOpen: boolean) {
-    if (!isOpen) {
-      keyword.value = '';
-    }
-  },
-});
-const open = modalApi.useStore((state) => state.isOpen);
+const searchShellStyle: CSSProperties = {
+  backgroundColor: 'hsl(var(--surface-panel) / 0.18)',
+  backgroundImage:
+    'linear-gradient(180deg, hsl(var(--glass-border) / 0.4), hsl(var(--glass-tint) / 0.2) 18%, hsl(var(--surface-panel) / 0.12) 100%)',
+  backdropFilter: 'blur(calc(var(--glass-blur) * 1.25)) saturate(178%)',
+  border: '1px solid hsl(var(--glass-border) / 0.42)',
+  boxShadow:
+    'inset 0 1px 0 hsl(var(--glass-border) / 0.44), var(--shadow-toolbar), 0 12px 24px -18px hsl(var(--nav-ambient) / 0.18)',
+};
+const searchPanelStyle: CSSProperties = {
+  backgroundColor: 'hsl(var(--surface-panel) / 0.22)',
+  backgroundImage:
+    'linear-gradient(180deg, hsl(var(--glass-border) / 0.42), hsl(var(--glass-tint) / 0.18) 16%, hsl(var(--surface-panel) / 0.16) 100%)',
+  backdropFilter: 'blur(calc(var(--glass-blur) * 1.9)) saturate(190%)',
+  border: '1px solid hsl(var(--glass-border) / 0.44)',
+  boxShadow:
+    'inset 0 1px 0 hsl(var(--glass-border) / 0.42), var(--shadow-float), 0 16px 32px -24px hsl(var(--nav-ambient) / 0.14)',
+  zIndex: 'calc(var(--popup-z-index) + 10)',
+};
+const expandedWidth = 'clamp(10rem, 14vw, 12rem)';
+
+function updatePanelPosition() {
+  const root = searchRootRef.value;
+  if (!root) {
+    return;
+  }
+  const rect = root.getBoundingClientRect();
+  const viewportWidth = window.innerWidth;
+  const desiredWidth = Math.min(420, Math.max(300, rect.width + 120));
+  const width = Math.min(desiredWidth, viewportWidth - 16);
+  const right = Math.max(8, viewportWidth - rect.right);
+  const left = Math.max(8, viewportWidth - right - width);
+
+  panelStyle.value = {
+    left: `${left}px`,
+    top: `${rect.bottom + 10}px`,
+    width: `${Math.min(width, viewportWidth - left - 8)}px`,
+  };
+}
+
+function focusSearchInput() {
+  nextTick(() => {
+    searchInputRef.value?.focus();
+  });
+}
+
+function openSearch() {
+  if (isOpen.value) {
+    focusSearchInput();
+    return;
+  }
+  isOpen.value = true;
+}
 
 function handleClose() {
-  modalApi.close();
-  keyword.value = '';
+  isOpen.value = false;
+  hasResults.value = false;
+}
+
+function toggleOpen() {
+  isOpen.value = !isOpen.value;
+}
+
+watch(isOpen, (open) => {
+  if (open) {
+    shouldMountPanel.value = true;
+    nextTick(() => {
+      updatePanelPosition();
+      focusSearchInput();
+    });
+  } else {
+    keyword.value = '';
+    shouldMountPanel.value = false;
+  }
+});
+
+onClickOutside(
+  searchRootRef,
+  () => {
+    if (isOpen.value) {
+      handleClose();
+    }
+  },
+  { ignore: [searchPanelRef] },
+);
+
+const handleViewportChange = () => {
+  if (isOpen.value && hasResults.value) {
+    updatePanelPosition();
+  }
+};
+
+watch(keyword, () => {
+  if (isOpen.value && hasResults.value) {
+    nextTick(updatePanelPosition);
+  }
+});
+
+function handleResultsChange(count: number) {
+  hasResults.value = count > 0;
+  if (isOpen.value && shouldMountPanel.value) {
+    nextTick(updatePanelPosition);
+  }
 }
 
 const keys = useMagicKeys();
 const cmd = isWindowsOs() ? keys['ctrl+k'] : keys['cmd+k'];
 whenever(cmd!, () => {
   if (props.enableShortcutKey) {
-    modalApi.open();
+    openSearch();
   }
 });
 
-whenever(open, () => {
-  nextTick(() => {
-    searchInputRef.value?.focus();
-  });
-});
-
 const preventDefaultBrowserSearchHotKey = (event: KeyboardEvent) => {
   if (event.key?.toLowerCase() === 'k' && (event.metaKey || event.ctrlKey)) {
     event.preventDefault();
@@ -79,79 +161,91 @@ const toggleKeydownListener = () => {
   }
 };
 
-const toggleOpen = () => {
-  open.value ? modalApi.close() : modalApi.open();
-};
-
 watch(() => props.enableShortcutKey, toggleKeydownListener);
 
 onMounted(() => {
   toggleKeydownListener();
+  window.addEventListener('resize', handleViewportChange);
+  window.addEventListener('scroll', handleViewportChange, true);
 
   onUnmounted(() => {
     window.removeEventListener('keydown', preventDefaultBrowserSearchHotKey);
+    window.removeEventListener('resize', handleViewportChange);
+    window.removeEventListener('scroll', handleViewportChange, true);
   });
 });
 </script>
 
 <template>
-  <div>
-    <Modal
-      :fullscreen-button="false"
-      class="w-[600px]"
-      header-class="py-2 border-b"
-    >
-      <template #title>
-        <div class="flex items-center">
-          <Search class="text-muted-foreground mr-2 size-4" />
-          <input
-            ref="searchInputRef"
-            v-model="keyword"
-            :placeholder="$t('ui.widgets.search.searchNavigate')"
-            class="ring-none placeholder:text-muted-foreground w-[80%] rounded-md border border-none bg-transparent p-2 pl-0 text-sm font-normal outline-none ring-0 ring-offset-transparent focus-visible:ring-transparent"
-          />
-        </div>
-      </template>
-
-      <SearchPanel :keyword="keyword" :menus="menus" @close="handleClose" />
-      <template #footer>
-        <div class="flex w-full justify-start text-xs">
-          <div class="mr-2 flex items-center">
-            <CornerDownLeft class="mr-1 size-3" />
-            {{ $t('ui.widgets.search.select') }}
-          </div>
-          <div class="mr-2 flex items-center">
-            <ArrowUp class="mr-1 size-3" />
-            <ArrowDown class="mr-1 size-3" />
-            {{ $t('ui.widgets.search.navigate') }}
-          </div>
-          <div class="flex items-center">
-            <MdiKeyboardEsc class="mr-1 size-3" />
-            {{ $t('ui.widgets.search.close') }}
-          </div>
-        </div>
-      </template>
-    </Modal>
+  <div ref="searchRootRef" class="relative flex items-center justify-end">
     <div
-      class="md:bg-accent group flex h-8 cursor-pointer items-center gap-3 rounded-2xl border-none bg-none px-2 py-0.5 outline-none"
-      @click="toggleOpen()"
+      :style="[searchShellStyle, { width: isOpen ? expandedWidth : '2.25rem' }]"
+      class="group flex h-9 items-center overflow-hidden rounded-2xl transition-[width,background-color,box-shadow,transform,border-color] duration-200 ease-out"
+      :class="
+        isOpen
+          ? '-translate-y-0.5 cursor-text border-[hsl(var(--glass-border))/0.5]'
+          : 'cursor-pointer hover:-translate-y-0.5 hover:border-[hsl(var(--glass-border))/0.52]'
+      "
+      @click="openSearch"
     >
-      <Search
-        class="text-muted-foreground group-hover:text-foreground size-4 group-hover:opacity-100"
+      <button
+        type="button"
+        class="hover:text-foreground flex h-full w-9 flex-shrink-0 items-center justify-center text-[hsl(var(--nav-item-muted-foreground))] outline-none transition-colors focus-visible:ring-2 focus-visible:ring-[hsl(var(--primary))/0.2]"
+        :aria-expanded="isOpen"
+        :aria-label="$t('ui.widgets.search.searchNavigate')"
+        @click.stop="toggleOpen"
+      >
+        <Search class="size-4" />
+      </button>
+      <input
+        ref="searchInputRef"
+        v-model="keyword"
+        :placeholder="$t('ui.widgets.search.searchNavigate')"
+        class="placeholder:text-muted-foreground min-w-0 flex-1 bg-transparent pr-2 text-sm font-medium text-[hsl(var(--text-strong))] outline-none transition-opacity duration-150"
+        :class="isOpen ? 'opacity-100' : 'pointer-events-none w-0 opacity-0'"
+        @keydown.esc.prevent.stop="handleClose"
       />
-      <span
-        class="text-muted-foreground group-hover:text-foreground hidden text-xs duration-300 md:block"
+      <button
+        v-if="isOpen"
+        type="button"
+        class="hover:text-foreground mr-1 flex h-7 w-7 flex-shrink-0 items-center justify-center rounded-xl text-[hsl(var(--text-muted))] outline-none transition-colors hover:bg-[hsl(var(--nav-item-hover))/0.92] focus-visible:ring-2 focus-visible:ring-[hsl(var(--primary))/0.2]"
+        :aria-label="$t('ui.widgets.search.close')"
+        @click.stop="handleClose"
       >
-        {{ $t('ui.widgets.search.title') }}
-      </span>
-      <span
-        v-if="enableShortcutKey"
-        class="bg-background border-foreground/60 text-muted-foreground group-hover:text-foreground relative hidden rounded-sm rounded-r-xl px-1.5 py-1 text-xs leading-none group-hover:opacity-100 md:block"
-      >
-        {{ isWindowsOs() ? 'Ctrl' : '⌘' }}
-        <kbd>K</kbd>
-      </span>
-      <span v-else></span>
+        <X class="size-4" />
+      </button>
     </div>
+
+    <Teleport to="body">
+      <transition
+        enter-active-class="transition duration-200 ease-out"
+        enter-from-class="translate-y-1.5 opacity-0"
+        enter-to-class="translate-y-0 opacity-100"
+        leave-active-class="transition duration-150 ease-in"
+        leave-from-class="translate-y-0 opacity-100"
+        leave-to-class="translate-y-1 opacity-0"
+      >
+        <div
+          v-if="isOpen && shouldMountPanel"
+          ref="searchPanelRef"
+          :style="[searchPanelStyle, panelStyle]"
+          class="duration-180 fixed overflow-hidden rounded-[28px] transition-[opacity,transform] ease-out"
+          :class="
+            hasResults
+              ? 'pointer-events-auto opacity-100'
+              : 'pointer-events-none opacity-0'
+          "
+        >
+          <div class="max-h-[420px] px-2 py-2">
+            <SearchPanel
+              :keyword="keyword"
+              :menus="menus"
+              @close="handleClose"
+              @results-change="handleResultsChange"
+            />
+          </div>
+        </div>
+      </transition>
+    </Teleport>
   </div>
 </template>
diff --git a/easyflow-ui-admin/packages/effects/layouts/src/widgets/global-search/search-panel.vue b/easyflow-ui-admin/packages/effects/layouts/src/widgets/global-search/search-panel.vue
index 76960ed..b08552f 100644
--- a/easyflow-ui-admin/packages/effects/layouts/src/widgets/global-search/search-panel.vue
+++ b/easyflow-ui-admin/packages/effects/layouts/src/widgets/global-search/search-panel.vue
@@ -1,17 +1,17 @@
 <script setup lang="ts">
 import type { MenuRecordRaw } from '@easyflow/types';
 
-import { nextTick, onMounted, ref, shallowRef, watch } from 'vue';
+import { computed, nextTick, onMounted, ref, shallowRef, watch } from 'vue';
 import { useRouter } from 'vue-router';
 
-import { SearchX, X } from '@easyflow/icons';
+import { SearchX } from '@easyflow/icons';
 import { $t } from '@easyflow/locales';
 import { mapTree, traverseTreeValues, uniqueByField } from '@easyflow/utils';
 
 import { EasyFlowIcon, EasyFlowScrollbar } from '@easyflow-core/shadcn-ui';
 import { isHttpUrl } from '@easyflow-core/shared/utils';
 
-import { onKeyStroke, useLocalStorage, useThrottleFn } from '@vueuse/core';
+import { onKeyStroke, useThrottleFn } from '@vueuse/core';
 
 defineOptions({
   name: 'SearchPanel',
@@ -24,58 +24,39 @@ const props = withDefaults(
     menus: () => [],
   },
 );
-const emit = defineEmits<{ close: [] }>();
+const emit = defineEmits<{ close: []; resultsChange: [count: number] }>();
 
 const router = useRouter();
-const searchHistory = useLocalStorage<MenuRecordRaw[]>(
-  `__search-history-${location.hostname}__`,
-  [],
-);
 const activeIndex = ref(-1);
 const searchItems = shallowRef<MenuRecordRaw[]>([]);
 const searchResults = ref<MenuRecordRaw[]>([]);
+const displayResults = computed(() =>
+  uniqueByField(searchResults.value, 'path'),
+);
 
 const handleSearch = useThrottleFn(search, 200);
 
-// 搜索函数，用于根据搜索关键词查找匹配的菜单项
 function search(searchKey: string) {
-  // 去除搜索关键词的前后空格
-  searchKey = searchKey.trim();
-
-  // 如果搜索关键词为空，清空搜索结果并返回
-  if (!searchKey) {
+  const normalizedKey = searchKey.trim();
+  if (!normalizedKey) {
     searchResults.value = [];
+    activeIndex.value = -1;
     return;
   }
 
-  // 使用搜索关键词创建正则表达式
-  const reg = createSearchReg(searchKey);
-
-  // 初始化结果数组
+  const reg = createSearchReg(normalizedKey);
   const results: MenuRecordRaw[] = [];
 
-  // 遍历搜索项
   traverseTreeValues(searchItems.value, (item) => {
-    // 如果菜单项的名称匹配正则表达式，将其添加到结果数组中
     if (reg.test(item.name?.toLowerCase())) {
       results.push(item);
     }
   });
 
-  // 更新搜索结果
-  searchResults.value = results;
-
-  // 如果有搜索结果，设置索引为 0
-  if (results.length > 0) {
-    activeIndex.value = 0;
-  }
-
-  // 赋值索引为 0
-  activeIndex.value = 0;
+  searchResults.value = uniqueByField(results, 'path');
+  activeIndex.value = searchResults.value.length > 0 ? 0 : -1;
 }
 
-// When the keyboard up and down keys move to an invisible place
-// the scroll bar needs to scroll automatically
 function scrollIntoView() {
   const element = document.querySelector(
     `[data-search-item="${activeIndex.value}"]`,
@@ -86,76 +67,87 @@ function scrollIntoView() {
   }
 }
 
-// enter keyboard event
 async function handleEnter() {
-  if (searchResults.value.length === 0) {
+  if (displayResults.value.length === 0 || activeIndex.value < 0) {
     return;
   }
-  const result = searchResults.value;
-  const index = activeIndex.value;
-  if (result.length === 0 || index < 0) {
+  await handleSelect(activeIndex.value);
+}
+
+async function handleSelect(index: number) {
+  const to = displayResults.value[index];
+  if (!to) {
     return;
   }
-  const to = result[index];
-  if (to) {
-    searchHistory.value = uniqueByField([...searchHistory.value, to], 'path');
-    handleClose();
-    await nextTick();
-    if (isHttpUrl(to.path)) {
-      window.open(to.path, '_blank');
-    } else {
-      router.push({ path: to.path, replace: true });
-    }
+  emit('close');
+  await nextTick();
+  if (isHttpUrl(to.path)) {
+    window.open(to.path, '_blank');
+  } else {
+    router.push({ path: to.path, replace: true });
   }
 }
 
-// Arrow key up
 function handleUp() {
-  if (searchResults.value.length === 0) {
+  if (displayResults.value.length === 0) {
     return;
   }
   activeIndex.value--;
   if (activeIndex.value < 0) {
-    activeIndex.value = searchResults.value.length - 1;
+    activeIndex.value = displayResults.value.length - 1;
   }
   scrollIntoView();
 }
 
-// Arrow key down
 function handleDown() {
-  if (searchResults.value.length === 0) {
+  if (displayResults.value.length === 0) {
     return;
   }
   activeIndex.value++;
-  if (activeIndex.value > searchResults.value.length - 1) {
+  if (activeIndex.value > displayResults.value.length - 1) {
     activeIndex.value = 0;
   }
   scrollIntoView();
 }
 
-// close search modal
 function handleClose() {
-  searchResults.value = [];
   emit('close');
 }
 
-// Activate when the mouse moves to a certain line
-function handleMouseenter(e: MouseEvent) {
-  const index = (e.target as HTMLElement)?.dataset.index;
-  activeIndex.value = Number(index);
+function handleMouseenter(index: number) {
+  activeIndex.value = index;
 }
 
-function removeItem(index: number) {
-  if (props.keyword) {
-    searchResults.value.splice(index, 1);
-  } else {
-    searchHistory.value.splice(index, 1);
+function getHighlightedChunks(text: string, keyword: string) {
+  const sourceChars = [...text];
+  const lowerChars = [...text.toLowerCase()];
+  const queryChars = [...keyword.trim().toLowerCase()];
+
+  if (queryChars.length === 0) {
+    return [{ text, matched: false }];
   }
-  activeIndex.value = Math.max(activeIndex.value - 1, 0);
-  scrollIntoView();
+
+  const chunks: Array<{ matched: boolean; text: string }> = [];
+  let queryIndex = 0;
+
+  sourceChars.forEach((char, index) => {
+    const matched =
+      queryIndex < queryChars.length &&
+      lowerChars[index] === queryChars[queryIndex];
+    if (matched) {
+      queryIndex++;
+    }
+    const previousChunk = chunks[chunks.length - 1];
+    if (previousChunk && previousChunk.matched === matched) {
+      previousChunk.text += char;
+    } else {
+      chunks.push({ matched, text: char });
+    }
+  });
+
+  return chunks;
 }
 
-// 存储所有需要转义的特殊字符
 const code = new Set([
   '$',
   '(',
@@ -173,20 +165,12 @@ const code = new Set([
   '}',
 ]);
 
-// 转换函数，用于转义特殊字符
 function transform(c: string) {
-  // 如果字符在特殊字符列表中，返回转义后的字符
-  // 如果不在，返回字符本身
   return code.has(c) ? `\\${c}` : c;
 }
 
-// 创建搜索正则表达式
 function createSearchReg(key: string) {
-  // 将输入的字符串拆分为单个字符
-  // 对每个字符进行转义
-  // 然后用'.*'连接所有字符，创建正则表达式
   const keys = [...key].map((item) => transform(item)).join('.*');
-  // 返回创建的正则表达式
   return new RegExp(`.*${keys}.*`);
 }
 
@@ -196,11 +180,20 @@ watch(
     if (val) {
       handleSearch(val);
     } else {
-      searchResults.value = [...searchHistory.value];
+      searchResults.value = [];
+      activeIndex.value = -1;
     }
   },
 );
 
+watch(
+  () => displayResults.value.length,
+  (count) => {
+    emit('resultsChange', count);
+  },
+  { immediate: true },
+);
+
 onMounted(() => {
   searchItems.value = mapTree(props.menus, (item) => {
     return {
@@ -208,81 +201,67 @@ onMounted(() => {
       name: $t(item?.name),
     };
   });
-  if (searchHistory.value.length > 0) {
-    searchResults.value = searchHistory.value;
-  }
-  // enter search
   onKeyStroke('Enter', handleEnter);
-  // Monitor keyboard arrow keys
   onKeyStroke('ArrowUp', handleUp);
   onKeyStroke('ArrowDown', handleDown);
-  // esc close
   onKeyStroke('Escape', handleClose);
 });
 </script>
 
 <template>
   <EasyFlowScrollbar>
-    <div class="!flex h-full justify-center px-2 sm:max-h-[450px]">
-      <!-- 无搜索结果 -->
-      <div
-        v-if="keyword && searchResults.length === 0"
-        class="text-muted-foreground text-center"
-      >
-        <SearchX class="mx-auto mt-4 size-12" />
-        <p class="mb-10 mt-6 text-xs">
-          {{ $t('ui.widgets.search.noResults') }}
-          <span class="text-foreground text-sm font-medium">
-            "{{ keyword }}"
-          </span>
-        </p>
-      </div>
-      <!-- 历史搜索记录 & 没有搜索结果 -->
-      <div
-        v-if="!keyword && searchResults.length === 0"
-        class="text-muted-foreground text-center"
-      >
-        <p class="my-10 text-xs">
-          {{ $t('ui.widgets.search.noRecent') }}
-        </p>
-      </div>
-
-      <ul v-show="searchResults.length > 0" class="w-full">
+    <div class="px-2 py-1 sm:max-h-[420px]">
+      <ul v-if="displayResults.length > 0" class="space-y-2">
         <li
-          v-if="searchHistory.length > 0 && !keyword"
-          class="text-muted-foreground mb-2 text-xs"
-        >
-          {{ $t('ui.widgets.search.recent') }}
-        </li>
-        <li
-          v-for="(item, index) in uniqueByField(searchResults, 'path')"
+          v-for="(item, index) in displayResults"
           :key="item.path"
           :class="
             activeIndex === index
-              ? 'active bg-primary text-primary-foreground'
+              ? 'bg-[linear-gradient(180deg,hsl(var(--glass-border))/0.22,hsl(var(--glass-tint))/0.1_18%,hsl(var(--surface-panel))/0.12)] shadow-[inset_0_1px_0_hsl(var(--glass-border))/0.34,0_18px_30px_-24px_hsl(var(--primary)/0.12)] ring-1 ring-[hsl(var(--glass-border))/0.26]'
               : ''
           "
           :data-index="index"
           :data-search-item="index"
-          class="bg-accent flex-center group mb-3 w-full cursor-pointer rounded-lg px-4 py-4"
-          @click="handleEnter"
-          @mouseenter="handleMouseenter"
+          class="group flex w-full cursor-pointer items-center gap-3 rounded-2xl bg-[linear-gradient(180deg,hsl(var(--glass-border))/0.14,hsl(var(--glass-tint))/0.08_18%,hsl(var(--surface-panel))/0.08)] px-4 py-3.5 backdrop-blur-2xl transition-[transform,background-color,box-shadow] hover:-translate-y-0.5 hover:bg-[linear-gradient(180deg,hsl(var(--glass-border))/0.18,hsl(var(--glass-tint))/0.12_18%,hsl(var(--surface-panel))/0.1)] hover:shadow-[inset_0_1px_0_hsl(var(--glass-border))/0.28,0_16px_28px_-24px_hsl(var(--primary)/0.1)]"
+          @click="handleSelect(index)"
+          @mouseenter="handleMouseenter(index)"
         >
-          <EasyFlowIcon
-            :icon="item.icon"
-            class="mr-2 size-5 flex-shrink-0"
-            fallback
-          />
-
-          <span class="flex-1">{{ item.name }}</span>
           <div
-            class="flex-center dark:hover:bg-accent hover:text-primary-foreground rounded-full p-1 hover:scale-110"
-            @click.stop="removeItem(index)"
+            class="flex size-10 flex-shrink-0 items-center justify-center rounded-2xl bg-[linear-gradient(180deg,hsl(var(--glass-border))/0.24,hsl(var(--nav-item-active))/0.09_22%,hsl(var(--glass-tint))/0.14)] text-[hsl(var(--nav-item-active-foreground))] shadow-[inset_0_1px_0_hsl(var(--glass-border))/0.36]"
           >
-            <X class="size-4" />
+            <EasyFlowIcon :icon="item.icon" class="size-5" fallback />
+          </div>
+
+          <div class="min-w-0 flex-1">
+            <span
+              class="block truncate text-sm font-medium leading-6 text-[hsl(var(--text-strong))]"
+            >
+              <template
+                v-for="(chunk, chunkIndex) in getHighlightedChunks(
+                  item.name || '',
+                  keyword,
+                )"
+                :key="`${item.path}-${chunkIndex}`"
+              >
+                <span
+                  :class="
+                    chunk.matched
+                      ? activeIndex === index
+                        ? 'rounded-md bg-[hsl(var(--primary))/0.1] px-0.5 font-semibold text-current'
+                        : 'rounded-md bg-[hsl(var(--primary))/0.08] px-0.5 font-semibold text-[hsl(var(--primary))]'
+                      : ''
+                  "
+                >
+                  {{ chunk.text }}
+                </span>
+              </template>
+            </span>
           </div>
         </li>
       </ul>
+      <div v-else class="hidden">
+        <SearchX class="size-0" />
+      </div>
     </div>
   </EasyFlowScrollbar>
 </template>