fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #831 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit 'c1fadcd504667bef4dae44444a21b3f677578529':
  update
  无JIRA任务 FR那边的htmlEncode和htmlDecode写的不对
es6
windy 6 years ago
parent
e31beacb7d c1fadcd504
commit
fd5613da6d
14 changed files with 425 additions and 178 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      dist/bundle.ie.js
  2. 72
      dist/bundle.ie.min.js
  3. 36
      dist/bundle.js
  4. 72
      dist/bundle.min.js
  5. 36
      dist/core.js
  6. 25
      dist/demo.js
  7. 36
      dist/fineui.ie.js
  8. 70
      dist/fineui.ie.min.js
  9. 36
      dist/fineui.js
  10. 72
      dist/fineui.min.js
  11. 36
      dist/fineui_without_jquery_polyfill.js
  12. 36
      dist/utils.js
  13. 4
      dist/utils.min.js
  14. 36
      src/core/alias.js

36
dist/bundle.ie.js vendored
Unescape View File

@ -15903,11 +15903,39 @@ BI.ShowAction = BI.inherit(BI.Action, {
// replace the html special tags
BI.htmlEncode = function (text) {
return (text == null) ? "" : String(text).replace(/&/g, "&amp;").replace(/\"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\s/g, "&nbsp;");
return text === null ? "" : BI.replaceAll(text + "", "&|\"|<|>|\\s", function (v) {
switch (v) {
case "&":
return "&amp;";
case "\"":
return "&quot;";
case "<":
return "&lt;";
case ">":
return "&gt;";
case " ":
default:
return "&nbsp;";
}
});
};
// html decode
BI.htmlDecode = function (text) {
return (text == null) ? "" : String(text).replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&nbsp;/g, " ");
return text === null ? "" : BI.replaceAll(text + "", "&amp;|&quot;|&lt;|&gt;|&nbsp;", function (v) {
switch (v) {
case "&amp;":
return "&";
case "&quot;":
return "\"";
case "&lt;":
return "<";
case "&gt;":
return ">";
case "&nbsp;":
default:
return " ";
}
});
};
BI.cjkEncodeDO = function (o) {
@ -16079,7 +16107,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = BI.replaceAll(url, BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
@ -16096,7 +16124,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = BI.replaceAll(url, BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return _global.decodeURIComponent(url);

72
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

36
dist/bundle.js vendored
Unescape View File

@ -15903,11 +15903,39 @@ BI.ShowAction = BI.inherit(BI.Action, {
// replace the html special tags
BI.htmlEncode = function (text) {
return (text == null) ? "" : String(text).replace(/&/g, "&amp;").replace(/\"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\s/g, "&nbsp;");
return text === null ? "" : BI.replaceAll(text + "", "&|\"|<|>|\\s", function (v) {
switch (v) {
case "&":
return "&amp;";
case "\"":
return "&quot;";
case "<":
return "&lt;";
case ">":
return "&gt;";
case " ":
default:
return "&nbsp;";
}
});
};
// html decode
BI.htmlDecode = function (text) {
return (text == null) ? "" : String(text).replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&nbsp;/g, " ");
return text === null ? "" : BI.replaceAll(text + "", "&amp;|&quot;|&lt;|&gt;|&nbsp;", function (v) {
switch (v) {
case "&amp;":
return "&";
case "&quot;":
return "\"";
case "&lt;":
return "<";
case "&gt;":
return ">";
case "&nbsp;":
default:
return " ";
}
});
};
BI.cjkEncodeDO = function (o) {
@ -16079,7 +16107,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = BI.replaceAll(url, BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
@ -16096,7 +16124,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = BI.replaceAll(url, BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return _global.decodeURIComponent(url);

72
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

36
dist/core.js vendored
Unescape View File

@ -15903,11 +15903,39 @@ BI.ShowAction = BI.inherit(BI.Action, {
// replace the html special tags
BI.htmlEncode = function (text) {
return (text == null) ? "" : String(text).replace(/&/g, "&amp;").replace(/\"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\s/g, "&nbsp;");
return text === null ? "" : BI.replaceAll(text + "", "&|\"|<|>|\\s", function (v) {
switch (v) {
case "&":
return "&amp;";
case "\"":
return "&quot;";
case "<":
return "&lt;";
case ">":
return "&gt;";
case " ":
default:
return "&nbsp;";
}
});
};
// html decode
BI.htmlDecode = function (text) {
return (text == null) ? "" : String(text).replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&nbsp;/g, " ");
return text === null ? "" : BI.replaceAll(text + "", "&amp;|&quot;|&lt;|&gt;|&nbsp;", function (v) {
switch (v) {
case "&amp;":
return "&";
case "&quot;":
return "\"";
case "&lt;":
return "<";
case "&gt;":
return ">";
case "&nbsp;":
default:
return " ";
}
});
};
BI.cjkEncodeDO = function (o) {
@ -16079,7 +16107,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = BI.replaceAll(url, BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
@ -16096,7 +16124,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = BI.replaceAll(url, BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return _global.decodeURIComponent(url);

25
dist/demo.js vendored
Unescape View File

@ -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, {

36
dist/fineui.ie.js vendored
Unescape View File

@ -16148,11 +16148,39 @@ BI.ShowAction = BI.inherit(BI.Action, {
// replace the html special tags
BI.htmlEncode = function (text) {
return (text == null) ? "" : String(text).replace(/&/g, "&amp;").replace(/\"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\s/g, "&nbsp;");
return text === null ? "" : BI.replaceAll(text + "", "&|\"|<|>|\\s", function (v) {
switch (v) {
case "&":
return "&amp;";
case "\"":
return "&quot;";
case "<":
return "&lt;";
case ">":
return "&gt;";
case " ":
default:
return "&nbsp;";
}
});
};
// html decode
BI.htmlDecode = function (text) {
return (text == null) ? "" : String(text).replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&nbsp;/g, " ");
return text === null ? "" : BI.replaceAll(text + "", "&amp;|&quot;|&lt;|&gt;|&nbsp;", function (v) {
switch (v) {
case "&amp;":
return "&";
case "&quot;":
return "\"";
case "&lt;":
return "<";
case "&gt;":
return ">";
case "&nbsp;":
default:
return " ";
}
});
};
BI.cjkEncodeDO = function (o) {
@ -16324,7 +16352,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = BI.replaceAll(url, BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
@ -16341,7 +16369,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = BI.replaceAll(url, BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return _global.decodeURIComponent(url);

70
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

36
dist/fineui.js vendored
Unescape View File

@ -16148,11 +16148,39 @@ BI.ShowAction = BI.inherit(BI.Action, {
// replace the html special tags
BI.htmlEncode = function (text) {
return (text == null) ? "" : String(text).replace(/&/g, "&amp;").replace(/\"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\s/g, "&nbsp;");
return text === null ? "" : BI.replaceAll(text + "", "&|\"|<|>|\\s", function (v) {
switch (v) {
case "&":
return "&amp;";
case "\"":
return "&quot;";
case "<":
return "&lt;";
case ">":
return "&gt;";
case " ":
default:
return "&nbsp;";
}
});
};
// html decode
BI.htmlDecode = function (text) {
return (text == null) ? "" : String(text).replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&nbsp;/g, " ");
return text === null ? "" : BI.replaceAll(text + "", "&amp;|&quot;|&lt;|&gt;|&nbsp;", function (v) {
switch (v) {
case "&amp;":
return "&";
case "&quot;":
return "\"";
case "&lt;":
return "<";
case "&gt;":
return ">";
case "&nbsp;":
default:
return " ";
}
});
};
BI.cjkEncodeDO = function (o) {
@ -16324,7 +16352,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = BI.replaceAll(url, BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
@ -16341,7 +16369,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = BI.replaceAll(url, BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return _global.decodeURIComponent(url);

72
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

36
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -15649,11 +15649,39 @@ BI.ShowAction = BI.inherit(BI.Action, {
// replace the html special tags
BI.htmlEncode = function (text) {
return (text == null) ? "" : String(text).replace(/&/g, "&amp;").replace(/\"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\s/g, "&nbsp;");
return text === null ? "" : BI.replaceAll(text + "", "&|\"|<|>|\\s", function (v) {
switch (v) {
case "&":
return "&amp;";
case "\"":
return "&quot;";
case "<":
return "&lt;";
case ">":
return "&gt;";
case " ":
default:
return "&nbsp;";
}
});
};
// html decode
BI.htmlDecode = function (text) {
return (text == null) ? "" : String(text).replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&nbsp;/g, " ");
return text === null ? "" : BI.replaceAll(text + "", "&amp;|&quot;|&lt;|&gt;|&nbsp;", function (v) {
switch (v) {
case "&amp;":
return "&";
case "&quot;":
return "\"";
case "&lt;":
return "<";
case "&gt;":
return ">";
case "&nbsp;":
default:
return " ";
}
});
};
BI.cjkEncodeDO = function (o) {
@ -15825,7 +15853,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = BI.replaceAll(url, BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
@ -15842,7 +15870,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = BI.replaceAll(url, BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return _global.decodeURIComponent(url);

36
dist/utils.js vendored
Unescape View File

@ -12908,11 +12908,39 @@ if (!_global.BI) {
// replace the html special tags
BI.htmlEncode = function (text) {
return (text == null) ? "" : String(text).replace(/&/g, "&amp;").replace(/\"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\s/g, "&nbsp;");
return text === null ? "" : BI.replaceAll(text + "", "&|\"|<|>|\\s", function (v) {
switch (v) {
case "&":
return "&amp;";
case "\"":
return "&quot;";
case "<":
return "&lt;";
case ">":
return "&gt;";
case " ":
default:
return "&nbsp;";
}
});
};
// html decode
BI.htmlDecode = function (text) {
return (text == null) ? "" : String(text).replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&nbsp;/g, " ");
return text === null ? "" : BI.replaceAll(text + "", "&amp;|&quot;|&lt;|&gt;|&nbsp;", function (v) {
switch (v) {
case "&amp;":
return "&";
case "&quot;":
return "\"";
case "&lt;":
return "<";
case "&gt;":
return ">";
case "&nbsp;":
default:
return " ";
}
});
};
BI.cjkEncodeDO = function (o) {
@ -13084,7 +13112,7 @@ if (!_global.BI) {
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = BI.replaceAll(url, BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
@ -13101,7 +13129,7 @@ if (!_global.BI) {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = BI.replaceAll(url, BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return _global.decodeURIComponent(url);

4
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

36
src/core/alias.js
Unescape View File

@ -412,11 +412,39 @@
// replace the html special tags
BI.htmlEncode = function (text) {
return (text == null) ? "" : String(text).replace(/&/g, "&amp;").replace(/\"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\s/g, "&nbsp;");
return text === null ? "" : BI.replaceAll(text + "", "&|\"|<|>|\\s", function (v) {
switch (v) {
case "&":
return "&amp;";
case "\"":
return "&quot;";
case "<":
return "&lt;";
case ">":
return "&gt;";
case " ":
default:
return "&nbsp;";
}
});
};
// html decode
BI.htmlDecode = function (text) {
return (text == null) ? "" : String(text).replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&nbsp;/g, " ");
return text === null ? "" : BI.replaceAll(text + "", "&amp;|&quot;|&lt;|&gt;|&nbsp;", function (v) {
switch (v) {
case "&amp;":
return "&";
case "&quot;":
return "\"";
case "&lt;":
return "<";
case "&gt;":
return ">";
case "&nbsp;":
default:
return " ";
}
});
};
BI.cjkEncodeDO = function (o) {
@ -588,7 +616,7 @@
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = BI.replaceAll(url, BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
@ -605,7 +633,7 @@
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = BI.replaceAll(url, BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
url = BI.replaceAll(url + "", BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
return _global.decodeURIComponent(url);

Write Preview
Loading…
Cancel
Save