jjb-cmd 1.0.10 → 1.0.11

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "jjb-cmd",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "jjb脚手架工具",
   "main": "index.js",
   "scripts": {
-    "test": "node bin/command.js help",
-    "publish": "npm publish"
+    "test": "node bin/command.js help"
   },
   "bin": {
     "jjb-cmd": "bin/command.js"

package/src/cli.merge.js

@@ -28,27 +28,34 @@ module.exports = (input, source) => {
   const settingJson = JSON.parse(fs.readFileSync(`${projectPath}/${inputRegion}/setting.json`).toString());
   TileItems(settingJson.items, () => {
 
-    fromFileData.router.forEach(fromItem => {
-      const itemPathArr = fromItem.pathAdr.split(fromItem.region);
-      const filePathArr = itemPathArr[1].split('/');
-      const application = filePathArr[1];
-      if (!applicationJson[application]) {
-        applicationJson[application] = {
-          routerConfig: [],
-          routerPath: []
-        };
-      }
-      applicationJson[application].routerConfig.push(`{ path: '${fromItem.path}', component: () => import('${fromItem.file}') }`);
-      applicationJson[application].routerPath.push(fromItem.path);
+    Object.keys(fromFileData).forEach(fileKey => {
+      fromFileData[fileKey].forEach(fromItem => {
+        const itemPathArr = fromItem.pathAdr.split(fromItem.region);
+        const filePathArr = itemPathArr[1].split('/');
+        const application = filePathArr[1];
+        if (!applicationJson[application]) {
+          applicationJson[application] = {
+            routerConfig: [],
+            routerPath: []
+          };
+        }
+        applicationJson[application].routerConfig.push(`{ path: '${fromItem.path}', component: () => import('${fromItem.file}') }`);
+        applicationJson[application].routerPath.push(fromItem.path);
 
-      let applicationStr = filePathArr.join('/');
+        let applicationStr = filePathArr.join('/');
 
-      const strArr = applicationStr.split('/');
-      utils.CreatePaths(applicationPath, strArr.slice(0, strArr.length - 1)).then(() => {
-        const fileContent = fs.readFileSync(fromItem.pathAdr).toString();
-        fs.writeFileSync(`${vesselPath}/${applicationStr}`, fileContent);
-      });
+        const strArr = applicationStr.split('/');
+        utils.CreatePaths(applicationPath, strArr.slice(0, strArr.length - 1)).then(() => {
+          if (fromItem.pathAdr.match(/(.png|.svg)/) != null) {
+            const imageFile = fs.readFileSync(fromItem.pathAdr, 'binary');
+            fs.writeFileSync(`${applicationPath}/${applicationStr}`, imageFile, 'binary');
+          } else {
+            const fileContent = fs.readFileSync(fromItem.pathAdr).toString();
+            fs.writeFileSync(`${applicationPath}/${applicationStr}`, fileContent);
+          }
+        });
 
+      });
     });
 
   });

package/src/cli.pull.js

@@ -60,7 +60,7 @@ module.exports = input => {
                               let commonToolsFile = fs.readFileSync(commonToolsPath).toString();
                               let commonWebsiteFile = fs.readFileSync(commonWebsitePath).toString();
                               commonToolsFile = commonToolsFile.replace('return __planA();', 'return process.env;');
-                              commonWebsiteFile = commonWebsiteFile.replace(/const\srelation\s=\srequire\(`\/src\/application\/\${module.code}\/enumerate\/menu`\)\.default;/, 'const relation = require(`/src/enumerate/menu`).default;');
+                              commonWebsiteFile = commonWebsiteFile.replace(/const\srelation\s=\srequire\(`~\/application\/\${module.code}\/enumerate\/menu`\)\.default;/, "const relation = require('~/enumerate/menu').default;");
                               fs.writeFileSync(commonToolsPath, commonToolsFile);
                               fs.writeFileSync(commonWebsitePath, commonWebsiteFile);
                             } else {