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

* commit '6238047ebb27241da5f73469d6a8fdacaae42f08':
  update
  update
  update
  无JIRA任务 Utils的单元测试搞一下

.gitignore

@@ -3,3 +3,4 @@ node_modules/
 #demo.js
 #demo.css
 .DS_Store
+coverage

demo/js/widget/multitree/demo.multi_tree_list.js

@@ -37,7 +37,7 @@ Demo.MultiTreeCombo = BI.inherit(BI.Widget, {
                                 break;
                         }
                         callback({
-                            items: items
+                            items: BI.deepClone(items)
                         });
                     },
                     width: 300,

dist/base.js

@@ -1974,7 +1974,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
             if (BI.isKey(o.paras.keyword)) {
                 n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html();
             } else {
-                n.text = BI.replaceAll((n.text + ""), " ", "&nbsp;");
+                n.text = BI.htmlEncode(n.text + "");
             }
         });
         return nodes;

dist/bundle.ie.js

@@ -37098,7 +37098,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
             if (BI.isKey(o.paras.keyword)) {
                 n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html();
             } else {
-                n.text = BI.replaceAll((n.text + ""), " ", "&nbsp;");
+                n.text = BI.htmlEncode(n.text + "");
             }
         });
         return nodes;

dist/bundle.js

@@ -37502,7 +37502,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
             if (BI.isKey(o.paras.keyword)) {
                 n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html();
             } else {
-                n.text = BI.replaceAll((n.text + ""), " ", "&nbsp;");
+                n.text = BI.htmlEncode(n.text + "");
             }
         });
         return nodes;

dist/demo.js

@@ -10941,7 +10941,7 @@ Demo.MultiTreeCombo = BI.inherit(BI.Widget, {
                                 break;
                         }
                         callback({
-                            items: items
+                            items: BI.deepClone(items)
                         });
                     },
                     width: 300,

dist/fineui.ie.js

@@ -37343,7 +37343,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
             if (BI.isKey(o.paras.keyword)) {
                 n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html();
             } else {
-                n.text = BI.replaceAll((n.text + ""), " ", "&nbsp;");
+                n.text = BI.htmlEncode(n.text + "");
             }
         });
         return nodes;

dist/fineui.js

@@ -37747,7 +37747,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
             if (BI.isKey(o.paras.keyword)) {
                 n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html();
             } else {
-                n.text = BI.replaceAll((n.text + ""), " ", "&nbsp;");
+                n.text = BI.htmlEncode(n.text + "");
             }
         });
         return nodes;

karma.conf.js

@@ -0,0 +1,99 @@
+// Karma configuration
+// Generated on Mon Nov 27 2017 11:16:26 GMT+0800 (中国标准时间)
+module.exports = function (config) {
+    config.set({
+
+        // base path that will be used to resolve all patterns (eg. files, exclude)
+        basePath: "",
+
+
+        // frameworks to use
+        // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+        frameworks: ["mocha", "chai"],
+
+
+        // list of files / patterns to load in the browser
+        files: [
+            "src/core/foundation.js",
+            "src/core/lodash.js",
+            "src/core/base.js",
+            "src/core/ob.js",
+            "src/core/widget.js",
+            "src/core/shortcut.js",
+            "src/core/utils/**/*.js",
+            "src/core/behavior/behavior.js",
+            "src/core/wrapper/layout.js",
+            "src/core/plugin.js",
+            "src/core/**/*.js",
+            "src/data/**/*.js",
+            "src/**/*.test.js",
+            "test/**/*.test.js"
+        ],
+
+
+        // preprocess matching files before serving them to the browser
+        // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+        preprocessors: {
+            "src/core/alias.js": "coverage",
+            "src/core/base.js": "coverage"
+        },
+
+
+        // test results reporter to use
+        // possible values: 'dots', 'progress'
+        // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+        reporters: ["progress", "coverage"],
+
+        coverageReporter: {
+            // specify a common output directory
+            dir: "coverage/",
+            reporters: [
+                // reporters not supporting the `file` property
+                { type: "html", subdir: "report-html" },
+                { type: "json-summary", subdir: "report-json-summary" }
+            ]
+        },
+
+
+        // web server port
+        port: 9878,
+
+
+        // enable / disable colors in the output (reporters and logs)
+        colors: true,
+
+
+        // level of logging
+        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+        logLevel: config.LOG_INFO,
+
+
+        // enable / disable watching file and executing tests whenever any file changes
+        autoWatch: true,
+
+
+        // start these browsers
+        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+        // browsers: [isJenkins ? "Chrome" : "ChromeHeadless"],
+        browsers: ["Chrome"],
+
+        retryLimit: 30,
+
+        captureTimeout: 30000,
+
+        // Continuous Integration mode
+        // if true, Karma captures browsers, runs the tests and exits
+        singleRun: true,
+
+        // Concurrency level
+        // how many browser should be started simultaneous
+        concurrency: Infinity,
+
+        plugins: [
+            "karma-mocha",
+            "karma-chai",
+            "karma-chrome-launcher",
+            "karma-coverage"
+        ]
+    });
+};

package.json

@@ -5,6 +5,7 @@
   "main": "index.js",
   "dependencies": {},
   "devDependencies": {
+    "chai": "^4.2.0",
     "express": "^4.15.2",
     "grunt": "^1.0.1",
     "grunt-contrib-clean": "^1.1.0",
@@ -16,6 +17,12 @@
     "grunt-contrib-less": "^1.4.1",
     "grunt-contrib-uglify": "^1.0.1",
     "grunt-contrib-watch": "^1.0.0",
+    "karma": "^3.1.4",
+    "karma-chai": "^0.1.0",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.2",
+    "karma-mocha": "^1.3.0",
+    "mocha": "^5.2.0",
     "open": "0.0.5"
   },
   "scripts": {
@@ -23,7 +30,8 @@
     "start": "node server.js",
     "build": "grunt build",
     "compile": "grunt compile",
-    "fake": "grunt fake-build"
+    "fake": "grunt fake-build",
+    "test": "karma start"
   },
   "repository": {
     "type": "git",

src/base/tree/ztree/treeview.js

@@ -323,7 +323,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
             if (BI.isKey(o.paras.keyword)) {
                 n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html();
             } else {
-                n.text = BI.replaceAll((n.text + ""), " ", "&nbsp;");
+                n.text = BI.htmlEncode(n.text + "");
             }
         });
         return nodes;

test/utils/alias.test.js

@@ -0,0 +1,16 @@
+/**
+ * Created by windy on 2018/01/23.
+ */
+describe("aliasFunctionTest", function () {
+
+    /**
+     * test_author_windy
+     */
+    it("htmlEncode和htmlDecode", function () {
+
+        var targetString = "<a>1 2&</a>";
+        var encodeString = BI.htmlEncode(targetString);
+        expect(encodeString).to.equal("&lt;a&gt;1&nbsp;2&amp;&lt;/a&gt;");
+        expect(BI.htmlDecode(encodeString)).to.equal(targetString);
+    });
+});