owl-cli 7.13.0 → 7.14.0

package/examples/models/owlsys/systemAdmin/apps.json

@@ -0,0 +1,101 @@
+{
+  "id": "string(12),listSize:18,tab:01,disabled:true;id",
+  "name": "string(12),listSize:16;表名称",
+  "tableId": "string(12),listSize:16;表Id",
+  "isWidget": "choice,values:yes_是/no_否;isWidget",
+  "isHide": "isHide,values:yes_是/no_否;是否隐藏",
+  "pos": "string(8);pos",
+  "groupId": "string(8),searchable:true;groupId",
+  "groupName": "string(8);groupName",
+  "groupPos": "string(8);groupPos",
+  "sections": [
+    {
+      "#meta": {
+        "type": "external",
+        "fieldLabel": "sections",
+        "dataSourceModel": "owl_app_sections",
+        "link": "tableId->tableId",
+        "relation": "child",
+        "tab": "7",
+        "position": "card",
+        "addSingle": "false"
+      }
+    }
+  ],
+  "fields": [
+    {
+      "#meta": {
+        "type": "external",
+        "fieldLabel": "fields",
+        "dataSourceModel": "owl_app_fields",
+        "link": "tableId->tableId",
+        "relation": "child",
+        "tab": "7",
+        "position": "card",
+        "addSingle": "false"
+      }
+    }
+  ],
+  "_t": "apps",
+  "#meta": {
+    "hide": "false",
+    "id": "<%=#tableId%>",
+    "push": true,
+    "rem": "apps",
+    "projectName": "roles",
+    "parent": [
+      "platform"
+    ],
+    "visitType": [
+      "platform"
+    ],
+    "pos": 1,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "appsmgt",
+        "name": "apps管理",
+        "icon": "setting",
+        "pos": 40
+      }
+    },
+    "formPlugins": [
+      {
+        "label": "刷新",
+        "id": "apps_refresh_apps",
+        "action": "/owl_apps/plugins/refresh_apps.jsx",
+        "position": "batch",
+        "responseAction": "showMessage",
+        "help": "刷新"
+      }
+    ],
+    "export": [
+      {
+        "label": "导出完整",
+        "mainTitleFormat": {
+          "background": "#474747",
+          "color": "#cccccc"
+        },
+        "subTitleFormat": {
+          "background": "#777777",
+          "color": "#ffffff"
+        },
+        "subRecordFormat": {
+          "background": "#ffffff",
+          "color": "#000000"
+        },
+        "mainRecordFormat": {
+          "background": "#555555",
+          "color": "#FFFFFF"
+        },
+        "key": "completeDoc",
+        "fields": [
+          "*"
+        ]
+      }
+    ]
+  }
+}

package/examples/models/owlsys/systemAdmin/backendSession.json

@@ -0,0 +1,52 @@
+{
+  "id": "string(14),listSize:18,tab:01,disabled:true,formSize:2;内部ID",
+  "isid": "string(18),listSize:16,tab:02,searchable:true,required:true,formSize:2;isid",
+  "createTime": "date,listSize:16,tab:03,searchable:true,required:true;创建时间",
+  "lastModified": "date,listSize:16,tab:04,searchable:true,required:true;修改时间",
+  "isLogin": "choice,values:y_是/n_否,tab:05,searchable:true;已登录",
+  "userId": "string(16),tab:06,searchable:true;用户id",
+  "userName": "string(8),tab:06,searchable:true;用户名称",
+  "role": "string(18),tab:07,searchable:true;登录角色",
+  "orgId": "string(18),tab:071,searchable:true;登录单位(orgId)",
+  "orgIds": "string(18),tab:072,searchable:true;登录单位路径(orgIds)",
+  "sessionObjs":"string(18),showList:false,multiline:T,formSize:8,tab:08;sessionObjs",
+  "ip": "string(32),listSize:16,tab:09,searchable:true,required:false;ip",
+  "for_client_id": "string(32),listSize:16,tab:10,searchable:true,isId:true,required:false;代客下单用户Id",
+  "_t":"backend_session",
+  "#meta":{
+    "id": "<%=#isid%>",
+    "push": true,
+    "hide": "true",
+    "rem":"后台Session",
+    "projectName":"owlmall",
+    "parent":["platform"],
+    "visitType": [
+      "platform",
+      "shop"
+    ],
+    "pos": 1,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "session",
+        "name": "session管理",
+        "icon": "setting",
+        "pos": 45
+      }
+    },
+    "export":[
+      {
+        "label":"导出完整",
+        "mainTitleFormat":{"background":"#474747","color":"#cccccc"},
+        "subTitleFormat":{"background":"#777777","color":"#ffffff"},
+        "subRecordFormat":{"background":"#ffffff","color":"#000000"},
+        "mainRecordFormat":{"background":"#555555","color":"#FFFFFF"},
+        "key":"completeDoc",
+        "fields":["*"]
+      }
+    ]
+  }
+}

package/examples/models/owlsys/systemAdmin/batchImport.json

