BI-29639 && BI-24431 FineUI中需要encodeURIComponent需要对特殊字符编码

6 years ago · 18f5138a85
16 changed files with 219 additions and 134 deletions
--- a/dist/base.css
+++ b/dist/base.css
@ -1034,6 +1034,8 @@ li.CodeMirror-hint-active {
 .bi-message-title {
  font-size: 14px;
  cursor: pointer;
+  background-color: #F2F4F7;
+  color: #3d4d66;
 }
 .bi-message-text {
  font-size: 16px;
--- a/dist/base.js
+++ b/dist/base.js
@ -15409,14 +15409,12 @@ BI.Popover = BI.inherit(BI.Widget, {
        var items = {
            north: {
                el: {
-                    type: "bi.border",
+                    type: "bi.htape",
                    cls: "bi-message-title bi-background",
                    ref: function (_ref) {
                        self.dragger = _ref;
                    },
-                    items: {
-                        center: {
-                            el: {
+                    items: [{
                        type: "bi.absolute",
                        items: [{
                            el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
@ -15433,9 +15431,7 @@ BI.Popover = BI.inherit(BI.Widget, {
                            right: 0,
                            bottom: 0
                        }]
-                            }
-                        },
-                        east: {
+                    }, {
                        el: {
                            type: "bi.icon_button",
                            cls: "bi-message-close close-font",
@ -15444,9 +15440,8 @@ BI.Popover = BI.inherit(BI.Widget, {
                                self.close();
                            }
                        },
-                            width: 60
-                        }
-                    }
+                        width: 56
+                    }]
                },
                height: this._constant.HEADER_HEIGHT
            },
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -408,7 +408,7 @@ textarea {
  border-radius: 2px;
 }
 .bi-font-bold {
-  font-weight: 600;
+  font-weight: 700;
 }
 .bi-theme-dark .bi-border {
  border: 1px solid #3a3c53;
@ -2887,6 +2887,8 @@ li.CodeMirror-hint-active {
 .bi-message-title {
  font-size: 14px;
  cursor: pointer;
+  background-color: #F2F4F7;
+  color: #3d4d66;
 }
 .bi-message-text {
  font-size: 16px;
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -26331,6 +26331,25 @@ BI.ShowAction = BI.inherit(BI.Action, {
        })(jo);
    };

+    BI.encodeURIComponent = function (url) {
+        BI.specialCharsMap = BI.specialCharsMap || {};
+        url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
+            return BI.specialCharsMap[str] || str;
+        });
+        return window.encodeURIComponent(url);
+    };
+
+    BI.decodeURIComponent = function (url) {
+        var reserveSpecialCharsMap = {};
+        BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
+            reserveSpecialCharsMap[encodeChar] = initialChar;
+        });
+        url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
+            return reserveSpecialCharsMap[str] || str;
+        });
+        return window.decodeURIComponent(url);
+    };
+
    BI.contentFormat = function (cv, fmt) {
        if (isEmpty(cv)) {
            // 原值为空，返回空字符
@ -51420,14 +51439,12 @@ BI.Popover = BI.inherit(BI.Widget, {
        var items = {
            north: {
                el: {
-                    type: "bi.border",
+                    type: "bi.htape",
                    cls: "bi-message-title bi-background",
                    ref: function (_ref) {
                        self.dragger = _ref;
                    },
-                    items: {
-                        center: {
-                            el: {
+                    items: [{
                        type: "bi.absolute",
                        items: [{
                            el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
@ -51444,9 +51461,7 @@ BI.Popover = BI.inherit(BI.Widget, {
                            right: 0,
                            bottom: 0
                        }]
-                            }
-                        },
-                        east: {
+                    }, {
                        el: {
                            type: "bi.icon_button",
                            cls: "bi-message-close close-font",
@ -51455,9 +51470,8 @@ BI.Popover = BI.inherit(BI.Widget, {
                                self.close();
                            }
                        },
-                            width: 60
-                        }
-                    }
+                        width: 56
+                    }]
                },
                height: this._constant.HEADER_HEIGHT
            },
--- a/dist/core.css
+++ b/dist/core.css
@ -408,7 +408,7 @@ textarea {
  border-radius: 2px;
 }
 .bi-font-bold {
-  font-weight: 600;
+  font-weight: 700;
 }
 .bi-theme-dark .bi-border {
  border: 1px solid #3a3c53;
--- a/dist/core.js
+++ b/dist/core.js
@ -26331,6 +26331,25 @@ BI.ShowAction = BI.inherit(BI.Action, {
        })(jo);
    };

+    BI.encodeURIComponent = function (url) {
+        BI.specialCharsMap = BI.specialCharsMap || {};
+        url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
+            return BI.specialCharsMap[str] || str;
+        });
+        return window.encodeURIComponent(url);
+    };
+
+    BI.decodeURIComponent = function (url) {
+        var reserveSpecialCharsMap = {};
+        BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
+            reserveSpecialCharsMap[encodeChar] = initialChar;
+        });
+        url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
+            return reserveSpecialCharsMap[str] || str;
+        });
+        return window.decodeURIComponent(url);
+    };
+
    BI.contentFormat = function (cv, fmt) {
        if (isEmpty(cv)) {
            // 原值为空，返回空字符
--- a/dist/core_without_normalize.css
+++ b/dist/core_without_normalize.css
@ -127,7 +127,7 @@ textarea {
  border-radius: 2px;
 }
 .bi-font-bold {
-  font-weight: 600;
+  font-weight: 700;
 }
 .bi-theme-dark .bi-border {
  border: 1px solid #3a3c53;
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -408,7 +408,7 @@ textarea {
  border-radius: 2px;
 }
 .bi-font-bold {
-  font-weight: 600;
+  font-weight: 700;
 }
 .bi-theme-dark .bi-border {
  border: 1px solid #3a3c53;
@ -2887,6 +2887,8 @@ li.CodeMirror-hint-active {
 .bi-message-title {
  font-size: 14px;
  cursor: pointer;
+  background-color: #F2F4F7;
+  color: #3d4d66;
 }
 .bi-message-text {
  font-size: 16px;
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -26552,6 +26552,25 @@ BI.ShowAction = BI.inherit(BI.Action, {
        })(jo);
    };

+    BI.encodeURIComponent = function (url) {
+        BI.specialCharsMap = BI.specialCharsMap || {};
+        url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
+            return BI.specialCharsMap[str] || str;
+        });
+        return window.encodeURIComponent(url);
+    };
+
+    BI.decodeURIComponent = function (url) {
+        var reserveSpecialCharsMap = {};
+        BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
+            reserveSpecialCharsMap[encodeChar] = initialChar;
+        });
+        url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
+            return reserveSpecialCharsMap[str] || str;
+        });
+        return window.decodeURIComponent(url);
+    };
+
    BI.contentFormat = function (cv, fmt) {
        if (isEmpty(cv)) {
            // 原值为空，返回空字符
@ -51641,14 +51660,12 @@ BI.Popover = BI.inherit(BI.Widget, {
        var items = {
            north: {
                el: {
-                    type: "bi.border",
+                    type: "bi.htape",
                    cls: "bi-message-title bi-background",
                    ref: function (_ref) {
                        self.dragger = _ref;
                    },
-                    items: {
-                        center: {
-                            el: {
+                    items: [{
                        type: "bi.absolute",
                        items: [{
                            el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
@ -51665,9 +51682,7 @@ BI.Popover = BI.inherit(BI.Widget, {
                            right: 0,
                            bottom: 0
                        }]
-                            }
-                        },
-                        east: {
+                    }, {
                        el: {
                            type: "bi.icon_button",
                            cls: "bi-message-close close-font",
@ -51676,9 +51691,8 @@ BI.Popover = BI.inherit(BI.Widget, {
                                self.close();
                            }
                        },
-                            width: 60
-                        }
-                    }
+                        width: 56
+                    }]
                },
                height: this._constant.HEADER_HEIGHT
            },
--- a/dist/utils.js
+++ b/dist/utils.js
@ -13136,6 +13136,25 @@ _.extend(BI.OB.prototype, {
        })(jo);
    };

+    BI.encodeURIComponent = function (url) {
+        BI.specialCharsMap = BI.specialCharsMap || {};
+        url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
+            return BI.specialCharsMap[str] || str;
+        });
+        return window.encodeURIComponent(url);
+    };
+
+    BI.decodeURIComponent = function (url) {
+        var reserveSpecialCharsMap = {};
+        BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
+            reserveSpecialCharsMap[encodeChar] = initialChar;
+        });
+        url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
+            return reserveSpecialCharsMap[str] || str;
+        });
+        return window.decodeURIComponent(url);
+    };
+
    BI.contentFormat = function (cv, fmt) {
        if (isEmpty(cv)) {
            // 原值为空，返回空字符
--- a/src/base/layer/layer.popover.js
+++ b/src/base/layer/layer.popover.js
@ -45,14 +45,12 @@ BI.Popover = BI.inherit(BI.Widget, {
        var items = {
            north: {
                el: {
-                    type: "bi.border",
+                    type: "bi.htape",
                    cls: "bi-message-title bi-background",
                    ref: function (_ref) {
                        self.dragger = _ref;
                    },
-                    items: {
-                        center: {
-                            el: {
+                    items: [{
                        type: "bi.absolute",
                        items: [{
                            el: BI.isPlainObject(o.header) ? BI.createWidget(o.header, {
@ -69,9 +67,7 @@ BI.Popover = BI.inherit(BI.Widget, {
                            right: 0,
                            bottom: 0
                        }]
-                            }
-                        },
-                        east: {
+                    }, {
                        el: {
                            type: "bi.icon_button",
                            cls: "bi-message-close close-font",
@ -80,9 +76,8 @@ BI.Popover = BI.inherit(BI.Widget, {
                                self.close();
                            }
                        },
-                            width: 60
-                        }
-                    }
+                        width: 56
+                    }]
                },
                height: this._constant.HEADER_HEIGHT
            },
--- a/src/core/alias.js
+++ b/src/core/alias.js
@ -575,6 +575,25 @@
        })(jo);
    };

+    BI.encodeURIComponent = function (url) {
+        BI.specialCharsMap = BI.specialCharsMap || {};
+        url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
+            return BI.specialCharsMap[str] || str;
+        });
+        return window.encodeURIComponent(url);
+    };
+
+    BI.decodeURIComponent = function (url) {
+        var reserveSpecialCharsMap = {};
+        BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
+            reserveSpecialCharsMap[encodeChar] = initialChar;
+        });
+        url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
+            return reserveSpecialCharsMap[str] || str;
+        });
+        return window.decodeURIComponent(url);
+    };
+
    BI.contentFormat = function (cv, fmt) {
        if (isEmpty(cv)) {
            // 原值为空，返回空字符
--- a/src/css/base/foundation/bi.css
+++ b/src/css/base/foundation/bi.css
@ -1,6 +1,8 @@
 .bi-message-title {
  font-size: 14px;
  cursor: pointer;
+  background-color: #F2F4F7;
+  color: #3d4d66;
 }
 .bi-message-text {
  font-size: 16px;
--- a/src/css/core/utils/common.css
+++ b/src/css/core/utils/common.css
@ -127,7 +127,7 @@ textarea {
  border-radius: 2px;
 }
 .bi-font-bold {
-  font-weight: 600;
+  font-weight: 700;
 }
 .bi-theme-dark .bi-border {
  border: 1px solid #3a3c53;
--- a/src/less/base/foundation/bi.message.less
+++ b/src/less/base/foundation/bi.message.less
@ -3,6 +3,8 @@
 .bi-message-title {
  font-size: 14px;
  cursor: pointer;
+  background-color: @color-bi-background-light-gray;
+  color: @color-bi-text-normal;
 }

 .bi-message-text {
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@ -148,7 +148,7 @@ textarea {
 }

 .bi-font-bold {
-  font-weight: 600;
+  font-weight: 700;
 }

 .bi-theme-dark {