@vue-ui-kit/ant 2.5.10 → 2.5.12-beta.0

package/src/packages/components/PCanvasGrid.vue

@@ -64,8 +64,18 @@
     ): void;
     (event: 'pick', data: { row: D; field: string }): void;
     (event: 'resetQuery'): void;
+    (
+      event: 'sortChange',
+      value: Map<string, { direction: 'asc' | 'desc' | 'none'; timestamp: number }>,
+    ): void;
   }>();
 
+  const handleSortChange = (
+    sortState: Map<string, { direction: 'asc' | 'desc' | 'none'; timestamp: number }>,
+  ) => {
+    emit('sortChange', sortState);
+  };
+
   const { formConfig, pageConfig, columns, toolbarConfig, proxyConfig, config, staticConfig } =
     toRefs(props);
   const canvasTableDefaults = getCanvasTableDefaults();
@@ -82,11 +92,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'>(() =>
@@ -671,6 +687,7 @@
             :data="tableData"
             :loading="loading.table"
             @selection-change="handleSelectionChange"
+            @sort-change="handleSortChange"
           >
             <template v-for="(_, name) in $slots" #[name]="slotProps">
               <slot :name="name" v-bind="slotProps"></slot>

package/src/packages/components/PCanvasTable.vue

@@ -32,6 +32,7 @@
   const emit = defineEmits<{
     (e: 'change', value: any[]): void; // 需要默认实现change，不能动态绑定
     (e: 'selectionChange', value: T[]): void;
+    (e: 'sortChange', value: Map<string, { direction: 'asc' | 'desc' | 'none'; timestamp: number }>): void;
     (e: 'ready', value: EVirtTable): void;
   }>();
 
@@ -207,6 +208,9 @@
       selectedRecords.value = selection;
       emit('selectionChange', selection);
     });
+    eVirtTable.on('sortChange', (sortState) => {
+      emit('sortChange', sortState);
+    });
     emit('ready', eVirtTable);
     applyBorderRadius();
     themeSyncHandle = bindCanvasTableThemeSync({
@@ -268,7 +272,9 @@
     { immediate: true },
   );
   defineExpose({
-    $table: eVirtTable,
+    get $table() {
+      return eVirtTable;
+    },
     selectedRecords: computed(() => selectedRecords.value),
     reloadData: () => {
       eVirtTable?.loadData(props.data);

package/src/packages/styles/canvas-theme.scss

@@ -24,10 +24,10 @@
   --evt-footer-text-color: #4e5969;
   --evt-readonly-text-color: #4e5969;
   /* 默认 14px。font 简写必须是「字重 字号 字体」；表头 bold、表体 normal */
-  --evt-header-font: bold 14px 'Microsoft YaHei', -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  --evt-body-font: normal 14px 'Microsoft YaHei', -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
+  --evt-header-font:
+    bold 14px 'Microsoft YaHei', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  --evt-body-font:
+    normal 14px 'Microsoft YaHei', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
   --evt-scroller-color: #dee0e3;
   --evt-scroller-focus-color: #bbbec4;
   --evt-edit-bg-color: #fcf6ed;