diff --git a/demo/version.js b/demo/version.js index 4c2d725971..b8f3ce97ea 100644 --- a/demo/version.js +++ b/demo/version.js @@ -155,5 +155,8 @@ BI.i18n = { "BI-Conf_Formula_And": "且公式条件", "BI-Conf_Formula_Or": "或公式条件", "BI-Conf_Condition_And": "且条件", - "BI-Conf_Condition_Or": "或条件" + "BI-Conf_Condition_Or": "或条件", + "BI-Microsoft_YaHei": "微软雅黑", + "BI-Apple_Light": "苹方-light", + "BI-Font_Family": "字体" }; \ No newline at end of file diff --git a/dist/_fineui.min.js b/dist/_fineui.min.js index 64984fbd91..f5460a83de 100644 --- a/dist/_fineui.min.js +++ b/dist/_fineui.min.js @@ -34,20 +34,20 @@ a=a.parentNode}}var e=9;if("undefined"!=typeof Element&&!Element.prototype.match jQuery.fn.farbtastic=function(a){return $.farbtastic(this,a),this},jQuery.farbtastic=function(a,b){var a=$(a).get(0);return a.farbtastic||(a.farbtastic=new jQuery._farbtastic(a,b))},jQuery._farbtastic=function(a,b){var c=this;$(a).html('