vue-element-ui-x 1.0.2 → 1.0.4

package/src/components/Sender/src/main.vue

@@ -397,21 +397,15 @@
       internalValue(newVal, oldVal) {
         this.$emit('input', newVal);
 
-        // 当内容变化时，修复高度问题
-
         if (this.isComposing) return;
-        // 新增：如果处于防抖状态，则不进行触发检测
         if (this.triggerDebounce) return;
 
-        // 触发逻辑：检测输入内容中是否出现了触发字符
         const triggerStrings = this.triggerStrings || []; // 如果为 undefined，就使用空数组
 
-        // 新的检测逻辑：检查是否在当前光标位置前有触发字符
         if (this.inputRef && triggerStrings.length > 0) {
           const textArea = this.inputRef.$el.querySelector('textarea');
           if (textArea) {
             const cursorPosition = textArea.selectionStart;
-            // 检查光标前是否有新增的触发字符
             if (cursorPosition > 0 && newVal.length > oldVal.length) {
               const lastChar = newVal.charAt(cursorPosition - 1);
               if (triggerStrings.includes(lastChar)) {
@@ -431,7 +425,7 @@
             }
           }
         }
-
+        // V2.7X 兼容问题
         // 原有的处理逻辑，用于向后兼容
         const validOldVal = typeof oldVal === 'string' ? oldVal : '';
         const wasOldValTrigger = triggerStrings.includes(validOldVal);
@@ -479,6 +473,31 @@
     },
 
     methods: {
+      /* 确保光标在可视区域内 */
+      ensureCursorVisible() {
+        if (!this.inputRef) return;
+
+        const textareaEl = this.inputRef.$el.querySelector('textarea');
+        if (!textareaEl) return;
+
+        this.$nextTick(() => {
+          // 获取光标位置信息
+          const cursorPosition = textareaEl.selectionStart;
+          const textBeforeCursor = this.internalValue.substring(0, cursorPosition);
+          const linesBeforeCursor = textBeforeCursor.split('\n').length;
+
+          const lineHeight = parseInt(window.getComputedStyle(textareaEl).lineHeight) || 20;
+          const maxVisibleHeight = textareaEl.offsetHeight;
+          const maxVisibleLines = Math.floor(maxVisibleHeight / lineHeight);
+
+          // 如果光标超出可视范围，滚动到光标位置
+          if (linesBeforeCursor > maxVisibleLines) {
+            const targetScrollTop = (linesBeforeCursor - maxVisibleLines) * lineHeight;
+            textareaEl.scrollTop = targetScrollTop;
+          }
+        });
+      },
+
       /* 直接应用输入框样式 */
       applyInputStyles() {
         if (!this.inputRef) return;
@@ -486,14 +505,18 @@
         const textareaEl = this.inputRef.$el.querySelector('textarea');
         if (!textareaEl) return;
 
-        // 设置默认基础样式
+        // 设置默认基础样式（当启用autosize时，不设置固定高度）
         const defaultStyles = {
           width: this.inputWidth || '100%',
-          height: '24px',
           maxHeight: '176px',
           boxSizing: 'border-box',
         };
 
+        // 只有在未启用autosize时才设置固定高度
+        if (!this.computedAutoSize) {
+          defaultStyles.height = '24px';
+        }
+
         // 应用默认样式
         Object.keys(defaultStyles).forEach(key => {
           textareaEl.style[key] = defaultStyles[key];
@@ -502,11 +525,15 @@
         // 如果用户传入了样式对象，则应用覆盖默认样式
         if (this.inputStyle && typeof this.inputStyle === 'object') {
           Object.keys(this.inputStyle).forEach(key => {
+            // 当启用autosize时，避免覆盖height相关属性
+            if (this.computedAutoSize && (key === 'height' || key === 'minHeight')) {
+              return;
+            }
             textareaEl.style[key] = this.inputStyle[key];
           });
 
-          // 如果用户设置了字体大小，需要调整高度
-          if (this.inputStyle.fontSize) {
+          // 如果用户设置了字体大小，需要调整高度（仅在未启用autosize时）
+          if (this.inputStyle.fontSize && !this.computedAutoSize) {
             // 确保高度能完全容纳当前字体大小
             const computedFontSize = window.getComputedStyle(textareaEl).fontSize;
             const fontSize = parseInt(computedFontSize);
@@ -665,6 +692,8 @@
             this.internalValue = `${textBeforeCursor}\n${textAfterCursor}`; // 插入换行符
             this.$nextTick(() => {
               e.target.setSelectionRange(cursorPosition + 1, cursorPosition + 1); // 更新光标位置
+              // 确保光标在可视区域内
+              this.ensureCursorVisible();
             });
           } else if (e.keyCode === 13 && !e.shiftKey) {
             // 阻止掉 Enter 的默认换行行为
@@ -687,6 +716,8 @@
             this.internalValue = `${textBeforeCursor}\n${textAfterCursor}`; // 插入换行符
             this.$nextTick(() => {
               e.target.setSelectionRange(cursorPosition + 1, cursorPosition + 1); // 更新光标位置
+              // 确保光标在可视区域内
+              this.ensureCursorVisible();
             });
           }
         }
@@ -758,8 +789,11 @@
     },
 
     updated() {
-      // 确保在组件更新后重新应用样式
-      this.applyInputStyles();
+      // 只在特定条件下重新应用样式，避免干扰autosize功能
+      // 当启用autosize时，减少样式重新应用的频率
+      if (!this.computedAutoSize) {
+        this.applyInputStyles();
+      }
     },
   };
 </script>

package/src/components/Thinking/index.js

@@ -1,8 +1,8 @@
-import ElXThinking from './src/main.vue';
-
-/* istanbul ignore next */
-ElXThinking.install = function (Vue) {
-  Vue.component(ElXThinking.name, ElXThinking);
-};
-
-export default ElXThinking;
+import ElXThinking from './src/main.vue';
+
+/* istanbul ignore next */
+ElXThinking.install = function (Vue) {
+  Vue.component(ElXThinking.name, ElXThinking);
+};
+
+export default ElXThinking;

package/src/components/ThoughtChain/index.js

@@ -1,8 +1,8 @@
-import ElXThoughtChain from './src/main.vue';
-
-/* istanbul ignore next */
-ElXThoughtChain.install = function (Vue) {
-  Vue.component(ElXThoughtChain.name, ElXThoughtChain);
-};
-
-export default ElXThoughtChain;
+import ElXThoughtChain from './src/main.vue';
+
+/* istanbul ignore next */
+ElXThoughtChain.install = function (Vue) {
+  Vue.component(ElXThoughtChain.name, ElXThoughtChain);
+};
+
+export default ElXThoughtChain;

package/src/components/Typewriter/index.js

@@ -1,8 +1,8 @@
-import ElXTypewriter from './src/main.vue';
-
-/* istanbul ignore next */
-ElXTypewriter.install = function (Vue) {
-  Vue.component(ElXTypewriter.name, ElXTypewriter);
-};
-
-export default ElXTypewriter;
+import ElXTypewriter from './src/main.vue';
+
+/* istanbul ignore next */
+ElXTypewriter.install = function (Vue) {
+  Vue.component(ElXTypewriter.name, ElXTypewriter);
+};
+
+export default ElXTypewriter;

package/src/components/Welcome/index.js

@@ -1,8 +1,8 @@
-import ElXWelcome from './src/main.vue';
-
-/* istanbul ignore next */
-ElXWelcome.install = function (Vue) {
-  Vue.component(ElXWelcome.name, ElXWelcome);
-};
-
-export default ElXWelcome;
+import ElXWelcome from './src/main.vue';
+
+/* istanbul ignore next */
+ElXWelcome.install = function (Vue) {
+  Vue.component(ElXWelcome.name, ElXWelcome);
+};
+
+export default ElXWelcome;

package/src/index.js

@@ -9,8 +9,8 @@ import ElXThinking from './components/Thinking/index.js';
 import ElXThoughtChain from './components/ThoughtChain/index.js';
 import ElXTypewriter from './components/Typewriter/index.js';
 import ElXWelcome from './components/Welcome/index.js';
-// 导入所有 mixins
-import * as customMixins from './mixins';
+
+// 导入 mixins
 import {
   createSendUtils,
   createStreamUtils,
@@ -57,7 +57,11 @@ export {
   // Mixins
   createSendUtils,
   createStreamUtils,
-  customMixins,
+  recordMixin,
+  sendMixin,
+  streamMixin,
+  XRequest,
+  XStream,
   // 组件
   ElXAttachments,
   ElXBubble,
@@ -73,11 +77,6 @@ export {
   lang,
   // 国际化
   locale,
-  recordMixin,
-  sendMixin,
-  streamMixin,
-  XRequest,
-  XStream,
 };
 
 // 默认导出（完整引入）
@@ -94,7 +93,6 @@ components.forEach(component => {
 });
 
 // 添加mixins
-ElementUIX.customMixins = customMixins;
 ElementUIX.streamMixin = streamMixin;
 ElementUIX.sendMixin = sendMixin;
 ElementUIX.recordMixin = recordMixin;

package/src/styles/Conversations.scss

@@ -1,6 +1,3 @@
-/* ElXConversations 组件样式 */
-
-/* 主容器 */
 .el-x-conversations-container {
   display: flex;
   flex-direction: column;
@@ -9,7 +6,7 @@
   width: fit-content;
   box-sizing: border-box;
   overflow: hidden;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, .1)
 }
 
 .el-x-conversations-list {
@@ -19,34 +16,30 @@
   flex: 1;
   display: flex;
   flex-direction: column;
-  box-sizing: border-box;
+  box-sizing: border-box
 }
 
 .el-x-conversations-scroll-wrapper {
   flex: 1;
   overflow: hidden;
-  position: relative;
+  position: relative
+}
 
-  /* 在右侧添加留白区域 */
-  &::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 8px;
-    /* 右侧留白宽度 */
-    height: 100%;
-    background-color: transparent;
-    pointer-events: none;
-    /* 确保不影响交互 */
-  }
+.el-x-conversations-scroll-wrapper::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 8px;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0);
+  pointer-events: none
 }
 
-// 加载更多
 .el-x-conversations-load-more {
   display: flex;
   width: calc(100% - 20px);
-  padding: 4px 0;
+  padding: 14px 10px;
   justify-content: center;
   align-items: center;
   font-size: 12px;
@@ -57,71 +50,69 @@
   border-radius: 8px;
   height: auto;
   min-height: var(--conversation-label-height, 20px);
-  box-sizing: border-box;
+  box-sizing: border-box
 }
 
-// 加载动画
 .el-x-conversations-load-more-is-loading {
   margin-top: 2px;
-  animation: spinloading 2s linear infinite;
+  animation: spinloading 2s linear infinite
 }
 
 @keyframes spinloading {
   0% {
-    transform: rotate(0deg);
+    transform: rotate(0deg)
   }
 
   100% {
-    transform: rotate(360deg);
+    transform: rotate(360deg)
   }
 }
 
 .scroll-content {
-  min-height: 100%;
+  min-height: 100%
 }
 
 .loading-more {
   text-align: center;
   padding: 10px 0;
   color: #909399;
-  font-size: 14px;
+  font-size: 14px
 }
 
 .el-x-conversation-group {
-  position: relative;
+  position: relative
+}
 
-  &:last-child {
-    margin-bottom: 0;
-  }
+.el-x-conversation-group:last-child {
+  margin-bottom: 0
+}
 
-  .el-x-conversation-group-title {
-    font-size: 14px;
-    color: #909399;
-    padding: 8px 0;
-    font-weight: 500;
-    margin-bottom: 4px;
-    border-radius: 4px;
-    border-top-left-radius: 0px;
-    border-top-right-radius: 0px;
-    // 预留滚动条宽度
-    width: calc(100% - 10px);
-    box-sizing: border-box;
-  }
+.el-x-conversation-group .el-x-conversation-group-title {
+  font-size: 14px;
+  color: #909399;
+  padding: 8px 0;
+  font-weight: 500;
+  margin-bottom: 4px;
+  border-radius: 4px;
+  border-top-left-radius: 0px;
+  border-top-right-radius: 0px;
+  width: calc(100% - 10px);
+  box-sizing: border-box
+}
 
-  .sticky-title {
-    position: sticky;
-    top: 0;
-    z-index: 20;
-    background-color: var(--conversation-list-auto-bg-color, #fff);
-  }
+.el-x-conversation-group .sticky-title {
+  position: sticky;
+  top: 0;
+  z-index: 20;
+  background-color: var(--conversation-list-auto-bg-color, #fff)
+}
 
-  .active-sticky {
-    z-index: 10;
-  }
+.el-x-conversation-group .active-sticky {
+  z-index: 10
+}
 
-  .el-x-conversation-group-items {
-    padding-top: 0;
-  }
+.el-x-conversation-group .el-x-conversation-group-items {
+  padding-top: 0
 }
 
 .scroll-to-top-btn {
@@ -129,132 +120,164 @@
   right: 16px;
   bottom: 16px;
   z-index: 99;
-  opacity: 0.8;
-  transition: opacity 0.3s;
+  opacity: .8;
+  transition: opacity .3s
+}
 
-  &:hover {
-    opacity: 1;
-  }
+.scroll-to-top-btn:hover {
+  opacity: 1
 }
 
-/* 项目样式 */
 .el-x-conversation-item {
   padding: 14px 10px;
   margin-right: 20px;
   border-radius: 8px;
   cursor: pointer;
-  transition: background-color 0.2s ease;
+  transition: background-color .2s ease
+}
 
-  &+& {
-    margin-top: 4px;
-  }
+.el-x-conversation-item+.el-x-conversation-item {
+  margin-top: 4px
+}
 
-  &.disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-    color: #c0c4cc;
-  }
+.el-x-conversation-item.disabled {
+  opacity: .5;
+  cursor: not-allowed;
+  color: #c0c4cc
+}
 
-  &.active {
-    background-color: #f0f0f0;
-  }
+.el-x-conversation-item.active {
+  background-color: #f0f0f0
+}
 
-  &.hovered,
-  &:hover {
-    background-color: #f0f0f0;
-  }
+.el-x-conversation-item.hovered,
+.el-x-conversation-item:hover {
+  background-color: #f0f0f0
+}
 
-  &.menu-opened {
-    background-color: #f0f0f0;
-  }
+.el-x-conversation-item.menu-opened {
+  background-color: #f0f0f0
 }
 
 .el-x-conversation-content {
   display: flex;
   align-items: center;
-  height: var(--conversation-label-height, 20px);
+  height: var(--conversation-label-height, 20px)
+}
 
-  .el-x-conversation-prefix-icon {
-    margin-right: 8px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
+.el-x-conversation-content .el-x-conversation-prefix-icon {
+  margin-right: 8px;
+  display: flex;
+  justify-content: center;
+  align-items: center
+}
 
-  .el-x-conversation-content-main {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    position: relative;
-    overflow: hidden;
-  }
+.el-x-conversation-content .el-x-conversation-content-main {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  position: relative;
+  overflow: hidden
+}
 
-  .el-x-conversation-label-container {
-    flex: 1;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    overflow: hidden;
-  }
+.el-x-conversation-content .el-x-conversation-label-container {
+  flex: 1;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  overflow: hidden
+}
 
-  .el-x-conversation-label {
-    font-size: 14px;
-    color: #303133;
-    position: relative;
-    white-space: nowrap;
+.el-x-conversation-content .el-x-conversation-label {
+  font-size: 14px;
+  color: #303133;
+  position: relative;
+  white-space: nowrap
+}
 
-    &.text-gradient {
-      mask-image: linear-gradient(to right, black 60%, transparent 100%);
-      -webkit-mask-image: linear-gradient(to right, black 60%, transparent 100%);
-    }
-  }
+.el-x-conversation-content .el-x-conversation-label.text-gradient {
+  mask-image: linear-gradient(to right, black 60%, transparent 100%);
+  -webkit-mask-image: linear-gradient(to right, black 60%, transparent 100%)
+}
 
-  .el-x-conversation-timestamp {
-    font-size: 14px;
-    color: #909399;
-    margin-left: 8px;
-  }
+.el-x-conversation-content .el-x-conversation-timestamp {
+  font-size: 14px;
+  color: #909399;
+  margin-left: 8px
+}
 
-  .el-x-conversation-suffix-icon {
-    margin-left: 8px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
+.el-x-conversation-content .el-x-conversation-suffix-icon {
+  margin-left: 8px;
+  display: flex;
+  justify-content: center;
+  align-items: center
+}
 
-  .el-x-conversation-dropdown-more {
-    justify-self: center;
-    height: 100%;
-    display: flex;
-    align-items: center;
-  }
+.el-x-conversation-content .el-x-conversation-dropdown-more {
+  justify-self: center;
+  height: 100%;
+  display: flex;
+  align-items: center
+}
+
+.el-x-conversation-content .el-x-conversation-dropdown-more-icon {
+  font-size: 16px;
+  padding: 2px;
+  border-radius: 5px
+}
 
-  .el-x-conversation-dropdown-more-icon {
-    font-size: 16px;
-    padding: 2px;
-    border-radius: 5px;
+.el-x-conversation-content .el-x-conversation-dropdown-more-icon:hover {
+  background-color: #d3d3d3
+}
 
-    &:hover {
-      background-color: #d3d3d3;
-    }
-  }
+.el-x-conversation-content .el-x-conversation-menu {
+  margin-left: 8px;
+  display: flex;
+  align-items: center;
+  opacity: 0;
+  transition: opacity .2s ease
+}
 
-  .el-x-conversation-menu {
-    margin-left: 8px;
-    display: flex;
-    align-items: center;
-    opacity: 0;
-    transition: opacity 0.2s ease;
-
-    .hovered &,
-    .active & {
-      opacity: 1;
-    }
-  }
+.hovered .el-x-conversation-content .el-x-conversation-menu,
+.active .el-x-conversation-content .el-x-conversation-menu {
+  opacity: 1
 }
 
-// Dropdown菜单样式
 .el-x-conversation-dropdown-menu {
   max-height: 300px;
-  overflow-y: auto;
+  overflow-y: auto
+}
+
+.el-x-conversations-scrollbar {
+  height: 100%;
+  overflow-y: auto
+}
+
+.el-x-conversations-scrollbar::-webkit-scrollbar {
+  width: 6px
+}
+
+.el-x-conversations-scrollbar::-webkit-scrollbar-thumb {
+  background-color: rgba(0, 0, 0, 0);
+  border-radius: 3px;
+  transition: background-color .3s ease
+}
+
+.el-x-conversations-scrollbar::-webkit-scrollbar-track {
+  background-color: rgba(0, 0, 0, 0)
+}
+
+.el-x-conversations-scrollbar:hover::-webkit-scrollbar-thumb {
+  background-color: #e0e0e0
+}
+
+@supports(scrollbar-width: thin) {
+  .el-x-conversations-scrollbar {
+    scrollbar-width: thin;
+    scrollbar-color: rgba(0, 0, 0, 0) rgba(0, 0, 0, 0)
+  }
+
+  .el-x-conversations-scrollbar:hover {
+    scrollbar-color: #e0e0e0 rgba(0, 0, 0, 0)
+  }
 }

package/src/styles/Sender.scss

@@ -129,7 +129,7 @@ $--el-x-fill-color: $--background-color-base;
       align-self: center;
 
       ::v-deep .el-textarea__inner {
-        padding: 0;
+        padding: 0 !important;
         margin: 0;
         color: $--el-x-text-color-primary;
         font-size: $--el-x-sender-input-font-size;