fix: use trigger instead function for form description

deepexi · Oct 10, 2019 · 5e4ce88 · 5e4ce88
1 parent 4077169
commit 5e4ce88
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 28 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const path = require('path');
+const Trigger = require('yo-power-generator').Trigger;
 
 const obj = {
   groupId: {
@@ -54,9 +55,9 @@ const obj = {
         },
         option: { desc: '数据库连接池', type: String, default: 'none' },
         callbacks: {
-          trigger (answers) {
-            return answers.db === 'mysql';
-          }
+          trigger: [
+            new Trigger.AnyAnswerTrigger('db', 'mysql')
+          ]
         }
       },
       orm: {
@@ -71,9 +72,9 @@ const obj = {
         },
         option: { desc: 'ORM框架', type: String, default: 'none' },
         callbacks: {
-          trigger (answers) {
-            return answers.db === 'mysql';
-          }
+          trigger: [
+            new Trigger.AnyAnswerTrigger('db', 'mysql')
+          ]
         }
       }
     }
@@ -102,9 +103,9 @@ const obj = {
         },
         option: { desc: 'feign熔断降级', type: String, default: 'hystrix' },
         callbacks: {
-          trigger (answers) {
-            return answers.discovery === 'eureka';
-          }
+          trigger: [
+            new Trigger.AnyAnswerTrigger('discovery', 'eureka')
+          ]
         }
       }
     }
@@ -147,9 +148,9 @@ const obj = {
         prompting: { type: 'input', default: 'deepexi', message: '请填写你的jwt issue' },
         option: { desc: 'jwt issue', type: String, default: 'deepexi' },
         callbacks: {
-          trigger (answers) {
-            return answers.authentication === 'jwt';
-          }
+          trigger: [
+            new Trigger.AnyAnswerTrigger('authentication', 'jwt')
+          ]
         }
       },
       security: {
@@ -163,9 +164,9 @@ const obj = {
         },
         option: { desc: '认证框架', type: String, default: 'shiro' },
         callbacks: {
-          trigger (answers) {
-            return answers.authentication !== 'none';
-          }
+          trigger: [
+            new Trigger.NoAnyAnswerTrigger('authentication', 'none')
+          ]
         }
       }
     }
@@ -180,19 +181,30 @@ const obj = {
       ],
       message: '请选择你使用的缓存类型'
     },
-    option: { desc: '缓存', type: String, default: 'none' },
-    child: {
-      // redisAddress: {
-      //   prompting: { type: 'input', default: '127.0.0.1:6379', message: '请填写你的redis地址' },
-      //   option: { desc: 'redis地址', type: String, default: '127.0.0.1:6379' },
-      //   callbacks: {
-      //     trigger (answers) {
-      //       return answers.cache === 'redis';
-      //     }
-      //   }
-      // }
-    }
+    option: { desc: '缓存', type: String, default: 'none' }
+    // child: {
+    //   redisAddress: {
+    //     prompting: { type: 'input', default: '127.0.0.1:6379', message: '请填写你的redis地址' },
+    //     option: { desc: 'redis地址', type: String, default: '127.0.0.1:6379' },
+    //     callbacks: {
+    //       trigger: [
+    //         new Trigger.AnyAnswerTrigger('cache', 'redis')
+    //       ]
+    //     }
+    //   }
+    // }
   },
+  // log: {
+  //   prompting: {
+  //     type: 'list',
+  //     choices: [
+  //       'logback',
+  //       'log4j2'
+  //     ],
+  //     message: '请选择你使用的日志框架类型'
+  //   },
+  //   option: { desc: '日志框架', type: String, default: 'logback' }
+  // },
   demo: {
     prompting: {
       type: 'confirm',

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "prettify-xml": "^1.2.0",
     "xml": "^1.0.1",
     "yeoman-generator": "^1.1.1",
-    "yo-power-generator": "^0.5.1"
+    "yo-power-generator": "^0.6.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^8.0.0",