@thinkpixellab-public/px-vue 3.0.34 → 3.0.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/utils/cssStr.js +20 -5
package/package.json
CHANGED
package/utils/cssStr.js
CHANGED
|
@@ -65,22 +65,37 @@ Add the specified unit if no other unit is specified.
|
|
|
65
65
|
cssUnitFallback('10', 'em') => '10em'
|
|
66
66
|
cssUnitFallback(10, 'em') => '10em'
|
|
67
67
|
*/
|
|
68
|
-
function cssUnitFallback(val, fallback) {
|
|
68
|
+
function cssUnitFallback(val, fallback, allowNumberless = false) {
|
|
69
69
|
if (!val) {
|
|
70
70
|
return val;
|
|
71
71
|
}
|
|
72
72
|
|
|
73
|
+
let num = typeof val == 'number' ? val : parseFloat(val.toString());
|
|
74
|
+
|
|
73
75
|
val = val.toString().trim();
|
|
74
|
-
|
|
75
|
-
|
|
76
|
+
|
|
77
|
+
if (isNaN(num)) {
|
|
78
|
+
if (allowNumberless) {
|
|
79
|
+
num = '';
|
|
80
|
+
} else {
|
|
81
|
+
return null;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
const unit =
|
|
86
|
+
val
|
|
87
|
+
.replace(num, '')
|
|
88
|
+
.replace(/[0-9]|-|\./g, '')
|
|
89
|
+
.trim() || fallback;
|
|
90
|
+
|
|
76
91
|
return `${num}${unit}`;
|
|
77
92
|
}
|
|
78
93
|
|
|
79
94
|
/*
|
|
80
95
|
Ems version of cssUnitFallback
|
|
81
96
|
*/
|
|
82
|
-
function cssEmFallback(val) {
|
|
83
|
-
return cssUnitFallback(val, 'em');
|
|
97
|
+
function cssEmFallback(val, allowNumberless = false) {
|
|
98
|
+
return cssUnitFallback(val, 'em', allowNumberless);
|
|
84
99
|
}
|
|
85
100
|
|
|
86
101
|
export { cssPx, cssEm, cssPcnt, cssUrl, cssVar, cssUnitFallback, cssEmFallback };
|