Merge branch 'Tencent:develop' into develop

Tencent · Jan 16, 2025 · 6aea156 · 6aea156
2 parents 1728511 + e1dd8bd
commit 6aea156
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/_common b/src/_common
diff --git a/src/tabs/__test__/demo.test.jsx b/src/tabs/__test__/demo.test.jsx
@@ -13,6 +13,9 @@ import sizeVue from '@/tabs/demos/size.vue';
 import statusVue from '@/tabs/demos/status.vue';
 import themeVue from '@/tabs/demos/theme.vue';
 
+// scrollTo isn't implemented in JSDOM，see: https://github.com/vuejs/vue-test-utils/issues/319
+Element.prototype.scrollTo = () => {};
+
 const mapper = {
   badgeVue,
   contentVue,

diff --git a/src/tabs/__test__/index.test.jsx b/src/tabs/__test__/index.test.jsx
@@ -69,6 +69,8 @@ describe('Tabs', () => {
       const navWrap = wrapper.find(`.${name}__wrapper`);
       const $tabNavItems = navWrap.findAllComponents(TTabNav);
 
+      const $tabs = wrapper.findComponent(Tabs);
+
       theme = 'line';
       await wrapper.setProps({
         theme,
+1 −1		docs/mobile/flutter_design/pull-down-refresh.md
+2 −0		js/common.ts
+1 −0		js/global-config/default-config.ts
+3 −0		js/global-config/locale/ar_KW.ts
+3 −0		js/global-config/locale/en_US.ts
+3 −0		js/global-config/locale/it_IT.ts
+3 −0		js/global-config/locale/ja_JP.ts
+3 −0		js/global-config/locale/ko_KR.ts
+3 −0		js/global-config/locale/ru_RU.ts
+3 −0		js/global-config/locale/zh_CN.ts
+3 −0		js/global-config/locale/zh_TW.ts
+8 −4		js/input-number/large-number.ts
+4 −4		js/tree-v1/tree-node.ts
+4 −4		js/tree/tree-node.ts
+4 −1		js/utils/getPosition.ts
+8 −10		package.json
+324 −0		style/mobile/components/color-picker/_index.less
+34 −0		style/mobile/components/color-picker/_var.less
+1 −0		style/mobile/components/input/v2/_index.less
+1 −0		style/mobile/components/input/v2/_var.less
+9 −0		style/web/components/auto-complete/_index.less
+2 −0		style/web/components/auto-complete/_var.less
+1 −8		style/web/components/menu/_index.less
+0 −40		test/script/jest.base.conf.js
+0 −34		test/script/jest.unit.conf.js
+1 −0		test/unit/date-picker/utils.test.js
+1 −0		test/unit/input-number/compareLargeNumber.test.js
+17 −0		test/unit/input-number/formatDecimal.test.js
+1 −0		test/unit/input-number/largeIntNumberAdd.test.js
+1 −0		test/unit/input-number/largeNumberAdd.test.js
+1 −0		test/unit/input-number/largeNumberSubtract.test.js
+1 −0		test/unit/input-number/largeNumberToFixed.test.js
+2 −1		test/unit/input-number/number.test.js
+1 −0		test/unit/time-picker/utils.test.js
+1 −0		test/unit/tree/activable.test.js
+1 −0		test/unit/tree/append.test.js
+1 −0		test/unit/tree/checkable.test.js
+1 −0		test/unit/tree/disabled.test.js
+1 −0		test/unit/tree/event.test.js
+1 −0		test/unit/tree/expand.test.js
+1 −0		test/unit/tree/filter.test.js
+1 −0		test/unit/tree/get-node.test.js
+1 −0		test/unit/tree/init.test.js
+1 −0		test/unit/tree/lazy.test.js
+1 −0		test/unit/tree/model.test.js
+1 −0		test/unit/upload/returnFileSize.test.js
+1 −0		test/unit/upload/utils.test.js
+1 −1		tsconfig.json
+13 −0		vitest.config.mts