@veltra/desktop 1.2.25 → 1.2.27

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";
-  circle: boolean;
+  type: import("@veltra/utils").ColorType;
   max: number;
+  circle: boolean;
   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/batch-edit/batch-edit-form.js

@@ -7,7 +7,7 @@ import { BatchEditDIKey } from "./di.js";
 import { FORM_ACTION_HEADER_MAP } from "./form-action-header.js";
 import { Fragment, Transition, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, guardReactiveProps, inject, normalizeClass, normalizeProps, openBlock, renderSlot, resolveDynamicComponent, shallowRef, toDisplayString, toRef, unref, withCtx } from "vue";
 import { bem } from "@veltra/utils";
-import { Close } from "@veltra/icons/normal";
+import { Close, Save } from "@veltra/icons/normal";
 import { o } from "@cat-kit/core";
 //#region src/components/batch-edit/batch-edit-form.vue
 const _sfc_main = /*@__PURE__*/ defineComponent({
@@ -119,6 +119,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					}),
 					_cache[3] || (_cache[3] = createTextVNode(" 关闭 ", -1))
 				], 2)], 2), createElementVNode("div", { class: normalizeClass(unref(cls).e("form-actions")) }, [createVNode(unref(_sfc_main$3), {
+					size: "small",
 					text: "",
 					loading: unref(state).loading,
 					onClick: unref(handleClose)
@@ -128,12 +129,16 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				}, 8, ["loading", "onClick"]), showSaveBtn.value ? (openBlock(), createBlock(unref(_sfc_main$3), {
 					key: 0,
 					type: "primary",
+					size: "small",
+					title: "保存",
+					icon: unref(Save),
 					loading: unref(state).loading,
 					onClick: unref(handleSave)
-				}, {
-					default: withCtx(() => [..._cache[5] || (_cache[5] = [createTextVNode(" 保存 ", -1)])]),
-					_: 1
-				}, 8, ["loading", "onClick"])) : createCommentVNode("v-if", true)], 2)], 2)
+				}, null, 8, [
+					"icon",
+					"loading",
+					"onClick"
+				])) : createCommentVNode("v-if", true)], 2)], 2)
 			], 2)) : createCommentVNode("v-if", true);
 		};
 	}

package/dist/components/batch-edit/batch-edit-form.js.map

