qidian-vue-ui 2.0.65 → 2.1.0

package/dist/components/crud/table/index.css

@@ -1,40 +1,40 @@
-.qd-crud-table[data-v-cf0c0269] {
+.qd-crud-table[data-v-38df8d6e] {
   width: 100%;
   display: flex;
   flex-direction: column;
 }
-.qd-crud-table > .qd-crud-search:not(.qd-crud-search--hide) + .qd-crud-table__body[data-v-cf0c0269] {
+.qd-crud-table > .qd-crud-search:not(.qd-crud-search--hide) + .qd-crud-table__body[data-v-38df8d6e] {
   margin-top: var(--td-comp-margin-l);
 }
-.qd-crud-table__body[data-v-cf0c0269] >  .t-loading__parent > .t-card__body {
+.qd-crud-table__body[data-v-38df8d6e] >  .t-loading__parent > .t-card__body {
   display: flex;
   flex-direction: column;
 }
-.qd-crud-table__body[data-v-cf0c0269] >  .t-loading__parent > .t-card__body > .qd-service-table .t-table__pagination {
+.qd-crud-table__body[data-v-38df8d6e] >  .t-loading__parent > .t-card__body > .qd-service-table .t-table__pagination {
   padding-bottom: 0;
 }
-.qd-crud-table--fit-parent-height[data-v-cf0c0269] {
+.qd-crud-table--fit-parent-height[data-v-38df8d6e] {
   height: 100%;
 }
-.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-cf0c0269] {
+.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-38df8d6e] {
   flex: auto;
 }
-.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-cf0c0269] >  .t-loading__parent > .t-card__body {
+.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-38df8d6e] >  .t-loading__parent > .t-card__body {
   height: 100%;
   min-height: 443px;
 }
-.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-cf0c0269] >  .t-loading__parent > .t-card__body > .qd-service-table {
+.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-38df8d6e] >  .t-loading__parent > .t-card__body > .qd-service-table {
   flex: 1 1 0;
   overflow: hidden;
 }
-.qd-crud-table__toolbar[data-v-cf0c0269] {
+.qd-crud-table__toolbar[data-v-38df8d6e] {
   display: flex;
   justify-content: space-between;
 }
-.qd-crud-table__toolbar--has-space-item + .qd-service-table[data-v-cf0c0269] {
+.qd-crud-table__toolbar--has-space-item + .qd-service-table[data-v-38df8d6e] {
   margin-top: var(--td-comp-margin-l);
 }
-.qd-crud-table__toolbar-separator[data-v-cf0c0269] {
+.qd-crud-table__toolbar-separator[data-v-38df8d6e] {
   display: inline-block;
   padding-left: var(--td-comp-paddingLR-s);
 }

package/dist/components/crud/table/index.vue.mjs

@@ -2,7 +2,7 @@ import './index.css'
 import _sfc_main from "./index.vue2.mjs";
 /* empty css            */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
-const QdCrudTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-cf0c0269"]]);
+const QdCrudTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-38df8d6e"]]);
 export {
   QdCrudTable as default
 };

package/dist/components/crud/table/index.vue2.mjs

@@ -18,8 +18,8 @@ import { hasPermiDirective } from "../../../directive/hasPermi.mjs";
 import _sfc_main$2 from "../../dialog/form.vue.mjs";
 import QdColumnsController from "../../columns-controller/index.vue.mjs";
 import get from "../../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/get.mjs";
-import QdServiceTable from "../../service/table/index.vue.mjs";
 import { hasPermiOr } from "../../../utils/auth.mjs";
+import QdServiceTable from "../../service/table/index.vue.mjs";
 const _hoisted_1 = {
   key: 0,
   class: "qd-crud-table__toolbar-separator"
@@ -412,12 +412,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const {
       t
     } = useConfig("crud");
+    const {
+      global: tableGlobalConfig
+    } = useConfig("table");
     const {
       msgError,
       msgSuccess,
       alertWarning,
       confirm
     } = useModal();
+    const SIZE_FONT_MAP = {
+      large: 16,
+      medium: 14,
+      small: 14,
+      mini: 12
+    };
+    const SIZE_PADDING_MAP = {
+      large: 40,
+      medium: 32,
+      small: 16,
+      mini: 12
+    };
     const treeIsExpand = computed(() => !!expandedTreeNodes.value?.length);
     const dialogFormMap = reactive({});
     const ifRenderMap = reactive({});
@@ -425,7 +440,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const shouldValidateInitialSearch = computed(() => !!props.service && props.manual !== true && !!props.search?.items?.length);
     const reProps = computed(() => {
       const {
-        data: data2,
+        data: propsData,
         searchData: inSearchData,
         selectedRowKeys: selectedRowKeys2,
         activeRowKeys: activeRowKeys2,
@@ -524,13 +539,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       const operationLength = reRowActions.length;
       if (operationLength) {
+        const operationSize = serviceTableOptions.size ?? tableGlobalConfig.value?.size ?? "medium";
         const operationIdx = reColumns.findIndex((item) => item.colKey === "operation");
         const defaultOperation = {
           title: t("operationText"),
           colKey: "operation",
           align: "center",
           fixed: "right",
-          width: 28 * operationLength + 25 * operationLength - 1 + 32
+          width: calcOperationWidth(reRowActions, data.value, operationSize)
         };
         if (operationIdx > -1) {
           reColumns[operationIdx] = {
@@ -579,7 +595,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         rowActions: reRowActions,
         tools: reTools,
         models: {
-          data: data2,
+          data: propsData,
           searchData: inSearchData,
           selectedRowKeys: selectedRowKeys2,
           activeRowKeys: activeRowKeys2,
@@ -740,6 +756,61 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!hasChanged) return;
       mergeColumns.value = newColumns;
     };
+    function calcTextWidth(text, fontSize) {
+      return [...text].reduce((width, char) => {
+        if (char.charCodeAt(0) > 255) return width + fontSize;
+        return width + Math.round(fontSize * (/[A-Z]/.test(char) ? 0.79 : 0.57));
+      }, 0);
+    }
+    function getActionWidth(action, row, fontSize = 14) {
+      if (action.component) return Math.round(fontSize * 2);
+      let iconWidth = 0;
+      if (action.prefixIcon) {
+        const icon = action.prefixIcon?.__qdCompute && row !== void 0 ? action.prefixIcon(getConfigRendererCtx(action, {
+          row
+        }), void 0) : action.prefixIcon;
+        iconWidth = icon ? Math.round(fontSize * 1.43) : 0;
+      }
+      const {
+        content
+      } = action;
+      if (typeof content === "string") return calcTextWidth(content, fontSize) + iconWidth;
+      if (row !== void 0 && content?.__qdCompute) {
+        const text = content(getConfigRendererCtx(action, {
+          row
+        }), void 0);
+        return typeof text === "string" ? calcTextWidth(text, fontSize) + iconWidth : Math.round(fontSize * 2) + iconWidth;
+      }
+      return content === void 0 && !iconWidth ? 0 : Math.round(fontSize * 1.14);
+    }
+    function isActionVisible(action, row) {
+      if (!hasPermiOr(action.permi, false)) return false;
+      const {
+        ifRender
+      } = action;
+      if (ifRender?.__qdCompute) {
+        return ifRender(getConfigRendererCtx(action, {
+          row
+        }), void 0) !== false;
+      }
+      return ifRender !== false;
+    }
+    function calcOperationWidth(rowActions, rows, size = "medium") {
+      const permittedActions = rowActions.filter((action) => hasPermiOr(action.permi, false));
+      if (!permittedActions.length) return 0;
+      const fontSize = SIZE_FONT_MAP[size] ?? 14;
+      const cellPadding = SIZE_PADDING_MAP[size] ?? 32;
+      const sumWidth = (actions, row) => actions.reduce((width, action) => width + getActionWidth(action, row, fontSize), 0) + (actions.length - 1) * 25 + cellPadding + 5;
+      if (!rows?.length) {
+        return sumWidth(permittedActions);
+      }
+      let maxWidth = 0;
+      for (const row of rows) {
+        const visibleActions = permittedActions.filter((action) => isActionVisible(action, row));
+        maxWidth = Math.max(maxWidth, sumWidth(visibleActions, row));
+      }
+      return maxWidth;
+    }
     function buildActions(actions, crudForm) {
       if (!actions) return [];
       return actions.map((item) => mergeAction({

package/dist/components/service/table/index.css

@@ -1,103 +1,103 @@
-.qd-service-table[data-v-bb8ca5b9] {
+.qd-service-table[data-v-645038b1] {
   height: 100%;
   display: flex;
   flex-direction: column;
 }
-.qd-service-table[data-v-bb8ca5b9] >  .t-table__content {
+.qd-service-table[data-v-645038b1] >  .t-table__content {
   flex: 1;
 }
-.qd-service-table--mini[data-v-bb8ca5b9] {
+.qd-service-table--mini[data-v-645038b1] {
   font: var(--td-font-body-small);
 }
-.qd-service-table--mini[data-v-bb8ca5b9] th,
-.qd-service-table--mini[data-v-bb8ca5b9] tr:not(.t-table__expanded-row) > td {
+.qd-service-table--mini[data-v-645038b1] th,
+.qd-service-table--mini[data-v-645038b1] tr:not(.t-table__expanded-row) > td {
   padding: var(--td-comp-paddingTB-xxs) var(--td-comp-paddingLR-xxs);
   line-height: var(--td-line-height-body-small);
 }
-.qd-service-table--mini[data-v-bb8ca5b9] .t-table__row-full-element {
+.qd-service-table--mini[data-v-645038b1] .t-table__row-full-element {
   padding: var(--td-comp-paddingTB-xs) var(--td-comp-paddingLR-s);
 }
-.qd-service-table--hide-empty-image[data-v-bb8ca5b9] .t-table__empty {
+.qd-service-table--hide-empty-image[data-v-645038b1] .t-table__empty {
   min-height: auto;
 }
-.qd-service-table--hide-empty-image[data-v-bb8ca5b9] .t-table__empty .t-empty {
+.qd-service-table--hide-empty-image[data-v-645038b1] .t-table__empty .t-empty {
   padding: 0 !important;
 }
-.qd-service-table--hide-empty-image[data-v-bb8ca5b9] .t-table__empty .t-empty__image {
+.qd-service-table--hide-empty-image[data-v-645038b1] .t-table__empty .t-empty__image {
   display: none;
 }
-.qd-service-table--hide-empty-image[data-v-bb8ca5b9] .t-table__empty .t-empty__title {
+.qd-service-table--hide-empty-image[data-v-645038b1] .t-table__empty .t-empty__title {
   margin-top: 0;
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__tree-col:not(:has(.t-table__tree-op-icon)) {
+.qd-service-table[data-v-645038b1] .t-table__tree-col:not(:has(.t-table__tree-op-icon)) {
   margin-left: calc(var(--td-font-size-body-large) + var(--td-comp-margin-s));
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__tree-leaf-node .t-table__tree-op-icon:empty {
+.qd-service-table[data-v-645038b1] .t-table__tree-leaf-node .t-table__tree-op-icon:empty {
   width: calc(var(--td-font-size-body-large) + var(--td-comp-margin-s));
 }
-.qd-service-table[data-v-bb8ca5b9] .t-affix > .t-table__affixed-header-elm-wrap,
-.qd-service-table[data-v-bb8ca5b9] .t-affix > .t-table__scrollbar--obvious {
-  transform: var(--f9e71248);
+.qd-service-table[data-v-645038b1] .t-affix > .t-table__affixed-header-elm-wrap,
+.qd-service-table[data-v-645038b1] .t-affix > .t-table__scrollbar--obvious {
+  transform: var(--bd3cad9a);
 }
-.qd-service-table--horizontal-bar-static[data-v-bb8ca5b9] .t-table__scrollbar--obvious {
+.qd-service-table--horizontal-bar-static[data-v-645038b1] .t-table__scrollbar--obvious {
   visibility: hidden;
   pointer-events: none;
 }
-.qd-service-table--horizontal-bar-static[data-v-bb8ca5b9] >  div:has(> div > .t-table__scrollbar--obvious) {
+.qd-service-table--horizontal-bar-static[data-v-645038b1] >  div:has(> div > .t-table__scrollbar--obvious) {
   height: 0;
   margin-top: 0 !important;
   overflow: hidden;
 }
-.qd-service-table[data-v-bb8ca5b9]  .t-table__expanded-row .qd-service-table--horizontal-bar-static > div:has(> div > .t-table__scrollbar--obvious) {
+.qd-service-table[data-v-645038b1]  .t-table__expanded-row .qd-service-table--horizontal-bar-static > div:has(> div > .t-table__scrollbar--obvious) {
   display: none;
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__expanded-row > td {
+.qd-service-table[data-v-645038b1] .t-table__expanded-row > td {
   height: 0;
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__affixed-header-elm-wrap {
+.qd-service-table[data-v-645038b1] .t-table__affixed-header-elm-wrap {
   height: auto !important;
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__affixed-header-elm {
+.qd-service-table[data-v-645038b1] .t-table__affixed-header-elm {
   position: relative;
   scrollbar-width: none;
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__affixed-header-elm::-webkit-scrollbar {
+.qd-service-table[data-v-645038b1] .t-table__affixed-header-elm::-webkit-scrollbar {
   display: none;
   width: 0;
   height: 0;
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__virtual-scroll-cursor + table {
+.qd-service-table[data-v-645038b1] .t-table__virtual-scroll-cursor + table {
   border-collapse: separate;
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__expanded-row-inner,
-.qd-service-table[data-v-bb8ca5b9] .t-table__row-filter-inner {
+.qd-service-table[data-v-645038b1] .t-table__expanded-row-inner,
+.qd-service-table[data-v-645038b1] .t-table__row-filter-inner {
   display: block;
   position: sticky;
   left: 0;
-  width: var(--v88d7fa5e) !important;
+  width: var(--v44f78268) !important;
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__cell-wrap > .t-form__controls > .t-form__controls-content > *:not(.t-switch):not(.t-tag):not(.t-icon):not(.qd-file-icon) {
+.qd-service-table[data-v-645038b1] .t-table__cell-wrap > .t-form__controls > .t-form__controls-content > *:not(.t-switch):not(.t-tag):not(.t-icon):not(.qd-file-icon) {
   width: 100%;
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table__non-editable-col {
+.qd-service-table[data-v-645038b1] .qd-service-table__non-editable-col {
   background-color: color-mix(in srgb, var(--td-bg-color-component) 50%, transparent);
 }
-.qd-service-table[data-v-bb8ca5b9] td.qd-service-table__selected-cell {
+.qd-service-table[data-v-645038b1] td.qd-service-table__selected-cell {
   box-shadow: inset 0 1px 0 0 var(--qst-sel-t, transparent), inset 0 -1px 0 0 var(--qst-sel-b, transparent), inset 1px 0 0 0 var(--qst-sel-l, transparent), inset -1px 0 0 0 var(--qst-sel-r, transparent);
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table__selected-bt {
+.qd-service-table[data-v-645038b1] .qd-service-table__selected-bt {
   --qst-sel-t: var(--td-brand-color);
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table__selected-bb {
+.qd-service-table[data-v-645038b1] .qd-service-table__selected-bb {
   --qst-sel-b: var(--td-brand-color);
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table__selected-bl {
+.qd-service-table[data-v-645038b1] .qd-service-table__selected-bl {
   --qst-sel-l: var(--td-brand-color);
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table__selected-br {
+.qd-service-table[data-v-645038b1] .qd-service-table__selected-br {
   --qst-sel-r: var(--td-brand-color);
 }
-.qd-service-table[data-v-bb8ca5b9] td.qd-service-table__copied-cell {
+.qd-service-table[data-v-645038b1] td.qd-service-table__copied-cell {
   background-image: var(--qst-copy-t, none), var(--qst-copy-b, none), var(--qst-copy-l, none), var(--qst-copy-r, none);
   background-size: 8px 1px,
         8px 1px,
@@ -108,134 +108,134 @@
         0 0,
         100% 0;
   background-repeat: repeat-x, repeat-x, repeat-y, repeat-y;
-  animation: qst-cell-ants-bb8ca5b9 0.5s linear infinite;
+  animation: qst-cell-ants-645038b1 0.5s linear infinite;
 }
-.qd-service-table[data-v-bb8ca5b9] td.qd-service-table__copied-cell.qd-service-table__selected-cell {
+.qd-service-table[data-v-645038b1] td.qd-service-table__copied-cell.qd-service-table__selected-cell {
   background-size: 8px 2px,
           8px 2px,
           2px 8px,
           2px 8px;
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table__copied-bt {
+.qd-service-table[data-v-645038b1] .qd-service-table__copied-bt {
   --qst-copy-t: linear-gradient(90deg, var(--td-brand-color-hover) 50%, transparent 0);
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table__copied-bb {
+.qd-service-table[data-v-645038b1] .qd-service-table__copied-bb {
   --qst-copy-b: linear-gradient(90deg, var(--td-brand-color-hover) 50%, transparent 0);
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table__copied-bl {
+.qd-service-table[data-v-645038b1] .qd-service-table__copied-bl {
   --qst-copy-l: linear-gradient(0deg, var(--td-brand-color-hover) 50%, transparent 0);
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table__copied-br {
+.qd-service-table[data-v-645038b1] .qd-service-table__copied-br {
   --qst-copy-r: linear-gradient(0deg, var(--td-brand-color-hover) 50%, transparent 0);
 }
-.qd-service-table[data-v-bb8ca5b9] tbody > tr.t-table__row--active {
+.qd-service-table[data-v-645038b1] tbody > tr.t-table__row--active {
   background-color: var(--td-brand-color-light);
 }
-.qd-service-table[data-v-bb8ca5b9] tbody > tr.t-table__row--active.t-table__row--hover,
-.qd-service-table[data-v-bb8ca5b9] tbody > tr.t-table__row--active:hover {
+.qd-service-table[data-v-645038b1] tbody > tr.t-table__row--active.t-table__row--hover,
+.qd-service-table[data-v-645038b1] tbody > tr.t-table__row--active:hover {
   background-color: var(--td-brand-color-light-hover);
 }
-.qd-service-table[data-v-bb8ca5b9]  .qd-service-table__non-editable-col:not(.qd-service-table__copied-cell):is(
+.qd-service-table[data-v-645038b1]  .qd-service-table__non-editable-col:not(.qd-service-table__copied-cell):is(
           .t-table__cell--fixed-left,
           .t-table__cell--fixed-right
         ) {
   background-color: inherit;
   background-image: linear-gradient(color-mix(in srgb, var(--td-bg-color-secondarycontainer) 50%, transparent), color-mix(in srgb, var(--td-bg-color-secondarycontainer) 50%, transparent));
 }
-.qd-service-table--disable-horizontal-scroll[data-v-bb8ca5b9] colgroup > col {
+.qd-service-table--disable-horizontal-scroll[data-v-645038b1] colgroup > col {
   width: auto !important;
 }
-.qd-service-table--cell-drag-selecting[data-v-bb8ca5b9] {
+.qd-service-table--cell-drag-selecting[data-v-645038b1] {
   cursor: crosshair;
 }
-.qd-service-table--cell-drag-selecting[data-v-bb8ca5b9] td {
+.qd-service-table--cell-drag-selecting[data-v-645038b1] td {
   cursor: crosshair;
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__filter-pop-content-inner {
+.qd-service-table[data-v-645038b1] .t-table__filter-pop-content-inner {
   padding: var(--td-comp-paddingTB-s) var(--td-comp-paddingLR-s) 0;
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__filter-pop-content-inner:has(.qd-service-table-filter-item) {
+.qd-service-table[data-v-645038b1] .t-table__filter-pop-content-inner:has(.qd-service-table-filter-item) {
   padding: 0;
 }
-.qd-service-table[data-v-bb8ca5b9]  .t-table__filter-pop-content-inner:has(
+.qd-service-table[data-v-645038b1]  .t-table__filter-pop-content-inner:has(
         .qd-service-table-filter-input,
         .qd-service-table-filter-custom
       ) {
   padding-bottom: var(--td-comp-paddingTB-s);
 }
-.qd-service-table[data-v-bb8ca5b9] .t-table__filter--bottom-buttons {
+.qd-service-table[data-v-645038b1] .t-table__filter--bottom-buttons {
   padding: var(--td-comp-paddingTB-s) var(--td-comp-paddingLR-s);
 }
-.qd-service-table--mini[data-v-bb8ca5b9] .t-table__filter-pop-content-inner {
+.qd-service-table--mini[data-v-645038b1] .t-table__filter-pop-content-inner {
   padding: var(--td-comp-paddingTB-xs) var(--td-comp-paddingLR-xs) 0;
 }
-.qd-service-table--mini[data-v-bb8ca5b9] .t-table__filter--bottom-buttons {
+.qd-service-table--mini[data-v-645038b1] .t-table__filter--bottom-buttons {
   padding: var(--td-comp-paddingTB-xs) var(--td-comp-paddingLR-xs);
 }
-.qd-service-table--mini[data-v-bb8ca5b9] .t-table__filter-pop-content-inner:has(.qd-service-table-filter-item) {
+.qd-service-table--mini[data-v-645038b1] .t-table__filter-pop-content-inner:has(.qd-service-table-filter-item) {
   padding: 0;
 }
-.qd-service-table--mini[data-v-bb8ca5b9]  .t-table__filter-pop-content-inner:has(
+.qd-service-table--mini[data-v-645038b1]  .t-table__filter-pop-content-inner:has(
           .qd-service-table-filter-input,
           .qd-service-table-filter-custom
         ) {
   padding-bottom: var(--td-comp-paddingTB-xs);
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item {
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item {
   width: 266px;
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item__search,
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item__all,
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item__options {
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item__search,
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item__all,
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item__options {
   padding: var(--td-comp-paddingTB-s) var(--td-comp-paddingLR-s) 0;
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item__all {
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item__all {
   display: flex;
   align-items: center;
   padding: 0 var(--td-comp-paddingLR-s);
   border-bottom: 1px solid var(--td-component-stroke);
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item__options {
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item__options {
   display: flex;
   flex-direction: column;
   height: 206px;
   padding: 0 var(--td-comp-paddingLR-s);
   overflow-y: auto;
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item__count {
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item__count {
   margin-left: var(--td-comp-margin-xs);
   color: var(--td-text-color-placeholder);
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item__cell {
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item__cell {
   pointer-events: none;
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item .t-checkbox,
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item .t-radio {
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item .t-checkbox,
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item .t-radio {
   display: flex;
   align-items: center;
 }
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item .t-checkbox__label,
-.qd-service-table[data-v-bb8ca5b9] .qd-service-table-filter-item .t-radio__label {
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item .t-checkbox__label,
+.qd-service-table[data-v-645038b1] .qd-service-table-filter-item .t-radio__label {
   display: inline-flex;
   flex: 1 1 0;
   align-items: center;
   min-width: 0;
   overflow: hidden;
 }
-.qd-service-table--mini[data-v-bb8ca5b9] .qd-service-table-filter-item__search {
+.qd-service-table--mini[data-v-645038b1] .qd-service-table-filter-item__search {
   padding: var(--td-comp-paddingTB-xs) var(--td-comp-paddingLR-xs) 0;
 }
-.qd-service-table--mini[data-v-bb8ca5b9] .qd-service-table-filter-item__all,
-.qd-service-table--mini[data-v-bb8ca5b9] .qd-service-table-filter-item__options {
+.qd-service-table--mini[data-v-645038b1] .qd-service-table-filter-item__all,
+.qd-service-table--mini[data-v-645038b1] .qd-service-table-filter-item__options {
   padding: 0 var(--td-comp-paddingLR-xs);
 }
-@keyframes qst-cell-ants-bb8ca5b9 {
+@keyframes qst-cell-ants-645038b1 {
 to {
     background-position: 8px 0, -8px 100%, 0 -8px, 100% 8px;
 }
 }
 @media (prefers-reduced-motion: reduce) {
-[data-v-bb8ca5b9] td.qd-service-table__copied-cell {
+[data-v-645038b1] td.qd-service-table__copied-cell {
     animation: none;
 }
 }

package/dist/components/service/table/index.vue.mjs

@@ -2,7 +2,7 @@ import './index.css'
 import _sfc_main from "./index.vue2.mjs";
 /* empty css            */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
-const QdServiceTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-bb8ca5b9"]]);
+const QdServiceTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-645038b1"]]);
 export {
   QdServiceTable as default
 };

package/dist/components/service/table/index.vue2.mjs

@@ -359,8 +359,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     emit: __emit
   }) {
     useCssVars((_ctx) => ({
-      "f9e71248": affixedHeaderTransform.value,
-      "v88d7fa5e": expandedRowWidth.value
+      "bd3cad9a": affixedHeaderTransform.value,
+      "v44f78268": expandedRowWidth.value
     }));
     const props = __props;
     const emit = __emit;
@@ -440,6 +440,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const formItemColumns = computed(() => flattenFormItemColumns(props.columns || []));
     const editableColumns = computed(() => flattenEditableColumns(props.columns || []));
     const reCellSelectable = computed(() => props.cellSelectable ?? false);
+    const rowClickSelectsRows = computed(() => {
+      if (props.selectOnRowClick !== void 0) return props.selectOnRowClick;
+      if (props.onRowClick) return false;
+      return !props.expandOnRowClick && !props.tree?.expandTreeNodeOnClick;
+    });
     const parentAddBeforeSubmitQueue = inject(PROVIDE_FORM_ADD_BEFORE_SUBMIT_QUEUE, void 0);
     const beforeSubmitQueueMap = /* @__PURE__ */ new Map();
     const editingCellValidationVersions = /* @__PURE__ */ new Map();
@@ -653,7 +658,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         loading: loading2,
         data: data2,
         selectedRowKeys: selectedRowKeys2,
-        activeRowKeys: activeRowKeys2,
+        activeRowKeys: _activeRowKeys,
         columnControllerVisible: columnControllerVisible2,
         displayColumns: displayColumns2,
         expandedRowKeys: expandedRowKeys2,
@@ -696,6 +701,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const onValidate = reTableOptions.onValidate;
       const onRowValidate = reTableOptions.onRowValidate;
       const onFilterChange = reTableOptions.onFilterChange;
+      const onSelectChange = reTableOptions.onSelectChange;
+      reTableOptions.onSelectChange = (value, context) => {
+        if (props.activeRowType) activeRowKeys.value = [...value];
+        onSelectChange?.(value, context);
+      };
       reTableOptions.onValidate = (context) => {
         replaceTableValidationErrors(context.result);
         onValidate?.(context);
@@ -978,7 +988,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         models: {
           data: data2,
           selectedRowKeys: selectedRowKeys2,
-          activeRowKeys: activeRowKeys2,
+          activeRowKeys: _activeRowKeys,
           columnControllerVisible: columnControllerVisible2,
           displayColumns: displayColumns2,
           expandedRowKeys: expandedRowKeys2,
@@ -1359,7 +1369,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           checkableRowKeys.push(rowValue);
         }
       }
-      selectedRowKeys.value = checkableRowKeys;
+      if (rowClickSelectsRows.value) selectedRowKeys.value = checkableRowKeys;
       if (props.activeRowType) activeRowKeys.value = rowKeys;
     }
     function pruneDisabledSelectedRows(newData) {
@@ -1378,6 +1388,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return column.cellSelectable ?? String(column.colKey) !== "operation";
     }
     function emitRowSelectChange(clickedRow, type) {
+      if (!rowClickSelectsRows.value) return;
       const rowKeys = [...selectedRowKeys.value];
       const selectedRowData = rowKeys.map((key) => data.value.find((row) => getRowValue(row) === key)).filter((row) => !!row);
       props.onSelectChange?.(rowKeys, {
@@ -1394,10 +1405,44 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (event?.metaKey || event?.ctrlKey) {
         const exists = selectedCells.value.some((item) => isSameEditingCell(item, cell));
         const rest = selectedCells.value.filter((item) => !isSameEditingCell(item, cell));
-        selectedCells.value = exists ? rest : [...rest, cell];
-        selectedCell.value = selectedCells.value.at(-1);
+        const prevRows = new Set(selectedCells.value.map((item) => getRowValue(item.row)));
+        const next = exists ? rest : [...rest, cell];
+        const nextRows = new Set(next.map((item) => getRowValue(item.row)));
+        selectedCells.value = next;
+        selectedCell.value = next.at(-1);
         selectedCellAnchor.value = cell;
-        syncSelectedRowKeysFromCells();
+        const singleRowSelect = props.selectType === "single";
+        const clickedRowValue = getRowValue(cell.row);
+        if (rowClickSelectsRows.value) {
+          if (singleRowSelect) {
+            selectedRowKeys.value = [clickedRowValue];
+          } else {
+            const nextKeys = new Set(selectedRowKeys.value);
+            for (const rowValue of nextRows) {
+              if (prevRows.has(rowValue)) continue;
+              const rowIndex = data.value.findIndex((row) => getRowValue(row) === rowValue);
+              if (rowIndex >= 0 && !isRowSelectDisabled(data.value[rowIndex], rowIndex)) {
+                nextKeys.add(rowValue);
+              }
+            }
+            for (const rowValue of prevRows) {
+              if (!nextRows.has(rowValue)) nextKeys.delete(rowValue);
+            }
+            selectedRowKeys.value = [...nextKeys];
+          }
+        }
+        if (props.activeRowType) {
+          if (singleRowSelect) {
+            activeRowKeys.value = [clickedRowValue];
+          } else {
+            const nextActive = new Set(activeRowKeys.value);
+            for (const rowValue of nextRows) nextActive.add(rowValue);
+            for (const rowValue of prevRows) {
+              if (!nextRows.has(rowValue)) nextActive.delete(rowValue);
+            }
+            activeRowKeys.value = [...nextActive];
+          }
+        }
         emitRowSelectChange(cell.row, wasSelected ? "uncheck" : "check");
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qidian-vue-ui",
-  "version": "2.0.65",
+  "version": "2.1.0",
   "description": "基于 TDesign 的 QiDian Vue UI 组件库",
   "author": "qidian",
   "license": "MIT",