@qingfu/core-env 0.1.3 → 0.1.7
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/lib/utils.js +12 -5
- package/package.json +1 -1
package/lib/utils.js
CHANGED
|
@@ -56,7 +56,7 @@ utils.xlsx2json = ( buffer, mapping ) => {
|
|
|
56
56
|
return _.transform( mapping, ( r, map ) => {
|
|
57
57
|
if ( map.index === -1 ) return;
|
|
58
58
|
let value = values[ map.index ];
|
|
59
|
-
if ( _.isString( value )) value = value.trim().replace(
|
|
59
|
+
if ( _.isString( value )) value = value.trim().replace( /[\uFEFF\u0001\u200b-\u200f\u202a-\u202e]/g, '' );
|
|
60
60
|
else if ( value instanceof Date ) value = fixImportedDate( value, date1904 );
|
|
61
61
|
r[ map.field ] = ( map.format || _.identity )( value );
|
|
62
62
|
}, {});
|
|
@@ -129,6 +129,12 @@ utils.paramsToSign = ( params, head, identity = _.identity ) => {
|
|
|
129
129
|
}
|
|
130
130
|
};
|
|
131
131
|
|
|
132
|
+
utils.emailFormat = function( string ) {
|
|
133
|
+
let regex = /([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9._-]+)/gi;
|
|
134
|
+
let emails = ( string || '' ).match( regex );
|
|
135
|
+
return emails && emails.join( ', ' );
|
|
136
|
+
};
|
|
137
|
+
|
|
132
138
|
utils.dateFormat = Date.prototype.format = function( fmt = 'yyyy-MM-dd' ) {
|
|
133
139
|
let o = {
|
|
134
140
|
'M+': this.getMonth() + 1,
|
|
@@ -175,10 +181,11 @@ utils.getBorn = identity => {
|
|
|
175
181
|
);
|
|
176
182
|
};
|
|
177
183
|
|
|
178
|
-
utils.getAge = identity => {
|
|
179
|
-
let born = utils.getBorn( identity )
|
|
180
|
-
|
|
181
|
-
|
|
184
|
+
utils.getAge = ( identity, start )=> {
|
|
185
|
+
let born = utils.getBorn( identity );
|
|
186
|
+
start = new Date(( start ? new Date( start ) : new Date() ).setHours( 0, 0, 0, 0 ));
|
|
187
|
+
return born && start.getFullYear() - born.getFullYear() +
|
|
188
|
+
( start.getTime() < born.setFullYear( start.getFullYear() ) ? -1 : 0 );
|
|
182
189
|
};
|
|
183
190
|
|
|
184
191
|
utils.minaDecrypt = ({ encrypted, session, iv }) => {
|