From 8e3f3890e93d097df4be744648b9ac404d20a558 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 23 四月 2026 17:58:50 +0800
Subject: [PATCH] 2026.4.23
---
miniprogram_npm/tdesign-miniprogram/avatar/avatar.wxs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/miniprogram_npm/tdesign-miniprogram/avatar/avatar.wxs b/miniprogram_npm/tdesign-miniprogram/avatar/avatar.wxs
index d67e5d8..13bcd7f 100644
--- a/miniprogram_npm/tdesign-miniprogram/avatar/avatar.wxs
+++ b/miniprogram_npm/tdesign-miniprogram/avatar/avatar.wxs
@@ -11,16 +11,20 @@
return classNames.join(' ');
},
- getSize: function (size = 'medium') {
- var pxIndex = size.indexOf('px');
- if (pxIndex > -1) {
- return 'width:' + size + ';height:' + size + ';font-size:' + ((size.slice(0, pxIndex) / 8) * 3 + 2) + 'px;';
+ getSize: function (size = 'medium', windowWidth) {
+ var res = getRegExp('^([0-9]+)(px|rpx)$').exec(size);
+
+ if (res && res.length >= 3) {
+ var px = res[1];
+ if (res[2] === 'rpx') {
+ px = Math.floor((windowWidth * res[1]) / 750);
+ }
+
+ return 'width:' + size + ';height:' + size + ';font-size:' + ((px / 8) * 3 + 2) + 'px';
}
},
- getStyles: function (isShow, zIndex) {
- var displayStyle = isShow ? '' : 'display: none;';
- var zIndexStyle = zIndex ? 'z-index:' + zIndex + ';' : '';
- return displayStyle + zIndexStyle;
+ getStyles: function (isShow) {
+ return isShow ? '' : 'display: none;';
},
};
--
Gitblit v1.9.3