Skip to content

feat(style-setter): 数字输入支持自定义单位 #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
share-man-man wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(style-setter): 数字输入支持自定义单位 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions src/setter/style-setter/components/number/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,17 @@ export default (props: numberProps) => {
}, []);

let value = unit ? removeUnit(styleData[styleKey]) : styleData[styleKey];
let curUnit = unit ? getUnit(styleData[styleKey]) || 'px' : '';
// 处理unit为：vw、vh等自定义单位时，且styleData[styleKey]没有值，默认为px的问题
const defaultUnit = (Array.isArray(unit) ? unit[0] : unit) || 'px';
let curUnit = unit ? getUnit(styleData[styleKey]) || defaultUnit : '';
// 不加multiprop一样，加了单独处理
if (typeof multiProp === 'number') {
value = unifyStyle(styleData[styleKey])?.split(' ')?.[multiProp];
if (value === null || value === undefined || value === 'auto') {
value = null;
curUnit = 'px';
curUnit = defaultUnit;
} else {
curUnit = unit ? getUnit(value) || 'px' : '';
curUnit = unit ? getUnit(value) || defaultUnit : '';
value = unit ? removeUnit(value) : value;
}
}
Expand All @@ -103,27 +105,29 @@ export default (props: numberProps) => {
};
});
return (
<Select
defaultValue="px"
style={{ width: '24px' }}
value={curUnit || 'px'}
autoWidth={false}
hasBorder={false}
hasArrow={false}
onChange={(val) =>
onChangeFunction
? onChangeFunction(styleKey, value, val)
: onNumberChange(styleKey, value, val)
}
dataSource={options}
/>
<Select
defaultValue="px"
style={{ width: '24px' }}
value={curUnit || 'px'}
autoWidth={false}
hasBorder={false}
hasArrow={false}
onChange={(val) =>
onChangeFunction
? onChangeFunction(styleKey, value, val)
: onNumberChange(styleKey, value, val)
}
dataSource={options}
/>
);
}, [unit]);
const originValue = styleData[styleKey]
const originValue = styleData[styleKey];
if (isCssVarBind(originValue)) {
return <div className='ext-css-variable-ghost' title={originValue}>
{originValue}
</div>;
return (
<div className="ext-css-variable-ghost" title={originValue}>
{originValue}
</div>
);
}
return (
<NumberPicker
Expand All @@ -139,6 +143,6 @@ export default (props: numberProps) => {
}
innerAfter={getInnerAfter}
placeholder={placeholder}
/>
/>
);
};
Loading