Merge remote-tracking branch 'origin/master'

demo/repeat.yaml

@@ -6,9 +6,11 @@ version: 1.0
 fields:
   - field: objectype
     range: [bug,task,story]:2{3},[testcase]{2}
+    postfix: " "
 
   - field: objectid
     range: 1.0-9.0:3{2}
+    postfix: " "
 
   - field: action
     range: [create,resolve,close]{2},[create,finish,close]{10}
\ No newline at end of file

demo/test.yaml

@@ -59,11 +59,3 @@ fields:
             type: list
             range: 1-9
             loop: 2
-
-  - field: field5
-    note: 滚动字段
-    range: abc*5,123,456
-    loop: 3
-    loopfix: ","
-    prefix: "'"
-    postfix: "'"

src/action/generator.go

@@ -30,7 +30,7 @@ func Generate(deflt string, yml string, total int, fieldsToExportStr string, out
 	vari.InputDir = filepath.Dir(yml) + string(os.PathSeparator)
 	constant.Total = total
 
-	rows, colTypes := gen.GenerateForDefinition(deflt, yml, fieldsToExport, total)
+	rows, colTypes := gen.GenerateForDefinition(deflt, yml, &fieldsToExport, total)
 	content := Print(rows, format, table, colTypes, fieldsToExport)
 
 	if out != "" {

src/gen/generator.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 )
 
-func GenerateForDefinition(deflt, yml string, fieldsToExport []string, total int) ([][]string, []bool) {
-	constant.Def = LoadRootDef(deflt, yml, &fieldsToExport)
-	constant.Res = LoadResDef(fieldsToExport)
+func GenerateForDefinition(deflt, yml string, fieldsToExport *[]string, total int) ([][]string, []bool) {
+	constant.Def = LoadRootDef(deflt, yml, fieldsToExport)
+	constant.Res = LoadResDef(*fieldsToExport)
 
 	fieldNameToValues := map[string][]string{}
 
@@ -19,7 +19,7 @@ func GenerateForDefinition(deflt, yml string, fieldsToExport []string, total int
 
 	// 为每个field生成值列表
 	for index, field := range constant.Def.Fields {
-		if !stringUtils.FindInArr(field.Field, fieldsToExport) {
+		if !stringUtils.FindInArr(field.Field, *fieldsToExport) {
 			continue
 		}
 
@@ -34,7 +34,7 @@ func GenerateForDefinition(deflt, yml string, fieldsToExport []string, total int
 	rows := make([][]string, 0)
 	for i := 0; i < total; i++ {
 		for _, field := range constant.Def.Fields {
-			if !stringUtils.FindInArr(field.Field, fieldsToExport) {
+			if !stringUtils.FindInArr(field.Field, *fieldsToExport) {
 				continue
 			}
 

xdoc/build-linux.sh

 rm -rf build
 mkdir build
-mkdir build/log
-cp -r data build/
-cp -r demo build/
 
 go-bindata -o=res/res.go -pkg=res res/ res/doc
 
 GO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o build/zd-linux src/zd.go
-
-cd build
-
-cp zd-linux zd
-tar -zcvf zd-linux-1.0.tar.gz zd data demo
-rm zd
-
-cd ..
 scp build/zd-linux* aaron@172.16.13.1:/Users/aaron/testing/project/zd/build
\ No newline at end of file

xdoc/build-mac.sh

@@ -6,12 +6,4 @@ cp -r demo build/
 
 go-bindata -o=res/res.go -pkg=res res/ res/doc
 
-CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -o build/zd-mac src/zd.go
-
-cd build
-
-cp zd-mac zd
-zip -r zd-mac-1.0.zip zd data demo
-rm zd
-
-cd ..
\ No newline at end of file
+CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -o build/zd-mac src/zd.go
\ No newline at end of file