Merge remote-tracking branch 'origin/master'

# Conflicts: # dist/bundle.js # dist/bundle.min.js # dist/fineui.js # dist/fineui.min.js # dist/utils.min.js
6 years ago · 87430e865b
10 changed files with 211375 additions and 211376 deletions
--- a/dist/base.js
+++ b/dist/base.js
--- a/dist/bundle.js
+++ b/dist/bundle.js
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/case.js
+++ b/dist/case.js
--- a/dist/fineui.js
+++ b/dist/fineui.js
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/utils.js
+++ b/dist/utils.js
@ -15906,7 +15906,8 @@ BI.Date._OFFSET = [0, -1, -2, -3, -4, -5, -6];BI.i18n = {
    "BI-Basic_Minute": "分",
    "BI-Basic_Wan": "万",
    "BI-Basic_Million": "百万",
-    "BI-Basic_Billion": "亿"
+    "BI-Basic_Billion": "亿",
+    "BI-Basic_Quarter": "季度"
 };/**
 * 缓冲池
 * @type {{Buffer: {}}}
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/dist/widget.js
+++ b/dist/widget.js
--- a/public/js/fineui.i18n.js
+++ b/public/js/fineui.i18n.js
@ -183,5 +183,6 @@ BI.i18n = {
    "BI-Basic_Minute": "分",
    "BI-Basic_Wan": "万",
    "BI-Basic_Million": "百万",
-    "BI-Basic_Billion": "亿"
+    "BI-Basic_Billion": "亿",
+    "BI-Basic_Quarter": "季度"
 };