diff --git a/packages/runtime/formatters.js b/packages/runtime/formatters.js index 406267d..8714c09 100644 --- a/packages/runtime/formatters.js +++ b/packages/runtime/formatters.js @@ -36,19 +36,7 @@ function dict(value, ...args) { if (args.length > 0 && (args.length % 2 !== 0)) return args[args.length - 1] return value } - -/** - * 格式化货币 - * formatCurrency("123456789") == "123,456,789" - * formatCurrency("123456789",4) == "1,2345,6789" - * @param {*} value - * @param {*} bit 逗号分割位置 - */ -function formatCurrency(value, bit = 3) { - if (!isNumber(value)) return value - -} - + /** * 格式化日期 @@ -59,7 +47,7 @@ function toDate(value) { try { return value instanceof Date ? value : new Date(value) } catch { - return value == undefined ? "" : value + return value } } @@ -71,7 +59,7 @@ function toNumber(value,defualt=0) { return defualt } } catch { - return value == undefined ? "" : value + return value } } @@ -80,14 +68,23 @@ const CHINESE_UNITS = ['', '十', '百', '千', '万', '十', '百', '千', const CHINESE_BIG_DIGITS = ["零", '壹', '貳', '參', '肆', '伍', '陸', '柒', '捌', '玖'] const CHINESE_BIG_UNITS = ['', '拾', '佰', '仟', '萬', '拾', '佰', '仟', '億', '拾', '佰', '仟', '兆', '拾', '佰', '仟', '京', '拾', '佰', '仟', '垓'] -function toChineseNumber(value,isBig=false) { - if(typeof(value)!=="number") return value; - +/** + * + * 将数字转换为中文数字 + * + * 注意会忽略掉小数点后面的数字 + * + * @param {*} value 数字 + * @param {*} isBig 是否大写数字 + * @returns + */ +function toChineseNumber(value,isBig) { + if(!isNumber(value)) return value; let [wholeValue,decimalValue] = String(value).split(".") // 处理小数点 const DIGITS = isBig ? CHINESE_BIG_DIGITS : CHINESE_DIGITS const UNITS = isBig ? CHINESE_BIG_UNITS : CHINESE_UNITS - // 整数部份 let result = '' + if(wholeValue.length==1) return DIGITS[parseInt(wholeValue)] for(let i=wholeValue.length-1; i>=0; i--){ let bit = parseInt(wholeValue[i]) let digit = DIGITS[bit] @@ -95,7 +92,6 @@ function toChineseNumber(value,isBig=false) { if(bit==0){ let preBit =i< wholeValue.length ? parseInt(wholeValue[i+1]) : null// 上一位 let isKeyBits = ((wholeValue.length-i-1) % 4)==0 - //if(preBit && preBit!=0) result = "零" + result if(preBit && preBit!=0 && !isKeyBits) result = "零" + result if(isKeyBits) result = UNITS[wholeValue.length-i-1] + result }else{ @@ -116,12 +112,8 @@ function toChineseNumber(value,isBig=false) { .replace("万千","万") if(result.startsWith("一十")) result=result.substring(1) } - // 中文数字忽略小数部分 - return result -} -function toChineseBigNumber(value) { - return toChineseNumber(value,true) -} + return result // 中文数字忽略小数部分 +} /** @@ -147,19 +139,29 @@ function toCurrency(value,{division=3,unit="",precision=2}={}){ /** * 转换为中文大写货币 + * + * + * * @param {*} value * @param {*} division 分割符号位数,3代表每3个数字添加一个,号 * @param {*} unit 货币单位 * @param {*} precision 小数点精确到几位 */ -function toChineseCurrency(value,division=3,unit="￥"){ - let result = [] - let v = String(value) - for(let i=0;i toDate(value).getMilliseconds(), timestamp : value => toDate(value).getTime(), // 数字 - number : (value) => toNumber(value), - error : (value, tips = 'ERROR') => value instanceof Error ? tips : value, - empty : (value) => value, + number : (value) => toNumber(value), + + // 货币 + currency: (value,unit="$",division=3,precision=2) => toCurrency(value,{division,unit,precision}), + capital: value=>value, dict, + error : (value, tips = 'ERROR') => value instanceof Error ? tips : value, + empty : (value) => value }, zh: { $types: { @@ -207,15 +213,12 @@ module.exports = { shorMonthName: value => ["一","二","三","四","五","六","七","八","九","十","十一","十二"][value.getMonth()] // 时间 time : value => `${value.getHours()}点${value.getMinutes()}分${value.getSeconds()}秒` + // 数字 - number : (value) => toNumber(value), + number : (value,isBig=false) => toChineseNumber(value,isBig), // 转换为中文数字 // 货币 - currency: (value) => `￥${value}元`, + currency: (value,unit="￥",division=4,precision=2) => toCurrency(value,{division,unit,precision}), }, -en: { - currency: (value) => { - return `$${value}` - } -} + en: { } } \ No newline at end of file diff --git a/packages/runtime/index.js b/packages/runtime/index.js index e3b6617..1655fea 100644 --- a/packages/runtime/index.js +++ b/packages/runtime/index.js @@ -226,20 +226,20 @@ function getDataTypeDefaultFormatter(scope,activeLanguage,dataType){ const targets = [scope.formatters,scope.global.formatters] for(const target of targets){ if(!target) continue - // 1. 优先在当前语言的$types中查找 + // 1. 在全局$types中查找 + if(("*" in target) && isPlainObject(target["*"].$types)){ + let formatters = target["*"].$types + if(dataType in formatters && typeof(formatters[dataType])==="function"){ + return scope.$cache.typedFormatters[dataType] = formatters[dataType] + } + } + // 2. 当前语言的$types中查找 if((activeLanguage in target) && isPlainObject(target[activeLanguage].$types)){ let formatters = target[activeLanguage].$types if(dataType in formatters && typeof(formatters[dataType])==="function"){ return scope.$cache.typedFormatters[dataType] = formatters[dataType] } - } - // 2. 在全局$types中查找 - if(("*" in target) && isPlainObject(target["*"].$types)){ - let formatters = target["*"].$types - if(dataType in formatters && typeof(formatters[dataType])==="function"){ - return scope.$cache.typedFormatters[dataType] = formatters[dataType] - } - } + } } } @@ -251,6 +251,7 @@ function getDataTypeDefaultFormatter(scope,activeLanguage,dataType){ * * - 在全局作用域中查找 * + * 全局作用域的格式化器优先 * * @param {*} scope * @param {*} activeLanguage @@ -266,7 +267,7 @@ function getFormatter(scope,activeLanguage,name){ resetScopeCache(scope,activeLanguage) } // 先在当前作用域中查找，再在全局查找 - const targets = [scope.formatters,scope.global.formatters] + const targets = [scope.global.formatters,scope.formatters] for(const target of targets){ // 1. 优先在当前语言查找 if(activeLanguage in target){ diff --git a/packages/runtime/utils.js b/packages/runtime/utils.js index 335905d..1d41169 100644 --- a/packages/runtime/utils.js +++ b/packages/runtime/utils.js @@ -22,7 +22,7 @@ * @returns */ function isNumber(value){ - if(!value) return false + if(value==undefined) return false if(typeof(value)=='number') return true if(typeof(value)!='string') return false try{