Skip to content

Commit 7f2ccb2

Browse files
feat: ✨ 将 Tabbar 和 Badge 设置为标准盒子模型 (#1036)
1 parent 901c754 commit 7f2ccb2

7 files changed

Lines changed: 16 additions & 671 deletions

File tree

.eslintrc.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*
22
* @Author: weisheng
33
* @Date: 2023-03-14 16:06:21
4-
* @LastEditTime: 2023-03-28 16:52:32
4+
* @LastEditTime: 2025-05-06 21:14:16
55
* @LastEditors: weisheng
66
* @Description:
7-
* @FilePath: \wot-design-uni\.eslintrc.js
7+
* @FilePath: /wot-design-uni/.eslintrc.js
88
* 记得注释
99
*/
1010
module.exports = {
@@ -37,6 +37,14 @@ module.exports = {
3737
'no-inner-declarations': 'off',
3838
'@typescript-eslint/no-this-alias': 'off',
3939
'@typescript-eslint/no-empty-function': 'off',
40-
'vue/multi-word-component-names': 'off'
40+
'vue/multi-word-component-names': 'off',
41+
'@typescript-eslint/consistent-type-imports': [
42+
'error',
43+
{
44+
prefer: 'type-imports',
45+
disallowTypeAnnotations: false,
46+
fixStyle: 'inline-type-imports'
47+
}
48+
]
4149
}
4250
}

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,7 @@
135135
"lint-staged": "^13.2.0",
136136
"mini-types": "^0.1.7",
137137
"miniprogram-api-typings": "^3.12.3",
138-
"npm-run-all": "^4.1.5",
139138
"prettier": "^2.8.4",
140-
"puppeteer": "14.0.0",
141139
"query-string": "^8.1.0",
142140
"rimraf": "^4.4.0",
143141
"rollup-plugin-visualizer": "^5.9.0",

pnpm-lock.yaml

Lines changed: 0 additions & 664 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/env.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/// <reference types="vite/client" />
1111

1212
declare module '*.vue' {
13-
import { DefineComponent } from 'vue'
13+
import { type DefineComponent } from 'vue'
1414
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
1515
const component: DefineComponent<{}, {}, any>
1616
export default component

src/pages/configProvider/Index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ import type { ColPickerColumnChangeOption } from '@/uni_modules/wot-design-uni/c
121121
import { ref } from 'vue'
122122
import { useColPickerData } from '@/hooks/useColPickerData'
123123
import { useI18n } from 'vue-i18n'
124-
import { Action } from '@/uni_modules/wot-design-uni/components/wd-action-sheet/types'
124+
import { type Action } from '@/uni_modules/wot-design-uni/components/wd-action-sheet/types'
125125
const { colPickerData, findChildrenByCode } = useColPickerData()
126126
127127
const { t } = useI18n()

src/uni_modules/wot-design-uni/components/wd-badge/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
@include e(content) {
1919
display: inline-block;
20+
box-sizing: content-box;
2021
height: $-badge-height;
2122
line-height: $-badge-height;
2223
padding: $-badge-padding;

src/uni_modules/wot-design-uni/components/wd-tabbar/index.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
height: $-tabbar-height;
1717

1818
@include e(placeholder) {
19+
box-sizing: content-box;
1920
padding-bottom: constant(safe-area-inset-bottom);
2021
padding-bottom: env(safe-area-inset-bottom);
2122
}
@@ -39,6 +40,7 @@
3940

4041
@include when(fixed) {
4142
@include when(safe) {
43+
box-sizing: content-box;
4244
padding-bottom: constant(safe-area-inset-bottom);
4345
padding-bottom: env(safe-area-inset-bottom);
4446
}

0 commit comments

Comments
 (0)