Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6

packages/fineui/package.json

@@ -21,7 +21,9 @@
         "dist/es/case/ztree/jquery.ztree.excheck-3.5.js"
     ],
     "scripts": {
-        "dev": "tsc && babel src -d dist/es --config-file ./esm.babel.js -w",
+        "dev": "tsc && run-p dev:*",
+        "dev:es": "babel src -d dist/es --config-file ./esm.babel.js -w",
+        "dev:fineui": "webpack-dev-server --progress --config=webpack/webpack.dev.js",
         "build": "tsc && run-p build:*",
         "build:es": "babel src -d dist/es --config-file ./esm.babel.js",
         "build:fineui": "webpack --progress --config=webpack/webpack.prod.js"

packages/fineui/src/core/func/array.js

@@ -7,7 +7,7 @@ export function pushArray(sArray, array) {
 }
 
 export function pushDistinct(sArray, obj) {
-    if (sArray.indexOf(obj) !== -1) {
+    if (sArray.indexOf(obj) === -1) {
         sArray.push(obj);
     }
 }

packages/fineui/src/fix/fix.js

@@ -635,7 +635,7 @@ const Observer = (function() {
 
 function protoAugment(target, src, keys) {
     /* eslint-disable no-proto */
-    target.__proto__ = src;
+    Object.setPrototypeOf(target, src);
     /* eslint-enable no-proto */
 }