qidian-vue-ui 2.0.9 → 2.0.11

package/dist/components/dict/tag/index.css

@@ -1,5 +1,8 @@
-.qd-dict-tag[data-v-b88cab23] {
+.qd-dict-tag[data-v-e8a6ce9c] {
   display: inline-flex;
   align-items: center;
   flex-wrap: wrap;
 }
+.qd-dict-tag[data-v-e8a6ce9c] >  .t-loading {
+  position: static;
+}

package/dist/components/dict/tag/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 index = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b88cab23"]]);
+const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e8a6ce9c"]]);
 export {
   index as default
 };

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

@@ -1,66 +1,66 @@
-.qd-service-table[data-v-ee419bfb] {
+.qd-service-table[data-v-98a1baeb] {
   height: 100%;
   display: flex;
   flex-direction: column;
 }
-.qd-service-table[data-v-ee419bfb] >  .t-table__content {
+.qd-service-table[data-v-98a1baeb] >  .t-table__content {
   flex: 1;
 }
-.qd-service-table--mini[data-v-ee419bfb] {
+.qd-service-table--mini[data-v-98a1baeb] {
   font: var(--td-font-body-small);
 }
-.qd-service-table--mini[data-v-ee419bfb] th,
-.qd-service-table--mini[data-v-ee419bfb] tr:not(.t-table__expanded-row) > td {
+.qd-service-table--mini[data-v-98a1baeb] th,
+.qd-service-table--mini[data-v-98a1baeb] 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[data-v-ee419bfb] .t-table__tree-col:not(:has(.t-table__tree-op-icon)) {
+.qd-service-table[data-v-98a1baeb] .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-ee419bfb] .t-table__tree-leaf-node .t-table__tree-op-icon:empty {
+.qd-service-table[data-v-98a1baeb] .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-ee419bfb] .t-affix > .t-table__affixed-header-elm-wrap,
-.qd-service-table[data-v-ee419bfb] .t-affix > .t-table__scrollbar--obvious {
-  transform: var(--v5f2dd170);
+.qd-service-table[data-v-98a1baeb] .t-affix > .t-table__affixed-header-elm-wrap,
+.qd-service-table[data-v-98a1baeb] .t-affix > .t-table__scrollbar--obvious {
+  transform: var(--dfe9a5de);
 }
-.qd-service-table--horizontal-bar-static[data-v-ee419bfb] .t-table__scrollbar--obvious {
+.qd-service-table--horizontal-bar-static[data-v-98a1baeb] .t-table__scrollbar--obvious {
   visibility: hidden;
   pointer-events: none;
 }
-.qd-service-table[data-v-ee419bfb] .t-table__affixed-header-elm-wrap {
+.qd-service-table[data-v-98a1baeb] .t-table__affixed-header-elm-wrap {
   height: auto !important;
 }
-.qd-service-table[data-v-ee419bfb] .t-table__affixed-header-elm {
+.qd-service-table[data-v-98a1baeb] .t-table__affixed-header-elm {
   position: relative;
   scrollbar-width: none;
 }
-.qd-service-table[data-v-ee419bfb] .t-table__affixed-header-elm::-webkit-scrollbar {
+.qd-service-table[data-v-98a1baeb] .t-table__affixed-header-elm::-webkit-scrollbar {
   display: none;
   width: 0;
   height: 0;
 }
-.qd-service-table[data-v-ee419bfb] .t-table__virtual-scroll-cursor + table {
+.qd-service-table[data-v-98a1baeb] .t-table__virtual-scroll-cursor + table {
   border-collapse: separate;
 }
-.qd-service-table[data-v-ee419bfb] .t-table__expanded-row-inner {
+.qd-service-table[data-v-98a1baeb] .t-table__expanded-row-inner {
   position: sticky;
   left: 0;
-  width: var(--v1d473786) !important;
+  width: var(--v7ade7674) !important;
 }
-.qd-service-table[data-v-ee419bfb] .t-table__cell-wrap > *:not(.t-switch):not(.t-tag):not(.t-icon):not(.qd-file-icon) {
+.qd-service-table[data-v-98a1baeb] .t-table__cell-wrap > *:not(.t-switch):not(.t-tag):not(.t-icon):not(.qd-file-icon) {
   width: 100%;
 }
-.qd-service-table[data-v-ee419bfb] .qd-service-table__non-editable-col {
+.qd-service-table[data-v-98a1baeb] .qd-service-table__non-editable-col {
   background-color: color-mix(in srgb, var(--td-bg-color-component) 50%, transparent);
 }
-.qd-service-table[data-v-ee419bfb]  .qd-service-table__non-editable-col:is(
+.qd-service-table[data-v-98a1baeb]  .qd-service-table__non-editable-col: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-ee419bfb] colgroup > col {
+.qd-service-table--disable-horizontal-scroll[data-v-98a1baeb] colgroup > col {
   width: auto !important;
 }

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-ee419bfb"]]);
+const QdServiceTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-98a1baeb"]]);
 export {
   QdServiceTable as default
 };

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

@@ -1,7 +1,7 @@
 import './index.css'
 import { defineComponent, mergeDefaults, useCssVars, computed, ref, useSlots, useTemplateRef, shallowRef, inject, getCurrentInstance, reactive, createVNode, watch, nextTick, onMounted, onActivated, onDeactivated, onBeforeUnmount, withDirectives, createBlock, openBlock, resolveDynamicComponent, unref, mergeProps, isRef, createSlots, withCtx, renderList, renderSlot, normalizeProps, guardReactiveProps, render, h } from "vue";
 import { useVModels, useElementSize, useElementBounding, useIntersectionObserver } from "../../../node_modules/.pnpm/@vueuse_core@14.2.0_vue@3.5.26_typescript@5.9.3_/node_modules/@vueuse/core/dist/index.mjs";
-import { useActivated, useTimer, easyCopy, isEmpty, suspectedWrapperPromise, useServicePagination, createExposeProxy, resizeDirective, getScrollEl } from "qidian-shared";
+import { useActivated, useTimer, easyCopy, isEmpty, suspectedWrapperPromise, getScrollEl, useServicePagination, createExposeProxy, resizeDirective } from "qidian-shared";
 import { LoadingIcon, AddRectangleIcon, MinusRectangleIcon } from "tdesign-icons-vue-next";
 import { EnhancedTable, Table, Empty } from "tdesign-vue-next";
 import { validate } from "tdesign-vue-next/es/form/utils/form-model.mjs";
@@ -19,6 +19,7 @@ const defaultMinWidth = 80;
 const defaultVirtualScrollBufferSize = 2;
 const defaultVirtualScrollUpdateInterval = 16;
 const minVirtualScrollUpdateInterval = 8;
+const scrollRestoreMaxAttempts = 4;
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
     name: "QdServiceTable"
@@ -320,8 +321,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     emit: __emit
   }) {
     useCssVars((_ctx) => ({
-      "v5f2dd170": affixedHeaderTransform.value,
-      "v1d473786": expandedRowWidth.value
+      "dfe9a5de": affixedHeaderTransform.value,
+      "v7ade7674": expandedRowWidth.value
     }));
     const props = __props;
     const emit = __emit;
@@ -413,8 +414,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let offscreenInstance = null;
     const scrollRecord = {
       top: 0,
-      left: 0
+      left: 0,
+      bottom: false
     };
+    let scrollRestoreRafId = 0;
     const outsideScrollEl = ref(null);
     const tableHeaderEl = ref(null);
     const tableContentEl = ref(null);
@@ -431,10 +434,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return width > 0 ? `${width}px` : "auto";
     });
     const affixBottomOffset = ref(0);
-    const horizontalAffixBottomOffset = computed(() => {
-      if (!outsideScrollEl.value) return affixBottomOffset.value;
-      return Math.max(0, window.innerHeight - outsideScrollRect.bottom + affixBottomOffset.value);
-    });
     const {
       timer: probeDelayTimer,
       clearTimer: clearProbeDelayTimer
@@ -649,12 +648,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         onScroll?.(params);
         const target = params.e.target;
         if (!target) return;
+        if (!activated.value) return;
         const {
           scrollTop,
-          scrollLeft
+          scrollLeft,
+          scrollHeight,
+          clientHeight
         } = target;
         scrollRecord.top = scrollTop;
         scrollRecord.left = scrollLeft;
+        scrollRecord.bottom = !isVirtualScroll.value && Math.abs(scrollHeight - clientHeight - scrollTop) <= 1;
       };
       const reOnCellClick = (context) => {
         handleCellClick(context);
@@ -678,11 +681,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ...horizontalScrollAffixProps
       } = typeof horizontalScrollAffixedBottom === "object" ? horizontalScrollAffixedBottom : {};
       const reHorizontalScrollAffixedBottom = horizontalScrollAffixedBottom === false ? false : {
-        ...outsideScrollEl.value ? {
-          container: () => outsideScrollEl.value
-        } : {},
+        container: () => outsideScrollEl.value ?? getScrollEl(tableRef.value?.$el),
         ...horizontalScrollAffixProps,
-        offsetBottom: horizontalScrollOffsetBottom + horizontalAffixBottomOffset.value,
+        offsetBottom: horizontalScrollOffsetBottom + affixBottomOffset.value,
         onFixedChange: (...args) => {
           const [affixed, context] = args;
           onHorizontalScrollFixedChange?.(affixed, context);
@@ -705,9 +706,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ...headerAffixProps
       } = headerAffixOptions;
       const reHeaderAffixedTop = headerAffixedTop && headerAffixedNeeded.value ? {
-        ...outsideScrollEl.value ? {
-          container: () => outsideScrollEl.value
-        } : {},
+        container: () => outsideScrollEl.value ?? getScrollEl(tableRef.value?.$el),
         ...headerAffixProps,
         onFixedChange: (...args) => {
           const [affixed, context] = args;
@@ -1585,25 +1584,42 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return reColumn;
       });
     }
-    function setScrollElTo() {
-      const el = tableRef.value?.$el;
-      if (!el) return;
-      const scrollEl = tableContentEl.value;
+    function getCurrentTableContentEl() {
+      const rootEl = tableRef.value?.$el ?? currentInstance?.proxy?.$el;
+      if (!(rootEl instanceof HTMLElement)) return tableContentEl.value;
+      return rootEl.querySelector(".t-table__content") ?? tableContentEl.value;
+    }
+    function setScrollElTo(position = scrollRecord) {
+      const scrollEl = getCurrentTableContentEl();
       if (!scrollEl) return;
       const {
         scrollTop,
         scrollLeft
       } = scrollEl;
       const {
-        top,
         left
-      } = scrollRecord;
+      } = position;
+      const top = position.bottom && !isVirtualScroll.value ? Math.max(scrollEl.scrollHeight - scrollEl.clientHeight, 0) : position.top;
       if (top === scrollTop && left === scrollLeft) return;
       scrollEl.scrollTo({
         top,
         left
       });
     }
+    function cancelScrollRestore() {
+      if (!scrollRestoreRafId) return;
+      cancelAnimationFrame(scrollRestoreRafId);
+      scrollRestoreRafId = 0;
+    }
+    function scheduleScrollRestore(position, attempts = scrollRestoreMaxAttempts) {
+      scrollRestoreRafId = requestAnimationFrame(() => {
+        scrollRestoreRafId = 0;
+        if (!activated.value) return;
+        setScrollElTo(position);
+        if (attempts <= 1) return;
+        scheduleScrollRestore(position, attempts - 1);
+      });
+    }
     async function triggerAffixedRefresh() {
       if (!outsideScrollEl.value) return;
       outsideScrollEl.value.scrollTo({
@@ -1836,14 +1852,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       document.addEventListener("click", handleDocumentClick);
       document.addEventListener("keydown", handleDocumentKeydown);
     });
-    onActivated(() => {
-      setScrollElTo();
+    onActivated(async () => {
+      const position = {
+        ...scrollRecord
+      };
       tableContentResume();
+      await nextTick();
+      if (!activated.value) return;
+      cancelScrollRestore();
+      scheduleScrollRestore(position);
     });
     onDeactivated(() => {
+      cancelScrollRestore();
       tableContentPause();
     });
     onBeforeUnmount(() => {
+      cancelScrollRestore();
       tableContentStop();
       if (probeRafId) cancelAnimationFrame(probeRafId);
       if (affixRefreshRafId) cancelAnimationFrame(affixRefreshRafId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qidian-vue-ui",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "基于 TDesign 的 QiDian Vue UI 组件库",
   "author": "qidian",
   "license": "MIT",
@@ -130,7 +130,7 @@
     "vue-codemirror": "^6.1.1",
     "vue-echarts": "^8.0.1",
     "vue-stream-markdown": "1.0.1-beta.1",
-    "qidian-shared": "1.2.3"
+    "qidian-shared": "1.2.4"
   },
   "scripts": {
     "clean": "rm -rf dist",