Merge branch 'main' of https://github.com/wangz-code/celeris-web-admin …

…into dist

表格列设置, 拖动排序,列显示隐藏

package.json

@@ -49,6 +49,7 @@
     "pkg-types": "^1.2.1",
     "useNProgress": "link:@vueuse/integrations/useNProgress",
     "vue": "^3.5.12",
+    "vue-draggable-plus": "^0.5.4",
     "vue-echarts": "^7.0.3",
     "vue-i18n": "^10.0.4",
     "vue-router": "^4.4.5"

src/components/ActionIcon/src/ActionIcon.vue

@@ -4,14 +4,12 @@ import ToolTipper from "./ToolTipper.vue";
 
 interface Props {
 	tooltipText?: string;
-	icon: string;
 	transparent?: boolean; // 是否设置背景透明
 	size?: number; // 按钮大小
 	component?: Component | String; // 图标组件
 }
 withDefaults(defineProps<Props>(), {
 	tooltipText: undefined,
-	icon: "",
 	transparent: false, // 是否设置背景透明
 	size: 16, // 按钮大小
 	component: undefined, // 图标组件

src/components/AppLogo/src/AppLogo.vue

@@ -54,7 +54,7 @@ const isLightTheme = computed(() => !isDarkMode.value);
 
 <template>
   <!-- 应用程序 Logo 区域 -->
-  <div :class="`text-${titleSize}`" class="app-logo flex items-center"@click="navigateHome">
+  <div :class="`text-${titleSize}`" class="flex items-center"@click="navigateHome">
     <!-- 根据主题和模式显示 Logo 图片 -->
     <Transition
       appear :name="RouterTransitionConstants.FADE" mode="in-out"

src/components/PageWrapper/index.ts

@@ -1,4 +1,4 @@
 import { withInstall } from "@/utils";
-import pageWrapper from "./src/PageWrapper.vue";
+import wrapper from "./src/PageWrapper.vue";
 
-export const PageWrapper = withInstall(pageWrapper);
+export const PageWrapper = withInstall(wrapper);

src/components/PageWrapper/src/PageWrapper.vue

@@ -1,43 +1,15 @@
 <script setup lang="ts">
 import { NBackTop } from "naive-ui";
 
-interface PageWrapperProps {
-	useScrollbar?: boolean;
-}
-
-withDefaults(defineProps<PageWrapperProps>(), {
+withDefaults(defineProps<{ useScrollbar?: boolean }>(), {
 	useScrollbar: true,
 });
 const { getShouldUseOpenBackTop } = useAppSetting();
 </script>
 
 <template>
-	<div class="page-wrapper" :class="[{ 'scrollbar-enabled': useScrollbar }]">
-		<NScrollbar v-if="useScrollbar" class="rounded-2xl">
-			<div class="m-4">
-				<slot />
-			</div>
-			<NBackTop v-if="getShouldUseOpenBackTop" :bottom="160" :right="0" />
-		</NScrollbar>
-		<div v-else class="m-4">
-			<slot />
-		</div>
-	</div>
+	<NScrollbar>
+		<slot />
+		<NBackTop v-if="getShouldUseOpenBackTop" :bottom="160" :right="0" />
+	</NScrollbar>
 </template>
-
-<style scoped>
-.page-wrapper {
-	/* Default styles for page-wrapper */
-	@apply rounded-2xl w-full h-full min-h-full;
-}
-
-.page-wrapper.scrollbar-enabled {
-	/* Styles specific to when scrollbar is enabled */
-	width: calc(100% + 8px);
-}
-
-.page-wrapper.scrollbar-enabled :deep(.ca-scrollbar-container) {
-	width: calc(100% - 8px);
-	@apply rounded-2xl;
-}
-</style>