' +
@@ -455,58 +455,67 @@ const pivottableconfigHTML = '';
-const luckysheetAlternateformatHtml = '
'+
+
+
+function luckysheetAlternateformatHtml(){
+ const _locale = locale()
+ const alternatingColors =_locale.alternatingColors;
+ const toolbar = _locale.toolbar;
+
+
+ return '
';
+ }
const luckysheetchartpointconfigHTML = '
数据点设置
图形大小
图形形状
边框粗细
数值比例
小数位数
标签格式
标签位置
';
const luckysheetToolHTML = '
';
@@ -514,6 +523,7 @@ const luckysheetToolHTML = '
';
}
else if(type == "moredigit"){ //数字
- title = "数字格式";
+ title = locale_format.titleNumber;
let listHtml = '';
@@ -869,7 +1132,7 @@ const luckysheetMoreFormat = {
"addclass": "luckysheet-moreFormat-dialog",
"title": title,
"content": content,
- "botton": '',
+ "botton": '',
"style": "z-index:100003"
}));
let $t = $("#luckysheet-moreFormat-dialog").find(".luckysheet-modal-dialog-content").css("min-width", 400).end(),
diff --git a/src/index.html b/src/index.html
index dfa074d..788422c 100644
--- a/src/index.html
+++ b/src/index.html
@@ -31,7 +31,7 @@
luckysheet.create({
container: 'luckysheet',
- lang: 'zh',
+ lang: 'en',
plugins: ['chart'],
data: [sheetCell,sheetFormula,sheetConditionFormat,sheetTable,sheetComment,sheetPivotTableData,sheetPivotTable]
})
diff --git a/src/locale/en.js b/src/locale/en.js
index 402a8dd..66ea980 100644
--- a/src/locale/en.js
+++ b/src/locale/en.js
@@ -45,12 +45,24 @@ export default {
chart: 'Chart',
screenshot: 'Screenshot',
splitColumn: 'Split column',
+
+ clearText:"Clear color",
+ noColorSelectedText:"No color is selected",
},
alternatingColors:{
applyRange: 'Apply to range',
selectRange: 'Select a data range',
header: 'Header',
footer: 'Footer',
+
+ errorInfo:"Cannot perform this operation on multiple selection areas, please select a single area and try again",
+ textTitle:"Format style",
+ custom:"CUSTOM",
+ close:"close",
+ selectionTextColor:"Click to select text color",
+ selectionCellColor:"Click to select cell color",
+ removeColor:"Remove alternating colors",
+ colorShow:"color",
},
button: {
confirm: 'OK',
@@ -61,30 +73,245 @@ export default {
paintFormatEnd: 'ESC key to exit',
},
format:{
- auto: 'Automatic',
- text: 'Plain text',
- number: 'Number',
- percent: 'Percent',
- scientific: 'Scientific',
- accounting: 'Accounting',
- tenThousand: 'Ten thousand',
- currency: 'Currency',
- tenThousandDecimal: 'Ten thousand (2 decimal places)',
- date: 'Date',
- time: 'Time',
- time24H: 'Time 24H',
- dateTime: 'Date time',
- dateTime24H: 'Date time 24 H',
- customFormats: 'Custom formats',
moreCurrency: 'More currency formats',
moreDateTime: 'More date and time formats',
moreNumber: 'More number formats',
+
+ titleCurrency: 'Currency formats',
+ decimalPlaces: 'Decimal places',
+ titleDateTime: 'Date and time formats',
+ titleNumber: 'Number formats'
},
info:{
detailUpdate: 'New opened',
detailSave: 'Local cache restored',
row: 'row',
column: 'column'
- }
+ },
+ currencyDetail:{
+ RMB:'RMB',
+ USdollar:'US dollar',
+ EUR:'EUR',
+ GBP:'GBP',
+ HK:'HK',
+ JPY:'JPY',
+ AlbanianLek:'Albanian Lek',
+ AlgerianDinar:'Algerian Dinar',
+ Afghani:'Afghani',
+ ArgentinePeso:'Argentine Peso',
+ UnitedArabEmiratesDirham:'United Arab Emirates Dirham',
+ ArubanFlorin:'Aruban Florin',
+ OmaniRial:'Omani Rial',
+ Azerbaijanimanat:'Azerbaijani manat',
+ EgyptianPound:'Egyptian Pound',
+ EthiopianBirr:'Ethiopian Birr',
+ AngolaKwanza:'Angola Kwanza',
+ AustralianDollar:'Australian Dollar',
+ Patacas:'Patacas',
+ BarbadosDollar:'Barbados Dollar',
+ PapuaNewGuineaKina:'Papua New Guinea Kina',
+ BahamianDollar:'Bahamian Dollar',
+ PakistanRupee:'Pakistan Rupee',
+ ParaguayanGuarani:'Paraguayan Guarani',
+ BahrainiDinar:'Bahraini Dinar',
+ PanamanianBalboa:'Panamanian Balboa',
+ Brazilianreal:'Brazilian real',
+ Belarusianruble:'Belarusian ruble',
+ BermudianDollar:'Bermudian Dollar',
+ BulgarianLev:'Bulgarian Lev',
+ IcelandKrona:'Iceland Krona',
+ BosniaHerzegovinaConvertibleMark:'Bosnia-Herzegovina Convertible Mark',
+ PolishZloty:'Polish Zloty',
+ Boliviano:'Boliviano',
+ BelizeDollar:'Belize Dollar',
+ BotswanaPula:'Botswana Pula',
+ NotDannuzhamu:'Not Dannuzhamu',
+ BurundiFranc:'Burundi Franc',
+ NorthKoreanWon:'North Korean Won',
+ DanishKrone:'Danish Krone',
+ EastCaribbeanDollar:'East Caribbean Dollar',
+ DominicaPeso:'Dominica Peso',
+ RussianRuble:'Russian Ruble',
+ EritreanNakfa:'Eritrean Nakfa',
+ CFAfranc:'CFA franc',
+ PhilippinePeso:'Philippine Peso',
+ FijiDollar:'Fiji Dollar',
+ CapeVerdeEscudo:'Cape Verde Escudo',
+ FalklandIslandsPound:'Falkland Islands Pound',
+ GambianDalasi:'Gambian Dalasi',
+ Congolesefranc:'Congolese franc',
+ ColombianPeso:'Colombian Peso',
+ CostaRicanColon:'Costa Rican Colon',
+ CubanPeso:'Cuban Peso',
+ Cubanconvertiblepeso:'Cuban convertible peso',
+ GuyanaDollar:'Guyana Dollar',
+ KazakhstanTenge:'Kazakhstan Tenge',
+ Haitiangourde:'Haitian gourde',
+ won:'won',
+ NetherlandsAntillesGuilder:'Netherlands Antilles Guilder',
+ Honduraslempiras:'Honduras lempiras',
+ DjiboutiFranc:'Djibouti Franc',
+ KyrgyzstanSom:'Kyrgyzstan Som',
+ GuineaFranc:'Guinea Franc',
+ CanadianDollar:'Canadian Dollar',
+ GhanaianCedi:'Ghanaian Cedi',
+ Cambodianriel:'Cambodian riel',
+ CzechKoruna:'Czech Koruna',
+ ZimbabweDollar:'Zimbabwe Dollar',
+ QatariRiyal:'Qatari Riyal',
+ CaymanIslandsDollar:'Cayman Islands Dollar',
+ Comorianfranc:'Comorian franc',
+ KuwaitiDinar:'Kuwaiti Dinar',
+ CroatianKuna:'Croatian Kuna',
+ KenyanShilling:'Kenyan Shilling',
+ LesothoLoti:'Lesotho Loti',
+ LaoKip:'Lao Kip',
+ LebanesePound:'Lebanese Pound',
+ Lithuanianlitas:'Lithuanian litas',
+ LibyanDinar:'Libyan Dinar',
+ LiberianDollar:'Liberian Dollar',
+ RwandaFranc:'Rwanda Franc',
+ RomanianLeu:'Romanian Leu',
+ MalagasyAriary:'Malagasy Ariary',
+ MaldivianRufiyaa:'Maldivian Rufiyaa',
+ MalawiKwacha:'Malawi Kwacha',
+ MalaysianRinggit:'Malaysian Ringgit',
+ MacedoniawearingDinar:'Macedonia wearing Dinar',
+ MauritiusRupee:'Mauritius Rupee',
+ MauritanianOuguiya:'Mauritanian Ouguiya',
+ MongolianTugrik:'Mongolian Tugrik',
+ BangladeshiTaka:'Bangladeshi Taka',
+ PeruvianNuevoSol:'Peruvian Nuevo Sol',
+ MyanmarKyat:'Myanmar Kyat',
+ MoldovanLeu:'Moldovan Leu',
+ MoroccanDirham:'Moroccan Dirham',
+ MozambiqueMetical:'Mozambique Metical',
+ MexicanPeso:'Mexican Peso',
+ NamibianDollar:'Namibian Dollar',
+ SouthAfricanRand:'South African Rand',
+ SouthSudanesePound:'South Sudanese Pound',
+ NicaraguaCordoba:'Nicaragua Cordoba',
+ NepaleseRupee:'Nepalese Rupee',
+ NigerianNaira:'Nigerian Naira',
+ NorwegianKrone:'Norwegian Krone',
+ GeorgianLari:'Georgian Lari',
+ RMBOffshore:'RMB (Offshore)',
+ SwedishKrona:'Swedish Krona',
+ SwissFranc:'Swiss Franc',
+ SerbianDinar:'Serbian Dinar',
+ SierraLeone:'Sierra Leone',
+ SeychellesRupee:'Seychelles Rupee',
+ SaudiRiyal:'Saudi Riyal',
+ SaoTomeDobra:'Sao Tome Dobra',
+ SaintHelenapound:'Saint Helena pound',
+ SriLankaRupee:'Sri Lanka Rupee',
+ SwazilandLilangeni:'Swaziland Lilangeni',
+ SudanesePound:'Sudanese Pound',
+ Surinamesedollar:'Surinamese dollar',
+ SolomonIslandsDollar:'Solomon Islands Dollar',
+ SomaliShilling:'Somali Shilling',
+ TajikistanSomoni:'Tajikistan Somoni',
+ PacificFranc:'Pacific Franc',
+ ThaiBaht:'Thai Baht',
+ TanzanianShilling:'Tanzanian Shilling',
+ TonganPaanga:"Tongan Pa'anga",
+ TrinidadandTobagoDollar:'Trinidad and Tobago Dollar',
+ TunisianDinar:'Tunisian Dinar',
+ TurkishLira:'Turkish Lira',
+ VanuatuVatu:'Vanuatu Vatu',
+ GuatemalanQuetzal:'Guatemalan Quetzal',
+ CommissionBolivar:'Commission Bolivar',
+ BruneiDollar:'Brunei Dollar',
+ UgandanShilling:'Ugandan Shilling',
+ UkrainianHryvnia:'Ukrainian Hryvnia',
+ UruguayanPeso:'Uruguayan Peso',
+ Uzbekistansom:'Uzbekistan som',
+ WesternSamoaTala:'Western Samoa Tala',
+ SingaporeDollar:'Singapore Dollar',
+ NT:'NT',
+ NewZealandDollar:'New Zealand Dollar',
+ HungarianForint:'Hungarian Forint',
+ SyrianPound:'Syrian Pound',
+ JamaicanDollar:'Jamaican Dollar',
+ ArmenianDram:'Armenian Dram',
+ YemeniRial:'Yemeni Rial',
+ IraqiDinar:'Iraqi Dinar',
+ IranianRial:'Iranian Rial',
+ NewIsraeliShekel:'New Israeli Shekel',
+ IndianRupee:'Indian Rupee',
+ IndonesianRupiah:'Indonesian Rupiah',
+ JordanianDinar:'Jordanian Dinar',
+ VND:'VND',
+ ZambianKwacha:'Zambian Kwacha',
+ GibraltarPound:'Gibraltar Pound',
+ ChileanPeso:'Chilean Peso',
+ CFAFrancBEAC:'CFA Franc BEAC'
+ },
+ defaultFmt:[
+ { "text": 'Automatic', "value": "General", "example": "" },
+ { "text": 'Plain text', "value": "@", "example": "" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": 'Number', "value": "##0.00", "example": "1000.12" },
+ { "text": 'Percent', "value": "#0.00%", "example": "12.21%" },
+ { "text": 'Scientific', "value": "0.00E+00", "example": "1.01E+5" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": 'Accounting', "value": "¥(0.00)", "example": "¥(1200.09)" },
+ { "text": 'Currency', "value": "¥0.00", "example": "¥1200.09" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": 'Date', "value": "yyyy-MM-dd", "example": "2017-11-29" },
+ { "text": 'Time', "value": "hh:mm AM/PM", "example": "3:00 PM" },
+ { "text": 'Time 24H', "value": "hh:mm", "example": "15:00" },
+ { "text": 'Date time', "value": "yyyy-MM-dd hh:mm AM/PM", "example": "2017-11-29 3:00 PM" },
+ { "text": 'Date time 24 H', "value": "yyyy-MM-dd hh:mm", "example": "2017-11-29 15:00" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": 'Custom formats', "value": "fmtOtherSelf", "example": "more" }
+ ],
+ dateFmtList:[
+ {
+ "name": "1930-08-05",
+ "value": "yyyy-MM-dd"
+ },
+ {
+ "name": "1930/8/5",
+ "value": "yyyy/MM/dd"
+ },
+ {
+ "name": "08-05",
+ "value": "MM-dd"
+ },
+ {
+ "name": "8-5",
+ "value": "M-d"
+ },
+ {
+ "name": "13:30:30",
+ "value": "h:mm:ss"
+ },
+ {
+ "name": "13:30",
+ "value": "h:mm"
+ },
+ {
+ "name": "PM 01:30",
+ "value": 'AM/PM hh:mm'
+ },
+ {
+ "name": "PM 1:30",
+ "value": 'AM/PM h:mm'
+ },
+ {
+ "name": "PM 1:30:30",
+ "value": 'AM/PM h:mm:ss'
+ },
+ {
+ "name": "08-05 PM 01:30",
+ "value": "MM-dd AM/PM hh:mm"
+ }
+ ],
+ fontFamily:{
+ MicrosoftYaHei:"YaHei",
+ },
+ fontarray: ["Times New Roman","Arial","Tahoma","Verdana"],
+ fontjson: {"arial":1,"times new roman":0,"tahoma":2,"verdana":3}
};
\ No newline at end of file
diff --git a/src/locale/zh.js b/src/locale/zh.js
index 392e524..da3e9aa 100644
--- a/src/locale/zh.js
+++ b/src/locale/zh.js
@@ -44,12 +44,26 @@ export default {
chart: '图表',
screenshot: '截图',
splitColumn: '分列',
+
+ clearText:"清除颜色选择",
+ noColorSelectedText:"没有颜色被选择",
+
+
},
alternatingColors:{
applyRange: '应用范围',
selectRange: '选择应用范围',
header: '页眉',
footer: '页脚',
+
+ errorInfo:"不能对多重选择区域执行此操作,请选择单个区域,然后再试",
+ textTitle:"格式样式",
+ custom:"自定义",
+ close:"关闭",
+ selectionTextColor:"点击选择文本颜色",
+ selectionCellColor:"点击选择单元格颜色",
+ removeColor:"移除交替颜色",
+ colorShow:"颜色",
},
button: {
confirm: '确定',
@@ -60,29 +74,265 @@ export default {
paintFormatEnd: 'ESC键退出',
},
format: {
- auto: '自动',
- text: '纯文本',
- number: '数字',
- percent: '百分比',
- scientific: '科学计数',
- accounting: '会计',
- tenThousand: '万元',
- currency: '货币',
- tenThousandDecimal: '万元2位小数',
- date: '日期',
- time: '时间',
- time24H: '时间24H',
- dateTime: '日期时间',
- dateTime24H: '日期时间24H',
- customFormats: '自定义格式',
moreCurrency: '更多货币格式',
moreDateTime: '更多日期与时间格式',
- moreNumber: '更多数字格式'
+ moreNumber: '更多数字格式',
+
+ titleCurrency: '货币格式',
+ decimalPlaces: '小数位数',
+ titleDateTime: '日期与时间格式',
+ titleNumber: '数字格式'
},
info: {
detailUpdate: '新打开',
detailSave: '已恢复本地缓存',
row: '行',
column: '列'
- }
+ },
+ currencyDetail:{
+ RMB:'人民币',
+ USdollar:'美元',
+ EUR:'欧元',
+ GBP:'英镑',
+ HK:'港元',
+ JPY:'日元',
+ AlbanianLek:'阿尔巴尼亚列克',
+ AlgerianDinar:'阿尔及利亚第纳尔',
+ Afghani:'阿富汗尼',
+ ArgentinePeso:'阿根廷比索',
+ UnitedArabEmiratesDirham:'阿拉伯联合酋长国迪拉姆',
+ ArubanFlorin:'阿鲁巴弗罗林',
+ OmaniRial:'阿曼里亚尔',
+ Azerbaijanimanat:'阿塞拜疆马纳特',
+ EgyptianPound:'埃及镑',
+ EthiopianBirr:'埃塞俄比亚比尔',
+ AngolaKwanza:'安哥拉宽扎',
+ AustralianDollar:'澳大利亚元',
+ Patacas:'澳门元',
+ BarbadosDollar:'巴巴多斯元',
+ PapuaNewGuineaKina:'巴布亚新几内亚基那',
+ BahamianDollar:'巴哈马元',
+ PakistanRupee:'巴基斯坦卢比',
+ ParaguayanGuarani:'巴拉圭瓜拉尼',
+ BahrainiDinar:'巴林第纳尔',
+ PanamanianBalboa:'巴拿马巴波亚',
+ Brazilianreal:'巴西里亚伊',
+ Belarusianruble:'白俄罗斯卢布',
+ BermudianDollar:'百慕大元',
+ BulgarianLev:'保加利亚列弗',
+ IcelandKrona:'冰岛克朗',
+ BosniaHerzegovinaConvertibleMark:'波黑可兑换马克',
+ PolishZloty:'波兰兹罗提',
+ Boliviano:'玻利维亚诺',
+ BelizeDollar:'伯利兹元',
+ BotswanaPula:'博茨瓦纳普拉',
+ NotDannuzhamu:'不丹努扎姆',
+ BurundiFranc:'布隆迪法郎',
+ NorthKoreanWon:'朝鲜圆',
+ DanishKrone:'丹麦克朗',
+ EastCaribbeanDollar:'东加勒比元',
+ DominicaPeso:'多米尼加比索',
+ RussianRuble:'俄国卢布',
+ EritreanNakfa:'厄立特里亚纳克法',
+ CFAfranc:'非洲金融共同体法郎',
+ PhilippinePeso:'菲律宾比索',
+ FijiDollar:'斐济元',
+ CapeVerdeEscudo:'佛得角埃斯库多',
+ FalklandIslandsPound:'福克兰群岛镑',
+ GambianDalasi:'冈比亚达拉西',
+ Congolesefranc:'刚果法郎',
+ ColombianPeso:'哥伦比亚比索',
+ CostaRicanColon:'哥斯达黎加科朗',
+ CubanPeso:'古巴比索',
+ Cubanconvertiblepeso:'古巴可兑换比索',
+ GuyanaDollar:'圭亚那元',
+ KazakhstanTenge:'哈萨克斯坦坚戈',
+ Haitiangourde:'海地古德',
+ won:'韩元',
+ NetherlandsAntillesGuilder:'荷属安的列斯盾',
+ Honduraslempiras:'洪都拉斯拉伦皮拉',
+ DjiboutiFranc:'吉布提法郎',
+ KyrgyzstanSom:'吉尔吉斯斯坦索姆',
+ GuineaFranc:'几内亚法郎',
+ CanadianDollar:'加拿大元',
+ GhanaianCedi:'加纳塞地',
+ Cambodianriel:'柬埔寨瑞尔',
+ CzechKoruna:'捷克克朗',
+ ZimbabweDollar:'津巴布韦元',
+ QatariRiyal:'卡塔尔里亚尔',
+ CaymanIslandsDollar:'开曼群岛元',
+ Comorianfranc:'科摩罗法郎',
+ KuwaitiDinar:'科威特第纳尔',
+ CroatianKuna:'克罗地亚库纳',
+ KenyanShilling:'肯尼亚先令',
+ LesothoLoti:'莱索托洛蒂',
+ LaoKip:'老挝基普',
+ LebanesePound:'黎巴嫩镑',
+ Lithuanianlitas:'立陶宛立特',
+ LibyanDinar:'利比亚第纳尔',
+ LiberianDollar:'利比亚元',
+ RwandaFranc:'卢旺达法郎',
+ RomanianLeu:'罗马尼亚列伊',
+ MalagasyAriary:'马达加斯加阿里亚里',
+ MaldivianRufiyaa:'马尔代夫拉菲亚',
+ MalawiKwacha:'马拉维克瓦查',
+ MalaysianRinggit:'马来西亚林吉特',
+ MacedoniawearingDinar:'马其顿戴第纳尔',
+ MauritiusRupee:'毛里求斯卢比',
+ MauritanianOuguiya:'毛里塔尼亚乌吉亚',
+ MongolianTugrik:'蒙古图格里克',
+ BangladeshiTaka:'孟加拉塔卡',
+ PeruvianNuevoSol:'秘鲁新索尔',
+ MyanmarKyat:'缅甸开亚特',
+ MoldovanLeu:'摩尔多瓦列伊',
+ MoroccanDirham:'摩洛哥迪拉姆',
+ MozambiqueMetical:'莫桑比克梅蒂卡尔',
+ MexicanPeso:'墨西哥比索',
+ NamibianDollar:'纳米比亚元',
+ SouthAfricanRand:'南非兰特',
+ SouthSudanesePound:'南苏丹镑',
+ NicaraguaCordoba:'尼加拉瓜科多巴',
+ NepaleseRupee:'尼泊尔卢比',
+ NigerianNaira:'尼日利亚奈拉',
+ NorwegianKrone:'挪威克朗',
+ GeorgianLari:'乔治亚拉瑞',
+ RMBOffshore:'人民币(离岸)',
+ SwedishKrona:'瑞典克朗',
+ SwissFranc:'瑞士法郎',
+ SerbianDinar:'塞尔维亚第纳尔',
+ SierraLeone:'塞拉利昂利昂',
+ SeychellesRupee:'塞舌尔卢比',
+ SaudiRiyal:'沙特里亚尔',
+ SaoTomeDobra:'圣多美多布拉',
+ SaintHelenapound:'圣赫勒拿群岛磅',
+ SriLankaRupee:'斯里兰卡卢比',
+ SwazilandLilangeni:'斯威士兰里兰吉尼',
+ SudanesePound:'苏丹镑',
+ Surinamesedollar:'苏里南元',
+ SolomonIslandsDollar:'所罗门群岛元',
+ SomaliShilling:'索马里先令',
+ TajikistanSomoni:'塔吉克斯坦索莫尼',
+ PacificFranc:'太平洋法郎',
+ ThaiBaht:'泰国铢',
+ TanzanianShilling:'坦桑尼亚先令',
+ TonganPaanga:'汤加潘加',
+ TrinidadandTobagoDollar:'特立尼达和多巴哥元',
+ TunisianDinar:'突尼斯第纳尔',
+ TurkishLira:'土耳其里拉',
+ VanuatuVatu:'瓦努阿图瓦图',
+ GuatemalanQuetzal:'危地马拉格查尔',
+ CommissionBolivar:'委内瑞拉博利瓦',
+ BruneiDollar:'文莱元',
+ UgandanShilling:'乌干达先令',
+ UkrainianHryvnia:'乌克兰格里夫尼亚',
+ UruguayanPeso:'乌拉圭比索',
+ Uzbekistansom:'乌兹别克斯坦苏姆',
+ WesternSamoaTala:'西萨摩亚塔拉',
+ SingaporeDollar:'新加坡元',
+ NT:'新台币',
+ NewZealandDollar:'新西兰元',
+ HungarianForint:'匈牙利福林',
+ SyrianPound:'叙利亚镑',
+ JamaicanDollar:'牙买加元',
+ ArmenianDram:'亚美尼亚德拉姆',
+ YemeniRial:'也门里亚尔',
+ IraqiDinar:'伊拉克第纳尔',
+ IranianRial:'伊朗里亚尔',
+ NewIsraeliShekel:'以色列新谢克尔',
+ IndianRupee:'印度卢比',
+ IndonesianRupiah:'印度尼西亚卢比',
+ JordanianDinar:'约旦第纳尔',
+ VND:'越南盾',
+ ZambianKwacha:'赞比亚克瓦查',
+ GibraltarPound:'直布罗陀镑',
+ ChileanPeso:'智利比索',
+ CFAFrancBEAC:'中非金融合作法郎',
+ },
+ defaultFmt:[
+ { "text": '自动', "value": "General", "example": "" },
+ { "text": '纯文本', "value": "@", "example": "" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": '数字', "value": "##0.00", "example": "1000.12" },
+ { "text": '百分比', "value": "#0.00%", "example": "12.21%" },
+ { "text": '科学计数', "value": "0.00E+00", "example": "1.01E+5" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": '会计', "value": "¥(0.00)", "example": "¥(1200.09)" },
+ //{ "text": "财务", "value": "(#.####)", "example": "(1200.09)" },
+ { "text": '万元', "value": "w", "example": "1亿2000万2500" },
+ { "text": '货币', "value": "¥0.00", "example": "¥1200.09" },
+ //{ "text": "货币整数", "value": "¥####", "example": "¥1200" },
+ { "text": '万元2位小数', "value": "w0.00", "example": "2万2500.55" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": '日期', "value": "yyyy-MM-dd", "example": "2017-11-29" },
+ { "text": '时间', "value": "hh:mm AM/PM", "example": "3:00 PM" },
+ { "text": '时间24H', "value": "hh:mm", "example": "15:00" },
+ { "text": '日期时间', "value": "yyyy-MM-dd hh:mm AM/PM", "example": "2017-11-29 3:00 PM" },
+ { "text": '日期时间24H', "value": "yyyy-MM-dd hh:mm", "example": "2017-11-29 15:00" },
+ { "text": "", "value": "split", "example": "" },
+ { "text": '自定义格式', "value": "fmtOtherSelf", "example": "more" }
+ ],
+ dateFmtList:[
+ {
+ "name": "1930-08-05",
+ "value": "yyyy-MM-dd"
+ },
+ {
+ "name": "1930/8/5",
+ "value": "yyyy/MM/dd"
+ },
+ {
+ "name": "1930年8月5日",
+ "value": 'yyyy"年"M"月"d"日"'
+ },
+ {
+ "name": "08-05",
+ "value": "MM-dd"
+ },
+ {
+ "name": "8-5",
+ "value": "M-d"
+ },
+ {
+ "name": "8月5日",
+ "value": 'M"月"d"日"'
+ },
+ {
+ "name": "13:30:30",
+ "value": "h:mm:ss"
+ },
+ {
+ "name": "13:30",
+ "value": "h:mm"
+ },
+ {
+ "name": "下午01:30",
+ "value": 'AM/PM hh:mm'
+ },
+ {
+ "name": "下午1:30",
+ "value": 'AM/PM h:mm'
+ },
+ {
+ "name": "下午1:30:30",
+ "value": 'AM/PM h:mm:ss'
+ },
+ {
+ "name": "08-05 下午01:30",
+ "value": "MM-dd AM/PM hh:mm"
+ },
+ // {
+ // "name": "1930年8月5日星期二",
+ // "value": ''
+ // },
+ // {
+ // "name": "1930年8月5日星期二 下午1:30:30",
+ // "value": ''
+ // },
+ ],
+ fontFamily:{
+ MicrosoftYaHei:"Microsoft YaHei",
+ },
+ fontarray: ["微软雅黑","宋体","黑体","楷体","仿宋","新宋体","华文新魏","华文行楷","华文隶书","Arial","Times New Roman","Tahoma","Verdana"],
+ fontjson: {"微软雅黑":0,"microsoft yahei":0,"宋体":1,"simsun":1,"黑体":2,"simhei":2,"楷体":3,"kaiti":3,"仿宋":4,"fangsong":4,"新宋体":5,"nsimsun":5,"华文新魏":6,"stxinwei":6,"华文行楷":7,"stxingkai":7,"华文隶书":8,"stliti":8,"arial":9,"times new roman":10,"tahoma":11,"verdana":12}
+
};
diff --git a/src/utils/util.js b/src/utils/util.js
index 7447351..7a6f685 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -3,6 +3,7 @@ import menuButton from '../controllers/menuButton';
import { isdatatype, isdatatypemulti } from '../global/datecontroll';
import { hasChinaword } from '../global/validate';
import Store from '../store';
+import locale from '../locale/locale';
/**
* Common tool methods
@@ -292,6 +293,7 @@ function ArrayUnique(dataArr) {
//获取字体配置
function luckysheetfontformat(format) {
+ let fontarray = locale().fontarray;
if (getObjType(format) == "object") {
let font = "";
@@ -323,21 +325,22 @@ function luckysheetfontformat(format) {
}
if (!format.ff) {
- font += '微软雅黑, "Helvetica Neue", Helvetica, Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif';
+
+ font += fontarray[0] + ', "Helvetica Neue", Helvetica, Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif';
}
else {
- let fontarray = menuButton.fontarray;
let fontfamily = null;
-
+ let fontjson = locale().fontjson;
if (isdatatypemulti(format.ff)["num"]) {
fontfamily = fontarray[parseInt(format.ff)];
}
else {
- fontfamily = fontarray[menuButton.fontjson[format.ff]];
+
+ fontfamily = fontarray[fontjson[format.ff]];
}
if (fontfamily == null) {
- fontfamily = "微软雅黑";
+ fontfamily = fontarray[0];
}
font += fontfamily + ', "Helvetica Neue", Helvetica, Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif';