chore: merge develop

Author: github-actions[bot]

package.json

@@ -94,7 +94,7 @@
     "lodash": "^4.17.21",
     "mitt": "^3.0.1",
     "sortablejs": "^1.15.0",
-    "tdesign-icons-vue-next": "^0.2.4",
+    "tdesign-icons-vue-next": "^0.3.4",
     "tinycolor2": "^1.6.0",
     "validator": "^13.9.0"
   },
@@ -176,7 +176,7 @@
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-vue": "^6.0.0",
     "semver": "^7.5.4",
-    "tdesign-icons-view": "^0.3.0",
+    "tdesign-icons-view": "^0.3.4",
     "tdesign-publish-cli": "^0.0.12",
     "tdesign-site-components": "^0.15.3",
     "tdesign-theme-generator": "^1.0.11",

src/auto-complete/__tests__/index.test.jsx

@@ -12,9 +12,9 @@ describe('Anchor', () => {
       });
       await wrapper.setProps({ popupProps: { visible: true } });
       expect(wrapper.find('.t-auto-complete').exists()).toBeTruthy();
-      const panelNode = document.querySelector('.t-autocomplete__panel');
+      const panelNode = document.querySelector('.t-auto-complete__panel');
       expect(document.querySelectorAll('.t-select-option').length).toBe(3);
-      expect(document.querySelector('.t-autocomplete__panel')).toBeTruthy();
+      expect(document.querySelector('.t-auto-complete__panel')).toBeTruthy();
       panelNode.parentNode.removeChild(panelNode);
     });
   });

src/auto-complete/auto-complete.tsx

