Oak-Team
/
oak-general-business
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 38 Wiki Activity

maskBgColor改为maskColor

This commit is contained in:
wkj 2025-09-13 22:21:47 +08:00
parent c4c78aa885
commit 8af8487016
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
es/components/common/qrCode/index.d.ts vendored
View File

@ -14,7 +14,7 @@ declare const _default: <ED2 extends EntityDict & BaseEntityDict, T2 extends key
disabled: boolean;
color: string;
bgColor: string;
maskBgColor: string;
maskColor: string;
maskTextColor: string;
maskText: string;
}>) => React.ReactElement;

2
es/components/common/qrCode/index.xml
View File

@ -13,7 +13,7 @@
<view class="qrcode" >
<image src="{{qrCodeURL}}" mode="aspectFit" class="image" style="width: {{size}}px; height: {{size}}px;" />
<block wx:if="{{disabled}}">
<view class="mask" style="background: {{maskBgColor}}; color: {{maskTextColor}};">
<view class="mask" style="background: {{maskColor}}; color: {{maskTextColor}};">
{{maskText}}
</view>
</block>

2
es/components/common/qrCode/web.d.ts vendored
View File

@ -15,7 +15,7 @@ type IQrCodeProps = {
disabled: boolean;
color: string;
bgColor: string;
maskBgColor: string;
maskColor: string;
maskTextColor: string;
maskText: string;
};

4
es/components/common/qrCode/web.js
View File

@ -6,7 +6,7 @@ import './web.less';
export default function Render(props) {
const { data, methods } = props;
const { t } = methods;
const { filename = 'qrCode.png', expiresAt, tips, onDownload, onRefresh, size = 280, url, loading = false, disableDownload = false, disabled = false, isBase64, expired, expiresAtStr, color, bgColor, maskBgColor, maskTextColor, maskText, } = data;
const { filename = 'qrCode.png', expiresAt, tips, onDownload, onRefresh, size = 280, url, loading = false, disableDownload = false, disabled = false, isBase64, expired, expiresAtStr, color, bgColor, maskColor, maskTextColor, maskText, } = data;
const prefixCls = 'oak';
let V;
if (expiresAtStr) {
@ -34,7 +34,7 @@ export default function Render(props) {
{isBase64 ? (<img src={url} alt="qrCode" width={size} height={size}/>) : url ? (<QRCodeCanvas value={url} size={size} fgColor={color} bgColor={bgColor}/>) : null}
</Spin>
{disabled ? <div className={`${prefixCls}-qrCodeBox_mask`} style={{
background: maskBgColor,
background: maskColor,
color: maskTextColor,
}}>
{maskText}

2
src/components/common/qrCode/index.ts
View File

@ -244,7 +244,7 @@ export default OakComponent({
disabled: boolean; //二维码禁用
color: string,
bgColor: string,
maskBgColor: string;
maskColor: string;
maskTextColor: string;
maskText: string;
}

2
src/components/common/qrCode/index.xml
View File

@ -13,7 +13,7 @@
<view class="qrcode" >
<image src="{{qrCodeURL}}" mode="aspectFit" class="image" style="width: {{size}}px; height: {{size}}px;" />
<block wx:if="{{disabled}}">
<view class="mask" style="background: {{maskBgColor}}; color: {{maskTextColor}};">
<view class="mask" style="background: {{maskColor}}; color: {{maskTextColor}};">
{{maskText}}
</view>
</block>

6
src/components/common/qrCode/web.tsx
View File

@ -20,7 +20,7 @@ type IQrCodeProps = {
disabled: boolean;
color: string;
bgColor: string;
maskBgColor: string;
maskColor: string;
maskTextColor: string;
maskText: string;
};
@ -57,7 +57,7 @@ export default function Render(
expiresAtStr,
color,
bgColor,
maskBgColor,
maskColor,
maskTextColor,
maskText,
} = data;
@ -105,7 +105,7 @@ export default function Render(
) : null}
</Spin>
{disabled ? <div className={`${prefixCls}-qrCodeBox_mask`} style={{
background: maskBgColor,
background: maskColor,
color: maskTextColor,
}} >
{maskText}