@king-design/vue 3.8.0-beta.1 → 3.8.0-beta.2

package/components/xmarkdown/useXMarkdownDisplay.js

@@ -24,6 +24,7 @@ export function useXMarkdownDisplay(getPrefixCls) {
   var previousContent = instance.get('content');
   var previousLoading = !!instance.get('loading');
   var previousStreaming = !!instance.get('streaming');
+  var typingTargetKey = '';
   // Markdown 渲染缓存
   var lastStableMarkdownSource = '';
   var lastStableMarkdownBlocks = [];
@@ -130,12 +131,16 @@ export function useXMarkdownDisplay(getPrefixCls) {
     if (typing && typeof typing === 'object') {
       return {
         interval: Math.max(typing.interval || 24, 16),
-        step: Math.max(typing.step || 2, 1)
+        step: Math.max(typing.step || 2, 1),
+        keepPrefix: typing.keepPrefix !== false,
+        resumeFrom: typing.resumeFrom
       };
     }
     return {
       interval: 24,
-      step: 2
+      step: 2,
+      keepPrefix: true,
+      resumeFrom: undefined
     };
   }
   /**
@@ -209,19 +214,50 @@ export function useXMarkdownDisplay(getPrefixCls) {
   function getDisplayedContent() {
     return instance.get('$displayContent') || '';
   }
+  function getSafeContentPrefix(content, prefix) {
+    if (!prefix) return '';
+    if (_startsWithInstanceProperty(content).call(content, prefix)) return prefix;
+    var i = 0;
+    while (i < prefix.length && i < content.length && prefix[i] === content[i]) {
+      i++;
+    }
+    return _sliceInstanceProperty(prefix).call(prefix, 0, i);
+  }
+  function getResumePrefix(content) {
+    var _getTypingOptions = getTypingOptions(),
+      resumeFrom = _getTypingOptions.resumeFrom;
+    if (resumeFrom === undefined || resumeFrom === null) return '';
+    if (resumeFrom === 'content') return content;
+    if (typeof resumeFrom === 'number') return _sliceInstanceProperty(content).call(content, 0, Math.max(0, resumeFrom));
+    return getSafeContentPrefix(content, String(resumeFrom));
+  }
+  function getTypingTargetKey(content) {
+    var _getTypingOptions2 = getTypingOptions(),
+      keepPrefix = _getTypingOptions2.keepPrefix,
+      resumeFrom = _getTypingOptions2.resumeFrom;
+    return (keepPrefix ? '1' : '0') + "\0" + String(resumeFrom) + "\0" + content;
+  }
+  function syncTypingStart(content) {
+    var targetKey = getTypingTargetKey(content);
+    if (targetKey === typingTargetKey) return;
+    typingTargetKey = targetKey;
+    var sharedPrefix = getSharedPrefix(content);
+    if (sharedPrefix !== getDisplayedContent()) {
+      resetTypingComplete();
+      setDisplayContent(sharedPrefix);
+    }
+  }
   /**
    * 获取共享前缀
    */
   function getSharedPrefix(content) {
     var displayedContent = getDisplayedContent();
-    if (!displayedContent || _startsWithInstanceProperty(content).call(content, displayedContent)) {
+    if (!displayedContent) return getResumePrefix(content);
+    if (!getTypingOptions().keepPrefix) return '';
+    if (_startsWithInstanceProperty(content).call(content, displayedContent)) {
       return displayedContent;
     }
-    var i = 0;
-    while (i < displayedContent.length && i < content.length && displayedContent[i] === content[i]) {
-      i++;
-    }
-    return _sliceInstanceProperty(displayedContent).call(displayedContent, 0, i);
+    return getSafeContentPrefix(content, displayedContent);
   }
   /**
    * 立即渲染 Markdown
@@ -352,8 +388,8 @@ export function useXMarkdownDisplay(getPrefixCls) {
       runTyping();
       return;
     }
-    var _getTypingOptions = getTypingOptions(),
-      interval = _getTypingOptions.interval;
+    var _getTypingOptions3 = getTypingOptions(),
+      interval = _getTypingOptions3.interval;
     setTypingActive(true);
     typingTimer = window.setTimeout(function () {
       typingTimer = null;
@@ -371,6 +407,7 @@ export function useXMarkdownDisplay(getPrefixCls) {
     if (instance.get('loading')) {
       stopTyping();
       resetTypingComplete();
+      typingTargetKey = '';
       if (!setDisplayContent('')) {
         syncRenderedMarkdown();
       }
@@ -379,6 +416,7 @@ export function useXMarkdownDisplay(getPrefixCls) {
     // 无内容或禁用打字
     if (!instance.get('typing') || !nextValue) {
       stopTyping();
+      typingTargetKey = '';
       if (!setDisplayContent(nextValue)) {
         syncRenderedMarkdown();
       }
@@ -388,15 +426,11 @@ export function useXMarkdownDisplay(getPrefixCls) {
       return;
     }
     // 内容变化检测
-    var sharedPrefix = getSharedPrefix(nextValue);
-    if (sharedPrefix !== getDisplayedContent()) {
-      resetTypingComplete();
-      setDisplayContent(sharedPrefix);
-    }
+    syncTypingStart(nextValue);
     var currentValue = getDisplayedContent();
-    var _getTypingOptions2 = getTypingOptions(),
-      interval = _getTypingOptions2.interval,
-      step = _getTypingOptions2.step;
+    var _getTypingOptions4 = getTypingOptions(),
+      interval = _getTypingOptions4.interval,
+      step = _getTypingOptions4.step;
     // 逐步显示内容
     if (currentValue !== nextValue) {
       var nextLength = Math.min(currentValue.length + step, nextValue.length);
@@ -430,6 +464,7 @@ export function useXMarkdownDisplay(getPrefixCls) {
     if (instance.get('loading')) {
       stopTyping();
       resetTypingComplete();
+      typingTargetKey = '';
       if (!setDisplayContent('')) {
         syncRenderedMarkdown();
       }
@@ -442,6 +477,7 @@ export function useXMarkdownDisplay(getPrefixCls) {
     // 空内容或禁用打字效果，直接显示
     if (!nextValue || !typing) {
       stopTyping();
+      typingTargetKey = '';
       if (!setDisplayContent(nextValue)) {
         syncRenderedMarkdown();
       }
@@ -451,12 +487,11 @@ export function useXMarkdownDisplay(getPrefixCls) {
       return;
     }
     // 内容变化检测
-    var sharedPrefix = getSharedPrefix(nextValue);
+    var previousDisplayContent = getDisplayedContent();
+    syncTypingStart(nextValue);
     // 内容发生"非追加"变化时
-    if (sharedPrefix !== getDisplayedContent()) {
+    if (getDisplayedContent() !== previousDisplayContent) {
       stopTyping();
-      resetTypingComplete();
-      setDisplayContent(sharedPrefix);
     }
     // 已完成
     if (getDisplayedContent() === nextValue) {
@@ -475,8 +510,10 @@ export function useXMarkdownDisplay(getPrefixCls) {
    */
   function bootstrap() {
     var content = instance.get('content');
+    var nextValue = content === undefined || content === null ? '' : String(content);
     setTypingActive(false);
-    setDisplayContent(!instance.get('loading') && !instance.get('typing') && content !== undefined && content !== null ? String(content) : '');
+    var initialDisplayContent = !instance.get('loading') && nextValue ? instance.get('typing') ? getResumePrefix(nextValue) : nextValue : '';
+    setDisplayContent(initialDisplayContent);
     // 监听核心属性变化
     ['content', 'loading', 'streaming', 'typing'].forEach(function (key) {
       instance.watch(key, function () {

package/components/xmarkdown/xmarkdown.d.ts

@@ -6,6 +6,8 @@ export interface XMarkdownTyping {
     interval?: number;
     step?: number;
     suffix?: boolean;
+    keepPrefix?: boolean;
+    resumeFrom?: string | number | 'content';
 }
 export interface XMarkdownProps {
     content?: string | number;