判断表达式 handlebars 写法

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/CliOption.java

@@ -46,7 +46,7 @@ public class CliOption extends DataObj
         this.set(templateFileType.name(),baseData);
         this.set(templateFileType.value(),path);
         if(!StringUtils.isEmpty(this.cliSubType))
-            this.set(templateFileType.value()+"__"+this.cliSubType,path);
+            this.set(templateFileType.value()+"@"+this.cliSubType,path);
         return this;
     }
 
@@ -104,4 +104,8 @@ public class CliOption extends DataObj
     }
 
 
+    @Override
+    public int size() {
+        return super.size();
+    }
 }

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/templating/TemplateDefinition.java

@@ -55,7 +55,7 @@ public class TemplateDefinition {
             Pattern p = Pattern.compile("\\{\\{([^}]*)\\}\\}");
             Matcher m = p.matcher(fileName);
             while (m.find()) {
-                String[] pairs=m.group(1).split("__");
+                String[] pairs=m.group(1).split("@");
                 if(type.name().equalsIgnoreCase(pairs[0])
                         ||type.value().equalsIgnoreCase(pairs[0])) {
                     if(pairs.length>1&&(!StringUtils.isEmpty(pairs[1])))

modules/ibizlab-generator-core/src/main/resources/templ/r7/.def/README.md

-预定义代码片段模板目录
-其余模板文件引用时可以使用 {{>././.def/pub.txt}} 方式引用，支持相对路径
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/.def/pub.txt

-{{projectName}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/.ibizlab-generator-ignore

 **.ibizlab-generator-ignore
 **.DS_Store
-**.def/**
+**@macro/**
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/README.md

+预定义代码片段模板目录
+其余模板文件引用时可以使用 {{> @macro/pub.txt}} 方式引用，支持相对路径
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/pub.txt

+子模板 {{projectName}}
+
+123
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/page/{{appModules}}/{{pages}}/{{pages__DEEDITVIEW}}.vue → modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/page/{{appModules}}/{{pages}}/{{pages@DEEDITVIEW}}.vue

-edit
+edit@
 
 {{page.codeName}}--{{page.appModule}}
 

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/page/{{appModules}}/{{pages}}/{{pages__DEGRIDVIEW}}.vue → modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/page/{{appModules}}/{{pages}}/{{pages@DEGRIDVIEW}}.vue

-grid
+grid@
 
 {{page.codeName}}--{{page.appModule}}
 

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/service/{{appEntities}}/{{appEntities}}-service.ts

@@ -20,7 +20,7 @@
 {{/eq}}
  
 
-
+目前支持的判断有   eq 等于, neq 不等于, gt 大于, gte 大于等于, lt 小于 , lte 小于等于
 
 {{#appEntity.ctrls}}
 

modules/ibizlab-generator-core/src/main/resources/templ/r7/pom.xml

@@ -15,8 +15,7 @@
         <artifactId>{{projectName}}-dependencies</artifactId>
         <version>1.0.0.0</version>
         <relativePath>{{projectName}}-dependencies/pom.xml</relativePath>
-    </parent>
-
+    </parent> 
     <modules>
         <!-- dependencies -->
         <module>{{projectName}}-dependencies</module>