@@ -0,0 +1,54 @@
+{
+
+  "base_info": {
+    "#meta": {
+      "fieldLabel": "基本信息",
+      "showTitle": "no",
+      "includeKey": "no",
+      "position": "card",
+      "span": 1
+    },
+    "id": "string(12),hidden:true;id",
+    "app_id": "string(12),hidden:true,formSize:8;app_id",
+    "app_name": "string(12),formSize:8;表名称",
+    "importFile": "file,size:25M,exts:zip,maxFileCount:1,formSize:8;上传文件",
+    "msg": "string(12),formSize:8,multiline:T;信息",
+    "owl_createTime": "date,disable:true,formSize:8;生成时间",
+    "override": "choice,values:true_覆盖/false_不覆盖,disable:true,formSize:8;是否覆盖",
+    "zipPass": "string(12),formSize:8;zip密码",
+    "contentFileName": "string(12),formSize:8,help:zip文件内的文件名;内容文件名",
+    "content_type": "choice,values:json_Json/jsonl_jsonl,disable:true,formSize:8;内容类型",
+    "state": "choice,values:notstart_未开始/running_运行中/success_成功/failed_失败,disable:true,formSize:8;状态"
+  },
+
+
+  "_t": "batch_import",
+  "#meta": {
+    "rem":"批量导入记录",
+    "projectName":"batch_import",
+    "parent":["platform"],
+    "visitType": [
+      "platform"
+    ],
+    "jobs": [
+      {
+        "pageId":"tasks/doImportTask.jsx",
+        "params": {},
+        "cron": "* * * * * ?"
+      }
+    ],
+    "pos": 2,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "systemlog",
+        "name": "日志管理",
+        "icon": "setting",
+        "pos": 50
+      }
+    }
+  }
+}

package/examples/models/owlsys/systemAdmin/batch_import/api/src/plugins/addImport.jsx

@@ -0,0 +1,75 @@
+//#import @handlers/include/checklogin.jsx
+//#import $owl_batch_import:services/modelService.jsx
+
+function main(){
+    var params = JSON.parse($body);
+    var appId = params.appId;
+    var env = checklogin();
+    if(!env){
+        return;
+    }
+    var roleId = env.roleId
+    var orgId = env.orgId;
+    try {
+        var permissions = getPermissions(roleId,appId);
+        if(roleId!=='internal'  && roleId!='0') {
+            if (!checkPermission({_orgId: orgId}, permissions, orgId, "add")) {
+                var ret = {
+                    state: 'err',
+                    msg: '没有权限'
+                }
+                out.print(JSON.stringify(ret));
+                return;
+            }
+        }
+
+
+        var params = JSON.parse($body);
+        var appId = params.appId;
+        var url = params.url;
+        var name = params.name;
+        var msg = params.msg;
+        var override = params.override || "false";
+        var zipPass = params.password;
+        var contentFileName = params.contentFileName;
+
+
+
+        var batch_import = {
+            app_id:appId,
+            app_name:appId,
+            importFile:[{url:url,name:name}],
+            contentFileName:contentFileName,
+            msg:msg,
+            state:"notstart",
+            override:override,
+            zipPass:zipPass,
+            _orgId:orgId,
+            _orgIds:[orgId].concat(getParentOrgIds(orgId))
+        }
+        owl_batch_importService.add(batch_import);
+        var ret = {
+            state: 'ok',
+            id: batch_import.id
+        }
+        out.print(JSON.stringify(ret));
+
+    }
+    catch(e){
+        var msg = e;
+        if(typeof e == 'string'){
+            msg = e;
+        }
+        else if(e.msg){
+            msg = e.msg;
+        }
+        var ret = {
+            state: 'err',
+            msg:msg
+        }
+        out.print(JSON.stringify(ret));
+    }
+
+
+}
+main();

package/examples/models/owlsys/systemAdmin/batch_import/api/src/tasks/doImportTask.jsx

