BI-37817 年周数计算与firefox

6 years ago · 982104a5f6
16 changed files with 173 additions and 133 deletions
--- a/dist/bundle.ie.js
+++ b/dist/bundle.ie.js
@ -18023,11 +18023,7 @@ _.extend(BI, {
            }
            return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
        };
-        if (!BI.isKhtml()) {
-            return str.replace(re, function (par) {
-                return s[par] || par;
-            });
-        }
+
        // 包含年周的格式化，ISO8601标准周的计数会影响年
        if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
            switch (wn) {
@ -18049,6 +18045,12 @@ _.extend(BI, {
                    break;
            }
        }
+
+        if (!BI.isKhtml()) {
+            return str.replace(re, function (par) {
+                return s[par] || par;
+            });
+        }
        var a = str.match(re);
        for (var i = 0; i < a.length; i++) {
            var tmp = s[a[i]];
--- a/dist/bundle.ie.min.js
+++ b/dist/bundle.ie.min.js
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -18023,11 +18023,7 @@ _.extend(BI, {
            }
            return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
        };
-        if (!BI.isKhtml()) {
-            return str.replace(re, function (par) {
-                return s[par] || par;
-            });
-        }
+
        // 包含年周的格式化，ISO8601标准周的计数会影响年
        if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
            switch (wn) {
@ -18049,6 +18045,12 @@ _.extend(BI, {
                    break;
            }
        }
+
+        if (!BI.isKhtml()) {
+            return str.replace(re, function (par) {
+                return s[par] || par;
+            });
+        }
        var a = str.match(re);
        for (var i = 0; i < a.length; i++) {
            var tmp = s[a[i]];
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/core.js
+++ b/dist/core.js
@ -18023,11 +18023,7 @@ _.extend(BI, {
            }
            return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
        };
-        if (!BI.isKhtml()) {
-            return str.replace(re, function (par) {
-                return s[par] || par;
-            });
-        }
+
        // 包含年周的格式化，ISO8601标准周的计数会影响年
        if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
            switch (wn) {
@ -18049,6 +18045,12 @@ _.extend(BI, {
                    break;
            }
        }
+
+        if (!BI.isKhtml()) {
+            return str.replace(re, function (par) {
+                return s[par] || par;
+            });
+        }
        var a = str.match(re);
        for (var i = 0; i < a.length; i++) {
            var tmp = s[a[i]];
--- a/dist/demo.js
+++ b/dist/demo.js
@ -6158,7 +6158,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
        };
    }
 });
-BI.shortcut("demo.htape", Demo.HtapeLayout);/**
+BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-absolute"
+    },
+    render: function () {
+        return {
+            type: "bi.inline_vertical_adapt",
+            items: [{
+                type: "bi.label",
+                text: "绝对布局",
+                cls: "layout-bg1",
+                width: 300,
+                height: 200
+            }, {
+                type: "bi.label",
+                text: "绝对布局",
+                cls: "layout-bg1",
+                width: 300,
+                height: 100
+            }]
+        };
+    }
+});
+BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
 * Created by User on 2017/3/22.
 */
 Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {
--- a/dist/fineui.ie.js
+++ b/dist/fineui.ie.js
@ -18268,11 +18268,7 @@ _.extend(BI, {
            }
            return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
        };
-        if (!BI.isKhtml()) {
-            return str.replace(re, function (par) {
-                return s[par] || par;
-            });
-        }
+
        // 包含年周的格式化，ISO8601标准周的计数会影响年
        if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
            switch (wn) {
@ -18294,6 +18290,12 @@ _.extend(BI, {
                    break;
            }
        }
+
+        if (!BI.isKhtml()) {
+            return str.replace(re, function (par) {
+                return s[par] || par;
+            });
+        }
        var a = str.match(re);
        for (var i = 0; i < a.length; i++) {
            var tmp = s[a[i]];
--- a/dist/fineui.ie.min.js
+++ b/dist/fineui.ie.min.js
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -18268,11 +18268,7 @@ _.extend(BI, {
            }
            return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
        };
-        if (!BI.isKhtml()) {
-            return str.replace(re, function (par) {
-                return s[par] || par;
-            });
-        }
+
        // 包含年周的格式化，ISO8601标准周的计数会影响年
        if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
            switch (wn) {
@ -18294,6 +18290,12 @@ _.extend(BI, {
                    break;
            }
        }
+
+        if (!BI.isKhtml()) {
+            return str.replace(re, function (par) {
+                return s[par] || par;
+            });
+        }
        var a = str.match(re);
        for (var i = 0; i < a.length; i++) {
            var tmp = s[a[i]];
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -17769,11 +17769,7 @@ _.extend(BI, {
            }
            return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
        };
-        if (!BI.isKhtml()) {
-            return str.replace(re, function (par) {
-                return s[par] || par;
-            });
-        }
+
        // 包含年周的格式化，ISO8601标准周的计数会影响年
        if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
            switch (wn) {
@ -17795,6 +17791,12 @@ _.extend(BI, {
                    break;
            }
        }
+
+        if (!BI.isKhtml()) {
+            return str.replace(re, function (par) {
+                return s[par] || par;
+            });
+        }
        var a = str.match(re);
        for (var i = 0; i < a.length; i++) {
            var tmp = s[a[i]];
--- a/dist/utils.js
+++ b/dist/utils.js
@ -10784,11 +10784,7 @@ _.extend(BI, {
            }
            return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
        };
-        if (!BI.isKhtml()) {
-            return str.replace(re, function (par) {
-                return s[par] || par;
-            });
-        }
+
        // 包含年周的格式化，ISO8601标准周的计数会影响年
        if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
            switch (wn) {
@ -10810,6 +10806,12 @@ _.extend(BI, {
                    break;
            }
        }
+
+        if (!BI.isKhtml()) {
+            return str.replace(re, function (par) {
+                return s[par] || par;
+            });
+        }
        var a = str.match(re);
        for (var i = 0; i < a.length; i++) {
            var tmp = s[a[i]];
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/src/core/func/date.js
+++ b/src/core/func/date.js
@ -202,11 +202,7 @@ _.extend(BI, {
            }
            return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
        };
-        if (!BI.isKhtml()) {
-            return str.replace(re, function (par) {
-                return s[par] || par;
-            });
-        }
+
        // 包含年周的格式化，ISO8601标准周的计数会影响年
        if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
            switch (wn) {
@ -228,6 +224,12 @@ _.extend(BI, {
                    break;
            }
        }
+
+        if (!BI.isKhtml()) {
+            return str.replace(re, function (par) {
+                return s[par] || par;
+            });
+        }
        var a = str.match(re);
        for (var i = 0; i < a.length; i++) {
            var tmp = s[a[i]];