@vue-ui-kit/ant 2.5.10 → 2.5.11

package/dist/index.d.ts

@@ -268,6 +268,10 @@ declare type BodyOptions = {
     data: any[];
 };
 
+export declare type BorderConfigValue = boolean | BorderStyle;
+
+export declare type BorderStyle = 'default' | 'outer' | 'inner' | 'none';
+
 export declare interface CanvasColumnProps<T extends Recordable = Recordable> extends Omit<Column, 'children' | 'formatter' | 'key'> {
     key?: string;
     field?: string;
@@ -419,6 +423,7 @@ declare class Cell extends BaseCell {
         userSelect: string;
     };
     drawContainer(): void;
+    drawHorizontalBorder(): void;
     private drawAutofillPiont;
     draw(): void;
     /**
@@ -703,7 +708,7 @@ declare class Config {
     /** 单元格字体 */
     BODY_FONT: string;
     /** 边框 */
-    BORDER: boolean;
+    BORDER: BorderConfigValue;
     /** 斑马纹 */
     STRIPE: boolean;
     /** 斑马纹颜色 */
@@ -790,6 +795,10 @@ declare class Config {
     ENABLE_ZOOM_WHEEL: boolean;
     /** 滚动条轨道尺寸 */
     SCROLLER_TRACK_SIZE: number;
+    /** 滚动条模式，outer 为外部预留区域，inner 为覆盖在内容上 */
+    scrollbarMode: ScrollbarMode_2;
+    /** 内部滚动条悬停后显示延迟 */
+    SCROLLBAR_SHOW_DELAY: number;
     /** 滚动条滑块尺寸 */
     SCROLLER_SIZE: number;
     /** 滚动条滑块颜色 */
@@ -1609,6 +1618,7 @@ declare class EVirtTable {
     constructor(target: HTMLDivElement, options: EVirtTableOptions);
     private createContainer;
     private doDraw;
+    private updateStageBorder;
     draw(ignoreOverlayer?: boolean): void;
     loadConfig(_config: ConfigType): void;
     loadColumns(columns: Column[]): void;
@@ -2857,6 +2867,27 @@ export declare interface PCanvasGridProps<D extends Recordable = Recordable, F e
     pageConfig?: PageConfig;
     proxyConfig?: ProxyConfig<D, F>;
     config?: ConfigType;
+    /**
+     * 表格边框样式，映射 e-virt-table `BORDER`。
+     * - `true` / `'default'`：完整单元格边框
+     * - `'outer'`：仅外边框
+     * - `'inner'` / `false`：仅内部横线
+     * - `'none'`：无边框
+     * 显式传入时优先于 `config.BORDER`。
+     */
+    border?: BorderConfigValue;
+    /**
+     * 滚动条模式，映射 e-virt-table `scrollbarMode`。
+     * - `'outer'`：外部预留滚动条轨道（默认）
+     * - `'inner'`：覆盖在内容上，悬停表格内部后显示
+     * 显式传入时优先于 `config.scrollbarMode`。
+     */
+    scrollbarMode?: ScrollbarMode;
+    /**
+     * 内部滚动条（`scrollbarMode: 'inner'`）悬停后显示延迟（ms），映射 `SCROLLBAR_SHOW_DELAY`。
+     * 显式传入时优先于 `config.SCROLLBAR_SHOW_DELAY`。
+     */
+    scrollbarShowDelay?: number;
     lazyReset?: boolean;
     /**
      * 适应展示区到页面顶部的高度，通常和容器最上的y值有关（正比）
@@ -5114,6 +5145,8 @@ declare class Row {
     drawFixed(): void;
     drawContainer(): void;
     drawFixedContainer(): void;
+    drawHorizontalBorder(): void;
+    drawFixedHorizontalBorder(): void;
 }
 
 declare type RowMaxHeightData = {
@@ -5152,6 +5185,11 @@ declare type Rules = Rule[];
 
 declare type RuleValidator = (rule: Rule, value: any, callback: (message?: string) => void) => void;
 
+/** 与 e-virt-table `scrollbarMode` 对齐：`outer` 外部预留，`inner` 内部悬停显示 */
+export declare type ScrollbarMode = 'outer' | 'inner';
+
+declare type ScrollbarMode_2 = 'outer' | 'inner';
+
 declare type ScrollBehavior_2 = 'auto' | 'smooth';
 
 declare type ScrollLogicalPosition_2 = 'start' | 'center' | 'end' | 'nearest';

package/package.json

@@ -1,85 +1,85 @@
-{
-  "name": "@vue-ui-kit/ant",
-  "version": "2.5.10",
-  "description": "Vue3 UI Kit based on Ant Design",
-  "type": "module",
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/es/index.js",
-  "types": "./dist/index.d.ts",
-  "style": "./dist/style.css",
-  "sass": "./src/packages/styles/index.scss",
-  "exports": {
-    ".": {
-      "require": "./dist/cjs/index.js",
-      "import": "./dist/es/index.js",
-      "types": "./dist/index.d.ts"
-    },
-    "./style.css": "./dist/style.css",
-    "./style.scss": "./src/packages/styles/index.scss",
-    "./dist/style.scss": "./src/packages/styles/index.scss",
-    "./dist/style.css": "./dist/style.css"
-  },
-  "files": [
-    "dist",
-    "src",
-    "README.md",
-    "README.zh.md",
-    "tsconfig.json"
-  ],
-  "scripts": {
-    "dev": "ts-patch uninstall && vue-tsc --noEmit --skipLibCheck & vite",
-    "typecheck": "ts-patch uninstall && vue-tsc --noEmit --skipLibCheck",
-    "build": "ts-patch install && vite build && sass src/packages/styles/index.scss dist/style.css --no-source-map",
-    "prepack": "rimraf dist && pnpm build",
-    "prepare": "husky",
-    "lint:lint-staged": "lint-staged",
-    "lint:prettier": "prettier --write  \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""
-  },
-  "keywords": [
-    "vue3",
-    "ui kit",
-    "ant design",
-    "ant",
-    "antdv"
-  ],
-  "author": {
-    "name": "adoin",
-    "email": "adoin@qq.com"
-  },
-  "dependencies": {
-    "e-virt-table": "1.4.2",
-    "uuid": "^11.1.1",
-    "xe-utils": "^3.7.6"
-  },
-  "peerDependencies": {
-    "@ant-design/icons-vue": ">=7.0.0",
-    "ant-design-vue": ">=4.0.0",
-    "vue": ">=3.2.0"
-  },
-  "license": "GPL",
-  "engines": {
-    "node": "^20.19.0 || >=22.12.0"
-  },
-  "devDependencies": {
-    "@ant-design/icons-vue": ">=7.0.0",
-    "@commitlint/cli": "^21.0.0",
-    "@commitlint/config-conventional": "^21.0.0",
-    "@vitejs/plugin-vue": "^6.0.5",
-    "@vitejs/plugin-vue-jsx": "^5.1.5",
-    "ant-design-vue": "^4.2.3",
-    "esbuild": "^0.28.0",
-    "husky": "^9.1.5",
-    "lint-staged": "^15.2.9",
-    "prettier": "^3.3.3",
-    "rimraf": "^6.0.1",
-    "sass": "^1.77.8",
-    "scroll-into-view-if-needed": "^2.2.31",
-    "ts-patch": "^3.2.1",
-    "typescript-transform-paths": "^3.5.0",
-    "vite": "^8.0.8",
-    "vite-plugin-dts": "^4.5.4",
-    "vue": "^3.5.33",
-    "vue-tsc": "3.3.5",
-    "vue-types": "^3.0.2"
-  }
-}
+{
+  "name": "@vue-ui-kit/ant",
+  "version": "2.5.11",
+  "description": "Vue3 UI Kit based on Ant Design",
+  "type": "module",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/es/index.js",
+  "types": "./dist/index.d.ts",
+  "style": "./dist/style.css",
+  "sass": "./src/packages/styles/index.scss",
+  "exports": {
+    ".": {
+      "require": "./dist/cjs/index.js",
+      "import": "./dist/es/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./style.css": "./dist/style.css",
+    "./style.scss": "./src/packages/styles/index.scss",
+    "./dist/style.scss": "./src/packages/styles/index.scss",
+    "./dist/style.css": "./dist/style.css"
+  },
+  "files": [
+    "dist",
+    "src",
+    "README.md",
+    "README.zh.md",
+    "tsconfig.json"
+  ],
+  "scripts": {
+    "dev": "ts-patch uninstall && vue-tsc --noEmit --skipLibCheck & vite",
+    "typecheck": "ts-patch uninstall && vue-tsc --noEmit --skipLibCheck",
+    "build": "ts-patch install && vite build && sass src/packages/styles/index.scss dist/style.css --no-source-map",
+    "prepack": "rimraf dist && pnpm build",
+    "prepare": "husky",
+    "lint:lint-staged": "lint-staged",
+    "lint:prettier": "prettier --write  \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""
+  },
+  "keywords": [
+    "vue3",
+    "ui kit",
+    "ant design",
+    "ant",
+    "antdv"
+  ],
+  "author": {
+    "name": "adoin",
+    "email": "adoin@qq.com"
+  },
+  "dependencies": {
+    "e-virt-table": "1.4.3",
+    "uuid": "^11.1.1",
+    "xe-utils": "^3.7.6"
+  },
+  "peerDependencies": {
+    "@ant-design/icons-vue": ">=7.0.0",
+    "ant-design-vue": ">=4.0.0",
+    "vue": ">=3.2.0"
+  },
+  "license": "GPL",
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
+  "devDependencies": {
+    "@ant-design/icons-vue": ">=7.0.0",
+    "@commitlint/cli": "^21.0.0",
+    "@commitlint/config-conventional": "^21.0.0",
+    "@vitejs/plugin-vue": "^6.0.5",
+    "@vitejs/plugin-vue-jsx": "^5.1.5",
+    "ant-design-vue": "^4.2.3",
+    "esbuild": "^0.28.0",
+    "husky": "^9.1.5",
+    "lint-staged": "^15.2.9",
+    "prettier": "^3.3.3",
+    "rimraf": "^6.0.1",
+    "sass": "^1.77.8",
+    "scroll-into-view-if-needed": "^2.2.31",
+    "ts-patch": "^3.2.1",
+    "typescript-transform-paths": "^3.5.0",
+    "vite": "^8.0.8",
+    "vite-plugin-dts": "^4.5.4",
+    "vue": "^3.5.33",
+    "vue-tsc": "3.3.5",
+    "vue-types": "^3.0.2"
+  }
+}

package/src/declarations/antProxy.ts

@@ -3,9 +3,13 @@ import { ButtonProps } from 'ant-design-vue/lib/button';
 import { ColProps } from 'ant-design-vue/lib/grid/Col';
 import { FormProps } from 'ant-design-vue/lib/form/Form';
 import { TableColumnType, TableProps, TooltipProps } from 'ant-design-vue';
-import type { ConfigType, Column as EVirtColumn } from 'e-virt-table';
+import type { BorderConfigValue, ConfigType, Column as EVirtColumn } from 'e-virt-table';
 import EVirtTable from 'e-virt-table';
 
+export type { BorderConfigValue, BorderStyle } from 'e-virt-table';
+/** 与 e-virt-table `scrollbarMode` 对齐：`outer` 外部预留，`inner` 内部悬停显示 */
+export type ScrollbarMode = 'outer' | 'inner';
+
 export interface CellFuncArg<D extends Recordable = Recordable> {
   row: D;
   column?: ColumnProps<D>;
@@ -421,6 +425,27 @@ export interface PCanvasGridProps<
   pageConfig?: PageConfig;
   proxyConfig?: ProxyConfig<D, F>;
   config?: ConfigType;
+  /**
+   * 表格边框样式，映射 e-virt-table `BORDER`。
+   * - `true` / `'default'`：完整单元格边框
+   * - `'outer'`：仅外边框
+   * - `'inner'` / `false`：仅内部横线
+   * - `'none'`：无边框
+   * 显式传入时优先于 `config.BORDER`。
+   */
+  border?: BorderConfigValue;
+  /**
+   * 滚动条模式，映射 e-virt-table `scrollbarMode`。
+   * - `'outer'`：外部预留滚动条轨道（默认）
+   * - `'inner'`：覆盖在内容上，悬停表格内部后显示
+   * 显式传入时优先于 `config.scrollbarMode`。
+   */
+  scrollbarMode?: ScrollbarMode;
+  /**
+   * 内部滚动条（`scrollbarMode: 'inner'`）悬停后显示延迟（ms），映射 `SCROLLBAR_SHOW_DELAY`。
+   * 显式传入时优先于 `config.SCROLLBAR_SHOW_DELAY`。
+   */
+  scrollbarShowDelay?: number;
   // 重置后不自动提交
   lazyReset?: boolean;
   /**

package/src/packages/components/PCanvasGrid.vue

@@ -82,11 +82,17 @@
   const queryFormData = ref<Partial<F>>({}) as Ref<Partial<F>>;
 
   // 只处理 config 的合并，其他属性通过 withDefaults 处理
+  // border / scrollbarMode / scrollbarShowDelay 为提升到组件的配置，显式传入时覆盖 config 同名字段
   const propsWithDefaults = computed(() => ({
     ...props,
     config: {
       ...canvasTableDefaults,
       ...props.config,
+      ...(props.border !== undefined ? { BORDER: props.border } : {}),
+      ...(props.scrollbarMode !== undefined ? { scrollbarMode: props.scrollbarMode } : {}),
+      ...(props.scrollbarShowDelay !== undefined
+        ? { SCROLLBAR_SHOW_DELAY: props.scrollbarShowDelay }
+        : {}),
     },
   }));
   const mode = computed<'list' | 'pagination' | 'bad'>(() =>