@@ -0,0 +1,130 @@
+//#import $owl_batch_import:services/modelService.jsx
+//#import $owl_process_job:services/modelService.jsx
+//#import $owl_process_job_log:services/modelService.jsx
+//#import $owl_astro_product_que:services/modelService.jsx
+//#import jobs.js
+var process_id = "batch_import_task";
+function main(){
+    // $.log("doImportTask.jsx...main...begin");
+    if(checkTaskRunning()){
+        return;
+    }
+    updateTaskRunning()
+    var nUpdate = 0;
+    try{
+        var batchImport = getWaitingBatchImport();
+        if(!batchImport){
+            return;
+        }
+        var appId = batchImport.app_id;
+        JobsService.submitTask(appId,"tasks/doBatchImport.jsx", {batchImportId:batchImport.id}, new Date().getTime());
+
+    }
+    finally{
+        updateTaskEnd();
+        var endTime = new Date().getTime();
+        var beginTime = endTime ;
+        if(nUpdate>0){
+            var log = {
+                objId:batchImport.id,
+                startTime:beginTime,
+                endTime:endTime,
+                name:"批量导入",
+                process_id:process_id,
+                remark:appId + ", 开始导入:" + batchImport.id
+
+            }
+            owl_process_job_logService.add(log);
+        }
+
+    }
+
+}
+main();
+
+
+
+
+function checkTaskRunning(){
+    var jobId = "owl_process_job_" + process_id;
+    var process = owl_process_jobService.get(jobId);
+    if(!process){
+        return false;
+    }
+    if(process.state == 'running'){
+        return true;
+    }
+}
+
+function updateTaskRunning(){
+    var jobId = "owl_process_job_" + process_id;
+    var process = owl_process_jobService.get(jobId);
+    if(!process){
+        process = {
+            process_id:process_id,
+            state:"running",
+            name:"商品定时上下架",
+            startTime:new Date().getTime(),
+            remark:"每分钟执行一次"
+        }
+        owl_process_jobService.add(process);
+    }
+    else{
+        process.state = "running";
+        process.startTime = new Date().getTime();
+        owl_process_jobService.update(process);
+    }
+}
+
+function updateTaskEnd(){
+    var jobId = "owl_process_job_" + process_id;
+    var process = owl_process_jobService.get(jobId);
+    if(!process){
+        process = {
+            process_id:process_id,
+            state:"ended",
+            name:"批量导入",
+            endTime:new Date().getTime(),
+            remark:"每分钟执行一次"
+        }
+        owl_process_jobService.add(process);
+    }
+    else{
+        process.state = "ended";
+        process.endTime = new Date().getTime();
+        owl_process_jobService.update(process);
+    }
+}
+function getWaitingBatchImport(){
+
+    var now = new Date().getTime();
+    var lastTime = now - 1000*60*30;
+    var searchArgs = {
+        state:'notstart'
+    }
+
+    var dataSource = null;
+    var mfilters = null;
+    var keyword = null;
+    var pageSize = 1000;
+    var from = 0;
+    var sort = {
+        owl_createTime:{order:"desc"}
+    }
+
+
+    var sr = owl_batch_importService.search(mfilters, searchArgs, keyword,from, pageSize, sort, dataSource );
+    if(sr.state == 'ok'){
+        if(sr.list && sr.list.length>0){
+            var batchImport =  sr.list[0];
+            batchImport  = owl_batch_importService.get(batchImport.id);
+            if(batchImport.state == 'notstart'){
+                batchImport.state = 'running';
+                owl_batch_importService.update(batchImport);
+                return batchImport;
+            }
+        }
+    }
+    return null;
+
+}

package/examples/models/owlsys/systemAdmin/change_log.json

@@ -0,0 +1,70 @@
+{
+  "id": "string(12),disabled:true;id",
+  "nv": "number(10),disabled:true;新版本",
+  "ov": "number(10),disabled:true;旧版本",
+  "oid": "string(12),disable:true,searchable:true;对象id",
+  "ot": "string(12),disable:true;对象类型",
+  "ts": "date,disabled:true,searchable:true;发生时间",
+  "uid": "string(12),disabled:true;修改者UID",
+  "nn": "string(12),disabled:true;修改者名称",
+  "parentkeys": "string(12),disabled:true;上级",
+  "cli": "choice,values:pcadmin_pc后台/h5admin_h5后台/h5_h5前台/appadmin_app后台/jobs_自动进程;修改方式",
+  "jobId": "string(12);jobId",
+  "diff": [
+    {
+      "#meta": {
+        "fieldLabel": "修改",
+        "position": "card"
+      },
+      "type": "choice,values:changed_修改/added_添加/deleted,listSize:4;变动类型",
+      "fieldKey": "string(12);字段",
+      "fieldType": "choice,values:array_列表/other_其他,listSize:6;类型",
+      "parentKeys": "string(12),subtype:string;父字段",
+      "oldv": "string(12),subtype:variant;旧数据",
+      "newv": "string(12),subtype:variant;新数据",
+      "diff": [
+        {
+          "#meta": {
+            "fieldLabel": "修改"
+          },
+          "type":"choice,values:added_添加/deleted_删除;修改类型",
+          "r": "object;数据行"
+        }
+      ]
+    }
+  ],
+  "_t": "change_logs",
+  "#meta":{
+    "push": false,
+    "rem":"修改日志",
+    "projectName":"change_logs",
+    "parent":["platform"],
+    "visitType": [
+      "platform"
+    ],
+    "pos": 2,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "systemlog",
+        "name": "日志管理",
+        "icon": "setting",
+        "pos": 50
+      }
+    },
+    "export":[
+      {
+        "label":"导出完整",
+        "mainTitleFormat":{"background":"#474747","color":"#cccccc"},
+        "subTitleFormat":{"background":"#777777","color":"#ffffff"},
+        "subRecordFormat":{"background":"#ffffff","color":"#000000"},
+        "mainRecordFormat":{"background":"#555555","color":"#FFFFFF"},
+        "key":"completeDoc",
+        "fields":["*"]
+      }
+    ]
+  }
+}