owl-cli 6.211.0 → 6.213.0

package/bin/owl.js

@@ -4,7 +4,7 @@ const {lstatSync, readdirSync} = require('fs')
 const fs = require('fs')
 const {join, resolve,dirname,basename} = require('path')
 const {getFormSpecs, flattenFormSpecs} = require('./dsl')
-const {genTableSql} = require('./table_mysql.js');  
+const {genTableSql} = require('./table_mysql.js');
 const template = require('art-template')
 const path = require('path');
 
@@ -294,56 +294,72 @@ function processInputDir(dir, outdir, templatePath, buildType, project) {
     })
 }
 
+function main(){
+    var pjson = require(join(__dirname, "../package.json"));
+    var version = (pjson.version);
+    console.log("owl version:" + version );
 
-var pjson = require(join(__dirname, "../package.json"));
-var version = (pjson.version);
-console.log("owl version:" + version );
+    var configFile = resolve(cwd,"owlconfig.json");
+    // if (process.argv.length > 2) {
+    //     configFile = resolve(cwd, process.argv[2]);
+    // }
 
-var configFile = resolve(cwd,"owlconfig.json");
-if (process.argv.length > 2) {
-    configFile = resolve(cwd, process.argv[2]);
-}
 
+    var content = fs.readFileSync(configFile, {encoding: 'utf-8'})
+    var owlconfig = JSON.parse(content)
+    var inPath = owlconfig.models;
+    var outPath = owlconfig.generatedApps
+    var templatePath = owlconfig.templates
+    var buildType = owlconfig.buildType;
+    var project = owlconfig.project;
+    buildProperties = resolve(cwd,owlconfig.buildProperties);
+    libpath = resolve(cwd,owlconfig.libpath);
+    templatePath = resolve(cwd, templatePath);
+    var fulloutPath = resolve(cwd,outPath);
 
-var content = fs.readFileSync(configFile, {encoding: 'utf-8'})
-var owlconfig = JSON.parse(content)
-var inPath = owlconfig.models;
-var outPath = owlconfig.generatedApps
-var templatePath = owlconfig.templates
-var buildType = owlconfig.buildType;
-var project = owlconfig.project;
-buildProperties = resolve(cwd,owlconfig.buildProperties);
-libpath = resolve(cwd,owlconfig.libpath);
-templatePath = resolve(cwd, templatePath);
-var fulloutPath = resolve(cwd,outPath);
+    console.log("after read config");
 
-mkdir(fulloutPath);
+    console.log("inPath=",inPath);
+    console.log("outPath=",outPath);
+    console.log("templatePath=",templatePath);
+    console.log("buildType=",buildType);
+    console.log("project=",project);
+    console.log("fulloutPath",fulloutPath);
 
+    mkdir(fulloutPath);
 
 
-var inputPattern = null;
-if(process.argv.length>2){
-    inputPattern = process.argv[2];
-    console.log("compiling" + inputPattern);
-}
 
-if(inputPattern){
-   if(isDirectory(inputPattern)){
-       let inDir = resolve(inPath,inputPattern);
-       let outDir = resolve(fulloutPath,inputPattern);
-       processInputDir(inDir, outDir, templatePath, buildType,project);
-       return;
-   }
-   else if (inputPattern.indexOf('.json') > 0) {
-       let inDir = dirname(resolve(cwd,inPath,inputPattern));
-       let name =basename(resolve(cwd,inPath,inputPattern));
-       let outDir = dirname(resolve(cwd,fulloutPath,inputPattern));
-       processOwlFile(inDir, name, outDir, templatePath, buildType, dir, project)
-       console.log("processed " + name);
-       return;
-   }
-}
-else{
-    processInputDir(inPath, fulloutPath, templatePath, buildType,project);
+    var inputPattern = null;
+    if(process.argv.length>2){
+        inputPattern = process.argv[2];
+        console.log("compiling" + inputPattern);
+    }
+
+    if(inputPattern){
+        if(isDirectory(resolve(cwd,inPath,inputPattern))){
+            let inDir = resolve(cwd,inPath,inputPattern);
+            let outDir = resolve(fulloutPath,inputPattern);
+            processInputDir(inDir, outDir, templatePath, buildType,project);
+            return;
+        }
+        else if (inputPattern.indexOf('.json') > 0) {
+            let inDir = dirname(resolve(cwd,inPath,inputPattern));
+            let name =basename(resolve(cwd,inPath,inputPattern));
+            let outDir = dirname(resolve(fulloutPath,inputPattern));
+            console.log("inDir",inDir,"name",name,"outDir",outDir);
+            mkdir(outDir);
+            processOwlFile(inDir, name, outDir, templatePath, buildType, inDir, project)
+            console.log("processed " + name);
+            return;
+        }
+    }
+    else{
+        processInputDir(inPath, fulloutPath, templatePath, buildType,project);
+    }
 }
 
+main();
+
+
+

package/defaultTemplate/api/src/services/modelService.jsx

@@ -50,6 +50,14 @@ var @projectCodeService = (function (pigeon) {
             }
         },
 
+        getSpec:function(){
+            return spec;
+        },
+
+        getFormSpec:function(){
+            return formSpecs;
+        },
+
         getLock: function (data) {
             //@lockOrig
             if (lockFunc) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owl-cli",
-  "version": "6.211.0",
+  "version": "6.213.0",
   "main": "index.js",
   "preferGlobal": true,
   "bin": {