Pull request #3435: Es6

Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6

* commit '66544d73be7b643eda8d03b53b5a6763760dec99':
  update demo
  无jira 去掉grunt

demo/js/widget/selecttree/demo.multilayer_select_tree_combo.js

@@ -11,7 +11,8 @@ Demo.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         var items = BI.deepClone(Demo.CONSTANTS.TREE);
         return {
             type: "bi.horizontal_auto",
-            items: [{
+            items: [
+                {
                     type: "bi.multilayer_select_tree_combo",
                     ref: function (_ref) {
                         self.tree = _ref;
@@ -31,10 +32,11 @@ Demo.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
                     type: "bi.button",
                     text: "setVlaue (第二级文件1)",
                     handler: function () {
-                    self.tree.setValue(["第二级文件1"]);
+                        self.tree.setValue(["11"]);
                     },
                     width: 300
-            }],
+                }
+            ],
             vgap: 20
         };
     }

demo/js/widget/selecttree/demo.select_tree_combo.js

@@ -11,7 +11,8 @@ Demo.SelectTreeCombo = BI.inherit(BI.Widget, {
         var items = BI.deepClone(Demo.CONSTANTS.LEVELTREE);
         return {
             type: "bi.horizontal_auto",
-            items: [{
+            items: [
+                {
                     type: "bi.select_tree_combo",
                     ref: function (_ref) {
                         self.tree = _ref;
@@ -29,12 +30,13 @@ Demo.SelectTreeCombo = BI.inherit(BI.Widget, {
                     width: 300
                 }, {
                     type: "bi.button",
-                text: "setVlaue (第二级文件1)",
+                    text: "setVlaue (11)",
                     handler: function () {
                         self.tree.setValue(["2"]);
                     },
                     width: 300
-            }],
+                }
+            ],
             vgap: 20
         };
     }

demo/js/widget/singletree/demo.multilayer_single_tree_combo.js

@@ -11,7 +11,8 @@ Demo.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
         var items = BI.deepClone(Demo.CONSTANTS.TREE);
         return {
             type: "bi.horizontal_auto",
-            items: [{
+            items: [
+                {
                     type: "bi.multilayer_single_tree_combo",
                     ref: function (_ref) {
                         self.tree = _ref;
@@ -25,15 +26,16 @@ Demo.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                     handler: function () {
                         BI.Msg.toast(self.tree.getValue()[0]);
                     },
-                width: 300
+                    width: 300,
                 }, {
                     type: "bi.button",
-                text: "setVlaue (第二级文件1)",
+                    text: "setVlaue (11)",
                     handler: function () {
-                    self.tree.setValue(["第二级文件1"]);
+                        self.tree.setValue(["11"]);
                     },
                     width: 300
-            }],
+                }
+            ],
             vgap: 20
         };
     }

lib/postbuild/postbuild.js

@@ -1,9 +1,9 @@
 const { resolve } = require("path");
 const { existsSync, mkdirSync, readFileSync, writeFileSync } = require("fs");
 const rimraf = require("rimraf");
-const grunt = require("grunt");
 const concat = require("concat");
-const { config } = require("../../webpack/attachments")
+const glob = require("glob");
+const { config } = require("../../webpack/attachments");
 
 const dest = resolve(__dirname, '../../dist');
 
@@ -25,10 +25,7 @@ const deleteList = [
     "2.0/fineui_without_normalize.min.js.map",
     "fineui_without_normalize.min.js",
     "fineui_without_normalize.min.js.map",
-].concat(grunt.file.expand({}, [
-    "dist/*.css.map",
-    "dist/**/*.css.map",
-]).map(name => name.replace("dist/", "")));
+].concat(glob.sync("dist/**/*.css.map").map(name => name.replace("dist/", "")));
 
 deleteList.forEach(filename => {
     const sourcefile = resolve(dest, `./${filename}`);

package.json

@@ -30,7 +30,6 @@
     "express": "4.15.2",
     "fork-ts-checker-webpack-plugin": "1.4.3",
     "glob": "^7.2.0",
-    "grunt": "^1.0.1",
     "html-webpack-plugin": "3.2.0",
     "husky": "^3.1.0",
     "karma": "3.1.4",