diff --git a/demo/repeat.yaml b/demo/repeat.yaml index 0c73373961fbaa202058db1a9183ec101e4b65fe..a7610dc01df58e74f5faefa97485bc3ec8c897f2 100644 --- a/demo/repeat.yaml +++ b/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 diff --git a/demo/test.yaml b/demo/test.yaml index f6861e6f6e85a2e4b315cda2a536440a12f22a81..c3d8d2849a0c3d7c3428226e358b3bc8e85e768a 100644 --- a/demo/test.yaml +++ b/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: "'" diff --git a/src/action/generator.go b/src/action/generator.go index 26e1e471c3ab03fccc2490333d67e4f64b0514bc..82290cbdb48f868db85196a9e7d4268964967071 100644 --- a/src/action/generator.go +++ b/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 != "" { diff --git a/src/gen/generator.go b/src/gen/generator.go index 042b63846a76b8a16a37607f42b614c22e329a9b..5630db34bea48c965a9e0c4d259df46702768393 100644 --- a/src/gen/generator.go +++ b/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 } diff --git a/xdoc/build-linux.sh b/xdoc/build-linux.sh index 8fb082c311ed24a8e26da61e6435a1ae6ad9ddd8..039ae3b770e484b097f2ba24264bfa20c7c69ef8 100755 --- a/xdoc/build-linux.sh +++ b/xdoc/build-linux.sh @@ -1,18 +1,7 @@ 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 diff --git a/xdoc/build-mac.sh b/xdoc/build-mac.sh index 3fae35f40d6a9500feb09807c8c80405eb4a4d5b..f0b8d84a26a4e8b58113958b0eea5781131daa07 100755 --- a/xdoc/build-mac.sh +++ b/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