fix(auto-complete): options is an empty array, empty is not effective (…

…#3474) * fix(auto-complete): options is an empty array, empty is not effective * chore: revert code * chore: fix cr
Tencent · Feb 6, 2025 · 011fd41 · 011fd41
1 parent bafd315
commit 011fd41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/auto-complete/auto-complete.tsx b/src/auto-complete/auto-complete.tsx
@@ -158,7 +158,7 @@ export default defineComponent({
       />
     );
     // 联想词列表
-    const listContent = (
+    const listContent = Array.isArray(this.options) && (
       <AutoCompleteOptionList
         ref="optionListRef"
         value={this.tValue}
@@ -170,16 +170,15 @@ export default defineComponent({
         highlightKeyword={this.highlightKeyword}
         filterable={this.filterable}
         filter={this.filter}
-        empty={this.empty}
+        empty={renderTNodeJSX(this, 'empty')}
         scopedSlots={{
           option: this.$scopedSlots.option,
-          empty: this.$scopedSlots.empty,
         }}
       />
     );
     const topContent = renderTNodeJSX(this, 'panelTopContent');
     const bottomContent = renderTNodeJSX(this, 'panelBottomContent');
-    const panelContent = topContent || this.options?.length || bottomContent ? (
+    const panelContent = topContent || listContent || bottomContent ? (
         <div class={`${this.classPrefix}-auto-complete__panel`}>
           {topContent}
           {listContent}

diff --git a/src/auto-complete/option-list.tsx b/src/auto-complete/option-list.tsx
@@ -9,7 +9,6 @@ import { AutoCompleteOptionObj, TdAutoCompleteProps } from './type';
 import log from '../_common/js/log';
 import { useConfig, usePrefixClass } from '../hooks/useConfig';
 import { on, off } from '../utils/dom';
-import { renderTNodeJSX } from '../utils/render-tnode';
 
 export default defineComponent({
   name: 'AutoCompleteOptionList',
@@ -147,8 +146,9 @@ export default defineComponent({
 
   render() {
     if (!this.tOptions.length) {
-      const empty = renderTNodeJSX(this, 'empty');
-      return <div class={`${this.classPrefix}-auto-complete__panel--empty`}>{empty || this.globalConfig.empty}</div>;
+      return (
+        <div class={`${this.classPrefix}-auto-complete__panel--empty`}>{this.empty || this.globalConfig.empty}</div>
+      );
     }
     return (
       <ul class={this.classes}>