test/ant-design-vue
1
0
Fork 0
mirror of https://gitee.com/ant-design-vue/ant-design-vue.git synced 2024-12-02 03:58:05 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: inject value maybe undefined && tag style invalid (#6320)

Browse Source 
* fix: inject value maybe undefined

* fix(tag): style invalid
This commit is contained in:
zkwolf 2023-02-28 21:57:11 +08:00 committed by GitHub
parent f85485e733
commit eda7247c2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/cascader/index.tsx
View File

@ -323,7 +323,7 @@ const Cascader = defineComponent({
getTransitionDirection(placement.value),
transitionName,
)}
getPopupContainer={getPopupContainer.value}
getPopupContainer={getPopupContainer?.value}
customSlots={{
...slots,
checkable: () => <span class={`${cascaderPrefixCls.value}-checkbox-inner`} />,

2
components/drawer/index.tsx
View File

@ -148,7 +148,7 @@ const Drawer = defineComponent({
const [wrapSSR, hashId] = useStyle(prefixCls);
const getContainer = computed(() =>
// 有可能为 false，所以不能直接判断
props.getContainer === undefined && getPopupContainer.value
props.getContainer === undefined && getPopupContainer?.value
? () => getPopupContainer.value(document.body)
: props.getContainer,
);

2
components/image/index.tsx
View File

@ -43,7 +43,7 @@ const Image = defineComponent<ImageProps>({
});
return () => {
const imageLocale = configProvider.locale.value?.Image || defaultLocale.Image;
const imageLocale = configProvider.locale?.value?.Image || defaultLocale.Image;
const defaultPreviewMask = () => (
<div class={`${prefixCls.value}-mask-info`}>
<EyeOutlined />

2
components/page-header/index.tsx
View File

@ -56,7 +56,7 @@ const PageHeader = defineComponent({
compact.value = width < 768;
}
};
const ghost = computed(() => props.ghost ?? pageHeader.value?.ghost ?? true);
const ghost = computed(() => props.ghost ?? pageHeader?.value?.ghost ?? true);
const getBackIcon = () => {
return (

4
components/select/index.tsx
View File

@ -266,7 +266,7 @@ const Select = defineComponent({
dropdownMatchSelectWidth={dropdownMatchSelectWidth}
{...selectProps}
{...attrs}
showSearch={props.showSearch ?? select.value?.showSearch}
showSearch={props.showSearch ?? select?.value?.showSearch}
placeholder={placeholder}
listHeight={listHeight}
listItemHeight={listItemHeight}
@ -279,7 +279,7 @@ const Select = defineComponent({
clearIcon={clearIcon}
notFoundContent={mergedNotFound}
class={[mergedClassName.value, attrs.class]}
getPopupContainer={getPopupContainer.value}
getPopupContainer={getPopupContainer?.value}
dropdownClassName={rcSelectRtlDropdownClassName}
onChange={triggerChange}
onBlur={handleBlur}

8
components/tag/index.tsx
View File

@ -1,4 +1,4 @@
import type { HTMLAttributes, App, PropType, ExtractPropTypes, Plugin } from 'vue';
import type { HTMLAttributes, App, PropType, ExtractPropTypes, Plugin, CSSProperties } from 'vue';
import { ref, defineComponent, watchEffect, computed } from 'vue';
import classNames from '../_util/classNames';
import PropTypes from '../_util/vue-types';
@ -133,7 +133,11 @@ const Tag = defineComponent({
const isNeedWave = 'onClick' in attrs;
const tagNode = (
<span {...attrs} class={tagClassName.value} style={tagStyle}>
<span
{...attrs}
class={tagClassName.value}
style={[tagStyle, attrs.style as CSSProperties]}
>
{kids}
{renderCloseIcon()}
</span>

2
components/tree-select/index.tsx
View File

@ -314,7 +314,7 @@ const TreeSelect = defineComponent({
}
showTreeIcon={treeIcon as any}
notFoundContent={mergedNotFound}
getPopupContainer={getPopupContainer.value}
getPopupContainer={getPopupContainer?.value}
treeMotion={null}
dropdownClassName={mergedDropdownClassName.value}
choiceTransitionName={choiceTransitionName.value}