@@ -149,7 +149,7 @@ export default defineComponent({
       const topContent = renderTNodeJSX('panelTopContent');
       const bottomContent = renderTNodeJSX('panelBottomContent');
       const panelContent = Boolean(topContent || props.options?.length || bottomContent) ? (
-        <div class={`${classPrefix.value}-autocomplete__panel`}>
+        <div class={`${classPrefix.value}-auto-complete__panel`}>
           {topContent}
           {listContent}
           {bottomContent}

src/auto-complete/option-list.tsx

@@ -4,7 +4,7 @@ import HighlightOption from './highlight-option';
 import { CommonClassNameType } from '../hooks/useCommonClassName';
 import { AutoCompleteOptionObj, TdAutoCompleteProps } from './type';
 import log from '../_common/js/log';
-import { usePrefixClass } from '../hooks/useConfig';
+import { useConfig, usePrefixClass } from '../hooks/useConfig';
 import { on, off } from '../utils/dom';
 import isString from 'lodash/isString';
 import escapeRegExp from 'lodash/escapeRegExp';
@@ -30,6 +30,8 @@ export default defineComponent({
     const active = ref('');
     const classPrefix = usePrefixClass();
 
+    const { globalConfig } = useConfig('autoComplete');
+
     const classes = computed(() => `${classPrefix.value}-select__list`);
     const optionClasses = computed(() => [
       `${classPrefix.value}-select-option`,
@@ -138,7 +140,8 @@ export default defineComponent({
     });
 
     return () => {
-      if (!tOptions.value.length) return null;
+      if (!tOptions.value.length)
+        return <div className={`${classPrefix.value}-auto-complete__panel--empty`}>{globalConfig.value.empty}</div>;
       return (
         <ul class={classes.value}>
           {tOptions.value.map((item) => {

src/breadcrumb/breadcrumb-item.tsx

@@ -68,12 +68,12 @@ export default defineComponent({
     const { proxy } = getCurrentInstance();
 
     const handleClick = () => {
-      if (props.href) {
-        window.location.href = props.href;
-      }
       const router = props.router || proxy.$router;
+
       if (props.to && router) {
         props.replace ? router.replace(props.to) : router.push(props.to);
+      } else {
+        window.location.href = props.href;
       }
     };
     const bindEvent = (e: MouseEvent) => {

src/breadcrumb/breadcrumb.md

@@ -23,13 +23,13 @@ theme | String | light | 组件风格。可选项：light | N
 content | String / Slot / Function | - | 子元素。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/src/common.ts) | N
 default | String / Slot / Function | - | 子元素，同 content。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/src/common.ts) | N
 disabled | Boolean | - | 是否禁用当前项点击 | N
-href | String | - | 跳转链接 | N
+href | String | - | 跳转链接，不能与 to 共用 | N
 icon | Slot / Function | - | 面板屑项内的前置图标。TS 类型：`TNode`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/src/common.ts) | N
 maxWidth | String | undefined | 最大宽度，超出后会以省略号形式呈现。优先级高于 Breadcrumb 中的 maxItemWidth | N
 replace | Boolean | false | 路由跳转是否采用覆盖的方式（覆盖后将没有浏览器历史记录） | N
 router | Object | - | 路由对象。如果项目存在 Router，则默认使用 Router。TS 类型：`any` | N
 target | String | _self | 链接或路由跳转方式。可选项：_blank/_self/_parent/_top | N
-to | String / Object | - | 路由跳转目标，当且仅当 Router 存在时，该 API 有效。TS 类型：`string \| Route` `interface Route { path?: string; name?: string; hash?: string; query?: RouteData; params?: RouteData }` `type RouteData = { [key: string]: string \| string[] }`。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/tree/develop/src/breadcrumb/type.ts) | N
+to | String / Object | - | 路由跳转目标，当且仅当 Router 存在时，该 API 有效。不能与 href 共用。TS 类型：`string \| Route` `interface Route { path?: string; name?: string; hash?: string; query?: RouteData; params?: RouteData }` `type RouteData = { [key: string]: string \| string[] }`。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/tree/develop/src/breadcrumb/type.ts) | N
 onClick | Function |  | TS 类型：`(e: MouseEvent) => void`<br/>点击时触发 | N
 
 ### BreadcrumbItem Events

src/config-provider/type.ts

@@ -13,6 +13,10 @@ import { ImageProps } from '../image';
 import { TNode, SizeEnum } from '../common';
 
 export interface GlobalConfigProvider {
+  /**
+   * 自动填充全局配置
+   */
+  autoComplete?: AutoCompleteConfig;
   /**
    * 警告全局配置
    */
@@ -148,6 +152,14 @@ export interface GlobalConfigProvider {
   upload?: UploadConfig;
 }
 
+export interface AutoCompleteConfig {
+  /**
+   * 语言配置，“暂无数据”描述文本
+   * @default ''
+   */
+  empty?: string;
+}
+
 export interface InputConfig {
   /**
    * 是否开启自动填充功能

src/progress/progress.tsx

@@ -34,7 +34,7 @@ export default defineComponent({
       });
 
     const statusStyle = computed(() => {
-      if (props.percentage >= 100) {
+      if (!props.status && props.percentage >= 100) {
         return 'success';
       }
       return props.status || 'default';

src/select/select-panel.tsx

@@ -128,12 +128,9 @@ export default defineComponent({
             defaultNode: <div class={`${COMPONENT_NAME.value}__loading-tips`}>{t(globalConfig.value.loadingText)}</div>,
           })}
         {/* 空状态 */}
-        {!props.loading &&
-          isEmpty.value &&
-          !showCreateOption.value &&
-          renderDefaultTNode('empty', {
-            defaultNode: <div class={`${COMPONENT_NAME.value}__empty`}>{t(globalConfig.value.empty)}</div>,
-          })}
+        {!props.loading && isEmpty.value && !showCreateOption.value && (
+          <div class={`${COMPONENT_NAME.value}__empty`}>{renderTNodeJSX('empty') || t(globalConfig.value.empty)}</div>
+        )}
         {!isEmpty.value && renderOptionsContent(options)}
       </div>
     );