@@ -1 +1 @@
-{"version":3,"file":"batch-edit-form.js","names":[],"sources":["../../../src/components/batch-edit/batch-edit-form.vue"],"sourcesContent":["<template>\n  <aside :class=\"cls.e('form')\" v-if=\"state.formVisible && !!props.model\">\n    <header :class=\"cls.e('form-header')\">\n      <span :class=\"[cls.e('form-icon'), bem.is(state.formActionType)]\">\n        <u-icon>\n          <component :is=\"headerInfo.icon\" />\n        </u-icon>\n      </span>\n      <div :class=\"cls.e('form-title')\">\n        <h3 :class=\"cls.e('form-title-text')\">{{ headerInfo.title }}</h3>\n      </div>\n      <u-button\n        :class=\"cls.e('form-close')\"\n        :icon=\"Close\"\n        text\n        circle\n        size=\"small\"\n        title=\"关闭\"\n        @click=\"handleClose\"\n      />\n    </header>\n\n    <u-scroll always :class=\"cls.e('form-body')\" :key=\"bodyKey\">\n      <transition name=\"fade\" appear mode=\"out-in\">\n        <u-form\n          ref=\"formComponentRef\"\n          :model=\"props.model\"\n          :readonly=\"props.readonly\"\n          :label-width=\"props.labelWidth\"\n          @field:change=\"handleFieldChange\"\n        >\n          <slot\n            v-bind=\"{\n              row: state.row,\n              depth: state.depth,\n              indexes: state.indexPath,\n              index: state.row?.index\n            }\"\n          />\n        </u-form>\n      </transition>\n    </u-scroll>\n\n    <footer :class=\"cls.e('form-footer')\">\n      <span :class=\"cls.e('form-hint')\">\n        <template v-if=\"props.readonly\"> 只读模式 </template>\n\n        <span :class=\"{ [bem.is('concealed')]: !focused }\">\n          <template v-if=\"!(state.formActionType === 'update' && props.quickEdit)\">\n            <u-kbd>Ctrl + S</u-kbd> 保存 ·\n          </template>\n          <u-kbd>Esc</u-kbd> 关闭\n        </span>\n      </span>\n\n      <div :class=\"cls.e('form-actions')\">\n        <u-button text :loading=\"state.loading\" @click=\"handleClose\"> 取消 </u-button>\n        <u-button v-if=\"showSaveBtn\" type=\"primary\" :loading=\"state.loading\" @click=\"handleSave\">\n          保存\n        </u-button>\n      </div>\n    </footer>\n  </aside>\n</template>\n\n<script lang=\"ts\" setup>\nimport { o } from '@cat-kit/core'\nimport { Close } from '@veltra/icons/normal'\nimport { bem } from '@veltra/utils'\nimport { computed, inject, shallowRef, toRef } from 'vue'\n\nimport type { _FormExposed, FormExposed } from '../../types/form'\nimport { UButton } from '../button'\nimport { UForm } from '../form'\nimport { UIcon } from '../icon'\nimport { UKbd } from '../kbd'\nimport { UScroll } from '../scroll'\nimport { BatchEditDIKey } from './di'\nimport { FORM_ACTION_HEADER_MAP } from './form-action-header'\n\ndefineOptions({ name: 'UBatchEditForm' })\n\nconst batchEditCtx = inject(BatchEditDIKey)!\n\nconst { cls, props, state, handleClose, handleSave, staticFeatures, dynamicFeatures } = batchEditCtx\n\nconst focused = toRef(batchEditCtx, 'focused')\n\nconst formComponentRef = shallowRef<FormExposed>()\n\ndefineExpose<_FormExposed>({\n  el: toRef(() => formComponentRef.value?.el),\n  validate: () => formComponentRef.value?.validate() ?? Promise.resolve(true),\n  clearValidate: () => formComponentRef.value?.clearValidate(),\n  reset: () => formComponentRef.value?.reset()\n})\n\nfunction handleFieldChange(field: string, value: any) {\n  if (state.row && props.quickEdit) {\n    o(state.row.data).set(field, value)\n  }\n}\n\nconst creatable = computed(() => {\n  if (state.formActionType !== 'create') return false\n  return staticFeatures.value.has('create') || dynamicFeatures.value.create?.(state.row)\n})\n\nconst creatableChild = computed(() => {\n  if (state.formActionType !== 'createChild') return false\n  return staticFeatures.value.has('createChild') || dynamicFeatures.value.createChild?.(state.row)\n})\n\nconst updatable = computed(() => {\n  if (state.formActionType !== 'update') return false\n  return staticFeatures.value.has('update') || dynamicFeatures.value.update?.(state.row)\n})\n\nconst showSaveBtn = computed(() => {\n  if (props.readonly) return false\n  if (props.quickEdit && state.formActionType === 'update') return false\n  return creatable.value || updatable.value || creatableChild.value\n})\n\nconst headerInfo = computed(() => FORM_ACTION_HEADER_MAP[state.formActionType])\n\n/** 通过 row 切换 / 类型切换驱动表单内容淡出淡入 */\nconst bodyKey = computed(() => {\n  return `${state.formActionType}-${state.row?.uid ?? 'create'}-${state.parentRow?.uid ?? 'root'}`\n})\n</script>\n"],"mappings":";;;;;;;;;;;;;;;;EAkFA,MAAM,eAAe,OAAO,cAAc;EAE1C,MAAM,EAAE,KAAK,OAAO,OAAO,aAAa,YAAY,gBAAgB,oBAAoB;EAExF,MAAM,UAAU,MAAM,cAAc,SAAS;EAE7C,MAAM,mBAAmB,WAAwB;EAEjD,SAA2B;GACzB,IAAI,YAAY,iBAAiB,OAAO,EAAE;GAC1C,gBAAgB,iBAAiB,OAAO,SAAS,KAAK,QAAQ,QAAQ,IAAI;GAC1E,qBAAqB,iBAAiB,OAAO,cAAc;GAC3D,aAAa,iBAAiB,OAAO,MAAM;EAC7C,CAAC;EAED,SAAS,kBAAkB,OAAe,OAAY;GACpD,IAAI,MAAM,OAAO,MAAM,WACrB,EAAE,MAAM,IAAI,IAAI,CAAC,CAAC,IAAI,OAAO,KAAK;EAEtC;EAEA,MAAM,YAAY,eAAe;GAC/B,IAAI,MAAM,mBAAmB,UAAU,OAAO;GAC9C,OAAO,eAAe,MAAM,IAAI,QAAQ,KAAK,gBAAgB,MAAM,SAAS,MAAM,GAAG;EACvF,CAAC;EAED,MAAM,iBAAiB,eAAe;GACpC,IAAI,MAAM,mBAAmB,eAAe,OAAO;GACnD,OAAO,eAAe,MAAM,IAAI,aAAa,KAAK,gBAAgB,MAAM,cAAc,MAAM,GAAG;EACjG,CAAC;EAED,MAAM,YAAY,eAAe;GAC/B,IAAI,MAAM,mBAAmB,UAAU,OAAO;GAC9C,OAAO,eAAe,MAAM,IAAI,QAAQ,KAAK,gBAAgB,MAAM,SAAS,MAAM,GAAG;EACvF,CAAC;EAED,MAAM,cAAc,eAAe;GACjC,IAAI,MAAM,UAAU,OAAO;GAC3B,IAAI,MAAM,aAAa,MAAM,mBAAmB,UAAU,OAAO;GACjE,OAAO,UAAU,SAAS,UAAU,SAAS,eAAe;EAC9D,CAAC;EAED,MAAM,aAAa,eAAe,uBAAuB,MAAM,eAAe;;EAG9E,MAAM,UAAU,eAAe;GAC7B,OAAO,GAAG,MAAM,eAAe,GAAG,MAAM,KAAK,OAAO,SAAS,GAAG,MAAM,WAAW,OAAO;EAC1F,CAAC;;UAhIqC,MAAA,KAAA,CAAK,CAAC,eAAW,CAAA,CAAM,MAAA,KAAA,CAAK,CAAC,SAAA,UAAA,GAAjE,mBA6DQ,SAAA;;IA7DA,OAAK,eAAE,MAAA,GAAA,CAAG,CAAC,EAAC,MAAA,CAAA;;IAClB,mBAkBS,UAAA,EAlBA,OAAK,eAAE,MAAA,GAAA,CAAG,CAAC,EAAC,aAAA,CAAA,EAAA,GAAA;KACnB,mBAIO,QAAA,EAJA,OAAK,eAAA,CAAG,MAAA,GAAA,CAAG,CAAC,EAAC,WAAA,GAAe,MAAA,GAAA,CAAG,CAAC,GAAG,MAAA,KAAA,CAAK,CAAC,cAAc,CAAA,CAAA,EAAA,GAAA,CAC5D,YAES,MAAA,WAAA,GAAA,MAAA;6BAD4B,EAAA,UAAA,GAAnC,YAAmC,wBAAnB,WAAA,MAAW,IAAI,CAAA,EAAA,CAAA;;;KAGnC,mBAEM,OAAA,EAFA,OAAK,eAAE,MAAA,GAAA,CAAG,CAAC,EAAC,YAAA,CAAA,EAAA,GAAA,CAChB,mBAAiE,MAAA,EAA5D,OAAK,eAAE,MAAA,GAAA,CAAG,CAAC,EAAC,iBAAA,CAAA,EAAA,GAAA,gBAAwB,WAAA,MAAW,KAAK,GAAA,CAAA,CAAA,GAAA,CAAA;KAE3D,YAQE,MAAA,WAAA,GAAA;MAPC,OAAK,eAAE,MAAA,GAAA,CAAG,CAAC,EAAC,YAAA,CAAA;MACZ,MAAM,MAAA,KAAA;MACP,MAAA;MACA,QAAA;MACA,MAAK;MACL,OAAM;MACL,SAAO,MAAA,WAAA;;;;;;;kBAIZ,YAmBW,MAAA,WAAA,GAAA;KAnBD,QAAA;KAAQ,OAAK,eAAE,MAAA,GAAA,CAAG,CAAC,EAAC,WAAA,CAAA;KAAgB,KAAK,QAAA;;4BAkBpC,CAjBb,YAiBa,YAAA;MAjBD,MAAK;MAAO,QAAA;MAAO,MAAK;;6BAgBzB,CAfT,YAeS,MAAA,YAAA,GAAA;gBAdH;OAAJ,KAAI;OACH,OAAO,MAAA,KAAA,CAAK,CAAC;OACb,UAAU,MAAA,KAAA,CAAK,CAAC;OAChB,eAAa,MAAA,KAAA,CAAK,CAAC;OACnB,kBAAc;;8BASb,CAPF,WAOE,KAAA,QAAA,WAAA,eAAA,mBAAA;aAN6B,MAAA,KAAA,CAAK,CAAC;eAA0B,MAAA,KAAA,CAAK,CAAC;iBAA8B,MAAA,KAAA,CAAK,CAAC;eAAgC,MAAA,KAAA,CAAK,CAAC,KAAK;;;;;;;;;;;;IAW1J,mBAkBS,UAAA,EAlBA,OAAK,eAAE,MAAA,GAAA,CAAG,CAAC,EAAC,aAAA,CAAA,EAAA,GAAA,CACnB,mBASO,QAAA,EATA,OAAK,eAAE,MAAA,GAAA,CAAG,CAAC,EAAC,WAAA,CAAA,EAAA,GAAA,CACD,MAAA,KAAA,CAAK,CAAC,YAAA,UAAA,GAAtB,mBAAiD,UAAA,EAAA,KAAA,EAAA,GAAA,CAAA,gBAAjB,QAAM,CAAA,GAAA,EAAA,KAAA,mBAAA,QAAA,IAAA,GAEtC,mBAKO,QAAA,EALA,OAAK,eAAA,GAAK,MAAA,GAAA,CAAG,CAAC,GAAE,WAAA,IAAA,CAAiB,QAAA,MAAO,CAAA,EAAA,GAAA;OAC3B,MAAA,KAAA,CAAK,CAAC,mBAAc,YAAiB,MAAA,KAAA,CAAK,CAAC,cAAA,UAAA,GAA7D,mBAEW,UAAA,EAAA,KAAA,EAAA,GAAA,CADT,YAAuB,MAAA,WAAA,GAAA,MAAA;6BAAR,CAAA,GAAA,OAAA,OAAA,OAAA,KAAA,CAAA,gBAAR,YAAQ,EAAA,CAAA,EAAA,CAAA;;mDAAQ,UACzB,EAAA,EAAA,GAAA,EAAA,KAAA,mBAAA,QAAA,IAAA;KACA,YAAkB,MAAA,WAAA,GAAA,MAAA;6BAAR,CAAA,GAAA,OAAA,OAAA,OAAA,KAAA,CAAA,gBAAH,OAAG,EAAA,CAAA,EAAA,CAAA;;;+CAAQ,QACpB,EAAA;gBAGF,mBAKM,OAAA,EALA,OAAK,eAAE,MAAA,GAAA,CAAG,CAAC,EAAC,cAAA,CAAA,EAAA,GAAA,CAChB,YAA4E,MAAA,WAAA,GAAA;KAAlE,MAAA;KAAM,SAAS,MAAA,KAAA,CAAK,CAAC;KAAU,SAAO,MAAA,WAAA;;4BAAiB,CAAA,GAAA,OAAA,OAAA,OAAA,KAAA,CAAA,gBAAJ,QAAI,EAAA,CAAA,EAAA,CAAA;;mCACjD,YAAA,SAAA,UAAA,GAAhB,YAEW,MAAA,WAAA,GAAA;;KAFkB,MAAK;KAAW,SAAS,MAAA,KAAA,CAAK,CAAC;KAAU,SAAO,MAAA,UAAA;;4BAE7E,CAAA,GAAA,OAAA,OAAA,OAAA,KAAA,CAAA,gBAFyF,QAEzF,EAAA,CAAA,EAAA,CAAA"}
+{"version":3,"file":"batch-edit-form.js","names":[],"sources":["../../../src/components/batch-edit/batch-edit-form.vue"],"sourcesContent":["<template>\n  <aside :class=\"cls.e('form')\" v-if=\"state.formVisible && !!props.model\">\n    <header :class=\"cls.e('form-header')\">\n      <span :class=\"[cls.e('form-icon'), bem.is(state.formActionType)]\">\n        <u-icon>\n          <component :is=\"headerInfo.icon\" />\n        </u-icon>\n      </span>\n      <div :class=\"cls.e('form-title')\">\n        <h3 :class=\"cls.e('form-title-text')\">{{ headerInfo.title }}</h3>\n      </div>\n      <u-button\n        :class=\"cls.e('form-close')\"\n        :icon=\"Close\"\n        text\n        circle\n        size=\"small\"\n        title=\"关闭\"\n        @click=\"handleClose\"\n      />\n    </header>\n\n    <u-scroll always :class=\"cls.e('form-body')\" :key=\"bodyKey\">\n      <transition name=\"fade\" appear mode=\"out-in\">\n        <u-form\n          ref=\"formComponentRef\"\n          :model=\"props.model\"\n          :readonly=\"props.readonly\"\n          :label-width=\"props.labelWidth\"\n          @field:change=\"handleFieldChange\"\n        >\n          <slot\n            v-bind=\"{\n              row: state.row,\n              depth: state.depth,\n              indexes: state.indexPath,\n              index: state.row?.index\n            }\"\n          />\n        </u-form>\n      </transition>\n    </u-scroll>\n\n    <footer :class=\"cls.e('form-footer')\">\n      <span :class=\"cls.e('form-hint')\">\n        <template v-if=\"props.readonly\"> 只读模式 </template>\n\n        <span :class=\"{ [bem.is('concealed')]: !focused }\">\n          <template v-if=\"!(state.formActionType === 'update' && props.quickEdit)\">\n            <u-kbd>Ctrl + S</u-kbd> 保存 ·\n          </template>\n          <u-kbd>Esc</u-kbd> 关闭\n        </span>\n      </span>\n\n      <div :class=\"cls.e('form-actions')\">\n        <u-button size=\"small\" text :loading=\"state.loading\" @click=\"handleClose\"> 取消 </u-button>\n        <u-button\n          v-if=\"showSaveBtn\"\n          type=\"primary\"\n          size=\"small\"\n          title=\"保存\"\n          :icon=\"Save\"\n          :loading=\"state.loading\"\n          @click=\"handleSave\"\n        />\n      </div>\n    </footer>\n  </aside>\n</template>\n\n<script lang=\"ts\" setup>\nimport { o } from '@cat-kit/core'\nimport { Close, Save } from '@veltra/icons/normal'\nimport { bem } from '@veltra/utils'\nimport { computed, inject, shallowRef, toRef } from 'vue'\n\nimport type { _FormExposed, FormExposed } from '../../types/form'\nimport { UButton } from '../button'\nimport { UForm } from '../form'\nimport { UIcon } from '../icon'\nimport { UKbd } from '../kbd'\nimport { UScroll } from '../scroll'\nimport { BatchEditDIKey } from './di'\nimport { FORM_ACTION_HEADER_MAP } from './form-action-header'\n\ndefineOptions({ name: 'UBatchEditForm' })\n\nconst batchEditCtx = inject(BatchEditDIKey)!\n\nconst { cls, props, state, handleClose, handleSave, staticFeatures, dynamicFeatures } = batchEditCtx\n\nconst focused = toRef(batchEditCtx, 'focused')\n\nconst formComponentRef = shallowRef<FormExposed>()\n\ndefineExpose<_FormExposed>({\n  el: toRef(() => formComponentRef.value?.el),\n  validate: () => formComponentRef.value?.validate() ?? Promise.resolve(true),\n  clearValidate: () => formComponentRef.value?.clearValidate(),\n  reset: () => formComponentRef.value?.reset()\n})\n\nfunction handleFieldChange(field: string, value: any) {\n  if (state.row && props.quickEdit) {\n    o(state.row.data).set(field, value)\n  }\n}\n\nconst creatable = computed(() => {\n  if (state.formActionType !== 'create') return false\n  return staticFeatures.value.has('create') || dynamicFeatures.value.create?.(state.row)\n})\n\nconst creatableChild = computed(() => {\n  if (state.formActionType !== 'createChild') return false\n  return staticFeatures.value.has('createChild') || dynamicFeatures.value.createChild?.(state.row)\n})\n\nconst updatable = computed(() => {\n  if (state.formActionType !== 'update') return false\n  return staticFeatures.value.has('update') || dynamicFeatures.value.update?.(state.row)\n})\n\nconst showSaveBtn = computed(() => {\n  if (props.readonly) return false\n  if (props.quickEdit && state.formActionType === 'update') return false\n  return creatable.value || updatable.value || creatableChild.value\n})\n\nconst headerInfo = computed(() => FORM_ACTION_HEADER_MAP[state.formActionType])\n\n/** 通过 row 切换 / 类型切换驱动表单内容淡出淡入 */\nconst bodyKey = computed(() => {\n  return `${state.formActionType}-${state.row?.uid ?? 'create'}-${state.parentRow?.uid ?? 'root'}`\n})\n</script>\n"],"mappings":"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"}

package/dist/components/batch-edit/use-edit-state.js

