Skip to content

Commit

Permalink
fix(form): [form] fix form tooltip class name (#2154)
Browse files Browse the repository at this point in the history
  • Loading branch information
gimmyhehe authored Sep 20, 2024
1 parent fde4fab commit ce35aef
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
22 changes: 11 additions & 11 deletions packages/vue/src/form-item/package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"name": "@opentiny/vue-form-item",
"version": "3.18.0",
"type": "module",
"version": "3.18.1",
"description": "",
"license": "MIT",
"sideEffects": false,
"main": "lib/index.js",
"module": "index.ts",
"sideEffects": false,
"type": "module",
"devDependencies": {
"@opentiny-internal/vue-test-utils": "workspace:*",
"vitest": "^0.31.0"
},
"scripts": {
"build": "pnpm -w build:ui $npm_package_name",
"//postversion": "pnpm build"
},
"dependencies": {
"@opentiny/vue-tooltip": "workspace:~",
"@opentiny/vue-common": "workspace:~",
"@opentiny/vue-icon": "workspace:~",
"@opentiny/vue-renderless": "workspace:~",
"@opentiny/vue-icon": "workspace:~"
"@opentiny/vue-tooltip": "workspace:~"
},
"license": "MIT"
}
"devDependencies": {
"@opentiny-internal/vue-test-utils": "workspace:*",
"vitest": "^0.31.0"
}
}
5 changes: 3 additions & 2 deletions packages/vue/src/form-item/src/pc.vue
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ export default defineComponent({
// 兼容 2.0 组件 validation 是否有 required
state.validationRequired = propsData.validation && !!propsData.validation.required
}
// 如果为 2.0 的验证 不会使用 toolltip 组件
// 如果为 2.0 的验证 不会使用 tooltip 组件
if (propsData.validation) {
return item
}
Expand Down Expand Up @@ -221,7 +221,8 @@ export default defineComponent({
}
data = item.props
}
data.class = deduplicateCssClass('tiny-tooltip' + stringifyCssClass(data.class))
const mergeClass = `tiny-tooltip ${stringifyCssClass(data.class)}`
data.class = deduplicateCssClass(mergeClass)
return item
})
: null
Expand Down

0 comments on commit ce35aef

Please sign in to comment.