@veltra/desktop 1.1.32 → 1.1.33

package/dist/components/action/action-group.vue.d.ts

@@ -6,11 +6,11 @@ type __VLS_Slots = {
   default?: () => VNode[];
 };
 declare const __VLS_base: import("vue").DefineComponent<ActionGroupProps, _ActionGroupExposed, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<ActionGroupProps> & Readonly<{}>, {
-  type: import("@veltra/utils").ColorType;
   text: boolean;
   size: "small" | "default" | "large";
-  max: number;
+  type: import("@veltra/utils").ColorType;
   circle: boolean;
+  max: number;
   loading: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/action/action.vue.d.ts

@@ -12,9 +12,9 @@ declare const __VLS_base: import("vue").DefineComponent<ActionProps, {}, {}, {},
 }, string, import("vue").PublicProps, Readonly<ActionProps> & Readonly<{
   onRun?: (() => any) | undefined;
 }>, {
-  type: ButtonType;
   text: boolean;
   size: import("@veltra/utils").ComponentSize;
+  type: ButtonType;
   circle: boolean;
   loading: boolean;
   inDropdown: boolean;

package/dist/components/auto-complete/auto-complete.vue.d.ts

@@ -22,9 +22,9 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
   "onUpdate:modelValue"?: ((value: string) => any) | undefined;
   onSelect?: ((value: string) => any) | undefined;
 }>, {
-  disabled: boolean;
   placeholder: string;
   clearable: boolean;
+  disabled: boolean;
   readonly: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/batch-edit/batch-edit.vue.d.ts

@@ -7,11 +7,11 @@ declare const __VLS_export: <Model extends IFormModel>(__VLS_props: NonNullable<
     "onUpdate:selected"?: ((value: Record<string, any> | undefined) => any) | undefined;
     "onUpdate:checked"?: ((value: Record<string, any>[]) => any) | undefined;
     "onUpdate:current"?: ((row?: TableRow | undefined) => any) | undefined;
+    "onUpdate:data"?: ((value: Record<string, any>[]) => any) | undefined;
     "onUpdate:rows"?: ((rows: TableRow[]) => any) | undefined;
     "onUpdate:forest"?: ((rows?: import("@cat-kit/core").Forest<Record<string, unknown>, any> | undefined) => any) | undefined;
     "onCell-click"?: ((row: TableRow, column: TableColumn, ev: MouseEvent) => any) | undefined;
     "onRow-click"?: ((row: TableRow, ev: MouseEvent) => any) | undefined;
-    "onUpdate:data"?: ((value: Record<string, any>[]) => any) | undefined;
   }> & (typeof globalThis extends {
     __VLS_PROPS_FALLBACK: infer P;
   } ? P : {});

package/dist/components/cascade/cascade.vue.d.ts

@@ -9,7 +9,6 @@ declare const __VLS_export: import("vue").DefineComponent<CascadeProps, {}, {},
   onClear?: (() => any) | undefined;
   onChange?: ((...args: [value?: string | undefined, label?: string | undefined, item?: Record<string, any> | undefined] | [value: string[], label: string[], data: Record<string, any>[]]) => any) | undefined;
 }>, {
-  disabled: boolean;
   labelKey: string;
   valueKey: string;
   childrenKey: string;
@@ -17,9 +16,10 @@ declare const __VLS_export: import("vue").DefineComponent<CascadeProps, {}, {},
   placeholder: string;
   clearable: boolean;
   filterable: boolean;
+  disabled: boolean;
   readonly: boolean;
-  separator: string;
   visibilityLimit: number;
+  separator: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 //#endregion

package/dist/components/checkbox/checkbox-button.vue.d.ts

@@ -18,8 +18,8 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
   onChange?: ((checked: boolean) => any) | undefined;
 }>, {
   disabled: boolean;
-  type: import("@veltra/utils").ColorType;
   readonly: boolean;
+  type: import("@veltra/utils").ColorType;
   round: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/checkbox-group/checkbox-group.vue.d.ts

@@ -12,9 +12,9 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
 }, string, import("vue").PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
   "onUpdate:modelValue"?: ((value: any[]) => any) | undefined;
 }>, {
-  disabled: boolean;
   labelKey: string;
   valueKey: string;
+  disabled: boolean;
   readonly: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;

package/dist/components/date-panel/date-panel.vue.d.ts

@@ -7,8 +7,8 @@ declare const __VLS_export: import("vue").DefineComponent<DatePanelProps, {}, {}
   "onSelect:range-date"?: ((rangeDate?: [import("@cat-kit/core").Dater, import("@cat-kit/core").Dater] | undefined) => any) | undefined;
   "onSelect:date"?: ((date: import("@cat-kit/core").Dater) => any) | undefined;
 }>, {
-  type: "date" | "month" | "year";
   size: import("@veltra/utils").ComponentSize;
+  type: "date" | "month" | "year";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 //#endregion

package/dist/components/date-picker/date-picker.vue.d.ts

@@ -5,11 +5,11 @@ declare const __VLS_export: import("vue").DefineComponent<DatePickerProps, {}, {
 }, string, import("vue").PublicProps, Readonly<DatePickerProps> & Readonly<{
   "onUpdate:modelValue"?: ((value?: string | number | Date | undefined) => any) | undefined;
 }>, {
-  disabled: boolean;
-  type: "date" | "month" | "year";
   placeholder: string;
   clearable: boolean;
+  disabled: boolean;
   readonly: boolean;
+  type: "date" | "month" | "year";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 //#endregion

package/dist/components/date-range-picker/date-range-picker.vue.d.ts

@@ -5,11 +5,11 @@ declare const __VLS_export: import("vue").DefineComponent<DateRangePickerProps,
 }, string, import("vue").PublicProps, Readonly<DateRangePickerProps> & Readonly<{
   "onUpdate:modelValue"?: ((value?: [string, string] | undefined) => any) | undefined;
 }>, {
-  disabled: boolean;
-  type: "date" | "month" | "year";
   placeholder: [string, string];
   clearable: boolean;
+  disabled: boolean;
   readonly: boolean;
+  type: "date" | "month" | "year";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 //#endregion

package/dist/components/drawer/drawer.vue.d.ts

@@ -12,12 +12,12 @@ type __VLS_Slots = {} & {
 declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
   "update:modelValue": (value: boolean) => any;
 } & {
-  close: () => any;
   "update:modelValue": (value: boolean) => any;
+  close: () => any;
   closed: () => any;
 }, string, import("vue").PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
-  onClose?: (() => any) | undefined;
   "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
+  onClose?: (() => any) | undefined;
   onClosed?: (() => any) | undefined;
 }>, {
   direction: DrawerDirection;

package/dist/components/file-viewer/file-viewer.vue.d.ts

@@ -27,8 +27,8 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, _Fi
     error: unknown;
   }) => any) | undefined;
 }>, {
-  open: boolean;
   modelValue: string;
+  open: boolean;
   sidebarWidth: string | number | false;
   sheetMaxRows: number;
   downloadable: boolean;

package/dist/components/input/input.vue.d.ts

@@ -32,9 +32,9 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, _Inpu
   onBlur?: ((value?: string | undefined) => any) | undefined;
   "onNative:input"?: ((ev: Event) => any) | undefined;
 }>, {
-  disabled: boolean;
   placeholder: string;
   clearable: boolean;
+  disabled: boolean;
   readonly: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/multi-select/multi-select.vue.d.ts

@@ -26,12 +26,12 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
   "onUpdate:modelValue"?: ((value: any[]) => any) | undefined;
   onChange?: ((options: Record<string, any>[]) => any) | undefined;
 }>, {
-  minWidth: string;
-  disabled: boolean;
   labelKey: string;
   valueKey: string;
   placeholder: string;
   clearable: boolean;
+  minWidth: string;
+  disabled: boolean;
   readonly: boolean;
   visibilityLimit: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/dist/components/multi-tree-select/multi-tree-select.vue.d.ts

@@ -21,14 +21,14 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
   onClear?: (() => any) | undefined;
   onChange?: ((checked: Record<string, any>[]) => any) | undefined;
 }>, {
-  minWidth: string;
-  disabled: boolean;
   expandAll: boolean;
   labelKey: string;
   valueKey: string;
   placeholder: string;
   clearable: boolean;
   filterable: boolean;
+  minWidth: string;
+  disabled: boolean;
   readonly: boolean;
   visibilityLimit: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/dist/components/number/number.vue.d.ts

@@ -1,8 +1,8 @@
 import { NumberProps } from "../../types/number.js";
 //#region src/components/number/number.vue.d.ts
 declare const __VLS_export: import("vue").DefineComponent<NumberProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<NumberProps> & Readonly<{}>, {
-  format: "currency" | "percent" | "decimal";
   duration: number;
+  format: "currency" | "percent" | "decimal";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 //#endregion

package/dist/components/number-input/number-input.vue.d.ts

@@ -20,9 +20,9 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
   onClear?: (() => any) | undefined;
   onChange?: ((value?: number | undefined) => any) | undefined;
 }>, {
-  disabled: boolean;
   placeholder: string;
   clearable: boolean;
+  disabled: boolean;
   readonly: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/number-range-input/number-range-input.vue.d.ts

@@ -22,8 +22,8 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
   "onUpdate:start"?: ((value: number | undefined) => any) | undefined;
   "onUpdate:end"?: ((value: number | undefined) => any) | undefined;
 }>, {
-  disabled: boolean;
   clearable: boolean;
+  disabled: boolean;
   readonly: boolean;
   startPlaceholder: string;
   endPlaceholder: string;

package/dist/components/password-input/password-input.vue.d.ts

@@ -13,8 +13,8 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
 }, string, import("vue").PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
   "onUpdate:modelValue"?: ((value: string | undefined) => any) | undefined;
 }>, {
-  disabled: boolean;
   clearable: boolean;
+  disabled: boolean;
   readonly: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/progress-nodes/progress-nodes.vue.d.ts

@@ -13,11 +13,11 @@ type __VLS_Slots = {} & {
   default?: (props: typeof __VLS_3) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<ProgressNodesProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
-  click: (node: Record<string, any>, index: number) => any;
   "update:modelValue": (value: string | number) => any;
+  click: (node: Record<string, any>, index: number) => any;
 }, string, import("vue").PublicProps, Readonly<ProgressNodesProps> & Readonly<{
-  onClick?: ((node: Record<string, any>, index: number) => any) | undefined;
   "onUpdate:modelValue"?: ((value: string | number) => any) | undefined;
+  onClick?: ((node: Record<string, any>, index: number) => any) | undefined;
 }>, {
   labelKey: string;
   valueKey: string;

package/dist/components/radio-group/radio-group.vue.d.ts

@@ -14,9 +14,9 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
   "onUpdate:modelValue"?: ((value: any) => any) | undefined;
   onChange?: ((item: Record<string, any>) => any) | undefined;
 }>, {
-  disabled: boolean;
   labelKey: string;
   valueKey: string;
+  disabled: boolean;
   readonly: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;

package/dist/components/rich-text-editor/rich-text-editor.vue.d.ts

@@ -10,8 +10,8 @@ declare const __VLS_export: import("vue").DefineComponent<RichTextEditorProps &
 }> & Readonly<{
   "onUpdate:modelValue"?: ((value: string | undefined) => any) | undefined;
 }>, {
-  disabled: boolean;
   placeholder: string;
+  disabled: boolean;
   readonly: boolean;
   format: RichTextFormat;
   toolbar: ToolbarItem[];

package/dist/components/select/select.vue.d.ts

@@ -24,11 +24,11 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
   "onUpdate:text"?: ((value: any) => any) | undefined;
   "onUpdate:label"?: ((label?: string | undefined) => any) | undefined;
 }>, {
-  disabled: boolean;
   labelKey: string;
   valueKey: string;
   placeholder: string;
   clearable: boolean;
+  disabled: boolean;
   readonly: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/steps/steps.vue.d.ts

@@ -12,8 +12,8 @@ declare const __VLS_base: import("vue").DefineComponent<StepsProps, {}, {}, {},
   "onUpdate:current"?: ((value?: string | number | undefined) => any) | undefined;
   "onItem-click"?: ((item: Record<string, any>, index: number) => any) | undefined;
 }>, {
-  direction: "horizontal" | "vertical";
   labelKey: string;
+  direction: "horizontal" | "vertical";
   finishedStepType: import("@veltra/utils").ColorType;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/table/node/col.d.ts

@@ -37,6 +37,11 @@ declare class ColumnNode extends TreeNode<TableColumn, ColumnNode> {
   get isFirstFixed(): boolean;
   /** 是否是可调整宽度的列 */
   get resizable(): boolean;
+  /**
+   * 是否在列配置上显式指定了 width，或经表头拖拽锁定。
+   * 此类列不参与剩余宽度的均分。
+   */
+  explicitWidth: boolean;
   style: Record<string, number>;
   constructor(val: TableColumn, index: number, depth: number, parent?: ColumnNode);
 }

package/dist/components/table/node/col.js

@@ -74,9 +74,15 @@ var ColumnNode = class extends TreeNode {
 	get resizable() {
 		return this.data.resizable ?? true;
 	}
+	/**
+	* 是否在列配置上显式指定了 width，或经表头拖拽锁定。
+	* 此类列不参与剩余宽度的均分。
+	*/
+	explicitWidth;
 	style = reactive({});
 	constructor(val, index, depth, parent) {
 		super(isReactive(val) ? val : shallowReactive(val), index, depth, parent);
+		this.explicitWidth = val.width !== void 0;
 	}
 };
 //#endregion

package/dist/components/table/node/col.js.map

@@ -1 +1 @@
-{"version":3,"file":"col.js","names":[],"sources":["../../../../src/components/table/node/col.ts"],"sourcesContent":["import { TreeNode } from '@cat-kit/core'\nimport { isReactive, reactive, shallowReactive } from 'vue'\n\nimport type { TableColumn, TableColumnAlign } from '../../../types'\n\nexport class ColumnNode extends TreeNode<TableColumn, ColumnNode> {\n  declare children?: ColumnNode[] | undefined\n  declare parent?: ColumnNode\n  /** 叶子节点数量 */\n  leafs?: number\n\n  nextNode: ColumnNode | null = null\n\n  /** 列key */\n  get key(): string {\n    return this.data.key\n  }\n  set key(val) {\n    this.data.key = val\n  }\n  /** 列名 */\n  get name(): string {\n    return this.data.name\n  }\n  set name(val) {\n    this.data.name = val\n  }\n\n  /**\n   * 列对齐方式\n   * @default 'left'\n   */\n  get align(): TableColumnAlign {\n    return this.data.align ?? 'left'\n  }\n  set align(val) {\n    this.data.align = val\n  }\n\n  get headerAlign(): TableColumnAlign {\n    return this.data.headerAlign ?? this.align\n  }\n  set headerAlign(val) {\n    this.data.headerAlign = val\n  }\n\n  /** 宽度 */\n  get width(): number | undefined {\n    const { width } = this.data\n    if (!width || (this.minWidth && width && width < this.minWidth)) {\n      return this.minWidth\n    }\n    return width\n  }\n  set width(val) {\n    if (this.minWidth && val && val < this.minWidth) {\n      val = this.minWidth\n    }\n    this.data.width = val\n  }\n  /** 最小宽度 */\n  get minWidth(): number | undefined {\n    const minWidth = this.data.minWidth\n    if (!minWidth && this.isLeaf) {\n      return 100\n    }\n    return minWidth\n  }\n  set minWidth(val) {\n    this.data.minWidth = val\n  }\n\n  /** 列固定方向 */\n  get fixed(): 'left' | 'right' | undefined {\n    if (this.depth > 0) return\n    return this.data.fixed\n  }\n  set fixed(val) {\n    this.data.fixed = val\n  }\n\n  /** 是否是左侧的最后一个固定列 */\n  get isLastFixed(): boolean {\n    return this.data.isLastFixed ?? false\n  }\n\n  /** 是否是右侧的第一个固定列 */\n  get isFirstFixed(): boolean {\n    return this.data.isFirstFixed ?? false\n  }\n\n  /** 是否是可调整宽度的列 */\n  get resizable(): boolean {\n    return this.data.resizable ?? true\n  }\n\n  style: Record<string, number> = reactive({})\n\n  constructor(val: TableColumn, index: number, depth: number, parent?: ColumnNode) {\n    super(isReactive(val) ? val : shallowReactive(val), index, depth, parent)\n  }\n}\n"],"mappings":";;;AAKA,IAAa,aAAb,cAAgC,SAAkC;;CAIhE;CAEA,WAA8B;;CAG9B,IAAI,MAAc;EAChB,OAAO,KAAK,KAAK;CACnB;CACA,IAAI,IAAI,KAAK;EACX,KAAK,KAAK,MAAM;CAClB;;CAEA,IAAI,OAAe;EACjB,OAAO,KAAK,KAAK;CACnB;CACA,IAAI,KAAK,KAAK;EACZ,KAAK,KAAK,OAAO;CACnB;;;;;CAMA,IAAI,QAA0B;EAC5B,OAAO,KAAK,KAAK,SAAS;CAC5B;CACA,IAAI,MAAM,KAAK;EACb,KAAK,KAAK,QAAQ;CACpB;CAEA,IAAI,cAAgC;EAClC,OAAO,KAAK,KAAK,eAAe,KAAK;CACvC;CACA,IAAI,YAAY,KAAK;EACnB,KAAK,KAAK,cAAc;CAC1B;;CAGA,IAAI,QAA4B;EAC9B,MAAM,EAAE,UAAU,KAAK;EACvB,IAAI,CAAC,SAAU,KAAK,YAAY,SAAS,QAAQ,KAAK,UACpD,OAAO,KAAK;EAEd,OAAO;CACT;CACA,IAAI,MAAM,KAAK;EACb,IAAI,KAAK,YAAY,OAAO,MAAM,KAAK,UACrC,MAAM,KAAK;EAEb,KAAK,KAAK,QAAQ;CACpB;;CAEA,IAAI,WAA+B;EACjC,MAAM,WAAW,KAAK,KAAK;EAC3B,IAAI,CAAC,YAAY,KAAK,QACpB,OAAO;EAET,OAAO;CACT;CACA,IAAI,SAAS,KAAK;EAChB,KAAK,KAAK,WAAW;CACvB;;CAGA,IAAI,QAAsC;EACxC,IAAI,KAAK,QAAQ,GAAG;EACpB,OAAO,KAAK,KAAK;CACnB;CACA,IAAI,MAAM,KAAK;EACb,KAAK,KAAK,QAAQ;CACpB;;CAGA,IAAI,cAAuB;EACzB,OAAO,KAAK,KAAK,eAAe;CAClC;;CAGA,IAAI,eAAwB;EAC1B,OAAO,KAAK,KAAK,gBAAgB;CACnC;;CAGA,IAAI,YAAqB;EACvB,OAAO,KAAK,KAAK,aAAa;CAChC;CAEA,QAAgC,SAAS,CAAC,CAAC;CAE3C,YAAY,KAAkB,OAAe,OAAe,QAAqB;EAC/E,MAAM,WAAW,GAAG,IAAI,MAAM,gBAAgB,GAAG,GAAG,OAAO,OAAO,MAAM;CAC1E;AACF"}
+{"version":3,"file":"col.js","names":[],"sources":["../../../../src/components/table/node/col.ts"],"sourcesContent":["import { TreeNode } from '@cat-kit/core'\nimport { isReactive, reactive, shallowReactive } from 'vue'\n\nimport type { TableColumn, TableColumnAlign } from '../../../types'\n\nexport class ColumnNode extends TreeNode<TableColumn, ColumnNode> {\n  declare children?: ColumnNode[] | undefined\n  declare parent?: ColumnNode\n  /** 叶子节点数量 */\n  leafs?: number\n\n  nextNode: ColumnNode | null = null\n\n  /** 列key */\n  get key(): string {\n    return this.data.key\n  }\n  set key(val) {\n    this.data.key = val\n  }\n  /** 列名 */\n  get name(): string {\n    return this.data.name\n  }\n  set name(val) {\n    this.data.name = val\n  }\n\n  /**\n   * 列对齐方式\n   * @default 'left'\n   */\n  get align(): TableColumnAlign {\n    return this.data.align ?? 'left'\n  }\n  set align(val) {\n    this.data.align = val\n  }\n\n  get headerAlign(): TableColumnAlign {\n    return this.data.headerAlign ?? this.align\n  }\n  set headerAlign(val) {\n    this.data.headerAlign = val\n  }\n\n  /** 宽度 */\n  get width(): number | undefined {\n    const { width } = this.data\n    if (!width || (this.minWidth && width && width < this.minWidth)) {\n      return this.minWidth\n    }\n    return width\n  }\n  set width(val) {\n    if (this.minWidth && val && val < this.minWidth) {\n      val = this.minWidth\n    }\n    this.data.width = val\n  }\n  /** 最小宽度 */\n  get minWidth(): number | undefined {\n    const minWidth = this.data.minWidth\n    if (!minWidth && this.isLeaf) {\n      return 100\n    }\n    return minWidth\n  }\n  set minWidth(val) {\n    this.data.minWidth = val\n  }\n\n  /** 列固定方向 */\n  get fixed(): 'left' | 'right' | undefined {\n    if (this.depth > 0) return\n    return this.data.fixed\n  }\n  set fixed(val) {\n    this.data.fixed = val\n  }\n\n  /** 是否是左侧的最后一个固定列 */\n  get isLastFixed(): boolean {\n    return this.data.isLastFixed ?? false\n  }\n\n  /** 是否是右侧的第一个固定列 */\n  get isFirstFixed(): boolean {\n    return this.data.isFirstFixed ?? false\n  }\n\n  /** 是否是可调整宽度的列 */\n  get resizable(): boolean {\n    return this.data.resizable ?? true\n  }\n\n  /**\n   * 是否在列配置上显式指定了 width，或经表头拖拽锁定。\n   * 此类列不参与剩余宽度的均分。\n   */\n  explicitWidth: boolean\n\n  style: Record<string, number> = reactive({})\n\n  constructor(val: TableColumn, index: number, depth: number, parent?: ColumnNode) {\n    super(isReactive(val) ? val : shallowReactive(val), index, depth, parent)\n    this.explicitWidth = val.width !== undefined\n  }\n}\n"],"mappings":";;;AAKA,IAAa,aAAb,cAAgC,SAAkC;;CAIhE;CAEA,WAA8B;;CAG9B,IAAI,MAAc;EAChB,OAAO,KAAK,KAAK;CACnB;CACA,IAAI,IAAI,KAAK;EACX,KAAK,KAAK,MAAM;CAClB;;CAEA,IAAI,OAAe;EACjB,OAAO,KAAK,KAAK;CACnB;CACA,IAAI,KAAK,KAAK;EACZ,KAAK,KAAK,OAAO;CACnB;;;;;CAMA,IAAI,QAA0B;EAC5B,OAAO,KAAK,KAAK,SAAS;CAC5B;CACA,IAAI,MAAM,KAAK;EACb,KAAK,KAAK,QAAQ;CACpB;CAEA,IAAI,cAAgC;EAClC,OAAO,KAAK,KAAK,eAAe,KAAK;CACvC;CACA,IAAI,YAAY,KAAK;EACnB,KAAK,KAAK,cAAc;CAC1B;;CAGA,IAAI,QAA4B;EAC9B,MAAM,EAAE,UAAU,KAAK;EACvB,IAAI,CAAC,SAAU,KAAK,YAAY,SAAS,QAAQ,KAAK,UACpD,OAAO,KAAK;EAEd,OAAO;CACT;CACA,IAAI,MAAM,KAAK;EACb,IAAI,KAAK,YAAY,OAAO,MAAM,KAAK,UACrC,MAAM,KAAK;EAEb,KAAK,KAAK,QAAQ;CACpB;;CAEA,IAAI,WAA+B;EACjC,MAAM,WAAW,KAAK,KAAK;EAC3B,IAAI,CAAC,YAAY,KAAK,QACpB,OAAO;EAET,OAAO;CACT;CACA,IAAI,SAAS,KAAK;EAChB,KAAK,KAAK,WAAW;CACvB;;CAGA,IAAI,QAAsC;EACxC,IAAI,KAAK,QAAQ,GAAG;EACpB,OAAO,KAAK,KAAK;CACnB;CACA,IAAI,MAAM,KAAK;EACb,KAAK,KAAK,QAAQ;CACpB;;CAGA,IAAI,cAAuB;EACzB,OAAO,KAAK,KAAK,eAAe;CAClC;;CAGA,IAAI,eAAwB;EAC1B,OAAO,KAAK,KAAK,gBAAgB;CACnC;;CAGA,IAAI,YAAqB;EACvB,OAAO,KAAK,KAAK,aAAa;CAChC;;;;;CAMA;CAEA,QAAgC,SAAS,CAAC,CAAC;CAE3C,YAAY,KAAkB,OAAe,OAAe,QAAqB;EAC/E,MAAM,WAAW,GAAG,IAAI,MAAM,gBAAgB,GAAG,GAAG,OAAO,OAAO,MAAM;EACxE,KAAK,gBAAgB,IAAI,UAAU,KAAA;CACrC;AACF"}

package/dist/components/table/use-col-resize.js

@@ -13,17 +13,16 @@ function useColResize(options) {
 	function correctColumnStyle() {
 		const containerWidth = scrollRef.value?.containerRef?.clientWidth;
 		if (!containerWidth || !leafColumns.value.length) return;
-		const allColumnsWidth = leafColumns.value.reduce((acc, cur) => {
-			return acc + (cur.width ?? cur.minWidth);
-		}, 0);
-		if (allColumnsWidth < containerWidth) {
-			const freeWidth = containerWidth - allColumnsWidth;
-			const allocatableColumns = leafColumns.value.filter((column) => column.resizable !== false);
-			const allocatedWidth = freeWidth / allocatableColumns.length;
-			allocatableColumns.forEach((column) => {
-				column.width = (column.width ?? column.minWidth) + allocatedWidth;
+		const flexColumns = leafColumns.value.filter((column) => !column.explicitWidth);
+		const totalBase = leafColumns.value.filter((column) => column.explicitWidth).reduce((acc, cur) => acc + (cur.width ?? cur.minWidth), 0) + flexColumns.reduce((acc, cur) => acc + cur.minWidth, 0);
+		if (flexColumns.length > 0 && totalBase < containerWidth) {
+			const allocatedWidth = (containerWidth - totalBase) / flexColumns.length;
+			flexColumns.forEach((column) => {
+				column.width = column.minWidth + allocatedWidth;
 			});
-		}
+		} else flexColumns.forEach((column) => {
+			column.data.width = void 0;
+		});
 		const fixedLeft = leafColumns.value.filter((column) => column.fixed === "left");
 		const fixedRight = leafColumns.value.filter((column) => column.fixed === "right");
 		fixedLeft.reduce((acc, cur) => {
@@ -64,6 +63,7 @@ function useColResize(options) {
 	}
 	function handleResizeMouseup(e) {
 		currentResizeColumn.width = Math.max(originWidth + e.pageX - originX, currentResizeColumn.minWidth);
+		currentResizeColumn.explicitWidth = true;
 		showResizeLine.value = false;
 		currentResizeColumn = null;
 		correctColumnStyle();

package/dist/components/table/use-col-resize.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-col-resize.js","names":[],"sources":["../../../src/components/table/use-col-resize.ts"],"sourcesContent":["import { nextTick, provide, shallowRef, watchEffect, type ShallowRef } from 'vue'\n\nimport type { ScrollExposed } from '../../types'\nimport { TableResizeKey } from './di'\nimport type { ColumnNode } from './node/col'\n\ninterface Options {\n  scrollRef: ShallowRef<ScrollExposed | undefined>\n  leafColumns: ShallowRef<ColumnNode[]>\n}\n\ninterface UseColResizeReturned {\n  resizeLineRef: ShallowRef<HTMLElement | undefined>\n  colgroupRef: ShallowRef<HTMLElement | undefined>\n  showResizeLine: ShallowRef<boolean>\n  handleResizeMousedown: (e: MouseEvent, resizeColumn: ColumnNode) => void\n}\n\nexport function useColResize(options: Options): UseColResizeReturned {\n  const { scrollRef, leafColumns } = options\n\n  const showResizeLine = shallowRef(false)\n\n  const resizeLineRef = shallowRef<HTMLElement>()\n  const colgroupRef = shallowRef<HTMLElement>()\n  const headerRef = shallowRef<HTMLElement>()\n\n  /**\n   * 修正列样式\n   */\n  function correctColumnStyle() {\n    // 获取表格容器宽度\n    const containerWidth = scrollRef.value?.containerRef?.clientWidth\n\n    if (!containerWidth || !leafColumns.value.length) return\n\n    // 如果每个列都设置了宽度， 有两种情况\n    // 1. 表格容器宽度大于所有列宽度之和，则将剩下的宽度均匀分布到所有列中\n    // 2. 表格容器宽度小于所有列宽度之和，则什么也不管\n    const allColumnsWidth = leafColumns.value.reduce((acc, cur) => {\n      return acc + (cur.width ?? cur.minWidth!)\n    }, 0)\n\n    if (allColumnsWidth < containerWidth) {\n      const freeWidth = containerWidth - allColumnsWidth\n\n      const allocatableColumns = leafColumns.value.filter((column) => column.resizable !== false)\n\n      const allocatedWidth = freeWidth / allocatableColumns.length\n\n      allocatableColumns.forEach((column) => {\n        column.width = (column.width ?? column.minWidth!) + allocatedWidth\n      })\n    }\n\n    const fixedLeft = leafColumns.value.filter((column) => column.fixed === 'left')\n    const fixedRight = leafColumns.value.filter((column) => column.fixed === 'right')\n\n    fixedLeft.reduce((acc, cur) => {\n      cur.style.left = acc\n      return acc + (cur.width ?? cur.minWidth!)\n    }, 0)\n\n    fixedRight.reduceRight((acc, cur) => {\n      cur.style.right = acc\n      return acc + (cur.width ?? cur.minWidth!)\n    }, 0)\n  }\n\n  watchEffect(correctColumnStyle)\n\n  function updateResizeLine(transformX: number): void {\n    if (!resizeLineRef.value) return\n    resizeLineRef.value.style.transform = `translateX(${transformX}px)`\n  }\n\n  // 表格相对于页面左边缘的偏移量，\n  // 此处作为缓存以减少频繁地调用 getBoundingClientRect 方法\n  let containerLeft = 0\n  let originX = 0\n  let originWidth = 0\n  let currentResizeColumn: ColumnNode | null = null\n\n  function handleResizeMousedown(e: MouseEvent, resizeColumn: ColumnNode): void {\n    const tableEl = scrollRef.value?.el\n    if (!tableEl) return\n\n    showResizeLine.value = true\n    currentResizeColumn = resizeColumn\n    originX = e.pageX\n    originWidth = resizeColumn.width ?? 0\n\n    const { left } = tableEl.getBoundingClientRect()\n    containerLeft = left\n\n    nextTick(() => {\n      updateResizeLine(e.pageX - left)\n    })\n\n    document.addEventListener('mousemove', handleResizeMousemove)\n    document.addEventListener('mouseup', handleResizeMouseup)\n  }\n\n  function handleResizeMousemove(e: MouseEvent): void {\n    updateResizeLine(e.pageX - containerLeft)\n  }\n\n  function handleResizeMouseup(e: MouseEvent): void {\n    currentResizeColumn!.width = Math.max(\n      originWidth + e.pageX - originX,\n      currentResizeColumn!.minWidth!\n    )\n\n    showResizeLine.value = false\n    currentResizeColumn = null\n    correctColumnStyle()\n\n    document.removeEventListener('mouseup', handleResizeMouseup)\n    document.removeEventListener('mousemove', handleResizeMousemove)\n  }\n\n  provide(TableResizeKey, { handleResizeMousedown, headerRef })\n\n  return { resizeLineRef, colgroupRef, showResizeLine, handleResizeMousedown }\n}\n"],"mappings":";;;AAkBA,SAAgB,aAAa,SAAwC;CACnE,MAAM,EAAE,WAAW,gBAAgB;CAEnC,MAAM,iBAAiB,WAAW,KAAK;CAEvC,MAAM,gBAAgB,WAAwB;CAC9C,MAAM,cAAc,WAAwB;CAC5C,MAAM,YAAY,WAAwB;;;;CAK1C,SAAS,qBAAqB;EAE5B,MAAM,iBAAiB,UAAU,OAAO,cAAc;EAEtD,IAAI,CAAC,kBAAkB,CAAC,YAAY,MAAM,QAAQ;EAKlD,MAAM,kBAAkB,YAAY,MAAM,QAAQ,KAAK,QAAQ;GAC7D,OAAO,OAAO,IAAI,SAAS,IAAI;EACjC,GAAG,CAAC;EAEJ,IAAI,kBAAkB,gBAAgB;GACpC,MAAM,YAAY,iBAAiB;GAEnC,MAAM,qBAAqB,YAAY,MAAM,QAAQ,WAAW,OAAO,cAAc,KAAK;GAE1F,MAAM,iBAAiB,YAAY,mBAAmB;GAEtD,mBAAmB,SAAS,WAAW;IACrC,OAAO,SAAS,OAAO,SAAS,OAAO,YAAa;GACtD,CAAC;EACH;EAEA,MAAM,YAAY,YAAY,MAAM,QAAQ,WAAW,OAAO,UAAU,MAAM;EAC9E,MAAM,aAAa,YAAY,MAAM,QAAQ,WAAW,OAAO,UAAU,OAAO;EAEhF,UAAU,QAAQ,KAAK,QAAQ;GAC7B,IAAI,MAAM,OAAO;GACjB,OAAO,OAAO,IAAI,SAAS,IAAI;EACjC,GAAG,CAAC;EAEJ,WAAW,aAAa,KAAK,QAAQ;GACnC,IAAI,MAAM,QAAQ;GAClB,OAAO,OAAO,IAAI,SAAS,IAAI;EACjC,GAAG,CAAC;CACN;CAEA,YAAY,kBAAkB;CAE9B,SAAS,iBAAiB,YAA0B;EAClD,IAAI,CAAC,cAAc,OAAO;EAC1B,cAAc,MAAM,MAAM,YAAY,cAAc,WAAW;CACjE;CAIA,IAAI,gBAAgB;CACpB,IAAI,UAAU;CACd,IAAI,cAAc;CAClB,IAAI,sBAAyC;CAE7C,SAAS,sBAAsB,GAAe,cAAgC;EAC5E,MAAM,UAAU,UAAU,OAAO;EACjC,IAAI,CAAC,SAAS;EAEd,eAAe,QAAQ;EACvB,sBAAsB;EACtB,UAAU,EAAE;EACZ,cAAc,aAAa,SAAS;EAEpC,MAAM,EAAE,SAAS,QAAQ,sBAAsB;EAC/C,gBAAgB;EAEhB,eAAe;GACb,iBAAiB,EAAE,QAAQ,IAAI;EACjC,CAAC;EAED,SAAS,iBAAiB,aAAa,qBAAqB;EAC5D,SAAS,iBAAiB,WAAW,mBAAmB;CAC1D;CAEA,SAAS,sBAAsB,GAAqB;EAClD,iBAAiB,EAAE,QAAQ,aAAa;CAC1C;CAEA,SAAS,oBAAoB,GAAqB;EAChD,oBAAqB,QAAQ,KAAK,IAChC,cAAc,EAAE,QAAQ,SACxB,oBAAqB,QACvB;EAEA,eAAe,QAAQ;EACvB,sBAAsB;EACtB,mBAAmB;EAEnB,SAAS,oBAAoB,WAAW,mBAAmB;EAC3D,SAAS,oBAAoB,aAAa,qBAAqB;CACjE;CAEA,QAAQ,gBAAgB;EAAE;EAAuB;CAAU,CAAC;CAE5D,OAAO;EAAE;EAAe;EAAa;EAAgB;CAAsB;AAC7E"}
+{"version":3,"file":"use-col-resize.js","names":[],"sources":["../../../src/components/table/use-col-resize.ts"],"sourcesContent":["import { nextTick, provide, shallowRef, watchEffect, type ShallowRef } from 'vue'\n\nimport type { ScrollExposed } from '../../types'\nimport { TableResizeKey } from './di'\nimport type { ColumnNode } from './node/col'\n\ninterface Options {\n  scrollRef: ShallowRef<ScrollExposed | undefined>\n  leafColumns: ShallowRef<ColumnNode[]>\n}\n\ninterface UseColResizeReturned {\n  resizeLineRef: ShallowRef<HTMLElement | undefined>\n  colgroupRef: ShallowRef<HTMLElement | undefined>\n  showResizeLine: ShallowRef<boolean>\n  handleResizeMousedown: (e: MouseEvent, resizeColumn: ColumnNode) => void\n}\n\nexport function useColResize(options: Options): UseColResizeReturned {\n  const { scrollRef, leafColumns } = options\n\n  const showResizeLine = shallowRef(false)\n\n  const resizeLineRef = shallowRef<HTMLElement>()\n  const colgroupRef = shallowRef<HTMLElement>()\n  const headerRef = shallowRef<HTMLElement>()\n\n  /**\n   * 修正列样式\n   */\n  function correctColumnStyle() {\n    // 获取表格容器宽度\n    const containerWidth = scrollRef.value?.containerRef?.clientWidth\n\n    if (!containerWidth || !leafColumns.value.length) return\n\n    const flexColumns = leafColumns.value.filter((column) => !column.explicitWidth)\n    const fixedWidthTotal = leafColumns.value\n      .filter((column) => column.explicitWidth)\n      .reduce((acc, cur) => acc + (cur.width ?? cur.minWidth!), 0)\n    const flexBaseTotal = flexColumns.reduce((acc, cur) => acc + cur.minWidth!, 0)\n    const totalBase = fixedWidthTotal + flexBaseTotal\n\n    // 仅未显式指定 width 的列参与剩余宽度均分；指定了 width 的列保持该宽度。\n    if (flexColumns.length > 0 && totalBase < containerWidth) {\n      const allocatedWidth = (containerWidth - totalBase) / flexColumns.length\n\n      flexColumns.forEach((column) => {\n        column.width = column.minWidth! + allocatedWidth\n      })\n    } else {\n      flexColumns.forEach((column) => {\n        column.data.width = undefined\n      })\n    }\n\n    const fixedLeft = leafColumns.value.filter((column) => column.fixed === 'left')\n    const fixedRight = leafColumns.value.filter((column) => column.fixed === 'right')\n\n    fixedLeft.reduce((acc, cur) => {\n      cur.style.left = acc\n      return acc + (cur.width ?? cur.minWidth!)\n    }, 0)\n\n    fixedRight.reduceRight((acc, cur) => {\n      cur.style.right = acc\n      return acc + (cur.width ?? cur.minWidth!)\n    }, 0)\n  }\n\n  watchEffect(correctColumnStyle)\n\n  function updateResizeLine(transformX: number): void {\n    if (!resizeLineRef.value) return\n    resizeLineRef.value.style.transform = `translateX(${transformX}px)`\n  }\n\n  // 表格相对于页面左边缘的偏移量，\n  // 此处作为缓存以减少频繁地调用 getBoundingClientRect 方法\n  let containerLeft = 0\n  let originX = 0\n  let originWidth = 0\n  let currentResizeColumn: ColumnNode | null = null\n\n  function handleResizeMousedown(e: MouseEvent, resizeColumn: ColumnNode): void {\n    const tableEl = scrollRef.value?.el\n    if (!tableEl) return\n\n    showResizeLine.value = true\n    currentResizeColumn = resizeColumn\n    originX = e.pageX\n    originWidth = resizeColumn.width ?? 0\n\n    const { left } = tableEl.getBoundingClientRect()\n    containerLeft = left\n\n    nextTick(() => {\n      updateResizeLine(e.pageX - left)\n    })\n\n    document.addEventListener('mousemove', handleResizeMousemove)\n    document.addEventListener('mouseup', handleResizeMouseup)\n  }\n\n  function handleResizeMousemove(e: MouseEvent): void {\n    updateResizeLine(e.pageX - containerLeft)\n  }\n\n  function handleResizeMouseup(e: MouseEvent): void {\n    currentResizeColumn!.width = Math.max(\n      originWidth + e.pageX - originX,\n      currentResizeColumn!.minWidth!\n    )\n    currentResizeColumn!.explicitWidth = true\n\n    showResizeLine.value = false\n    currentResizeColumn = null\n    correctColumnStyle()\n\n    document.removeEventListener('mouseup', handleResizeMouseup)\n    document.removeEventListener('mousemove', handleResizeMousemove)\n  }\n\n  provide(TableResizeKey, { handleResizeMousedown, headerRef })\n\n  return { resizeLineRef, colgroupRef, showResizeLine, handleResizeMousedown }\n}\n"],"mappings":";;;AAkBA,SAAgB,aAAa,SAAwC;CACnE,MAAM,EAAE,WAAW,gBAAgB;CAEnC,MAAM,iBAAiB,WAAW,KAAK;CAEvC,MAAM,gBAAgB,WAAwB;CAC9C,MAAM,cAAc,WAAwB;CAC5C,MAAM,YAAY,WAAwB;;;;CAK1C,SAAS,qBAAqB;EAE5B,MAAM,iBAAiB,UAAU,OAAO,cAAc;EAEtD,IAAI,CAAC,kBAAkB,CAAC,YAAY,MAAM,QAAQ;EAElD,MAAM,cAAc,YAAY,MAAM,QAAQ,WAAW,CAAC,OAAO,aAAa;EAK9E,MAAM,YAJkB,YAAY,MACjC,QAAQ,WAAW,OAAO,aAAa,EACvC,QAAQ,KAAK,QAAQ,OAAO,IAAI,SAAS,IAAI,WAAY,CAE5B,IADV,YAAY,QAAQ,KAAK,QAAQ,MAAM,IAAI,UAAW,CAC5B;EAGhD,IAAI,YAAY,SAAS,KAAK,YAAY,gBAAgB;GACxD,MAAM,kBAAkB,iBAAiB,aAAa,YAAY;GAElE,YAAY,SAAS,WAAW;IAC9B,OAAO,QAAQ,OAAO,WAAY;GACpC,CAAC;EACH,OACE,YAAY,SAAS,WAAW;GAC9B,OAAO,KAAK,QAAQ,KAAA;EACtB,CAAC;EAGH,MAAM,YAAY,YAAY,MAAM,QAAQ,WAAW,OAAO,UAAU,MAAM;EAC9E,MAAM,aAAa,YAAY,MAAM,QAAQ,WAAW,OAAO,UAAU,OAAO;EAEhF,UAAU,QAAQ,KAAK,QAAQ;GAC7B,IAAI,MAAM,OAAO;GACjB,OAAO,OAAO,IAAI,SAAS,IAAI;EACjC,GAAG,CAAC;EAEJ,WAAW,aAAa,KAAK,QAAQ;GACnC,IAAI,MAAM,QAAQ;GAClB,OAAO,OAAO,IAAI,SAAS,IAAI;EACjC,GAAG,CAAC;CACN;CAEA,YAAY,kBAAkB;CAE9B,SAAS,iBAAiB,YAA0B;EAClD,IAAI,CAAC,cAAc,OAAO;EAC1B,cAAc,MAAM,MAAM,YAAY,cAAc,WAAW;CACjE;CAIA,IAAI,gBAAgB;CACpB,IAAI,UAAU;CACd,IAAI,cAAc;CAClB,IAAI,sBAAyC;CAE7C,SAAS,sBAAsB,GAAe,cAAgC;EAC5E,MAAM,UAAU,UAAU,OAAO;EACjC,IAAI,CAAC,SAAS;EAEd,eAAe,QAAQ;EACvB,sBAAsB;EACtB,UAAU,EAAE;EACZ,cAAc,aAAa,SAAS;EAEpC,MAAM,EAAE,SAAS,QAAQ,sBAAsB;EAC/C,gBAAgB;EAEhB,eAAe;GACb,iBAAiB,EAAE,QAAQ,IAAI;EACjC,CAAC;EAED,SAAS,iBAAiB,aAAa,qBAAqB;EAC5D,SAAS,iBAAiB,WAAW,mBAAmB;CAC1D;CAEA,SAAS,sBAAsB,GAAqB;EAClD,iBAAiB,EAAE,QAAQ,aAAa;CAC1C;CAEA,SAAS,oBAAoB,GAAqB;EAChD,oBAAqB,QAAQ,KAAK,IAChC,cAAc,EAAE,QAAQ,SACxB,oBAAqB,QACvB;EACA,oBAAqB,gBAAgB;EAErC,eAAe,QAAQ;EACvB,sBAAsB;EACtB,mBAAmB;EAEnB,SAAS,oBAAoB,WAAW,mBAAmB;EAC3D,SAAS,oBAAoB,aAAa,qBAAqB;CACjE;CAEA,QAAQ,gBAAgB;EAAE;EAAuB;CAAU,CAAC;CAE5D,OAAO;EAAE;EAAe;EAAa;EAAgB;CAAsB;AAC7E"}

package/dist/components/tabs/tabs-horizontal.vue.d.ts

@@ -14,13 +14,13 @@ type __VLS_PublicProps = __VLS_Props & __VLS_ModelProps;
 declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
   "update:modelValue": (value: string | undefined) => any;
 } & {
+  "update:modelValue": (value: string) => any;
   close: (item: TabItem, index: number) => any;
   click: (item: TabItem, index: number) => any;
-  "update:modelValue": (value: string) => any;
 }, string, import("vue").PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
+  "onUpdate:modelValue"?: ((value: string) => any) | undefined;
   onClose?: ((item: TabItem, index: number) => any) | undefined;
   onClick?: ((item: TabItem, index: number) => any) | undefined;
-  "onUpdate:modelValue"?: ((value: string) => any) | undefined;
 }>, {
   closable: boolean;
   position: "top" | "bottom";

package/dist/components/tabs/tabs-vertical.vue.d.ts

@@ -14,13 +14,13 @@ type __VLS_PublicProps = __VLS_Props & __VLS_ModelProps;
 declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
   "update:modelValue": (value: string | undefined) => any;
 } & {
+  "update:modelValue": (value: string) => any;
   close: (item: TabItem, index: number) => any;
   click: (item: TabItem, index: number) => any;
-  "update:modelValue": (value: string) => any;
 }, string, import("vue").PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
+  "onUpdate:modelValue"?: ((value: string) => any) | undefined;
   onClose?: ((item: TabItem, index: number) => any) | undefined;
   onClick?: ((item: TabItem, index: number) => any) | undefined;
-  "onUpdate:modelValue"?: ((value: string) => any) | undefined;
 }>, {
   closable: boolean;
   position: "left" | "right";

package/dist/components/tabs/tabs.vue.d.ts

@@ -9,13 +9,13 @@ type __VLS_PublicProps = __VLS_Props & __VLS_ModelProps;
 declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
   "update:modelValue": (value: string | undefined) => any;
 } & {
+  "update:modelValue": (value: string) => any;
   close: (item: TabItem, index: number) => any;
   click: (item: TabItem, index: number) => any;
-  "update:modelValue": (value: string) => any;
 }, string, import("vue").PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
+  "onUpdate:modelValue"?: ((value: string) => any) | undefined;
   onClose?: ((item: TabItem, index: number) => any) | undefined;
   onClick?: ((item: TabItem, index: number) => any) | undefined;
-  "onUpdate:modelValue"?: ((value: string) => any) | undefined;
 }>, {
   closable: boolean;
   position: "left" | "right" | "top" | "bottom";

package/dist/components/textarea/textarea.vue.d.ts

@@ -20,9 +20,9 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
   onFocus?: (() => any) | undefined;
   onBlur?: (() => any) | undefined;
 }>, {
-  disabled: boolean;
   placeholder: string;
   clearable: boolean;
+  disabled: boolean;
   readonly: boolean;
   resize: boolean;
   autosize: boolean;

package/dist/components/tip/tip.vue.d.ts

@@ -9,11 +9,11 @@ declare const __VLS_base: import("vue").DefineComponent<TipProps, {}, {}, {}, {}
 }, string, import("vue").PublicProps, Readonly<TipProps> & Readonly<{
   "onUpdate:visible"?: ((value: boolean) => any) | undefined;
 }>, {
+  content: string;
   trigger: "hover" | "click";
   contentTag: string;
   visible: boolean;
   direction: TipDirection;
-  content: string;
   alignment: TipAlign;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/tree-select/tree-select.vue.d.ts

@@ -23,14 +23,14 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
   onChange?: ((value?: string | number | undefined, selectedData?: Record<string, any> | undefined) => any) | undefined;
   "onUpdate:text"?: ((text?: string | undefined) => any) | undefined;
 }>, {
-  minWidth: string;
-  disabled: boolean;
   expandAll: boolean;
   labelKey: string;
   valueKey: string;
   placeholder: string;
   clearable: boolean;
   filterable: boolean;
+  minWidth: string;
+  disabled: boolean;
   readonly: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veltra/desktop",
-  "version": "1.1.32",
+  "version": "1.1.33",
   "files": [
     "dist",
     "src"
@@ -68,11 +68,11 @@
     "@cat-kit/core": ">=1.1.6",
     "@cat-kit/excel": ">=1.0.0",
     "@cat-kit/fe": "^1.1.6",
-    "@veltra/compositions": "1.1.32",
-    "@veltra/directives": "1.1.32",
-    "@veltra/icons": "1.1.32",
-    "@veltra/styles": "1.1.32",
-    "@veltra/utils": "1.1.32",
+    "@veltra/compositions": "1.1.33",
+    "@veltra/directives": "1.1.33",
+    "@veltra/icons": "1.1.33",
+    "@veltra/styles": "1.1.33",
+    "@veltra/utils": "1.1.33",
     "vue": ">=3.5.0"
   }
 }

package/src/components/table/node/col.ts

@@ -94,9 +94,16 @@ export class ColumnNode extends TreeNode<TableColumn, ColumnNode> {
     return this.data.resizable ?? true
   }
 
+  /**
+   * 是否在列配置上显式指定了 width，或经表头拖拽锁定。
+   * 此类列不参与剩余宽度的均分。
+   */
+  explicitWidth: boolean
+
   style: Record<string, number> = reactive({})
 
   constructor(val: TableColumn, index: number, depth: number, parent?: ColumnNode) {
     super(isReactive(val) ? val : shallowReactive(val), index, depth, parent)
+    this.explicitWidth = val.width !== undefined
   }
 }

package/src/components/table/use-col-resize.ts

@@ -34,22 +34,23 @@ export function useColResize(options: Options): UseColResizeReturned {
 
     if (!containerWidth || !leafColumns.value.length) return
 
-    // 如果每个列都设置了宽度， 有两种情况
-    // 1. 表格容器宽度大于所有列宽度之和，则将剩下的宽度均匀分布到所有列中
-    // 2. 表格容器宽度小于所有列宽度之和，则什么也不管
-    const allColumnsWidth = leafColumns.value.reduce((acc, cur) => {
-      return acc + (cur.width ?? cur.minWidth!)
-    }, 0)
-
-    if (allColumnsWidth < containerWidth) {
-      const freeWidth = containerWidth - allColumnsWidth
-
-      const allocatableColumns = leafColumns.value.filter((column) => column.resizable !== false)
-
-      const allocatedWidth = freeWidth / allocatableColumns.length
-
-      allocatableColumns.forEach((column) => {
-        column.width = (column.width ?? column.minWidth!) + allocatedWidth
+    const flexColumns = leafColumns.value.filter((column) => !column.explicitWidth)
+    const fixedWidthTotal = leafColumns.value
+      .filter((column) => column.explicitWidth)
+      .reduce((acc, cur) => acc + (cur.width ?? cur.minWidth!), 0)
+    const flexBaseTotal = flexColumns.reduce((acc, cur) => acc + cur.minWidth!, 0)
+    const totalBase = fixedWidthTotal + flexBaseTotal
+
+    // 仅未显式指定 width 的列参与剩余宽度均分；指定了 width 的列保持该宽度。
+    if (flexColumns.length > 0 && totalBase < containerWidth) {
+      const allocatedWidth = (containerWidth - totalBase) / flexColumns.length
+
+      flexColumns.forEach((column) => {
+        column.width = column.minWidth! + allocatedWidth
+      })
+    } else {
+      flexColumns.forEach((column) => {
+        column.data.width = undefined
       })
     }
 
@@ -110,6 +111,7 @@ export function useColResize(options: Options): UseColResizeReturned {
       originWidth + e.pageX - originX,
       currentResizeColumn!.minWidth!
     )
+    currentResizeColumn!.explicitWidth = true
 
     showResizeLine.value = false
     currentResizeColumn = null