@@ -12,6 +12,7 @@ function useEditState(options) {
 	};
 	const state = shallowReactive({ ...defaultState });
 	function resetState() {
+		formRef.value?.reset();
 		if (state.row) state.row.isCurrent = false;
 		Object.keys(state).forEach((key) => {
 			delete state[key];

package/dist/components/batch-edit/use-edit-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-edit-state.js","names":[],"sources":["../../../src/components/batch-edit/use-edit-state.ts"],"sourcesContent":["import { o } from '@cat-kit/core'\nimport { nextTick, shallowReactive, watch, type ShallowRef } from 'vue'\n\nimport type { BatchEditProps, BatchEditStates, FormExposed } from '../../types'\n\ninterface Options {\n  props: BatchEditProps\n  formRef: ShallowRef<FormExposed | null>\n}\n\nexport function useEditState(options: Options) {\n  const { props, formRef } = options\n\n  const defaultState: BatchEditStates = {\n    depth: -1,\n    formVisible: false,\n    formActionType: 'create',\n    loading: false,\n    indexPath: []\n  }\n\n  const state = shallowReactive({ ...defaultState })\n\n  function resetState() {\n    if (state.row) {\n      state.row.isCurrent = false\n    }\n\n    Object.keys(state).forEach((key) => {\n      delete state[key]\n    })\n\n    Object.assign(state, defaultState)\n  }\n\n  watch(\n    () => state.row,\n    (row) => {\n      formRef.value?.reset()\n\n      if (row) {\n        /** 延迟设置 model，防止表单初始状态丢失 */\n        nextTick(() => {\n          if (props.model) {\n            o(props.model).deepExtend(row.data)\n          }\n        })\n        state.formActionType = props.readonly ? 'view' : 'update'\n        state.formVisible = true\n        state.depth = row.depth\n        state.indexPath = [...row.indexes]\n\n        return\n      }\n\n      resetState()\n    }\n  )\n\n  return { state, resetState }\n}\n"],"mappings":";;;AAUA,SAAgB,aAAa,SAAkB;CAC7C,MAAM,EAAE,OAAO,YAAY;CAE3B,MAAM,eAAgC;EACpC,OAAO;EACP,aAAa;EACb,gBAAgB;EAChB,SAAS;EACT,WAAW,CAAC;CACd;CAEA,MAAM,QAAQ,gBAAgB,EAAE,GAAG,aAAa,CAAC;CAEjD,SAAS,aAAa;EACpB,IAAI,MAAM,KACR,MAAM,IAAI,YAAY;EAGxB,OAAO,KAAK,KAAK,CAAC,CAAC,SAAS,QAAQ;GAClC,OAAO,MAAM;EACf,CAAC;EAED,OAAO,OAAO,OAAO,YAAY;CACnC;CAEA,YACQ,MAAM,MACX,QAAQ;EACP,QAAQ,OAAO,MAAM;EAErB,IAAI,KAAK;;GAEP,eAAe;IACb,IAAI,MAAM,OACR,EAAE,MAAM,KAAK,CAAC,CAAC,WAAW,IAAI,IAAI;GAEtC,CAAC;GACD,MAAM,iBAAiB,MAAM,WAAW,SAAS;GACjD,MAAM,cAAc;GACpB,MAAM,QAAQ,IAAI;GAClB,MAAM,YAAY,CAAC,GAAG,IAAI,OAAO;GAEjC;EACF;EAEA,WAAW;CACb,CACF;CAEA,OAAO;EAAE;EAAO;CAAW;AAC7B"}
+{"version":3,"file":"use-edit-state.js","names":[],"sources":["../../../src/components/batch-edit/use-edit-state.ts"],"sourcesContent":["import { o } from '@cat-kit/core'\nimport { nextTick, shallowReactive, watch, type ShallowRef } from 'vue'\n\nimport type { BatchEditProps, BatchEditStates, FormExposed } from '../../types'\n\ninterface Options {\n  props: BatchEditProps\n  formRef: ShallowRef<FormExposed | null>\n}\n\nexport function useEditState(options: Options) {\n  const { props, formRef } = options\n\n  const defaultState: BatchEditStates = {\n    depth: -1,\n    formVisible: false,\n    formActionType: 'create',\n    loading: false,\n    indexPath: []\n  }\n\n  const state = shallowReactive({ ...defaultState })\n\n  function resetState() {\n    // 销毁表单前先重置，避免下次 v-if 重挂载时 Form 拍到脏 model\n    formRef.value?.reset()\n\n    if (state.row) {\n      state.row.isCurrent = false\n    }\n\n    Object.keys(state).forEach((key) => {\n      delete state[key]\n    })\n\n    Object.assign(state, defaultState)\n  }\n\n  watch(\n    () => state.row,\n    (row) => {\n      formRef.value?.reset()\n\n      if (row) {\n        /** 延迟设置 model，防止表单初始状态丢失 */\n        nextTick(() => {\n          if (props.model) {\n            o(props.model).deepExtend(row.data)\n          }\n        })\n        state.formActionType = props.readonly ? 'view' : 'update'\n        state.formVisible = true\n        state.depth = row.depth\n        state.indexPath = [...row.indexes]\n\n        return\n      }\n\n      resetState()\n    }\n  )\n\n  return { state, resetState }\n}\n"],"mappings":";;;AAUA,SAAgB,aAAa,SAAkB;CAC7C,MAAM,EAAE,OAAO,YAAY;CAE3B,MAAM,eAAgC;EACpC,OAAO;EACP,aAAa;EACb,gBAAgB;EAChB,SAAS;EACT,WAAW,CAAC;CACd;CAEA,MAAM,QAAQ,gBAAgB,EAAE,GAAG,aAAa,CAAC;CAEjD,SAAS,aAAa;EAEpB,QAAQ,OAAO,MAAM;EAErB,IAAI,MAAM,KACR,MAAM,IAAI,YAAY;EAGxB,OAAO,KAAK,KAAK,CAAC,CAAC,SAAS,QAAQ;GAClC,OAAO,MAAM;EACf,CAAC;EAED,OAAO,OAAO,OAAO,YAAY;CACnC;CAEA,YACQ,MAAM,MACX,QAAQ;EACP,QAAQ,OAAO,MAAM;EAErB,IAAI,KAAK;;GAEP,eAAe;IACb,IAAI,MAAM,OACR,EAAE,MAAM,KAAK,CAAC,CAAC,WAAW,IAAI,IAAI;GAEtC,CAAC;GACD,MAAM,iBAAiB,MAAM,WAAW,SAAS;GACjD,MAAM,cAAc;GACpB,MAAM,QAAQ,IAAI;GAClB,MAAM,YAAY,CAAC,GAAG,IAAI,OAAO;GAEjC;EACF;EAEA,WAAW;CACb,CACF;CAEA,OAAO;EAAE;EAAO;CAAW;AAC7B"}

package/dist/components/batch-edit/use-handlers.js

@@ -103,6 +103,9 @@ function useHandlers(options) {
 				if (result) item = result;
 			}
 			insert(item);
+			const next = last(state.indexPath) + 1;
+			state.indexPath = [...state.indexPath.slice(0, -1), next];
+			formRef.value?.reset();
 			return;
 		}
 		if (saveMethod) {

package/dist/components/batch-edit/use-handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-handlers.js","names":[],"sources":["../../../src/components/batch-edit/use-handlers.ts"],"sourcesContent":["import { last, o } from '@cat-kit/core'\nimport { computed, nextTick, type ShallowRef } from 'vue'\n\nimport type {\n  TableRow,\n  BatchEditEmits,\n  BatchEditProps,\n  BatchEditStates,\n  FormExposed\n} from '../../types'\n\n/** 按索引路径在原始数据树中定位节点（等价于历史 Forest.visit 路径访问） */\nfunction visitDataByIndexPath<T extends Record<string, unknown>>(\n  roots: T[],\n  indexPath: number[],\n  childrenKey: string\n): T | undefined {\n  if (!indexPath.length) return undefined\n  let currentList: T[] | undefined = roots\n  let node: T | undefined\n  for (let i = 0; i < indexPath.length; i++) {\n    const idx = indexPath[i]!\n    if (!currentList) return undefined\n    node = currentList[idx]\n    if (node === undefined) return undefined\n    if (i < indexPath.length - 1) {\n      const next = node[childrenKey]\n      currentList = Array.isArray(next) ? (next as T[]) : undefined\n    }\n  }\n  return node\n}\n\ninterface Options {\n  props: BatchEditProps\n  emit: BatchEditEmits\n  state: BatchEditStates\n  formRef: ShallowRef<FormExposed | null>\n  resetState: () => void\n}\n\nexport interface EditReturned {\n  handleSave: () => Promise<void>\n  handleClose: () => void\n  handleCreate: () => void\n  handleDelete: (row: TableRow) => Promise<void>\n  handleInsertToNext: (row: TableRow) => void\n  handleInsertToPrev: (row: TableRow) => void\n  handleInsertChild: (row: TableRow) => void\n}\n\nexport function useHandlers(options: Options): EditReturned {\n  const { props, emit, state, resetState, formRef } = options\n\n  const childrenKey = computed(() => {\n    return typeof props.tree === 'string' ? props.tree : 'children'\n  })\n\n  function getInsertData(): Record<string, any> {\n    return o(props.model ?? {}).copy()\n  }\n\n  /**\n   * 插入数据\n   * @param item 数据\n   */\n  function insert(item: Record<string, any>) {\n    const data = [...(props.data ?? [])]\n\n    const parent = visitDataByIndexPath(data ?? [], state.indexPath.slice(0, -1), childrenKey.value)\n\n    if (parent) {\n      const children = parent[childrenKey.value]\n      if (!children) {\n        parent[childrenKey.value] = [item]\n      } else {\n        children.splice(last(state.indexPath), 0, item)\n      }\n    } else {\n      data.splice(last(state.indexPath), 0, item)\n    }\n\n    emit('update:data', data)\n\n    return item\n  }\n\n  /**\n   * 点击新增按钮\n   */\n  function handleCreate() {\n    const { data } = props\n\n    resetState()\n\n    nextTick(() => {\n      state.formActionType = 'create'\n      state.formVisible = true\n      state.depth = 1\n      state.indexPath = [data?.length ?? 0]\n    })\n  }\n\n  function handleInsertToPrev(row: TableRow) {\n    resetState()\n    state.formActionType = 'create'\n    state.formVisible = true\n    state.depth = row.depth\n    state.indexPath = [...row.indexes]\n  }\n\n  function handleInsertToNext(row: TableRow) {\n    resetState()\n    state.formActionType = 'create'\n    state.formVisible = true\n    state.depth = row.depth\n    state.indexPath = [...row.indexes.slice(0, -1), row.index + 1]\n  }\n\n  function handleInsertChild(row: TableRow) {\n    resetState()\n    state.formActionType = 'createChild'\n    state.formVisible = true\n    state.parentRow = row\n    state.depth = row.depth + 1\n    row.expanded = true\n    state.indexPath = [...row.indexes, row.children?.length ?? 0]\n  }\n\n  function runWithLoading<Arg extends any[]>(fn: (...args: Arg) => Promise<void> | void) {\n    return async (...args: Arg) => {\n      state.loading = true\n      if (state.row) {\n        state.row.operating = true\n      }\n      try {\n        await fn.apply(null, args)\n      } catch (error) {\n        console.error(error)\n      }\n      state.loading = false\n      if (state.row) {\n        state.row.operating = false\n      }\n    }\n  }\n\n  /** 保存 */\n  const handleSave = runWithLoading(async () => {\n    const { model, saveMethod } = props\n    const valid = await formRef.value?.validate()\n    if (!model || !valid) return\n\n    let item = getInsertData()\n\n    // 新增\n    if (state.formActionType === 'create' || state.formActionType === 'createChild') {\n      await props.beforeCreate?.(item, state.parentRow?.data)\n      if (saveMethod) {\n        const result = await saveMethod(item, state.formActionType, state.parentRow?.data)\n        if (result) {\n          item = result\n        }\n      }\n      insert(item)\n      return\n    }\n\n    // 普通模式下的编辑\n    if (saveMethod) {\n      const result = await saveMethod(item, state.formActionType, state.parentRow?.data)\n      if (result) {\n        item = result\n      }\n    }\n\n    const { row } = state\n    row &&\n      Object.keys(item).forEach((key) => {\n        o(row.data).set(key, o(item).get(key))\n      })\n  })\n\n  const handleDelete = runWithLoading(async (row: TableRow) => {\n    const { deleteMethod } = props\n\n    if (deleteMethod) {\n      await deleteMethod([row.data])\n    }\n\n    const data = [...(props.data ?? [])]\n\n    const parent = visitDataByIndexPath(data, row.indexes.slice(0, -1), childrenKey.value)\n\n    if (parent) {\n      const children = parent[childrenKey.value]\n      if (children) {\n        children.splice(row.index, 1)\n      } else {\n        console.error('行路径不正确')\n      }\n    } else {\n      data.splice(row.index, 1)\n    }\n\n    if (state.row === row) {\n      resetState()\n    }\n\n    emit('update:data', data)\n  })\n\n  function handleClose() {\n    resetState()\n  }\n\n  return {\n    handleDelete,\n    handleInsertChild,\n    handleInsertToNext,\n    handleInsertToPrev,\n    handleCreate,\n    handleClose,\n    handleSave\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"use-handlers.js","names":[],"sources":["../../../src/components/batch-edit/use-handlers.ts"],"sourcesContent":["import { last, o } from '@cat-kit/core'\nimport { computed, nextTick, type ShallowRef } from 'vue'\n\nimport type {\n  TableRow,\n  BatchEditEmits,\n  BatchEditProps,\n  BatchEditStates,\n  FormExposed\n} from '../../types'\n\n/** 按索引路径在原始数据树中定位节点（等价于历史 Forest.visit 路径访问） */\nfunction visitDataByIndexPath<T extends Record<string, unknown>>(\n  roots: T[],\n  indexPath: number[],\n  childrenKey: string\n): T | undefined {\n  if (!indexPath.length) return undefined\n  let currentList: T[] | undefined = roots\n  let node: T | undefined\n  for (let i = 0; i < indexPath.length; i++) {\n    const idx = indexPath[i]!\n    if (!currentList) return undefined\n    node = currentList[idx]\n    if (node === undefined) return undefined\n    if (i < indexPath.length - 1) {\n      const next = node[childrenKey]\n      currentList = Array.isArray(next) ? (next as T[]) : undefined\n    }\n  }\n  return node\n}\n\ninterface Options {\n  props: BatchEditProps\n  emit: BatchEditEmits\n  state: BatchEditStates\n  formRef: ShallowRef<FormExposed | null>\n  resetState: () => void\n}\n\nexport interface EditReturned {\n  handleSave: () => Promise<void>\n  handleClose: () => void\n  handleCreate: () => void\n  handleDelete: (row: TableRow) => Promise<void>\n  handleInsertToNext: (row: TableRow) => void\n  handleInsertToPrev: (row: TableRow) => void\n  handleInsertChild: (row: TableRow) => void\n}\n\nexport function useHandlers(options: Options): EditReturned {\n  const { props, emit, state, resetState, formRef } = options\n\n  const childrenKey = computed(() => {\n    return typeof props.tree === 'string' ? props.tree : 'children'\n  })\n\n  function getInsertData(): Record<string, any> {\n    return o(props.model ?? {}).copy()\n  }\n\n  /**\n   * 插入数据\n   * @param item 数据\n   */\n  function insert(item: Record<string, any>) {\n    const data = [...(props.data ?? [])]\n\n    const parent = visitDataByIndexPath(data ?? [], state.indexPath.slice(0, -1), childrenKey.value)\n\n    if (parent) {\n      const children = parent[childrenKey.value]\n      if (!children) {\n        parent[childrenKey.value] = [item]\n      } else {\n        children.splice(last(state.indexPath), 0, item)\n      }\n    } else {\n      data.splice(last(state.indexPath), 0, item)\n    }\n\n    emit('update:data', data)\n\n    return item\n  }\n\n  /**\n   * 点击新增按钮\n   */\n  function handleCreate() {\n    const { data } = props\n\n    resetState()\n\n    nextTick(() => {\n      state.formActionType = 'create'\n      state.formVisible = true\n      state.depth = 1\n      state.indexPath = [data?.length ?? 0]\n    })\n  }\n\n  function handleInsertToPrev(row: TableRow) {\n    resetState()\n    state.formActionType = 'create'\n    state.formVisible = true\n    state.depth = row.depth\n    state.indexPath = [...row.indexes]\n  }\n\n  function handleInsertToNext(row: TableRow) {\n    resetState()\n    state.formActionType = 'create'\n    state.formVisible = true\n    state.depth = row.depth\n    state.indexPath = [...row.indexes.slice(0, -1), row.index + 1]\n  }\n\n  function handleInsertChild(row: TableRow) {\n    resetState()\n    state.formActionType = 'createChild'\n    state.formVisible = true\n    state.parentRow = row\n    state.depth = row.depth + 1\n    row.expanded = true\n    state.indexPath = [...row.indexes, row.children?.length ?? 0]\n  }\n\n  function runWithLoading<Arg extends any[]>(fn: (...args: Arg) => Promise<void> | void) {\n    return async (...args: Arg) => {\n      state.loading = true\n      if (state.row) {\n        state.row.operating = true\n      }\n      try {\n        await fn.apply(null, args)\n      } catch (error) {\n        console.error(error)\n      }\n      state.loading = false\n      if (state.row) {\n        state.row.operating = false\n      }\n    }\n  }\n\n  /** 保存 */\n  const handleSave = runWithLoading(async () => {\n    const { model, saveMethod } = props\n    const valid = await formRef.value?.validate()\n    if (!model || !valid) return\n\n    let item = getInsertData()\n\n    // 新增\n    if (state.formActionType === 'create' || state.formActionType === 'createChild') {\n      await props.beforeCreate?.(item, state.parentRow?.data)\n      if (saveMethod) {\n        const result = await saveMethod(item, state.formActionType, state.parentRow?.data)\n        if (result) {\n          item = result\n        }\n      }\n      insert(item)\n\n      // 推进插入点，便于连续新增；并重置表单到初始默认值\n      const next = last(state.indexPath) + 1\n      state.indexPath = [...state.indexPath.slice(0, -1), next]\n      formRef.value?.reset()\n      return\n    }\n\n    // 普通模式下的编辑\n    if (saveMethod) {\n      const result = await saveMethod(item, state.formActionType, state.parentRow?.data)\n      if (result) {\n        item = result\n      }\n    }\n\n    const { row } = state\n    row &&\n      Object.keys(item).forEach((key) => {\n        o(row.data).set(key, o(item).get(key))\n      })\n  })\n\n  const handleDelete = runWithLoading(async (row: TableRow) => {\n    const { deleteMethod } = props\n\n    if (deleteMethod) {\n      await deleteMethod([row.data])\n    }\n\n    const data = [...(props.data ?? [])]\n\n    const parent = visitDataByIndexPath(data, row.indexes.slice(0, -1), childrenKey.value)\n\n    if (parent) {\n      const children = parent[childrenKey.value]\n      if (children) {\n        children.splice(row.index, 1)\n      } else {\n        console.error('行路径不正确')\n      }\n    } else {\n      data.splice(row.index, 1)\n    }\n\n    if (state.row === row) {\n      resetState()\n    }\n\n    emit('update:data', data)\n  })\n\n  function handleClose() {\n    resetState()\n  }\n\n  return {\n    handleDelete,\n    handleInsertChild,\n    handleInsertToNext,\n    handleInsertToPrev,\n    handleCreate,\n    handleClose,\n    handleSave\n  }\n}\n"],"mappings":"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"}

package/dist/components/batch-edit/use-shortcut-key.js

@@ -10,7 +10,9 @@ function useShortcutKey(options) {
 		if (!e.currentTarget.contains(e.relatedTarget)) focused.value = false;
 	}
 	function runEscape(e) {
+		if (!state.formVisible) return;
 		e.preventDefault();
+		e.stopPropagation();
 		onClose();
 	}
 	function runSave(e) {

package/dist/components/batch-edit/use-shortcut-key.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-shortcut-key.js","names":[],"sources":["../../../src/components/batch-edit/use-shortcut-key.ts"],"sourcesContent":["import { shallowRef } from 'vue'\n\nimport type { BatchEditProps, BatchEditStates } from '../../types'\n\ninterface Options {\n  props: BatchEditProps\n  onSave: () => void\n  onClose: () => void\n  state: BatchEditStates\n}\nexport function useShortcutKey(options: Options) {\n  const { props, onClose, onSave, state } = options\n  const focused = shallowRef(false)\n\n  function handleFocusIn() {\n    focused.value = true\n  }\n\n  function handleFocusOut(e: FocusEvent) {\n    const root = e.currentTarget as HTMLElement\n    if (!root.contains(e.relatedTarget as Node | null)) {\n      focused.value = false\n    }\n  }\n\n  function runEscape(e: KeyboardEvent) {\n    e.preventDefault()\n    onClose()\n  }\n\n  function runSave(e: KeyboardEvent) {\n    if (!state.formVisible) return\n    if (props.quickEdit && state.formActionType === 'update') return\n    e.preventDefault()\n    onSave()\n  }\n\n  /**\n   * 键盘快捷键（仅组件获焦时生效）：\n   * - Esc          关闭表单\n   * - ⌘/Ctrl + S   保存（快速编辑模式下编辑行时除外）\n   */\n  function handleKeydown(e: KeyboardEvent) {\n    if (!focused.value) return\n    if (props.readonly && e.key !== 'Escape') return\n\n    if (e.key === 'Escape') return runEscape(e)\n\n    const meta = e.metaKey || e.ctrlKey\n    if (!meta) return\n\n    const key = e.key.toLowerCase()\n\n    if (key === 's') return runSave(e)\n  }\n\n  return { focused, handleFocusIn, handleFocusOut, handleKeydown }\n}\n"],"mappings":";;AAUA,SAAgB,eAAe,SAAkB;CAC/C,MAAM,EAAE,OAAO,SAAS,QAAQ,UAAU;CAC1C,MAAM,UAAU,WAAW,KAAK;CAEhC,SAAS,gBAAgB;EACvB,QAAQ,QAAQ;CAClB;CAEA,SAAS,eAAe,GAAe;EAErC,IAAI,CADS,EAAE,cACL,SAAS,EAAE,aAA4B,GAC/C,QAAQ,QAAQ;CAEpB;CAEA,SAAS,UAAU,GAAkB;EACnC,EAAE,eAAe;EACjB,QAAQ;CACV;CAEA,SAAS,QAAQ,GAAkB;EACjC,IAAI,CAAC,MAAM,aAAa;EACxB,IAAI,MAAM,aAAa,MAAM,mBAAmB,UAAU;EAC1D,EAAE,eAAe;EACjB,OAAO;CACT;;;;;;CAOA,SAAS,cAAc,GAAkB;EACvC,IAAI,CAAC,QAAQ,OAAO;EACpB,IAAI,MAAM,YAAY,EAAE,QAAQ,UAAU;EAE1C,IAAI,EAAE,QAAQ,UAAU,OAAO,UAAU,CAAC;EAG1C,IAAI,EADS,EAAE,WAAW,EAAE,UACjB;EAIX,IAFY,EAAE,IAAI,YAEZ,MAAM,KAAK,OAAO,QAAQ,CAAC;CACnC;CAEA,OAAO;EAAE;EAAS;EAAe;EAAgB;CAAc;AACjE"}
+{"version":3,"file":"use-shortcut-key.js","names":[],"sources":["../../../src/components/batch-edit/use-shortcut-key.ts"],"sourcesContent":["import { shallowRef } from 'vue'\n\nimport type { BatchEditProps, BatchEditStates } from '../../types'\n\ninterface Options {\n  props: BatchEditProps\n  onSave: () => void\n  onClose: () => void\n  state: BatchEditStates\n}\nexport function useShortcutKey(options: Options) {\n  const { props, onClose, onSave, state } = options\n  const focused = shallowRef(false)\n\n  function handleFocusIn() {\n    focused.value = true\n  }\n\n  function handleFocusOut(e: FocusEvent) {\n    const root = e.currentTarget as HTMLElement\n    if (!root.contains(e.relatedTarget as Node | null)) {\n      focused.value = false\n    }\n  }\n\n  function runEscape(e: KeyboardEvent) {\n    if (!state.formVisible) return\n    e.preventDefault()\n    e.stopPropagation()\n    onClose()\n  }\n\n  function runSave(e: KeyboardEvent) {\n    if (!state.formVisible) return\n    if (props.quickEdit && state.formActionType === 'update') return\n    e.preventDefault()\n    onSave()\n  }\n\n  /**\n   * 键盘快捷键（仅组件获焦时生效）：\n   * - Esc          关闭表单\n   * - ⌘/Ctrl + S   保存（快速编辑模式下编辑行时除外）\n   */\n  function handleKeydown(e: KeyboardEvent) {\n    if (!focused.value) return\n    if (props.readonly && e.key !== 'Escape') return\n\n    if (e.key === 'Escape') return runEscape(e)\n\n    const meta = e.metaKey || e.ctrlKey\n    if (!meta) return\n\n    const key = e.key.toLowerCase()\n\n    if (key === 's') return runSave(e)\n  }\n\n  return { focused, handleFocusIn, handleFocusOut, handleKeydown }\n}\n"],"mappings":";;AAUA,SAAgB,eAAe,SAAkB;CAC/C,MAAM,EAAE,OAAO,SAAS,QAAQ,UAAU;CAC1C,MAAM,UAAU,WAAW,KAAK;CAEhC,SAAS,gBAAgB;EACvB,QAAQ,QAAQ;CAClB;CAEA,SAAS,eAAe,GAAe;EAErC,IAAI,CADS,EAAE,cACL,SAAS,EAAE,aAA4B,GAC/C,QAAQ,QAAQ;CAEpB;CAEA,SAAS,UAAU,GAAkB;EACnC,IAAI,CAAC,MAAM,aAAa;EACxB,EAAE,eAAe;EACjB,EAAE,gBAAgB;EAClB,QAAQ;CACV;CAEA,SAAS,QAAQ,GAAkB;EACjC,IAAI,CAAC,MAAM,aAAa;EACxB,IAAI,MAAM,aAAa,MAAM,mBAAmB,UAAU;EAC1D,EAAE,eAAe;EACjB,OAAO;CACT;;;;;;CAOA,SAAS,cAAc,GAAkB;EACvC,IAAI,CAAC,QAAQ,OAAO;EACpB,IAAI,MAAM,YAAY,EAAE,QAAQ,UAAU;EAE1C,IAAI,EAAE,QAAQ,UAAU,OAAO,UAAU,CAAC;EAG1C,IAAI,EADS,EAAE,WAAW,EAAE,UACjB;EAIX,IAFY,EAAE,IAAI,YAEZ,MAAM,KAAK,OAAO,QAAQ,CAAC;CACnC;CAEA,OAAO;EAAE;EAAS;EAAe;EAAgB;CAAc;AACjE"}

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

@@ -17,9 +17,9 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
   "onUpdate:modelValue"?: ((checked: boolean) => any) | undefined;
   onChange?: ((checked: boolean) => any) | undefined;
 }>, {
-  type: import("@veltra/utils").ColorType;
   disabled: boolean;
   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/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;
 }>, {
-  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;
 }>, {
-  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/number-range-input/number-range-input.js

@@ -87,10 +87,8 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		const endRef = useModel(__props, "end");
 		let syncGuard = false;
 		function normalizeFromSplit(s, e) {
-			let nextS = s;
-			let nextE = e;
-			if (nextS !== void 0 && nextE !== void 0 && nextS > nextE) nextE = nextS;
-			return [nextS, nextE];
+			if (s !== void 0 && e !== void 0 && s > e) return [s, s];
+			return [s, e];
 		}
 		watch(model, (t) => {
 			if (syncGuard) return;
@@ -145,10 +143,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				return model.value?.[0];
 			},
 			set(v) {
-				const end = (model.value ?? [void 0, void 0])[1];
-				let nextEnd = end;
-				if (v !== void 0 && end !== void 0 && v > end) nextEnd = v;
-				model.value = [v, nextEnd];
+				model.value = [v, (model.value ?? [void 0, void 0])[1]];
 			}
 		});
 		const endModel = computed({
@@ -156,10 +151,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				return model.value?.[1];
 			},
 			set(v) {
-				const start = (model.value ?? [void 0, void 0])[0];
-				let nextStart = start;
-				if (v !== void 0 && start !== void 0 && v < start) nextStart = v;
-				model.value = [nextStart, v];
+				model.value = [(model.value ?? [void 0, void 0])[0], v];
 			}
 		});
 		function formatNumberPart(num) {
@@ -182,8 +174,23 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			const sep = props.separator ?? "~";
 			return `${p}${s === void 0 ? "—" : formatNumberPart(s)} ${sep} ${e === void 0 ? "—" : formatNumberPart(e)}${sfx}`;
 		});
-		function emitChange() {
-			emit("change", model.value ?? [void 0, void 0]);
+		function handleStartChange() {
+			const [start, end] = model.value ?? [void 0, void 0];
+			let next = [start, end];
+			if (start !== void 0 && end !== void 0 && start > end) {
+				next = [end, end];
+				model.value = next;
+			}
+			emit("change", next);
+		}
+		function handleEndChange() {
+			const [start, end] = model.value ?? [void 0, void 0];
+			let next = [start, end];
+			if (start !== void 0 && end !== void 0 && end < start) {
+				next = [start, start];
+				model.value = next;
+			}
+			emit("change", next);
 		}
 		return (_ctx, _cache) => {
 			return !unref(readonly) ? (openBlock(), createElementBlock("div", mergeProps({ key: 0 }, _ctx.$attrs, { class: className.value }), [
@@ -194,7 +201,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					disabled: unref(disabled),
 					readonly: unref(readonly),
 					size: unref(size)
-				}, numberInputBind.value, { onChange: emitChange }), null, 16, [
+				}, numberInputBind.value, { onChange: handleStartChange }), null, 16, [
 					"modelValue",
 					"placeholder",
 					"disabled",
@@ -209,7 +216,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					disabled: unref(disabled),
 					readonly: unref(readonly),
 					size: unref(size)
-				}, numberInputBind.value, { onChange: emitChange }), null, 16, [
+				}, numberInputBind.value, { onChange: handleEndChange }), null, 16, [
 					"modelValue",
 					"placeholder",
 					"disabled",

package/dist/components/number-range-input/number-range-input.js.map

@@ -1 +1 @@
-{"version":3,"file":"number-range-input.js","names":["$attrs"],"sources":["../../../src/components/number-range-input/number-range-input.vue"],"sourcesContent":["<template>\n  <div v-if=\"!readonly\" v-bind=\"$attrs\" :class=\"className\">\n    <u-number-input\n      v-model=\"startModel\"\n      :placeholder=\"startPlaceholder\"\n      :disabled=\"disabled\"\n      :readonly=\"readonly\"\n      :size=\"size\"\n      v-bind=\"numberInputBind\"\n      @change=\"emitChange\"\n    />\n    <span :class=\"cls.e('separator')\">{{ separator }}</span>\n    <u-number-input\n      v-model=\"endModel\"\n      :placeholder=\"endPlaceholder\"\n      :disabled=\"disabled\"\n      :readonly=\"readonly\"\n      :size=\"size\"\n      v-bind=\"numberInputBind\"\n      @change=\"emitChange\"\n    />\n  </div>\n\n  <template v-else>\n    {{ readonlyText || FORM_EMPTY_CONTENT }}\n  </template>\n</template>\n\n<script lang=\"ts\" setup>\nimport { n, $n, o } from '@cat-kit/core'\nimport { useFormFallbackProps } from '@veltra/compositions'\nimport { bem, FORM_EMPTY_CONTENT } from '@veltra/utils'\nimport { injectFormContext } from '@veltra/utils'\nimport { computed, getCurrentInstance, nextTick, onMounted, watch } from 'vue'\n\nimport type { NumberRangeInputEmits, NumberRangeInputProps, NumberRangeTuple } from '../../types'\nimport { UNumberInput } from '../number-input'\n\ndefineOptions({ name: 'UNumberRangeInput', inheritAttrs: false })\n\nconst props = withDefaults(defineProps<NumberRangeInputProps>(), {\n  startPlaceholder: '请输入',\n  endPlaceholder: '请输入',\n  separator: '~',\n  clearable: true,\n  disabled: undefined,\n  readonly: undefined\n})\n\nconst emit = defineEmits<NumberRangeInputEmits>()\n\nconst inst = getCurrentInstance()\n\nfunction splitBound(): boolean {\n  const p = inst?.vnode.props\n  if (!p) return false\n  return 'start' in p || 'onUpdate:start' in p || 'end' in p || 'onUpdate:end' in p\n}\n\nconst { formProps } = injectFormContext()\n\nconst { size, disabled, readonly } = useFormFallbackProps([formProps ?? {}, props], {\n  size: 'default',\n  disabled: false,\n  readonly: false\n})\n\nconst cls = bem('number-range-input')\n\nconst className = computed(() => {\n  return [cls.b, cls.m(size.value)]\n})\n\nconst model = defineModel<NumberRangeTuple>({ default: () => [undefined, undefined] })\n\nconst startRef = defineModel<number | undefined>('start')\nconst endRef = defineModel<number | undefined>('end')\n\nlet syncGuard = false\n\nfunction normalizeFromSplit(s: number | undefined, e: number | undefined): NumberRangeTuple {\n  let nextS = s\n  let nextE = e\n  if (nextS !== undefined && nextE !== undefined && nextS > nextE) nextE = nextS\n  return [nextS, nextE]\n}\n\nwatch(\n  model,\n  (t) => {\n    if (syncGuard) return\n    syncGuard = true\n    const tuple = t ?? [undefined, undefined]\n    if (startRef.value !== tuple[0]) startRef.value = tuple[0]\n    if (endRef.value !== tuple[1]) endRef.value = tuple[1]\n    nextTick(() => {\n      syncGuard = false\n    })\n  },\n  { deep: true }\n)\n\nwatch(\n  [startRef, endRef],\n  () => {\n    if (!splitBound() || syncGuard) return\n    syncGuard = true\n    const normalized = normalizeFromSplit(startRef.value, endRef.value)\n    const cur = model.value ?? [undefined, undefined]\n    if (cur[0] !== normalized[0] || cur[1] !== normalized[1]) {\n      model.value = normalized\n    }\n    nextTick(() => {\n      syncGuard = false\n    })\n  },\n  { deep: true }\n)\n\nonMounted(() => {\n  if (!splitBound()) return\n  const cur = model.value ?? [undefined, undefined]\n  const hasModel = cur[0] !== undefined || cur[1] !== undefined\n  if (hasModel) return\n  const normalized = normalizeFromSplit(startRef.value, endRef.value)\n  if (cur[0] !== normalized[0] || cur[1] !== normalized[1]) {\n    syncGuard = true\n    model.value = normalized\n    nextTick(() => {\n      syncGuard = false\n    })\n  }\n})\n\nconst numberInputBind = computed(() => {\n  return o(props).pick([\n    'clearable',\n    'prefix',\n    'suffix',\n    'step',\n    'min',\n    'max',\n    'currency',\n    'precision',\n    'minPrecision',\n    'maxPrecision',\n    'multiple'\n  ])\n})\n\nconst startModel = computed({\n  get(): number | undefined {\n    return model.value?.[0]\n  },\n  set(v: number | undefined) {\n    const cur = model.value ?? [undefined, undefined]\n    const end = cur[1]\n    let nextEnd = end\n    if (v !== undefined && end !== undefined && v > end) nextEnd = v\n    model.value = [v, nextEnd]\n  }\n})\n\nconst endModel = computed({\n  get(): number | undefined {\n    return model.value?.[1]\n  },\n  set(v: number | undefined) {\n    const cur = model.value ?? [undefined, undefined]\n    const start = cur[0]\n    let nextStart = start\n    if (v !== undefined && start !== undefined && v < start) nextStart = v\n    model.value = [nextStart, v]\n  }\n})\n\nfunction formatNumberPart(num: number): string {\n  const { currency, precision, minPrecision, maxPrecision, multiple } = props\n\n  const displayValue = multiple ? $n.div(num, multiple) : num\n\n  return currency\n    ? n(displayValue).currency('CNY', { precision, minPrecision, maxPrecision })\n    : n(displayValue).fixed(precision ?? { minPrecision, maxPrecision })\n}\n\nconst readonlyText = computed(() => {\n  const [s, e] = model.value ?? [undefined, undefined]\n  if (s === undefined && e === undefined) return ''\n  const p = props.prefix ?? ''\n  const sfx = props.suffix ?? ''\n  const sep = props.separator ?? '~'\n  const a = s === undefined ? '—' : formatNumberPart(s)\n  const b = e === undefined ? '—' : formatNumberPart(e)\n  return `${p}${a} ${sep} ${b}${sfx}`\n})\n\nfunction emitChange(): void {\n  emit('change', model.value ?? [undefined, undefined])\n}\n</script>\n"],"mappings":"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"}
+{"version":3,"file":"number-range-input.js","names":["$attrs"],"sources":["../../../src/components/number-range-input/number-range-input.vue"],"sourcesContent":["<template>\n  <div v-if=\"!readonly\" v-bind=\"$attrs\" :class=\"className\">\n    <u-number-input\n      v-model=\"startModel\"\n      :placeholder=\"startPlaceholder\"\n      :disabled=\"disabled\"\n      :readonly=\"readonly\"\n      :size=\"size\"\n      v-bind=\"numberInputBind\"\n      @change=\"handleStartChange\"\n    />\n    <span :class=\"cls.e('separator')\">{{ separator }}</span>\n    <u-number-input\n      v-model=\"endModel\"\n      :placeholder=\"endPlaceholder\"\n      :disabled=\"disabled\"\n      :readonly=\"readonly\"\n      :size=\"size\"\n      v-bind=\"numberInputBind\"\n      @change=\"handleEndChange\"\n    />\n  </div>\n\n  <template v-else>\n    {{ readonlyText || FORM_EMPTY_CONTENT }}\n  </template>\n</template>\n\n<script lang=\"ts\" setup>\nimport { n, $n, o } from '@cat-kit/core'\nimport { useFormFallbackProps } from '@veltra/compositions'\nimport { bem, FORM_EMPTY_CONTENT } from '@veltra/utils'\nimport { injectFormContext } from '@veltra/utils'\nimport { computed, getCurrentInstance, nextTick, onMounted, watch } from 'vue'\n\nimport type { NumberRangeInputEmits, NumberRangeInputProps, NumberRangeTuple } from '../../types'\nimport { UNumberInput } from '../number-input'\n\ndefineOptions({ name: 'UNumberRangeInput', inheritAttrs: false })\n\nconst props = withDefaults(defineProps<NumberRangeInputProps>(), {\n  startPlaceholder: '请输入',\n  endPlaceholder: '请输入',\n  separator: '~',\n  clearable: true,\n  disabled: undefined,\n  readonly: undefined\n})\n\nconst emit = defineEmits<NumberRangeInputEmits>()\n\nconst inst = getCurrentInstance()\n\nfunction splitBound(): boolean {\n  const p = inst?.vnode.props\n  if (!p) return false\n  return 'start' in p || 'onUpdate:start' in p || 'end' in p || 'onUpdate:end' in p\n}\n\nconst { formProps } = injectFormContext()\n\nconst { size, disabled, readonly } = useFormFallbackProps([formProps ?? {}, props], {\n  size: 'default',\n  disabled: false,\n  readonly: false\n})\n\nconst cls = bem('number-range-input')\n\nconst className = computed(() => {\n  return [cls.b, cls.m(size.value)]\n})\n\nconst model = defineModel<NumberRangeTuple>({ default: () => [undefined, undefined] })\n\nconst startRef = defineModel<number | undefined>('start')\nconst endRef = defineModel<number | undefined>('end')\n\nlet syncGuard = false\n\nfunction normalizeFromSplit(s: number | undefined, e: number | undefined): NumberRangeTuple {\n  // 外部 split 写入无法区分哪一侧后改，统一将越界的 end 抬到 start\n  if (s !== undefined && e !== undefined && s > e) return [s, s]\n  return [s, e]\n}\n\nwatch(\n  model,\n  (t) => {\n    if (syncGuard) return\n    syncGuard = true\n    const tuple = t ?? [undefined, undefined]\n    if (startRef.value !== tuple[0]) startRef.value = tuple[0]\n    if (endRef.value !== tuple[1]) endRef.value = tuple[1]\n    nextTick(() => {\n      syncGuard = false\n    })\n  },\n  { deep: true }\n)\n\nwatch(\n  [startRef, endRef],\n  () => {\n    if (!splitBound() || syncGuard) return\n    syncGuard = true\n    const normalized = normalizeFromSplit(startRef.value, endRef.value)\n    const cur = model.value ?? [undefined, undefined]\n    if (cur[0] !== normalized[0] || cur[1] !== normalized[1]) {\n      model.value = normalized\n    }\n    nextTick(() => {\n      syncGuard = false\n    })\n  },\n  { deep: true }\n)\n\nonMounted(() => {\n  if (!splitBound()) return\n  const cur = model.value ?? [undefined, undefined]\n  const hasModel = cur[0] !== undefined || cur[1] !== undefined\n  if (hasModel) return\n  const normalized = normalizeFromSplit(startRef.value, endRef.value)\n  if (cur[0] !== normalized[0] || cur[1] !== normalized[1]) {\n    syncGuard = true\n    model.value = normalized\n    nextTick(() => {\n      syncGuard = false\n    })\n  }\n})\n\nconst numberInputBind = computed(() => {\n  return o(props).pick([\n    'clearable',\n    'prefix',\n    'suffix',\n    'step',\n    'min',\n    'max',\n    'currency',\n    'precision',\n    'minPrecision',\n    'maxPrecision',\n    'multiple'\n  ])\n})\n\nconst startModel = computed({\n  get(): number | undefined {\n    return model.value?.[0]\n  },\n  set(v: number | undefined) {\n    // 输入过程只更新单侧，交叉约束放到 change（失焦）时处理\n    const cur = model.value ?? [undefined, undefined]\n    model.value = [v, cur[1]]\n  }\n})\n\nconst endModel = computed({\n  get(): number | undefined {\n    return model.value?.[1]\n  },\n  set(v: number | undefined) {\n    const cur = model.value ?? [undefined, undefined]\n    model.value = [cur[0], v]\n  }\n})\n\nfunction formatNumberPart(num: number): string {\n  const { currency, precision, minPrecision, maxPrecision, multiple } = props\n\n  const displayValue = multiple ? $n.div(num, multiple) : num\n\n  return currency\n    ? n(displayValue).currency('CNY', { precision, minPrecision, maxPrecision })\n    : n(displayValue).fixed(precision ?? { minPrecision, maxPrecision })\n}\n\nconst readonlyText = computed(() => {\n  const [s, e] = model.value ?? [undefined, undefined]\n  if (s === undefined && e === undefined) return ''\n  const p = props.prefix ?? ''\n  const sfx = props.suffix ?? ''\n  const sep = props.separator ?? '~'\n  const a = s === undefined ? '—' : formatNumberPart(s)\n  const b = e === undefined ? '—' : formatNumberPart(e)\n  return `${p}${a} ${sep} ${b}${sfx}`\n})\n\nfunction handleStartChange(): void {\n  const [start, end] = model.value ?? [undefined, undefined]\n  // 失焦时只校正刚改的一侧：start > end 时把 start 压回 end\n  let next: NumberRangeTuple = [start, end]\n  if (start !== undefined && end !== undefined && start > end) {\n    next = [end, end]\n    model.value = next\n  }\n  emit('change', next)\n}\n\nfunction handleEndChange(): void {\n  const [start, end] = model.value ?? [undefined, undefined]\n  // 失焦时只校正刚改的一侧：end < start 时把 end 抬回 start\n  let next: NumberRangeTuple = [start, end]\n  if (start !== undefined && end !== undefined && end < start) {\n    next = [start, start]\n    model.value = next\n  }\n  emit('change', next)\n}\n</script>\n"],"mappings":"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"}

package/dist/components/table/allocate-column-widths.js

@@ -0,0 +1,32 @@
+//#region src/components/table/allocate-column-widths.ts
+/**
+* 按容器宽度分配叶子列宽。
+*
+* - `explicitWidth` 列：保持配置/拖拽锁定的宽度
+* - `fixed` 且未显式设宽的列：保持 `minWidth`，不参与剩余宽度均分
+* - 其余未显式设宽的列：均分容器剩余宽度
+*/
+function allocateLeafColumnWidths(leafColumns, containerWidth) {
+	if (!containerWidth || !leafColumns.length) return;
+	const growColumns = leafColumns.filter((column) => !column.explicitWidth && !column.fixed);
+	const fixedFlexColumns = leafColumns.filter((column) => !column.explicitWidth && column.fixed);
+	fixedFlexColumns.forEach((column) => {
+		column.data.width = void 0;
+	});
+	const explicitWidthTotal = leafColumns.filter((column) => column.explicitWidth).reduce((acc, cur) => acc + (cur.width ?? cur.minWidth), 0);
+	const growBaseTotal = growColumns.reduce((acc, cur) => acc + cur.minWidth, 0);
+	const fixedFlexBaseTotal = fixedFlexColumns.reduce((acc, cur) => acc + cur.minWidth, 0);
+	const totalBase = explicitWidthTotal + growBaseTotal + fixedFlexBaseTotal;
+	if (growColumns.length > 0 && totalBase < containerWidth) {
+		const allocatedWidth = (containerWidth - totalBase) / growColumns.length;
+		growColumns.forEach((column) => {
+			column.width = column.minWidth + allocatedWidth;
+		});
+	} else growColumns.forEach((column) => {
+		column.data.width = void 0;
+	});
+}
+//#endregion
+export { allocateLeafColumnWidths };
+
+//# sourceMappingURL=allocate-column-widths.js.map

package/dist/components/table/allocate-column-widths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"allocate-column-widths.js","names":[],"sources":["../../../src/components/table/allocate-column-widths.ts"],"sourcesContent":["import type { ColumnNode } from './node/col'\n\n/**\n * 按容器宽度分配叶子列宽。\n *\n * - `explicitWidth` 列：保持配置/拖拽锁定的宽度\n * - `fixed` 且未显式设宽的列：保持 `minWidth`，不参与剩余宽度均分\n * - 其余未显式设宽的列：均分容器剩余宽度\n */\nexport function allocateLeafColumnWidths(leafColumns: ColumnNode[], containerWidth: number): void {\n  if (!containerWidth || !leafColumns.length) return\n\n  const growColumns = leafColumns.filter((column) => !column.explicitWidth && !column.fixed)\n  // fixed 且未显式设宽：清掉可能被旧算法撑大的残留 width，回落到 minWidth\n  const fixedFlexColumns = leafColumns.filter((column) => !column.explicitWidth && column.fixed)\n\n  fixedFlexColumns.forEach((column) => {\n    column.data.width = undefined\n  })\n\n  const explicitWidthTotal = leafColumns\n    .filter((column) => column.explicitWidth)\n    .reduce((acc, cur) => acc + (cur.width ?? cur.minWidth!), 0)\n  const growBaseTotal = growColumns.reduce((acc, cur) => acc + cur.minWidth!, 0)\n  const fixedFlexBaseTotal = fixedFlexColumns.reduce((acc, cur) => acc + cur.minWidth!, 0)\n  const totalBase = explicitWidthTotal + growBaseTotal + fixedFlexBaseTotal\n\n  if (growColumns.length > 0 && totalBase < containerWidth) {\n    const allocatedWidth = (containerWidth - totalBase) / growColumns.length\n    growColumns.forEach((column) => {\n      column.width = column.minWidth! + allocatedWidth\n    })\n  } else {\n    growColumns.forEach((column) => {\n      column.data.width = undefined\n    })\n  }\n}\n"],"mappings":";;;;;;;;AASA,SAAgB,yBAAyB,aAA2B,gBAA8B;CAChG,IAAI,CAAC,kBAAkB,CAAC,YAAY,QAAQ;CAE5C,MAAM,cAAc,YAAY,QAAQ,WAAW,CAAC,OAAO,iBAAiB,CAAC,OAAO,KAAK;CAEzF,MAAM,mBAAmB,YAAY,QAAQ,WAAW,CAAC,OAAO,iBAAiB,OAAO,KAAK;CAE7F,iBAAiB,SAAS,WAAW;EACnC,OAAO,KAAK,QAAQ,KAAA;CACtB,CAAC;CAED,MAAM,qBAAqB,YACxB,QAAQ,WAAW,OAAO,aAAa,CAAC,CACxC,QAAQ,KAAK,QAAQ,OAAO,IAAI,SAAS,IAAI,WAAY,CAAC;CAC7D,MAAM,gBAAgB,YAAY,QAAQ,KAAK,QAAQ,MAAM,IAAI,UAAW,CAAC;CAC7E,MAAM,qBAAqB,iBAAiB,QAAQ,KAAK,QAAQ,MAAM,IAAI,UAAW,CAAC;CACvF,MAAM,YAAY,qBAAqB,gBAAgB;CAEvD,IAAI,YAAY,SAAS,KAAK,YAAY,gBAAgB;EACxD,MAAM,kBAAkB,iBAAiB,aAAa,YAAY;EAClE,YAAY,SAAS,WAAW;GAC9B,OAAO,QAAQ,OAAO,WAAY;EACpC,CAAC;CACH,OACE,YAAY,SAAS,WAAW;EAC9B,OAAO,KAAK,QAAQ,KAAA;CACtB,CAAC;AAEL"}

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

@@ -1,4 +1,5 @@
 import { TableResizeKey } from "./di.js";
+import { allocateLeafColumnWidths } from "./allocate-column-widths.js";
 import { nextTick, provide, shallowRef, watchEffect } from "vue";
 //#region src/components/table/use-col-resize.ts
 function useColResize(options) {
@@ -13,16 +14,7 @@ function useColResize(options) {
 	function correctColumnStyle() {
 		const containerWidth = scrollRef.value?.containerRef?.clientWidth;
 		if (!containerWidth || !leafColumns.value.length) return;
-		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;
-		});
+		allocateLeafColumnWidths(leafColumns.value, containerWidth);
 		const fixedLeft = leafColumns.value.filter((column) => column.fixed === "left");
 		const fixedRight = leafColumns.value.filter((column) => column.fixed === "right");
 		fixedLeft.reduce((acc, cur) => {

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    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,CAAC,CACxC,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"}
+{"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 { allocateLeafColumnWidths } from './allocate-column-widths'\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    allocateLeafColumnWidths(leafColumns.value, containerWidth)\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":";;;;AAmBA,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,yBAAyB,YAAY,OAAO,cAAc;EAE1D,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veltra/desktop",
-  "version": "1.2.25",
+  "version": "1.2.27",
   "files": [
     "dist",
     "src"
@@ -57,11 +57,11 @@
     "@cat-kit/core": ">=1.1.8",
     "@cat-kit/excel": ">=1.0.0",
     "@cat-kit/fe": "^1.1.8",
-    "@veltra/compositions": "1.2.25",
-    "@veltra/directives": "1.2.25",
-    "@veltra/icons": "1.2.25",
-    "@veltra/styles": "1.2.25",
-    "@veltra/utils": "1.2.25",
+    "@veltra/compositions": "1.2.27",
+    "@veltra/directives": "1.2.27",
+    "@veltra/icons": "1.2.27",
+    "@veltra/styles": "1.2.27",
+    "@veltra/utils": "1.2.27",
     "vue": ">=3.5.39"
   },
   "devDependencies": {

package/src/components/batch-edit/batch-edit-form.vue

@@ -54,10 +54,16 @@
       </span>
 
       <div :class="cls.e('form-actions')">
-        <u-button text :loading="state.loading" @click="handleClose"> 取消 </u-button>
-        <u-button v-if="showSaveBtn" type="primary" :loading="state.loading" @click="handleSave">
-          保存
-        </u-button>
+        <u-button size="small" text :loading="state.loading" @click="handleClose"> 取消 </u-button>
+        <u-button
+          v-if="showSaveBtn"
+          type="primary"
+          size="small"
+          title="保存"
+          :icon="Save"
+          :loading="state.loading"
+          @click="handleSave"
+        />
       </div>
     </footer>
   </aside>
@@ -65,7 +71,7 @@
 
 <script lang="ts" setup>
 import { o } from '@cat-kit/core'
-import { Close } from '@veltra/icons/normal'
+import { Close, Save } from '@veltra/icons/normal'
 import { bem } from '@veltra/utils'
 import { computed, inject, shallowRef, toRef } from 'vue'
 

package/src/components/batch-edit/use-edit-state.ts

@@ -22,6 +22,9 @@ export function useEditState(options: Options) {
   const state = shallowReactive({ ...defaultState })
 
   function resetState() {
+    // 销毁表单前先重置，避免下次 v-if 重挂载时 Form 拍到脏 model
+    formRef.value?.reset()
+
     if (state.row) {
       state.row.isCurrent = false
     }

package/src/components/batch-edit/use-handlers.ts

@@ -163,6 +163,11 @@ export function useHandlers(options: Options): EditReturned {
         }
       }
       insert(item)
+
+      // 推进插入点，便于连续新增；并重置表单到初始默认值
+      const next = last(state.indexPath) + 1
+      state.indexPath = [...state.indexPath.slice(0, -1), next]
+      formRef.value?.reset()
       return
     }
 

package/src/components/batch-edit/use-shortcut-key.ts

@@ -24,7 +24,9 @@ export function useShortcutKey(options: Options) {
   }
 
   function runEscape(e: KeyboardEvent) {
+    if (!state.formVisible) return
     e.preventDefault()
+    e.stopPropagation()
     onClose()
   }
 

package/src/components/number-range-input/__test__/number-range-input.test.ts

@@ -0,0 +1,100 @@
+import { describe, expect, it } from 'vitest'
+import { createApp, h, nextTick, ref } from 'vue'
+
+import type { NumberRangeTuple } from '../../../types'
+import UNumberRangeInput from '../number-range-input.vue'
+
+function mountNumberRangeInput(initial: NumberRangeTuple) {
+  const host = document.createElement('div')
+  document.body.appendChild(host)
+
+  const model = ref<NumberRangeTuple>([...initial])
+  const changes: NumberRangeTuple[] = []
+
+  const app = createApp({
+    render() {
+      return h(UNumberRangeInput, {
+        modelValue: model.value,
+        'onUpdate:modelValue': (value: NumberRangeTuple) => {
+          model.value = value
+        },
+        onChange: (value: NumberRangeTuple) => {
+          changes.push(value)
+        }
+      })
+    }
+  })
+
+  app.mount(host)
+
+  const inputs = () => host.querySelectorAll<HTMLInputElement>('input')
+
+  return {
+    host,
+    model,
+    changes,
+    inputs,
+    async setInputValue(index: 0 | 1, value: string) {
+      const input = inputs()[index]
+      if (!input) throw new Error(`input[${index}] not found`)
+      input.value = value
+      input.dispatchEvent(new Event('input', { bubbles: true }))
+      await nextTick()
+    },
+    async blurInput(index: 0 | 1) {
+      const input = inputs()[index]
+      if (!input) throw new Error(`input[${index}] not found`)
+      input.dispatchEvent(new Event('change', { bubbles: true }))
+      input.dispatchEvent(new FocusEvent('blur', { bubbles: true }))
+      await nextTick()
+    },
+    unmount() {
+      app.unmount()
+      host.remove()
+    }
+  }
+}
+
+describe('NumberRangeInput', () => {
+  it('does not rewrite the other side while typing an intermediate value', async () => {
+    const { model, setInputValue, unmount } = mountNumberRangeInput([50, 80])
+
+    try {
+      // 结束框键入 2（意图输入 20），输入过程中 start 不应被改写
+      await setInputValue(1, '2')
+      expect(model.value).toEqual([50, 2])
+    } finally {
+      unmount()
+    }
+  })
+
+  it('clamps the edited end back to start on change when end < start', async () => {
+    const { model, changes, setInputValue, blurInput, unmount } = mountNumberRangeInput([80, 100])
+
+    try {
+      await setInputValue(1, '10')
+      expect(model.value).toEqual([80, 10])
+
+      await blurInput(1)
+      expect(model.value).toEqual([80, 80])
+      expect(changes.at(-1)).toEqual([80, 80])
+    } finally {
+      unmount()
+    }
+  })
+
+  it('clamps the edited start back to end on change when start > end', async () => {
+    const { model, changes, setInputValue, blurInput, unmount } = mountNumberRangeInput([50, 80])
+
+    try {
+      await setInputValue(0, '90')
+      expect(model.value).toEqual([90, 80])
+
+      await blurInput(0)
+      expect(model.value).toEqual([80, 80])
+      expect(changes.at(-1)).toEqual([80, 80])
+    } finally {
+      unmount()
+    }
+  })
+})

package/src/components/number-range-input/number-range-input.vue

@@ -7,7 +7,7 @@
       :readonly="readonly"
       :size="size"
       v-bind="numberInputBind"
-      @change="emitChange"
+      @change="handleStartChange"
     />
     <span :class="cls.e('separator')">{{ separator }}</span>
     <u-number-input
@@ -17,7 +17,7 @@
       :readonly="readonly"
       :size="size"
       v-bind="numberInputBind"
-      @change="emitChange"
+      @change="handleEndChange"
     />
   </div>
 
@@ -79,10 +79,9 @@ const endRef = defineModel<number | undefined>('end')
 let syncGuard = false
 
 function normalizeFromSplit(s: number | undefined, e: number | undefined): NumberRangeTuple {
-  let nextS = s
-  let nextE = e
-  if (nextS !== undefined && nextE !== undefined && nextS > nextE) nextE = nextS
-  return [nextS, nextE]
+  // 外部 split 写入无法区分哪一侧后改，统一将越界的 end 抬到 start
+  if (s !== undefined && e !== undefined && s > e) return [s, s]
+  return [s, e]
 }
 
 watch(
@@ -153,11 +152,9 @@ const startModel = computed({
     return model.value?.[0]
   },
   set(v: number | undefined) {
+    // 输入过程只更新单侧，交叉约束放到 change（失焦）时处理
     const cur = model.value ?? [undefined, undefined]
-    const end = cur[1]
-    let nextEnd = end
-    if (v !== undefined && end !== undefined && v > end) nextEnd = v
-    model.value = [v, nextEnd]
+    model.value = [v, cur[1]]
   }
 })
 
@@ -167,10 +164,7 @@ const endModel = computed({
   },
   set(v: number | undefined) {
     const cur = model.value ?? [undefined, undefined]
-    const start = cur[0]
-    let nextStart = start
-    if (v !== undefined && start !== undefined && v < start) nextStart = v
-    model.value = [nextStart, v]
+    model.value = [cur[0], v]
   }
 })
 
@@ -195,7 +189,25 @@ const readonlyText = computed(() => {
   return `${p}${a} ${sep} ${b}${sfx}`
 })
 
-function emitChange(): void {
-  emit('change', model.value ?? [undefined, undefined])
+function handleStartChange(): void {
+  const [start, end] = model.value ?? [undefined, undefined]
+  // 失焦时只校正刚改的一侧：start > end 时把 start 压回 end
+  let next: NumberRangeTuple = [start, end]
+  if (start !== undefined && end !== undefined && start > end) {
+    next = [end, end]
+    model.value = next
+  }
+  emit('change', next)
+}
+
+function handleEndChange(): void {
+  const [start, end] = model.value ?? [undefined, undefined]
+  // 失焦时只校正刚改的一侧：end < start 时把 end 抬回 start
+  let next: NumberRangeTuple = [start, end]
+  if (start !== undefined && end !== undefined && end < start) {
+    next = [start, start]
+    model.value = next
+  }
+  emit('change', next)
 }
 </script>

package/src/components/table/__test__/col-width.test.ts

@@ -0,0 +1,77 @@
+import { describe, expect, it } from 'vitest'
+
+import type { TableColumn } from '../../../types'
+import { allocateLeafColumnWidths } from '../allocate-column-widths'
+import { ColumnNode } from '../node/col'
+
+function createLeaf(column: TableColumn): ColumnNode {
+  return new ColumnNode(column, 0, 0)
+}
+
+describe('allocateLeafColumnWidths', () => {
+  it('fixed right 操作列未设 width 时保持 minWidth，不吞剩余空间', () => {
+    const name = createLeaf({ key: 'name', name: '姓名', width: 200 })
+    const age = createLeaf({ key: 'age', name: '年龄', width: 200 })
+    const action = createLeaf({ key: 'action', name: '操作', fixed: 'right' })
+    // 模拟旧算法曾把操作列撑大
+    action.data.width = 800
+
+    allocateLeafColumnWidths([name, age, action], 1000)
+
+    expect(name.width).toBe(200)
+    expect(age.width).toBe(200)
+    expect(action.data.width).toBeUndefined()
+    expect(action.width).toBe(100)
+  })
+
+  it('多个非 fixed 无 width 列均分剩余宽度', () => {
+    const a = createLeaf({ key: 'a', name: 'A', width: 200 })
+    const b = createLeaf({ key: 'b', name: 'B' })
+    const c = createLeaf({ key: 'c', name: 'C' })
+
+    // totalBase = 200 + 100 + 100 = 400，剩余 600，每列 +300
+    allocateLeafColumnWidths([a, b, c], 1000)
+
+    expect(a.width).toBe(200)
+    expect(b.width).toBe(400)
+    expect(c.width).toBe(400)
+  })
+
+  it('fixed left 未设 width 时同样不参与均分', () => {
+    const name = createLeaf({ key: 'name', name: '姓名', fixed: 'left' })
+    const age = createLeaf({ key: 'age', name: '年龄' })
+    const score = createLeaf({ key: 'score', name: '分数' })
+
+    // totalBase = 100 + 100 + 100 = 300，剩余 700 只分给 age/score
+    allocateLeafColumnWidths([name, age, score], 1000)
+
+    expect(name.data.width).toBeUndefined()
+    expect(name.width).toBe(100)
+    expect(age.width).toBe(450)
+    expect(score.width).toBe(450)
+  })
+
+  it('explicitWidth 列宽度不变', () => {
+    const locked = createLeaf({ key: 'locked', name: '锁定', width: 180 })
+    locked.explicitWidth = true
+    const grow = createLeaf({ key: 'grow', name: '弹性' })
+
+    allocateLeafColumnWidths([locked, grow], 500)
+
+    expect(locked.width).toBe(180)
+    // totalBase = 180 + 100 = 280，剩余 220 全给 grow
+    expect(grow.width).toBe(320)
+  })
+
+  it('无剩余空间时 grow 列回落到 minWidth', () => {
+    const a = createLeaf({ key: 'a', name: 'A', width: 400 })
+    const b = createLeaf({ key: 'b', name: 'B' })
+    b.data.width = 300
+
+    allocateLeafColumnWidths([a, b], 450)
+
+    expect(a.width).toBe(400)
+    expect(b.data.width).toBeUndefined()
+    expect(b.width).toBe(100)
+  })
+})

package/src/components/table/allocate-column-widths.ts

@@ -0,0 +1,38 @@
+import type { ColumnNode } from './node/col'
+
+/**
+ * 按容器宽度分配叶子列宽。
+ *
+ * - `explicitWidth` 列：保持配置/拖拽锁定的宽度
+ * - `fixed` 且未显式设宽的列：保持 `minWidth`，不参与剩余宽度均分
+ * - 其余未显式设宽的列：均分容器剩余宽度
+ */
+export function allocateLeafColumnWidths(leafColumns: ColumnNode[], containerWidth: number): void {
+  if (!containerWidth || !leafColumns.length) return
+
+  const growColumns = leafColumns.filter((column) => !column.explicitWidth && !column.fixed)
+  // fixed 且未显式设宽：清掉可能被旧算法撑大的残留 width，回落到 minWidth
+  const fixedFlexColumns = leafColumns.filter((column) => !column.explicitWidth && column.fixed)
+
+  fixedFlexColumns.forEach((column) => {
+    column.data.width = undefined
+  })
+
+  const explicitWidthTotal = leafColumns
+    .filter((column) => column.explicitWidth)
+    .reduce((acc, cur) => acc + (cur.width ?? cur.minWidth!), 0)
+  const growBaseTotal = growColumns.reduce((acc, cur) => acc + cur.minWidth!, 0)
+  const fixedFlexBaseTotal = fixedFlexColumns.reduce((acc, cur) => acc + cur.minWidth!, 0)
+  const totalBase = explicitWidthTotal + growBaseTotal + fixedFlexBaseTotal
+
+  if (growColumns.length > 0 && totalBase < containerWidth) {
+    const allocatedWidth = (containerWidth - totalBase) / growColumns.length
+    growColumns.forEach((column) => {
+      column.width = column.minWidth! + allocatedWidth
+    })
+  } else {
+    growColumns.forEach((column) => {
+      column.data.width = undefined
+    })
+  }
+}

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

@@ -1,6 +1,7 @@
 import { nextTick, provide, shallowRef, watchEffect, type ShallowRef } from 'vue'
 
 import type { ScrollExposed } from '../../types'
+import { allocateLeafColumnWidths } from './allocate-column-widths'
 import { TableResizeKey } from './di'
 import type { ColumnNode } from './node/col'
 
@@ -34,25 +35,7 @@ export function useColResize(options: Options): UseColResizeReturned {
 
     if (!containerWidth || !leafColumns.value.length) return
 
-    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
-      })
-    }
+    allocateLeafColumnWidths(leafColumns.value, containerWidth)
 
     const fixedLeft = leafColumns.value.filter((column) => column.fixed === 'left')
     const fixedRight = leafColumns.value.filter((column) => column.fixed === 'right')