From 0687eee2bbf22716999ab85a49fad46818c9b213 Mon Sep 17 00:00:00 2001 From: defans Date: Wed, 25 Jan 2017 17:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=92=8C=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E9=83=A8=E5=88=86BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cmpage/controller/page.js | 6 + view/cmpage/module_btn_list.html | 3 +- view/cmpage/module_col_list.html | 2 +- view/cmpage/module_edit_list.html | 2 +- view/cmpage/module_query_list.html | 2 +- www/static/doc/assets/js/config.js | 2 +- .../doc/classes/cmpage.controller.page.html | 114 +++++- www/static/doc/classes/cmpage.model.appr.html | 84 +++- www/static/doc/classes/cmpage.model.page.html | 359 ++++++++++++++++-- .../doc/classes/cmpage.model.utils.html | 84 +++- www/static/doc/classes/flow.model.act.html | 10 +- .../doc/classes/flow.model.act_path.html | 4 +- www/static/doc/data.json | 216 ++++++++--- .../files/src_cmpage_controller_page.js.html | 37 +- .../doc/files/src_cmpage_model_base.js.html | 50 +-- .../doc/files/src_cmpage_model_module.js.html | 57 +-- .../doc/files/src_cmpage_model_page.js.html | 148 ++++++-- .../src_cmpage_model_page_lookup.js.html | 2 +- .../files/src_cmpage_model_page_ms.js.html | 77 +++- .../doc/files/src_flow_model_act.js.html | 8 +- .../files/src_flow_model_act_assign.js.html | 6 +- .../doc/files/src_flow_model_act_path.js.html | 14 +- .../doc/files/src_flow_model_appr.js.html | 14 +- 23 files changed, 1032 insertions(+), 269 deletions(-) diff --git a/src/cmpage/controller/page.js b/src/cmpage/controller/page.js index ec8fe48..2421bc7 100644 --- a/src/cmpage/controller/page.js +++ b/src/cmpage/controller/page.js @@ -50,6 +50,7 @@ export default class extends Base { parms.parmsUrl = JSON.parse(this.post('parmsUrl')); parms.query = this.post(); } + delete parms.parmsUrl['_']; parms.parmsUrl.readonly = !(think.isEmpty(parms.parmsUrl.readonly) || parms.parmsUrl.readonly !=1); parms.user = await this.session('user'); // console.log(page); @@ -185,6 +186,7 @@ export default class extends Base { let module = cmpage.model('cmpage/module'); let parms = await module.getModuleByName(this.get('modulename')); parms.parmsUrl = this.get(); + delete parms.parmsUrl['_']; parms.parmsUrl.readonly = false; parms.editID = think.isEmpty(this.get("id")) ? this.get("c_id") : this.get("id"); parms.listIds = think.isEmpty(this.get('listIds')) ? '':this.get('listIds'); @@ -217,6 +219,7 @@ export default class extends Base { let module = this.model('module'); let parms = await module.getModuleByName(this.get('modulename')); parms.parmsUrl = this.get(); + delete parms.parmsUrl['_']; parms.parmsUrl.readonly = false; parms.editID = think.isEmpty(this.get("id")) ? this.get("c_id") : this.get("id"); parms.user = await this.session('user'); @@ -382,6 +385,7 @@ export default class extends Base { parms.pageSize = parms.c_page_size; //cmpage.debug(http._get); parms.parmsUrl = this.get(); + delete parms.parmsUrl['_']; parms.query = parms.parmsUrl; }else{ parms.modulename= this.post('modulename'); @@ -392,6 +396,7 @@ export default class extends Base { parms.pageIndex = this.post('pageIndex'); parms.pageSize = this.post('pageSize'); parms.parmsUrl = JSON.parse(this.post('parmsUrl')); + delete parms.parmsUrl['_']; } parms.user = await this.session('user'); let pageModel = cmpage.model(parms.c_path); @@ -477,6 +482,7 @@ export default class extends Base { parms.pageIndex = 1; parms.pageSize = 50; //parms.c_page_size; parms.parmsUrl = this.get(); + delete parms.parmsUrl['_']; parms.query = parms.parmsUrl; } parms.user = await this.session('user'); diff --git a/view/cmpage/module_btn_list.html b/view/cmpage/module_btn_list.html index 15e8211..beffdb9 100644 --- a/view/cmpage/module_btn_list.html +++ b/view/cmpage/module_btn_list.html @@ -14,7 +14,7 @@
-
+ @@ -65,4 +65,3 @@
- diff --git a/view/cmpage/module_col_list.html b/view/cmpage/module_col_list.html index c176fa6..61d69eb 100644 --- a/view/cmpage/module_col_list.html +++ b/view/cmpage/module_col_list.html @@ -14,7 +14,7 @@
-
+ diff --git a/view/cmpage/module_edit_list.html b/view/cmpage/module_edit_list.html index 5b3b593..aca6cd2 100644 --- a/view/cmpage/module_edit_list.html +++ b/view/cmpage/module_edit_list.html @@ -14,7 +14,7 @@
- +
diff --git a/view/cmpage/module_query_list.html b/view/cmpage/module_query_list.html index e547cda..1faac80 100644 --- a/view/cmpage/module_query_list.html +++ b/view/cmpage/module_query_list.html @@ -16,7 +16,7 @@
- +
diff --git a/www/static/doc/assets/js/config.js b/www/static/doc/assets/js/config.js index f764c64..f5a2b56 100644 --- a/www/static/doc/assets/js/config.js +++ b/www/static/doc/assets/js/config.js @@ -1 +1 @@ -window['__docConfig'] = {"filterItems":[{"type":"module","name":"admin.controller"},{"type":"module","name":"admin.model"},{"type":"module","name":"cmpage.controller"},{"type":"module","name":"cmpage.logic"},{"type":"module","name":"cmpage.model"},{"type":"module","name":"flow.controller"},{"type":"module","name":"flow.model"},{"type":"module","name":"demo.model"},{"type":"class","name":"admin.controller.base"},{"type":"class","name":"admin.controller.code"},{"type":"class","name":"admin.controller.index"},{"type":"class","name":"admin.controller.mob"},{"type":"class","name":"admin.model.code"},{"type":"class","name":"admin.model.code_list"},{"type":"class","name":"admin.model.code_lookup"},{"type":"class","name":"admin.model.groupuser"},{"type":"class","name":"admin.model.groupuser_add"},{"type":"class","name":"admin.model.log"},{"type":"class","name":"admin.model.login"},{"type":"class","name":"admin.model.privilege"},{"type":"class","name":"admin.model.teamuser"},{"type":"class","name":"admin.model.teamuser_add"},{"type":"class","name":"admin.model.user"},{"type":"class","name":"cmpage.controller.base"},{"type":"class","name":"cmpage.controller.mob"},{"type":"class","name":"cmpage.controller.module"},{"type":"class","name":"cmpage.controller.page"},{"type":"class","name":"cmpage.controller.utils"},{"type":"class","name":"cmpage.logic.page"},{"type":"class","name":"cmpage.model.area"},{"type":"class","name":"cmpage.model.base"},{"type":"class","name":"cmpage.model.file_list"},{"type":"class","name":"cmpage.model.page"},{"type":"class","name":"cmpage.model.page_excel"},{"type":"class","name":"cmpage.model.page_lookup"},{"type":"class","name":"cmpage.model.page_mob"},{"type":"class","name":"cmpage.model.utils"},{"type":"class","name":"cmpage.cmpage_global"},{"type":"class","name":"flow.controller.act"},{"type":"class","name":"flow.controller.base"},{"type":"class","name":"flow.controller.proc"},{"type":"class","name":"flow.controller.task"},{"type":"class","name":"flow.controller.task_act"},{"type":"class","name":"flow.model.act"},{"type":"class","name":"flow.model.proc_assign"},{"type":"class","name":"flow.model.act_path"},{"type":"class","name":"cmpage.model.appr"},{"type":"class","name":"flow.model.proc"},{"type":"class","name":"flow.model.task"},{"type":"class","name":"flow.model.task_act"},{"type":"class","name":"flow.model.task_act_appr"},{"type":"class","name":"cmpage.cmpage_global_flow"},{"type":"method","className":"admin.controller.base","name":"__before"},{"type":"method","className":"admin.controller.code","name":"codeTree"},{"type":"method","className":"admin.controller.code","name":"codeLookup"},{"type":"method","className":"admin.controller.code","name":"groupUserMain"},{"type":"method","className":"admin.controller.code","name":"groupUserAdd"},{"type":"method","className":"admin.controller.code","name":"groupUserDel"},{"type":"method","className":"admin.controller.code","name":"teamUserMain"},{"type":"method","className":"admin.controller.code","name":"teamUserAdd"},{"type":"method","className":"admin.controller.code","name":"teamUserDel"},{"type":"method","className":"admin.controller.code","name":"rolePrivilege"},{"type":"method","className":"admin.controller.code","name":"roleGetPrivilegeTree"},{"type":"method","className":"admin.controller.code","name":"roleSavePrivilege"},{"type":"method","className":"admin.controller.code","name":"userGetPrivilegeTree"},{"type":"method","className":"admin.controller.code","name":"userSavePrivilege"},{"type":"method","className":"admin.controller.code","name":"userSavePrivilege"},{"type":"method","className":"admin.controller.index","name":"index"},{"type":"method","className":"admin.controller.index","name":"loginPwdEdit"},{"type":"method","className":"admin.controller.index","name":"login"},{"type":"method","className":"admin.controller.index","name":"exitLogin"},{"type":"method","className":"admin.controller.index","name":"loginPwdEdit"},{"type":"method","className":"admin.controller.mob","name":"getVersion"},{"type":"method","className":"admin.controller.mob","name":"getGroups"},{"type":"method","className":"admin.controller.mob","name":"getMenus"},{"type":"method","className":"admin.controller.mob","name":"login"},{"type":"method","className":"admin.controller.mob","name":"exitLogin"},{"type":"method","className":"admin.controller.mob","name":"loginPwdEdit"},{"type":"method","className":"admin.model.code","name":"getTreeList"},{"type":"method","className":"admin.model.code","name":"getNameById"},{"type":"method","className":"admin.model.code","name":"getCodeById"},{"type":"method","className":"admin.model.code","name":"getCodesByPid"},{"type":"method","className":"admin.model.code","name":"getCodesByRoot"},{"type":"method","className":"admin.model.code","name":"getSexName"},{"type":"method","className":"admin.model.code","name":"getParms"},{"type":"method","className":"admin.model.code","name":"getParmsByPid"},{"type":"method","className":"admin.model.code","name":"getParmsByPobj"},{"type":"method","className":"admin.model.code","name":"getParmById"},{"type":"method","className":"admin.model.code","name":"getParmById"},{"type":"method","className":"admin.model.code","name":"clearCodeCache"},{"type":"method","className":"admin.model.code","name":"getGroups"},{"type":"method","className":"admin.model.code","name":"getRoles"},{"type":"method","className":"admin.model.code","name":"getStocks"},{"type":"method","className":"admin.model.code","name":"getDepts"},{"type":"method","className":"admin.model.code","name":"getCodes"},{"type":"method","className":"admin.model.code_list","name":"getQueryWhere"},{"type":"method","className":"admin.model.code_list","name":"pageEditInit"},{"type":"method","className":"admin.model.code_list","name":"pageSave"},{"type":"method","className":"admin.model.code_list","name":"pageDelete"},{"type":"method","className":"admin.model.code_lookup","name":"getQueryWhere"},{"type":"method","className":"admin.model.groupuser","name":"htmlGetOther"},{"type":"method","className":"admin.model.groupuser","name":"getLoginGroups"},{"type":"method","className":"admin.model.groupuser_add","name":"getQueryWhere"},{"type":"method","className":"admin.model.groupuser_add","name":"htmlGetOther"},{"type":"method","className":"admin.model.log","name":"getQueryWhere"},{"type":"method","className":"admin.model.log","name":"addLog"},{"type":"method","className":"admin.model.login","name":"getQueryWhere"},{"type":"method","className":"admin.model.login","name":"addLogin"},{"type":"method","className":"admin.model.login","name":"addLogin"},{"type":"method","className":"admin.model.privilege","name":"roleSavePrivilege"},{"type":"method","className":"admin.model.privilege","name":"roleGetPrivilegeTree"},{"type":"method","className":"admin.model.privilege","name":"userGetPrivilegeTree"},{"type":"method","className":"admin.model.privilege","name":"userSavePrivilege"},{"type":"method","className":"admin.model.teamuser","name":"htmlGetOther"},{"type":"method","className":"admin.model.teamuser","name":"getUsersByTeamId"},{"type":"method","className":"admin.model.teamuser","name":"isTeamMember"},{"type":"method","className":"admin.model.teamuser_add","name":"getQueryWhere"},{"type":"method","className":"admin.model.teamuser_add","name":"htmlGetOther"},{"type":"method","className":"admin.model.user","name":"getQueryWhere"},{"type":"method","className":"admin.model.user","name":"pageSave"},{"type":"method","className":"admin.model.user","name":"getNameById"},{"type":"method","className":"admin.model.user","name":"getNameById"},{"type":"method","className":"admin.model.user","name":"getUserByLogin"},{"type":"method","className":"admin.model.user","name":"getUsers"},{"type":"method","className":"cmpage.controller.base","name":"delete"},{"type":"method","className":"cmpage.controller.base","name":"__before"},{"type":"method","className":"cmpage.controller.mob","name":"list"},{"type":"method","className":"cmpage.controller.mob","name":"edit"},{"type":"method","className":"cmpage.controller.mob","name":"save"},{"type":"method","className":"cmpage.controller.mob","name":"view"},{"type":"method","className":"cmpage.controller.module","name":"list"},{"type":"method","className":"cmpage.controller.module","name":"save"},{"type":"method","className":"cmpage.controller.module","name":"copy"},{"type":"method","className":"cmpage.controller.module","name":"edit"},{"type":"method","className":"cmpage.controller.module","name":"resetModuleCache"},{"type":"method","className":"cmpage.controller.module","name":"colList"},{"type":"method","className":"cmpage.controller.module","name":"colReset"},{"type":"method","className":"cmpage.controller.module","name":"col_save"},{"type":"method","className":"cmpage.controller.module","name":"editList"},{"type":"method","className":"cmpage.controller.module","name":"editReset"},{"type":"method","className":"cmpage.controller.module","name":"edit_save"},{"type":"method","className":"cmpage.controller.module","name":"queryList"},{"type":"method","className":"cmpage.controller.module","name":"queryReset"},{"type":"method","className":"cmpage.controller.module","name":"query_delete_no_show"},{"type":"method","className":"cmpage.controller.module","name":"query_save"},{"type":"method","className":"cmpage.controller.module","name":"btnList"},{"type":"method","className":"cmpage.controller.module","name":"btnReset"},{"type":"method","className":"cmpage.controller.module","name":"btn_save"},{"type":"method","className":"cmpage.controller.page","name":"list"},{"type":"method","className":"cmpage.controller.page","name":"excelExport"},{"type":"method","className":"cmpage.controller.page","name":"delete"},{"type":"method","className":"cmpage.controller.page","name":"updateStatus"},{"type":"method","className":"cmpage.controller.page","name":"edit"},{"type":"method","className":"cmpage.controller.page","name":"recEdit"},{"type":"method","className":"cmpage.controller.page","name":"save"},{"type":"method","className":"cmpage.controller.page","name":"view"},{"type":"method","className":"cmpage.controller.page","name":"viewMs"},{"type":"method","className":"cmpage.controller.page","name":"lookup"},{"type":"method","className":"cmpage.controller.page","name":"updateFile"},{"type":"method","className":"cmpage.controller.page","name":"timeline"},{"type":"method","className":"cmpage.controller.utils","name":"callFunction"},{"type":"method","className":"cmpage.controller.utils","name":"callFunction"},{"type":"method","className":"cmpage.controller.utils","name":"clearCache"},{"type":"method","className":"cmpage.controller.utils","name":"getCitys"},{"type":"method","className":"cmpage.controller.utils","name":"getCountrys"},{"type":"method","className":"cmpage.logic.page","name":"save"},{"type":"method","className":"cmpage.model.area","name":"getProvinces"},{"type":"method","className":"cmpage.model.area","name":"getProvinceName"},{"type":"method","className":"cmpage.model.area","name":"getCityName"},{"type":"method","className":"cmpage.model.area","name":"getCountryName"},{"type":"method","className":"cmpage.model.area","name":"getCitys"},{"type":"method","className":"cmpage.model.area","name":"getCountrys"},{"type":"method","className":"cmpage.model.area","name":"getProvinceItems"},{"type":"method","className":"cmpage.model.area","name":"getCityItems"},{"type":"method","className":"cmpage.model.area","name":"getCountryItems"},{"type":"method","className":"cmpage.model.file_list","name":"mobHtmlGetList"},{"type":"method","className":"cmpage.model.page","name":"initPage"},{"type":"method","className":"cmpage.model.page","name":"htmlGetQuery"},{"type":"method","className":"cmpage.model.page","name":"htmlGetOther"},{"type":"method","className":"cmpage.model.page","name":"getOptions"},{"type":"method","className":"cmpage.model.page","name":"getOptionsTree"},{"type":"method","className":"cmpage.model.page","name":"getReplaceText"},{"type":"method","className":"cmpage.model.page","name":"htmlGetBtnHeader"},{"type":"method","className":"cmpage.model.page","name":"htmlGetBtnList"},{"type":"method","className":"cmpage.model.page","name":"htmlGetList"},{"type":"method","className":"cmpage.model.page","name":"isShowBtn"},{"type":"method","className":"cmpage.model.page","name":"getDataList"},{"type":"method","className":"cmpage.model.page","name":"isShowBtn"},{"type":"method","className":"cmpage.model.page","name":"getQueryWhere"},{"type":"method","className":"cmpage.model.page","name":"getListFields"},{"type":"method","className":"cmpage.model.page","name":"pageEditInit"},{"type":"method","className":"cmpage.model.page","name":"getDataRecord"},{"type":"method","className":"cmpage.model.page","name":"htmlGetEdit"},{"type":"method","className":"cmpage.model.page","name":"htmlGetEditInput"},{"type":"method","className":"cmpage.model.page","name":"htmlGetEditBtns"},{"type":"method","className":"cmpage.model.page","name":"htmlGetActBtns"},{"type":"method","className":"cmpage.model.page","name":"htmlGetTaskActBtns"},{"type":"method","className":"cmpage.model.page","name":"pageSave"},{"type":"method","className":"cmpage.model.page","name":"pageSaveLog"},{"type":"method","className":"cmpage.model.page","name":"htmlGetView"},{"type":"method","className":"cmpage.model.page","name":"pageDelete"},{"type":"method","className":"cmpage.model.page","name":"htmlGetFooter"},{"type":"method","className":"cmpage.model.page","name":"updateStatus"},{"type":"method","className":"cmpage.model.page","name":"htmlGetListTimeline"},{"type":"method","className":"cmpage.model.page_excel","name":"excelExport"},{"type":"method","className":"cmpage.model.page_excel","name":"getColStyle"},{"type":"method","className":"cmpage.model.page_excel","name":"getColData"},{"type":"method","className":"cmpage.model.page_lookup","name":"isShowRowBtns"},{"type":"method","className":"cmpage.model.page_lookup","name":"htmlGetBtnList"},{"type":"method","className":"cmpage.model.page_lookup","name":"getLookupResult"},{"type":"method","className":"cmpage.model.page_lookup","name":"htmlGetBtnHeader"},{"type":"method","className":"cmpage.model.page_lookup","name":"mobHtmlGetList"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetList"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetListBtns"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetHeaderBtnsFromModule"},{"type":"method","className":"cmpage.model.page_mob","name":"mobGetPageMuiSetting"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetListRow"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetQuery"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetEdit"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetEditInput"},{"type":"method","className":"cmpage.model.utils","name":"getDataList"},{"type":"method","className":"cmpage.model.utils","name":"getEnumName"},{"type":"method","className":"cmpage.model.utils","name":"getEnum"},{"type":"method","className":"cmpage.cmpage_global","name":"objPropertysReplaceToStr"},{"type":"method","className":"cmpage.cmpage_global","name":"objPropertysFromOtherObj"},{"type":"method","className":"cmpage.cmpage_global","name":"objToString"},{"type":"method","className":"cmpage.cmpage_global","name":"objFromString"},{"type":"method","className":"cmpage.cmpage_global","name":"arrFromString"},{"type":"method","className":"cmpage.cmpage_global","name":"arrFromString"},{"type":"method","className":"cmpage.cmpage_global","name":"arrGetValuesByColumnName"},{"type":"method","className":"cmpage.cmpage_global","name":"strGetValuesByPropertyName"},{"type":"method","className":"cmpage.cmpage_global","name":"arrGetUnique"},{"type":"method","className":"cmpage.cmpage_global","name":"checksql"},{"type":"method","className":"cmpage.cmpage_global","name":"parmsFromUrl"},{"type":"method","className":"cmpage.cmpage_global","name":"model"},{"type":"method","className":"cmpage.cmpage_global","name":"model"},{"type":"method","className":"cmpage.cmpage_global","name":"formatNumber"},{"type":"method","className":"cmpage.cmpage_global","name":"getRandomNum"},{"type":"method","className":"flow.controller.act","name":"edit"},{"type":"method","className":"flow.controller.act","name":"delete"},{"type":"method","className":"flow.controller.act","name":"deletePath"},{"type":"method","className":"flow.controller.act","name":"edit"},{"type":"method","className":"flow.controller.base","name":"__before"},{"type":"method","className":"flow.controller.proc","name":"design"},{"type":"method","className":"flow.controller.proc","name":"flowMap"},{"type":"method","className":"flow.controller.proc","name":"saveMap"},{"type":"method","className":"flow.controller.task","name":"start"},{"type":"method","className":"flow.controller.task","name":"run"},{"type":"method","className":"flow.controller.task","name":"suspend"},{"type":"method","className":"flow.controller.task","name":"terminate"},{"type":"method","className":"flow.controller.task","name":"autoExec"},{"type":"method","className":"flow.controller.task_act","name":"run"},{"type":"method","className":"flow.controller.task_act","name":"suspend"},{"type":"method","className":"flow.controller.task_act","name":"terminate"},{"type":"method","className":"flow.model.act","name":"canRun"},{"type":"method","className":"flow.model.act","name":"fwRun"},{"type":"method","className":"flow.model.act","name":"fwSuspend"},{"type":"method","className":"flow.model.act","name":"fwTerminate"},{"type":"method","className":"flow.model.act","name":"fwEnd"},{"type":"method","className":"flow.model.act","name":"fwGetActParms"},{"type":"method","className":"flow.model.act","name":"fwAutoExec"},{"type":"method","className":"flow.model.act","name":"getActsOrder"},{"type":"method","className":"flow.model.act","name":"getToActsFromId"},{"type":"method","className":"flow.model.act","name":"getActById"},{"type":"method","className":"flow.model.act","name":"getActByIdAndProcId"},{"type":"method","className":"flow.model.act","name":"getNameById"},{"type":"method","className":"flow.model.act","name":"getActs"},{"type":"method","className":"flow.model.act","name":"getActsByProcId"},{"type":"method","className":"flow.model.proc_assign","name":"pageEditInit"},{"type":"method","className":"flow.model.proc_assign","name":"htmlGetEditInput"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignByUser"},{"type":"method","className":"flow.model.proc_assign","name":"getLinkNameById"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignById"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignByActId"},{"type":"method","className":"flow.model.proc_assign","name":"getAssigns"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignsByActId"},{"type":"method","className":"flow.model.act_path","name":"getActPathById"},{"type":"method","className":"flow.model.act_path","name":"getActPathByIdAndProcId"},{"type":"method","className":"flow.model.act_path","name":"getFromActIDs"},{"type":"method","className":"flow.model.act_path","name":"getToActIDs"},{"type":"method","className":"flow.model.act_path","name":"getToActPaths"},{"type":"method","className":"flow.model.act_path","name":"getNameById"},{"type":"method","className":"cmpage.model.appr","name":"pageEditInit"},{"type":"method","className":"cmpage.model.appr","name":"pageSave"},{"type":"method","className":"cmpage.model.appr","name":"pageEditInit"},{"type":"method","className":"cmpage.model.appr","name":"pageSave"},{"type":"method","className":"cmpage.model.appr","name":"addStatus"},{"type":"method","className":"flow.model.proc","name":"fwStart"},{"type":"method","className":"flow.model.proc","name":"fwRun"},{"type":"method","className":"flow.model.proc","name":"fwSuspend"},{"type":"method","className":"flow.model.proc","name":"fwTerminate"},{"type":"method","className":"flow.model.proc","name":"fwEnd"},{"type":"method","className":"flow.model.proc","name":"fwGetActParms"},{"type":"method","className":"flow.model.proc","name":"getActById"},{"type":"method","className":"flow.model.proc","name":"getNameById"},{"type":"method","className":"flow.model.proc_assign","name":"pageEditInit"},{"type":"method","className":"flow.model.proc_assign","name":"htmlGetEditInput"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignByUser"},{"type":"method","className":"flow.model.proc_assign","name":"getLinkNameById"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignById"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignByProcId"},{"type":"method","className":"flow.model.proc_assign","name":"getAssigns"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignsByProcId"},{"type":"method","className":"flow.model.task","name":"getStocks"},{"type":"method","className":"flow.model.task","name":"saveMap"},{"type":"method","className":"flow.model.task","name":"copyToNewProc"},{"type":"method","className":"flow.model.task","name":"fwStart"},{"type":"method","className":"flow.model.task","name":"getTaskWithStatus"},{"type":"method","className":"flow.model.task","name":"fwInit"},{"type":"method","className":"flow.model.task","name":"getTaskNo"},{"type":"method","className":"flow.model.task","name":"fwRun"},{"type":"method","className":"flow.model.task","name":"fwSuspend"},{"type":"method","className":"flow.model.task","name":"fwTerminate"},{"type":"method","className":"flow.model.task","name":"fwEnd"},{"type":"method","className":"flow.model.task","name":"addTaskSt"},{"type":"method","className":"flow.model.task","name":"save"},{"type":"method","className":"flow.model.task","name":"getTask"},{"type":"method","className":"flow.model.task","name":"getUserFromTask"},{"type":"method","className":"flow.model.task","name":"getFlowMap"},{"type":"method","className":"flow.model.task_act","name":"canRun"},{"type":"method","className":"flow.model.task_act","name":"defineFromRule"},{"type":"method","className":"flow.model.task_act","name":"fwRun"},{"type":"method","className":"flow.model.task_act","name":"fwSuspend"},{"type":"method","className":"flow.model.task_act","name":"fwTerminate"},{"type":"method","className":"flow.model.task_act","name":"fwEnd"},{"type":"method","className":"flow.model.task_act","name":"defineOrSplit"},{"type":"method","className":"flow.model.task_act","name":"domainGetData"},{"type":"method","className":"flow.model.task_act","name":"defineToRule"},{"type":"method","className":"flow.model.task_act","name":"save"},{"type":"method","className":"flow.model.task_act","name":"addTaskSt"},{"type":"method","className":"flow.model.task_act","name":"getFromTasksWithEnd"},{"type":"method","className":"flow.model.task_act","name":"getFromTaskActs"},{"type":"method","className":"flow.model.task_act","name":"getToTaskIds"},{"type":"method","className":"flow.model.task_act","name":"getTaskActs"},{"type":"method","className":"flow.model.task_act","name":"getTaskAct"},{"type":"method","className":"flow.model.task_act_appr","name":"fwRun"},{"type":"method","className":"flow.model.task_act_appr","name":"domainGetData"},{"type":"method","className":"cmpage.cmpage_global_flow","name":"isShowRowBtn"}]} \ No newline at end of file +window['__docConfig'] = {"filterItems":[{"type":"module","name":"admin.controller"},{"type":"module","name":"admin.model"},{"type":"module","name":"cmpage.controller"},{"type":"module","name":"cmpage.logic"},{"type":"module","name":"cmpage.model"},{"type":"module","name":"flow.controller"},{"type":"module","name":"flow.model"},{"type":"module","name":"demo.model"},{"type":"class","name":"admin.controller.base"},{"type":"class","name":"admin.controller.code"},{"type":"class","name":"admin.controller.index"},{"type":"class","name":"admin.controller.mob"},{"type":"class","name":"admin.model.code"},{"type":"class","name":"admin.model.code_list"},{"type":"class","name":"admin.model.code_lookup"},{"type":"class","name":"admin.model.groupuser"},{"type":"class","name":"admin.model.groupuser_add"},{"type":"class","name":"admin.model.log"},{"type":"class","name":"admin.model.login"},{"type":"class","name":"admin.model.privilege"},{"type":"class","name":"admin.model.teamuser"},{"type":"class","name":"admin.model.teamuser_add"},{"type":"class","name":"admin.model.user"},{"type":"class","name":"cmpage.controller.base"},{"type":"class","name":"cmpage.controller.mob"},{"type":"class","name":"cmpage.controller.module"},{"type":"class","name":"cmpage.controller.page"},{"type":"class","name":"cmpage.controller.utils"},{"type":"class","name":"cmpage.logic.page"},{"type":"class","name":"cmpage.model.area"},{"type":"class","name":"cmpage.model.base"},{"type":"class","name":"cmpage.model.file_list"},{"type":"class","name":"cmpage.model.page"},{"type":"class","name":"cmpage.model.page_excel"},{"type":"class","name":"cmpage.model.page_lookup"},{"type":"class","name":"cmpage.model.page_mob"},{"type":"class","name":"cmpage.model.utils"},{"type":"class","name":"cmpage.cmpage_global"},{"type":"class","name":"flow.controller.act"},{"type":"class","name":"flow.controller.base"},{"type":"class","name":"flow.controller.proc"},{"type":"class","name":"flow.controller.task"},{"type":"class","name":"flow.controller.task_act"},{"type":"class","name":"flow.model.act"},{"type":"class","name":"flow.model.proc_assign"},{"type":"class","name":"flow.model.act_path"},{"type":"class","name":"cmpage.model.appr"},{"type":"class","name":"flow.model.proc"},{"type":"class","name":"flow.model.task"},{"type":"class","name":"flow.model.task_act"},{"type":"class","name":"flow.model.task_act_appr"},{"type":"class","name":"cmpage.cmpage_global_flow"},{"type":"method","className":"admin.controller.base","name":"__before"},{"type":"method","className":"admin.controller.code","name":"codeTree"},{"type":"method","className":"admin.controller.code","name":"codeLookup"},{"type":"method","className":"admin.controller.code","name":"groupUserMain"},{"type":"method","className":"admin.controller.code","name":"groupUserAdd"},{"type":"method","className":"admin.controller.code","name":"groupUserDel"},{"type":"method","className":"admin.controller.code","name":"teamUserMain"},{"type":"method","className":"admin.controller.code","name":"teamUserAdd"},{"type":"method","className":"admin.controller.code","name":"teamUserDel"},{"type":"method","className":"admin.controller.code","name":"rolePrivilege"},{"type":"method","className":"admin.controller.code","name":"roleGetPrivilegeTree"},{"type":"method","className":"admin.controller.code","name":"roleSavePrivilege"},{"type":"method","className":"admin.controller.code","name":"userGetPrivilegeTree"},{"type":"method","className":"admin.controller.code","name":"userSavePrivilege"},{"type":"method","className":"admin.controller.code","name":"userSavePrivilege"},{"type":"method","className":"admin.controller.index","name":"index"},{"type":"method","className":"admin.controller.index","name":"loginPwdEdit"},{"type":"method","className":"admin.controller.index","name":"login"},{"type":"method","className":"admin.controller.index","name":"exitLogin"},{"type":"method","className":"admin.controller.index","name":"loginPwdEdit"},{"type":"method","className":"admin.controller.mob","name":"getVersion"},{"type":"method","className":"admin.controller.mob","name":"getGroups"},{"type":"method","className":"admin.controller.mob","name":"getMenus"},{"type":"method","className":"admin.controller.mob","name":"login"},{"type":"method","className":"admin.controller.mob","name":"exitLogin"},{"type":"method","className":"admin.controller.mob","name":"loginPwdEdit"},{"type":"method","className":"admin.model.code","name":"getTreeList"},{"type":"method","className":"admin.model.code","name":"getNameById"},{"type":"method","className":"admin.model.code","name":"getCodeById"},{"type":"method","className":"admin.model.code","name":"getCodesByPid"},{"type":"method","className":"admin.model.code","name":"getCodesByRoot"},{"type":"method","className":"admin.model.code","name":"getSexName"},{"type":"method","className":"admin.model.code","name":"getParms"},{"type":"method","className":"admin.model.code","name":"getParmsByPid"},{"type":"method","className":"admin.model.code","name":"getParmsByPobj"},{"type":"method","className":"admin.model.code","name":"getParmById"},{"type":"method","className":"admin.model.code","name":"getParmById"},{"type":"method","className":"admin.model.code","name":"clearCodeCache"},{"type":"method","className":"admin.model.code","name":"getGroups"},{"type":"method","className":"admin.model.code","name":"getRoles"},{"type":"method","className":"admin.model.code","name":"getStocks"},{"type":"method","className":"admin.model.code","name":"getDepts"},{"type":"method","className":"admin.model.code","name":"getCodes"},{"type":"method","className":"admin.model.code_list","name":"getQueryWhere"},{"type":"method","className":"admin.model.code_list","name":"pageEditInit"},{"type":"method","className":"admin.model.code_list","name":"pageSave"},{"type":"method","className":"admin.model.code_list","name":"pageDelete"},{"type":"method","className":"admin.model.code_lookup","name":"getQueryWhere"},{"type":"method","className":"admin.model.groupuser","name":"htmlGetOther"},{"type":"method","className":"admin.model.groupuser","name":"getLoginGroups"},{"type":"method","className":"admin.model.groupuser_add","name":"getQueryWhere"},{"type":"method","className":"admin.model.groupuser_add","name":"htmlGetOther"},{"type":"method","className":"admin.model.log","name":"getQueryWhere"},{"type":"method","className":"admin.model.log","name":"addLog"},{"type":"method","className":"admin.model.login","name":"getQueryWhere"},{"type":"method","className":"admin.model.login","name":"addLogin"},{"type":"method","className":"admin.model.login","name":"addLogin"},{"type":"method","className":"admin.model.privilege","name":"roleSavePrivilege"},{"type":"method","className":"admin.model.privilege","name":"roleGetPrivilegeTree"},{"type":"method","className":"admin.model.privilege","name":"userGetPrivilegeTree"},{"type":"method","className":"admin.model.privilege","name":"userSavePrivilege"},{"type":"method","className":"admin.model.teamuser","name":"htmlGetOther"},{"type":"method","className":"admin.model.teamuser","name":"getUsersByTeamId"},{"type":"method","className":"admin.model.teamuser","name":"isTeamMember"},{"type":"method","className":"admin.model.teamuser_add","name":"getQueryWhere"},{"type":"method","className":"admin.model.teamuser_add","name":"htmlGetOther"},{"type":"method","className":"admin.model.user","name":"getQueryWhere"},{"type":"method","className":"admin.model.user","name":"pageSave"},{"type":"method","className":"admin.model.user","name":"getNameById"},{"type":"method","className":"admin.model.user","name":"getNameById"},{"type":"method","className":"admin.model.user","name":"getUserByLogin"},{"type":"method","className":"admin.model.user","name":"getUsers"},{"type":"method","className":"cmpage.controller.base","name":"delete"},{"type":"method","className":"cmpage.controller.base","name":"__before"},{"type":"method","className":"cmpage.controller.mob","name":"list"},{"type":"method","className":"cmpage.controller.mob","name":"edit"},{"type":"method","className":"cmpage.controller.mob","name":"save"},{"type":"method","className":"cmpage.controller.mob","name":"view"},{"type":"method","className":"cmpage.controller.module","name":"list"},{"type":"method","className":"cmpage.controller.module","name":"save"},{"type":"method","className":"cmpage.controller.module","name":"copy"},{"type":"method","className":"cmpage.controller.module","name":"edit"},{"type":"method","className":"cmpage.controller.module","name":"resetModuleCache"},{"type":"method","className":"cmpage.controller.module","name":"colList"},{"type":"method","className":"cmpage.controller.module","name":"colReset"},{"type":"method","className":"cmpage.controller.module","name":"col_save"},{"type":"method","className":"cmpage.controller.module","name":"editList"},{"type":"method","className":"cmpage.controller.module","name":"editReset"},{"type":"method","className":"cmpage.controller.module","name":"edit_save"},{"type":"method","className":"cmpage.controller.module","name":"queryList"},{"type":"method","className":"cmpage.controller.module","name":"queryReset"},{"type":"method","className":"cmpage.controller.module","name":"query_delete_no_show"},{"type":"method","className":"cmpage.controller.module","name":"query_save"},{"type":"method","className":"cmpage.controller.module","name":"btnList"},{"type":"method","className":"cmpage.controller.module","name":"btnReset"},{"type":"method","className":"cmpage.controller.module","name":"btn_save"},{"type":"method","className":"cmpage.controller.page","name":"list"},{"type":"method","className":"cmpage.controller.page","name":"excelExport"},{"type":"method","className":"cmpage.controller.page","name":"delete"},{"type":"method","className":"cmpage.controller.page","name":"updateStatus"},{"type":"method","className":"cmpage.controller.page","name":"edit"},{"type":"method","className":"cmpage.controller.page","name":"editMs"},{"type":"method","className":"cmpage.controller.page","name":"save"},{"type":"method","className":"cmpage.controller.page","name":"view"},{"type":"method","className":"cmpage.controller.page","name":"viewMs"},{"type":"method","className":"cmpage.controller.page","name":"print"},{"type":"method","className":"cmpage.controller.page","name":"lookup"},{"type":"method","className":"cmpage.controller.page","name":"updateFile"},{"type":"method","className":"cmpage.controller.page","name":"timeline"},{"type":"method","className":"cmpage.controller.utils","name":"callFunction"},{"type":"method","className":"cmpage.controller.utils","name":"callFunction"},{"type":"method","className":"cmpage.controller.utils","name":"clearCache"},{"type":"method","className":"cmpage.controller.utils","name":"getCitys"},{"type":"method","className":"cmpage.controller.utils","name":"getCountrys"},{"type":"method","className":"cmpage.logic.page","name":"save"},{"type":"method","className":"cmpage.model.area","name":"getProvinces"},{"type":"method","className":"cmpage.model.area","name":"getProvinceName"},{"type":"method","className":"cmpage.model.area","name":"getCityName"},{"type":"method","className":"cmpage.model.area","name":"getCountryName"},{"type":"method","className":"cmpage.model.area","name":"getCitys"},{"type":"method","className":"cmpage.model.area","name":"getCountrys"},{"type":"method","className":"cmpage.model.area","name":"getProvinceItems"},{"type":"method","className":"cmpage.model.area","name":"getCityItems"},{"type":"method","className":"cmpage.model.area","name":"getCountryItems"},{"type":"method","className":"cmpage.model.file_list","name":"mobHtmlGetList"},{"type":"method","className":"cmpage.model.page","name":"initPage"},{"type":"method","className":"cmpage.model.page","name":"htmlGetQuery"},{"type":"method","className":"cmpage.model.page","name":"htmlGetOther"},{"type":"method","className":"cmpage.model.page","name":"getOptions"},{"type":"method","className":"cmpage.model.page","name":"getOptionsTree"},{"type":"method","className":"cmpage.model.page","name":"getReplaceText"},{"type":"method","className":"cmpage.model.page","name":"htmlGetBtnHeader"},{"type":"method","className":"cmpage.model.page","name":"htmlGetBtnList"},{"type":"method","className":"cmpage.model.page","name":"htmlGetList"},{"type":"method","className":"cmpage.model.page","name":"isShowBtn"},{"type":"method","className":"cmpage.model.page","name":"getDataList"},{"type":"method","className":"cmpage.model.page","name":"isShowBtn"},{"type":"method","className":"cmpage.model.page","name":"getQueryWhere"},{"type":"method","className":"cmpage.model.page","name":"getListFields"},{"type":"method","className":"cmpage.model.page","name":"pageEditInit"},{"type":"method","className":"cmpage.model.page","name":"getDataRecord"},{"type":"method","className":"cmpage.model.page","name":"htmlGetEdit"},{"type":"method","className":"cmpage.model.page","name":"htmlGetEditInput"},{"type":"method","className":"cmpage.model.page","name":"htmlGetEditBtns"},{"type":"method","className":"cmpage.model.page","name":"htmlGetActBtns"},{"type":"method","className":"cmpage.model.page","name":"htmlGetTaskActBtns"},{"type":"method","className":"cmpage.model.page","name":"pageSave"},{"type":"method","className":"cmpage.model.page","name":"pageSaveLog"},{"type":"method","className":"cmpage.model.page","name":"htmlGetView"},{"type":"method","className":"cmpage.model.page","name":"htmlGetPrint"},{"type":"method","className":"cmpage.model.page","name":"pageDelete"},{"type":"method","className":"cmpage.model.page","name":"htmlGetFooter"},{"type":"method","className":"cmpage.model.page","name":"updateStatus"},{"type":"method","className":"cmpage.model.page","name":"htmlGetListTimeline"},{"type":"method","className":"cmpage.model.page","name":"getNameById"},{"type":"method","className":"cmpage.model.page_excel","name":"excelExport"},{"type":"method","className":"cmpage.model.page_excel","name":"getColStyle"},{"type":"method","className":"cmpage.model.page_excel","name":"getColData"},{"type":"method","className":"cmpage.model.page_lookup","name":"isShowRowBtns"},{"type":"method","className":"cmpage.model.page_lookup","name":"htmlGetBtnList"},{"type":"method","className":"cmpage.model.page_lookup","name":"getLookupResult"},{"type":"method","className":"cmpage.model.page_lookup","name":"htmlGetBtnHeader"},{"type":"method","className":"cmpage.model.page_lookup","name":"mobHtmlGetList"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetList"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetListBtns"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetHeaderBtnsFromModule"},{"type":"method","className":"cmpage.model.page_mob","name":"mobGetPageMuiSetting"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetListRow"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetQuery"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetEdit"},{"type":"method","className":"cmpage.model.page_mob","name":"mobHtmlGetEditInput"},{"type":"method","className":"cmpage.model.utils","name":"getDataList"},{"type":"method","className":"cmpage.model.utils","name":"htmlGetPrint"},{"type":"method","className":"cmpage.model.utils","name":"getEnumName"},{"type":"method","className":"cmpage.model.utils","name":"getEnum"},{"type":"method","className":"cmpage.cmpage_global","name":"objPropertysReplaceToStr"},{"type":"method","className":"cmpage.cmpage_global","name":"objPropertysFromOtherObj"},{"type":"method","className":"cmpage.cmpage_global","name":"objToString"},{"type":"method","className":"cmpage.cmpage_global","name":"objFromString"},{"type":"method","className":"cmpage.cmpage_global","name":"arrFromString"},{"type":"method","className":"cmpage.cmpage_global","name":"arrFromString"},{"type":"method","className":"cmpage.cmpage_global","name":"arrGetValuesByColumnName"},{"type":"method","className":"cmpage.cmpage_global","name":"strGetValuesByPropertyName"},{"type":"method","className":"cmpage.cmpage_global","name":"arrGetUnique"},{"type":"method","className":"cmpage.cmpage_global","name":"checksql"},{"type":"method","className":"cmpage.cmpage_global","name":"parmsFromUrl"},{"type":"method","className":"cmpage.cmpage_global","name":"model"},{"type":"method","className":"cmpage.cmpage_global","name":"model"},{"type":"method","className":"cmpage.cmpage_global","name":"formatNumber"},{"type":"method","className":"cmpage.cmpage_global","name":"getRandomNum"},{"type":"method","className":"flow.controller.act","name":"edit"},{"type":"method","className":"flow.controller.act","name":"delete"},{"type":"method","className":"flow.controller.act","name":"deletePath"},{"type":"method","className":"flow.controller.act","name":"edit"},{"type":"method","className":"flow.controller.base","name":"__before"},{"type":"method","className":"flow.controller.proc","name":"design"},{"type":"method","className":"flow.controller.proc","name":"flowMap"},{"type":"method","className":"flow.controller.proc","name":"saveMap"},{"type":"method","className":"flow.controller.task","name":"start"},{"type":"method","className":"flow.controller.task","name":"run"},{"type":"method","className":"flow.controller.task","name":"suspend"},{"type":"method","className":"flow.controller.task","name":"terminate"},{"type":"method","className":"flow.controller.task","name":"autoExec"},{"type":"method","className":"flow.controller.task_act","name":"run"},{"type":"method","className":"flow.controller.task_act","name":"suspend"},{"type":"method","className":"flow.controller.task_act","name":"terminate"},{"type":"method","className":"flow.model.act","name":"canRun"},{"type":"method","className":"flow.model.act","name":"fwRun"},{"type":"method","className":"flow.model.act","name":"fwSuspend"},{"type":"method","className":"flow.model.act","name":"fwTerminate"},{"type":"method","className":"flow.model.act","name":"fwEnd"},{"type":"method","className":"flow.model.act","name":"fwGetActParms"},{"type":"method","className":"flow.model.act","name":"fwAutoExec"},{"type":"method","className":"flow.model.act","name":"getActsOrder"},{"type":"method","className":"flow.model.act","name":"getToActsFromId"},{"type":"method","className":"flow.model.act","name":"getActById"},{"type":"method","className":"flow.model.act","name":"getActByIdAndProcId"},{"type":"method","className":"flow.model.act","name":"getNameById"},{"type":"method","className":"flow.model.act","name":"getActs"},{"type":"method","className":"flow.model.act","name":"getActsByProcId"},{"type":"method","className":"flow.model.proc_assign","name":"pageEditInit"},{"type":"method","className":"flow.model.proc_assign","name":"htmlGetEditInput"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignByUser"},{"type":"method","className":"flow.model.proc_assign","name":"getLinkNameById"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignById"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignByActId"},{"type":"method","className":"flow.model.proc_assign","name":"getAssigns"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignsByActId"},{"type":"method","className":"flow.model.act_path","name":"getActPathById"},{"type":"method","className":"flow.model.act_path","name":"getActPathByIdAndProcId"},{"type":"method","className":"flow.model.act_path","name":"getFromActIDs"},{"type":"method","className":"flow.model.act_path","name":"getToActIDs"},{"type":"method","className":"flow.model.act_path","name":"getToActPaths"},{"type":"method","className":"flow.model.act_path","name":"getNameById"},{"type":"method","className":"cmpage.model.appr","name":"pageEditInit"},{"type":"method","className":"cmpage.model.appr","name":"getDataRecord"},{"type":"method","className":"cmpage.model.appr","name":"pageSave"},{"type":"method","className":"cmpage.model.appr","name":"pageEditInit"},{"type":"method","className":"cmpage.model.appr","name":"pageSave"},{"type":"method","className":"cmpage.model.appr","name":"addStatus"},{"type":"method","className":"flow.model.proc","name":"fwStart"},{"type":"method","className":"flow.model.proc","name":"fwRun"},{"type":"method","className":"flow.model.proc","name":"fwSuspend"},{"type":"method","className":"flow.model.proc","name":"fwTerminate"},{"type":"method","className":"flow.model.proc","name":"fwEnd"},{"type":"method","className":"flow.model.proc","name":"fwGetActParms"},{"type":"method","className":"flow.model.proc","name":"getActById"},{"type":"method","className":"flow.model.proc","name":"getNameById"},{"type":"method","className":"flow.model.proc_assign","name":"pageEditInit"},{"type":"method","className":"flow.model.proc_assign","name":"htmlGetEditInput"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignByUser"},{"type":"method","className":"flow.model.proc_assign","name":"getLinkNameById"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignById"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignByProcId"},{"type":"method","className":"flow.model.proc_assign","name":"getAssigns"},{"type":"method","className":"flow.model.proc_assign","name":"getAssignsByProcId"},{"type":"method","className":"flow.model.task","name":"getStocks"},{"type":"method","className":"flow.model.task","name":"saveMap"},{"type":"method","className":"flow.model.task","name":"copyToNewProc"},{"type":"method","className":"flow.model.task","name":"fwStart"},{"type":"method","className":"flow.model.task","name":"getTaskWithStatus"},{"type":"method","className":"flow.model.task","name":"fwInit"},{"type":"method","className":"flow.model.task","name":"getTaskNo"},{"type":"method","className":"flow.model.task","name":"fwRun"},{"type":"method","className":"flow.model.task","name":"fwSuspend"},{"type":"method","className":"flow.model.task","name":"fwTerminate"},{"type":"method","className":"flow.model.task","name":"fwEnd"},{"type":"method","className":"flow.model.task","name":"addTaskSt"},{"type":"method","className":"flow.model.task","name":"save"},{"type":"method","className":"flow.model.task","name":"getTask"},{"type":"method","className":"flow.model.task","name":"getUserFromTask"},{"type":"method","className":"flow.model.task","name":"getFlowMap"},{"type":"method","className":"flow.model.task_act","name":"canRun"},{"type":"method","className":"flow.model.task_act","name":"defineFromRule"},{"type":"method","className":"flow.model.task_act","name":"fwRun"},{"type":"method","className":"flow.model.task_act","name":"fwSuspend"},{"type":"method","className":"flow.model.task_act","name":"fwTerminate"},{"type":"method","className":"flow.model.task_act","name":"fwEnd"},{"type":"method","className":"flow.model.task_act","name":"defineOrSplit"},{"type":"method","className":"flow.model.task_act","name":"domainGetData"},{"type":"method","className":"flow.model.task_act","name":"defineToRule"},{"type":"method","className":"flow.model.task_act","name":"save"},{"type":"method","className":"flow.model.task_act","name":"addTaskSt"},{"type":"method","className":"flow.model.task_act","name":"getFromTasksWithEnd"},{"type":"method","className":"flow.model.task_act","name":"getFromTaskActs"},{"type":"method","className":"flow.model.task_act","name":"getToTaskIds"},{"type":"method","className":"flow.model.task_act","name":"getTaskActs"},{"type":"method","className":"flow.model.task_act","name":"getTaskAct"},{"type":"method","className":"flow.model.task_act_appr","name":"fwRun"},{"type":"method","className":"flow.model.task_act_appr","name":"domainGetData"},{"type":"method","className":"cmpage.cmpage_global_flow","name":"isShowRowBtn"}]} \ No newline at end of file diff --git a/www/static/doc/classes/cmpage.controller.page.html b/www/static/doc/classes/cmpage.controller.page.html index 0af56c6..0ebfae7 100644 --- a/www/static/doc/classes/cmpage.controller.page.html +++ b/www/static/doc/classes/cmpage.controller.page.html @@ -547,6 +547,13 @@ + + +
  • + editMs + + +
  • @@ -571,7 +578,7 @@
  • - recEdit + print @@ -714,7 +721,7 @@ - src\cmpage\controller\page.js:138 + src\cmpage\controller\page.js:140

    @@ -790,7 +797,7 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    - src\cmpage\controller\page.js:178 + src\cmpage\controller\page.js:180

    @@ -808,6 +815,81 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    +
    +

    Returns:

    + +
    + + + [Promise] + +

    HTML片段

    + + +
    +
    + + + + + + +
    +

    editMs

    + + editMs + + () + + + + + + Promise + + + + + + + + + + + + + + + +
    + + + +

    + + Defined in + + + + + src\cmpage\controller\page.js:213 + +

    + + + + + +
    + +
    +

    业务模块的编辑页面，主从页面，一般调用： /cmpage/page/edit_ms?modulename=xxx

    +
    +
    + + + +

    Returns:

    @@ -865,7 +947,7 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    - src\cmpage\controller\page.js:90 + src\cmpage\controller\page.js:92

    @@ -1015,7 +1097,7 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    - src\cmpage\controller\page.js:338 + src\cmpage\controller\page.js:368

    @@ -1052,10 +1134,10 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    -
    -

    recEdit

    +
    +

    print

    - recEdit + print () @@ -1090,7 +1172,7 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    - src\cmpage\controller\page.js:209 + src\cmpage\controller\page.js:344

    @@ -1101,7 +1183,7 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    -

    业务模块的编辑页面，主从页面，一般调用： /cmpage/page/rec_edit?modulename=xxx

    +

    业务模块的编辑页面，主从页面，一般调用： /cmpage/page/print?modulename=xxx

    @@ -1165,7 +1247,7 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    - src\cmpage\controller\page.js:240 + src\cmpage\controller\page.js:245

    @@ -1238,7 +1320,7 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    - src\cmpage\controller\page.js:435 + src\cmpage\controller\page.js:467

    @@ -1313,7 +1395,7 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    - src\cmpage\controller\page.js:399 + src\cmpage\controller\page.js:431

    @@ -1389,7 +1471,7 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    - src\cmpage\controller\page.js:158 + src\cmpage\controller\page.js:160

    @@ -1465,7 +1547,7 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    - src\cmpage\controller\page.js:286 + src\cmpage\controller\page.js:291

    @@ -1540,7 +1622,7 @@ flag=true: 记录真删除，否则修改记录状态 c_status = -1

    - src\cmpage\controller\page.js:310 + src\cmpage\controller\page.js:316

    diff --git a/www/static/doc/classes/cmpage.model.appr.html b/www/static/doc/classes/cmpage.model.appr.html index f4f3010..6bf9e09 100644 --- a/www/static/doc/classes/cmpage.model.appr.html +++ b/www/static/doc/classes/cmpage.model.appr.html @@ -541,6 +541,13 @@ +
    • + +
  • + getDataRecord + + +
  • @@ -765,6 +772,81 @@ + + + +
    +

    getDataRecord

    + + getDataRecord + + () + + + + + + Object + + + + + + + + + + + + + + + +
    + + + +

    + + Defined in + + + + + src\flow\model\appr.js:50 + +

    + + + + + +
    + +
    +

    取当前记录对象，用于新增和修改的编辑页面展示

    +
    +
    + + + + +
    +

    Returns:

    + +
    + + + [Object] + +

    当前记录对象

    + + +
    +
    + + +
    @@ -962,7 +1044,7 @@ - src\flow\model\appr.js:50 + src\flow\model\appr.js:62

    diff --git a/www/static/doc/classes/cmpage.model.page.html b/www/static/doc/classes/cmpage.model.page.html index 5b1c766..4f1aa09 100644 --- a/www/static/doc/classes/cmpage.model.page.html +++ b/www/static/doc/classes/cmpage.model.page.html @@ -554,6 +554,13 @@ +
    • + +
  • + getNameById + + +
  • @@ -652,6 +659,13 @@ +
    • + +
  • + htmlGetPrint + + +
  • @@ -826,7 +840,7 @@ - src\cmpage\model\page.js:478 + src\cmpage\model\page.js:480

    @@ -901,7 +915,7 @@ - src\cmpage\model\page.js:686 + src\cmpage\model\page.js:692

    @@ -976,7 +990,7 @@ - src\cmpage\model\page.js:622 + src\cmpage\model\page.js:628

    @@ -1010,6 +1024,165 @@ + + + +
    +

    getNameById

    + + getNameById + +
    + (
      + +
    • + + id + +
      • + +
    • + + fieldNames + +
      • + +
    • + + joinStr + +
      • + +
    ) +
    + +     + + + + String + + + + + + + + + + + + + + + +
    + + + +

    + + Defined in + + + + + src\cmpage\model\page.js:1521 + +

    + + + + + +
    + +
    +

    根据参数ID取参数的名称，一般用于页面模块配置中的‘替换’调用: admin/cdoe:getNameById
    +子类中重写的时候需要为 this.mod.c_table 和 this.pk 赋值，因为直接调用的时候进行模块设置的初始化
    +当然也可以重写 constructor 设置这两个值

    +
    +
    + + +
    +

    Parameters:

    + +
    • + + + + + + + + + + + + + + + + + +
    nametypeflagdescription
    id + Int + + + + +
    +

    参数ID

    + +
    + + +
    fieldNames + String + + + + +
    +

    字段名称,逗号分隔

    + +
    + + +
    joinStr + String + + + + +
    +

    连接的字符串

    + +
    + + +
    +
    + + + +
    +

    Returns:

    + +
    + + + [String] + +

    参数名称

    + + +
    +
    + + + @@ -1067,7 +1240,7 @@ - src\cmpage\model\page.js:125 + src\cmpage\model\page.js:126

    @@ -1202,7 +1375,7 @@ - src\cmpage\model\page.js:178 + src\cmpage\model\page.js:179

    @@ -1321,7 +1494,7 @@ - src\cmpage\model\page.js:556 + src\cmpage\model\page.js:561

    @@ -1412,7 +1585,7 @@ - src\cmpage\model\page.js:227 + src\cmpage\model\page.js:228

    @@ -1532,7 +1705,7 @@ - src\cmpage\model\page.js:960 + src\cmpage\model\page.js:974

    @@ -1608,7 +1781,7 @@ - src\cmpage\model\page.js:266 + src\cmpage\model\page.js:267

    @@ -1693,7 +1866,7 @@ - src\cmpage\model\page.js:308 + src\cmpage\model\page.js:309

    @@ -1794,7 +1967,7 @@ - src\cmpage\model\page.js:718 + src\cmpage\model\page.js:724

    @@ -1869,7 +2042,7 @@ - src\cmpage\model\page.js:864 + src\cmpage\model\page.js:877

    @@ -1966,7 +2139,7 @@ - src\cmpage\model\page.js:849 + src\cmpage\model\page.js:862

    @@ -2101,7 +2274,7 @@ - src\cmpage\model\page.js:1400 + src\cmpage\model\page.js:1446

    @@ -2176,7 +2349,7 @@ - src\cmpage\model\page.js:363 + src\cmpage\model\page.js:365

    @@ -2251,7 +2424,7 @@ - src\cmpage\model\page.js:1442 + src\cmpage\model\page.js:1488

    @@ -2326,7 +2499,7 @@ - src\cmpage\model\page.js:116 + src\cmpage\model\page.js:117

    @@ -2360,6 +2533,81 @@ + + + +
    +

    htmlGetPrint

    + + htmlGetPrint + + () + + + + + + String + + + + + + + + + + + + + + + +
    + + + +

    + + Defined in + + + + + src\cmpage\model\page.js:1413 + +

    + + + + + +
    + +
    +

    取查看页面的设置，组合成打印页面的HTML输出

    +
    +
    + + + + +
    +

    Returns:

    + +
    + + + [String] + +

    HTML页面片段

    + + +
    +
    + + +
    @@ -2401,7 +2649,7 @@ - src\cmpage\model\page.js:47 + src\cmpage\model\page.js:48

    @@ -2476,7 +2724,7 @@ - src\cmpage\model\page.js:1089 + src\cmpage\model\page.js:1106

    @@ -2519,7 +2767,17 @@ htmlGetView - () +
    + (
      + +
    • + + [isPrintStyle] + +
      • + +
    ) +
    @@ -2552,7 +2810,7 @@ - src\cmpage\model\page.js:1303 + src\cmpage\model\page.js:1320

    @@ -2569,6 +2827,33 @@ +
    +

    Parameters:

    + + + + + + + + + + + +
    nametypeflagdescription
    + [isPrintStyle]Booleanoptional + + + +
    +

    是否是打印的风格

    + +
    + + +
    +
    +
    @@ -2658,7 +2943,7 @@ - String + Boolean @@ -2685,7 +2970,7 @@ - src\cmpage\model\page.js:525 + src\cmpage\model\page.js:460

    @@ -2696,7 +2981,8 @@
    -

    取合计行的HTML片段，子类中重写本方法可以定制合计行的显示

    +

    是否显示列表中某行的某个按钮，子类中重写本方法可以改变行按钮显示的逻辑 +按钮设置的备注中，形如： {isShow:'#c_status#==1192 && xxx>xxx'}

    @@ -2709,9 +2995,9 @@
    - [String] + [Boolean] -

    合计行的HTML片段

    +

    是否显示

    @@ -2733,7 +3019,7 @@ - Boolean + String @@ -2760,7 +3046,7 @@ - src\cmpage\model\page.js:458 + src\cmpage\model\page.js:530

    @@ -2771,8 +3057,7 @@
    -

    是否显示列表中某行的某个按钮，子类中重写本方法可以改变行按钮显示的逻辑 -按钮设置的备注中，形如： {isShow:'#c_status#==1192 && xxx>xxx'}

    +

    取合计行的HTML片段，子类中重写本方法可以定制合计行的显示

    @@ -2785,9 +3070,9 @@
    - [Boolean] + [String] -

    是否显示

    +

    合计行的HTML片段

    @@ -2836,7 +3121,7 @@ - src\cmpage\model\page.js:1381 + src\cmpage\model\page.js:1427

    @@ -2912,7 +3197,7 @@ - src\cmpage\model\page.js:644 + src\cmpage\model\page.js:650

    @@ -2997,7 +3282,7 @@ - src\cmpage\model\page.js:1189 + src\cmpage\model\page.js:1206

    @@ -3115,7 +3400,7 @@ - src\cmpage\model\page.js:1222 + src\cmpage\model\page.js:1239

    @@ -3259,7 +3544,7 @@ - src\cmpage\model\page.js:1421 + src\cmpage\model\page.js:1467

    diff --git a/www/static/doc/classes/cmpage.model.utils.html b/www/static/doc/classes/cmpage.model.utils.html index 3c2fd17..2b8d42b 100644 --- a/www/static/doc/classes/cmpage.model.utils.html +++ b/www/static/doc/classes/cmpage.model.utils.html @@ -554,6 +554,13 @@ + + +
  • + htmlGetPrint + + +
    • @@ -651,7 +658,7 @@ - src\cmpage\model\page_ms.js:49 + src\cmpage\model\page_ms.js:50

    @@ -930,6 +937,81 @@ +
    + + +
    +

    htmlGetPrint

    + + htmlGetPrint + + () + + + + + + String + + + + + + + + + + + + + + + +
    + + + +

    + + Defined in + + + + + src\cmpage\model\page_ms.js:62 + +

    + + + + + +
    + +
    +

    取查看页面的设置，组合成打印页面的HTML输出

    +
    +
    + + + + +
    +

    Returns:

    + +
    + + + [String] + +

    HTML页面片段

    + + +
    +
    + + +
    diff --git a/www/static/doc/classes/flow.model.act.html b/www/static/doc/classes/flow.model.act.html index 7361bd7..0c1e38b 100644 --- a/www/static/doc/classes/flow.model.act.html +++ b/www/static/doc/classes/flow.model.act.html @@ -1655,7 +1655,7 @@ canRun的判断在具体的业务task_act中调用

    - src\flow\model\act.js:280 + src\flow\model\act.js:282

    @@ -1772,7 +1772,7 @@ canRun的判断在具体的业务task_act中调用

    - src\flow\model\act.js:296 + src\flow\model\act.js:298

    @@ -1891,7 +1891,7 @@ canRun的判断在具体的业务task_act中调用

    - src\flow\model\act.js:330 + src\flow\model\act.js:332

    @@ -1976,7 +1976,7 @@ canRun的判断在具体的业务task_act中调用

    - src\flow\model\act.js:342 + src\flow\model\act.js:344

    @@ -2198,7 +2198,7 @@ canRun的判断在具体的业务task_act中调用

    - src\flow\model\act.js:314 + src\flow\model\act.js:316

    diff --git a/www/static/doc/classes/flow.model.act_path.html b/www/static/doc/classes/flow.model.act_path.html index b295588..f019340 100644 --- a/www/static/doc/classes/flow.model.act_path.html +++ b/www/static/doc/classes/flow.model.act_path.html @@ -1063,7 +1063,7 @@ - src\flow\model\act_path.js:104 + src\flow\model\act_path.js:106

    @@ -1314,7 +1314,7 @@ - src\flow\model\act_path.js:86 + src\flow\model\act_path.js:87

    diff --git a/www/static/doc/data.json b/www/static/doc/data.json index 921557b..fdd1052 100644 --- a/www/static/doc/data.json +++ b/www/static/doc/data.json @@ -2865,7 +2865,7 @@ }, { "file": "src\\cmpage\\controller\\page.js", - "line": 90, + "line": 92, "description": "模块主界面，导出excel文件，一般调用： /cmpage/page/excel_export?modulename=xxx", "itemtype": "method", "name": "excelExport", @@ -2878,7 +2878,7 @@ }, { "file": "src\\cmpage\\controller\\page.js", - "line": 138, + "line": 140, "description": "删除记录的URL接口，调用： /cmpage/page/delete?modulename=xxx&id=xxx&flag=false
    \nflag=true: 记录真删除，否则修改记录状态 c_status = -1", "itemtype": "method", "name": "delete", @@ -2891,7 +2891,7 @@ }, { "file": "src\\cmpage\\controller\\page.js", - "line": 158, + "line": 160, "description": "修改状态，供界面按钮直接调用，工作流相关方法（状态流转类）
    \n调用： /cmpage/page/update_status?modulename=xxx&id=xxx&actID=xxx&status=xxx", "itemtype": "method", "name": "updateStatus", @@ -2904,7 +2904,7 @@ }, { "file": "src\\cmpage\\controller\\page.js", - "line": 178, + "line": 180, "description": "业务模块的编辑页面，一般调用： /cmpage/page/edit?modulename=xxx", "itemtype": "method", "name": "edit", @@ -2917,10 +2917,10 @@ }, { "file": "src\\cmpage\\controller\\page.js", - "line": 209, - "description": "业务模块的编辑页面，主从页面，一般调用： /cmpage/page/rec_edit?modulename=xxx", + "line": 213, + "description": "业务模块的编辑页面，主从页面，一般调用： /cmpage/page/edit_ms?modulename=xxx", "itemtype": "method", - "name": "recEdit", + "name": "editMs", "return": { "description": "HTML片段", "type": "Promise" @@ -2930,7 +2930,7 @@ }, { "file": "src\\cmpage\\controller\\page.js", - "line": 240, + "line": 245, "description": "保存业务模块记录信息， POST调用： /cmpage/page/save", "itemtype": "method", "name": "save", @@ -2943,7 +2943,7 @@ }, { "file": "src\\cmpage\\controller\\page.js", - "line": 286, + "line": 291, "description": "业务模块的查看页面，一般调用： /cmpage/page/view?modulename=xxx", "itemtype": "method", "name": "view", @@ -2956,7 +2956,7 @@ }, { "file": "src\\cmpage\\controller\\page.js", - "line": 310, + "line": 316, "description": "主从业务模块的查看页面，一般调用： /cmpage/page/view_ms?modulename=xxx", "itemtype": "method", "name": "viewMs", @@ -2969,7 +2969,20 @@ }, { "file": "src\\cmpage\\controller\\page.js", - "line": 338, + "line": 344, + "description": "业务模块的编辑页面，主从页面，一般调用： /cmpage/page/print?modulename=xxx", + "itemtype": "method", + "name": "print", + "return": { + "description": "HTML片段", + "type": "Promise" + }, + "class": "cmpage.controller.page", + "module": "cmpage.controller" + }, + { + "file": "src\\cmpage\\controller\\page.js", + "line": 368, "description": "查找带回页面，一般调用： /cmpage/page/lookup?modulename=xxx&multiselect=false", "itemtype": "method", "name": "lookup", @@ -2982,7 +2995,7 @@ }, { "file": "src\\cmpage\\controller\\page.js", - "line": 399, + "line": 431, "description": "上传文件的URL接口，调用： /cmpage/page/upload_file
    \n如果多个文件上传，则前端循环调用本接口", "itemtype": "method", "name": "updateFile", @@ -2995,7 +3008,7 @@ }, { "file": "src\\cmpage\\controller\\page.js", - "line": 435, + "line": 467, "description": "时间轴展示页面，一般调用： /cmpage/page/timeline?modulename=xxx", "itemtype": "method", "name": "timeline", @@ -3365,13 +3378,13 @@ }, { "file": "src\\cmpage\\model\\module.js", - "line": 450, + "line": 415, "class": "cmpage.model.page", "module": "cmpage.model" }, { "file": "src\\cmpage\\model\\module.js", - "line": 537, + "line": 504, "class": "cmpage.model.page", "module": "cmpage.model" }, @@ -3386,7 +3399,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 47, + "line": 48, "description": "取查询项的设置，组合成HTML输出", "itemtype": "method", "name": "htmlGetQuery", @@ -3399,7 +3412,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 116, + "line": 117, "description": "输出额外的按钮和js函数和HTML片段，区别于 getPageOther", "itemtype": "method", "name": "htmlGetOther", @@ -3412,7 +3425,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 125, + "line": 126, "description": "取下拉框的选项集", "itemtype": "method", "name": "getOptions", @@ -3439,7 +3452,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 178, + "line": 179, "description": "取树状下拉框的选项集", "itemtype": "method", "name": "getOptionsTree", @@ -3466,7 +3479,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 227, + "line": 228, "description": "根据设置取显示的替换值", "itemtype": "method", "name": "getReplaceText", @@ -3491,7 +3504,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 266, + "line": 267, "description": "取顶部按钮的设置，分靠左和靠右两块，组合成HTML输出", "itemtype": "method", "name": "htmlGetBtnHeader", @@ -3504,7 +3517,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 308, + "line": 309, "description": "取记录列表每一行的按钮设置，组合成HTML输出，子类中重写本方法可以定制每行按钮的输出效果", "itemtype": "method", "name": "htmlGetBtnList", @@ -3524,7 +3537,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 363, + "line": 365, "description": "取分页列表的设置，结合结果数据集，组合成HTML输出，一般不需要重新本方法", "itemtype": "method", "name": "htmlGetList", @@ -3537,7 +3550,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 458, + "line": 460, "description": "是否显示列表中某行的某个按钮，子类中重写本方法可以改变行按钮显示的逻辑\n按钮设置的备注中，形如： {isShow:'#c_status#==1192 && xxx>xxx'}", "itemtype": "method", "name": "isShowBtn", @@ -3550,7 +3563,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 478, + "line": 480, "description": "取结果数据集，子类中重写本方法可以增加逻辑如：对结果集做进一步的数据处理等", "itemtype": "method", "name": "getDataList", @@ -3563,7 +3576,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 525, + "line": 530, "description": "取合计行的HTML片段，子类中重写本方法可以定制合计行的显示", "itemtype": "method", "name": "isShowBtn", @@ -3576,7 +3589,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 556, + "line": 561, "description": "取查询项的设置，结合POST参数，得到Where字句，重写本方法可以定制或修改SQL的where子句", "itemtype": "method", "name": "getQueryWhere", @@ -3589,7 +3602,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 622, + "line": 628, "description": "根据设置取得页面显示列表返回的字段，一般不需要重写本方法", "itemtype": "method", "name": "getListFields", @@ -3602,7 +3615,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 644, + "line": 650, "description": "新增的时候，初始化编辑页面的值，子类重写本方法可以定制新增页面的初始值", "itemtype": "method", "name": "pageEditInit", @@ -3615,7 +3628,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 686, + "line": 692, "description": "取当前记录对象，用于新增和修改的编辑页面展示", "itemtype": "method", "name": "getDataRecord", @@ -3628,7 +3641,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 718, + "line": 724, "description": "取编辑页面的设置，组合成列表数据的HTML输出", "itemtype": "method", "name": "htmlGetEdit", @@ -3641,7 +3654,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 849, + "line": 862, "description": "改变某些编辑列的样式，子类中可以重写本方法类增加模块编辑页面的操作逻辑", "itemtype": "method", "name": "htmlGetEditInput", @@ -3671,7 +3684,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 864, + "line": 877, "description": "取编辑页面的按钮设置，组合按钮的HTML输出", "itemtype": "method", "name": "htmlGetEditBtns", @@ -3684,7 +3697,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 960, + "line": 974, "description": "取状态流转类型的流程节点相关的按钮设置，组合成按钮的HTML输出
    \n考虑到按钮输出和业务关联度大，定义在此处", "itemtype": "method", "name": "htmlGetActBtns", @@ -3697,7 +3710,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 1089, + "line": 1106, "description": "取流程节点相关的按钮设置，组合按钮的HTML输出
    \n考虑到按钮输出和业务关联度大，定义在此处", "itemtype": "method", "name": "htmlGetTaskActBtns", @@ -3710,7 +3723,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 1189, + "line": 1206, "description": "编辑页面保存,
    \n如果是多个表的数据产生的编辑页，则根据存在于this.mod.c_table中的列更新表，一般需要在子类中继承，例如： admin/user:pageSave", "itemtype": "method", "name": "pageSave", @@ -3730,7 +3743,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 1222, + "line": 1239, "description": "保存后的操作日志记录,，通过重写可在子类中定制日志的格式", "itemtype": "method", "name": "pageSaveLog", @@ -3755,7 +3768,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 1303, + "line": 1320, "description": "取查看页面的设置，组合成列表数据的HTML输出
    \n如果需要改变查看页面的逻辑，可以重写本方法，或者修改 this.modCols的设置值后调用 super.htmlGetView()", "itemtype": "method", "name": "htmlGetView", @@ -3763,12 +3776,33 @@ "description": "HTML页面片段", "type": "String" }, + "params": [ + { + "name": "isPrintStyle", + "description": "是否是打印的风格", + "type": "Boolean", + "optional": true + } + ], + "class": "cmpage.model.page", + "module": "cmpage.model" + }, + { + "file": "src\\cmpage\\model\\page.js", + "line": 1413, + "description": "取查看页面的设置，组合成打印页面的HTML输出", + "itemtype": "method", + "name": "htmlGetPrint", + "return": { + "description": "HTML页面片段", + "type": "String" + }, "class": "cmpage.model.page", "module": "cmpage.model" }, { "file": "src\\cmpage\\model\\page.js", - "line": 1381, + "line": 1427, "description": "删除记录,
    \n子类中可以重写本方法，实现其他的删除逻辑，如判断是否可以删除，删除相关联的其他记录等等", "itemtype": "method", "name": "pageDelete", @@ -3781,7 +3815,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 1400, + "line": 1446, "description": "取分页列表的 footer 设置，组合成HTML输出，一般不需要重写本方法", "itemtype": "method", "name": "htmlGetFooter", @@ -3794,7 +3828,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 1421, + "line": 1467, "description": "修改状态，供界面按钮直接调用，工作流相关方法（状态流转类）
    \n子类中覆写本方法，可以根据业务对象的状态增加其他逻辑", "itemtype": "method", "name": "updateStatus", @@ -3829,7 +3863,7 @@ }, { "file": "src\\cmpage\\model\\page.js", - "line": 1442, + "line": 1488, "description": "取模块列表的显示列设置，组合成时间轴HTML输出，一般在子类中通过重写这个方法来达到页面定制的效果", "itemtype": "method", "name": "htmlGetListTimeline", @@ -3840,6 +3874,36 @@ "class": "cmpage.model.page", "module": "cmpage.model" }, + { + "file": "src\\cmpage\\model\\page.js", + "line": 1521, + "description": "根据参数ID取参数的名称，一般用于页面模块配置中的‘替换’调用: admin/cdoe:getNameById
    \n子类中重写的时候需要为 this.mod.c_table 和 this.pk 赋值，因为直接调用的时候进行模块设置的初始化
    \n当然也可以重写 constructor 设置这两个值", + "itemtype": "method", + "name": "getNameById", + "return": { + "description": "参数名称", + "type": "String" + }, + "params": [ + { + "name": "id", + "description": "参数ID", + "type": "Int" + }, + { + "name": "fieldNames", + "description": "字段名称,逗号分隔", + "type": "String" + }, + { + "name": "joinStr", + "description": "连接的字符串", + "type": "String" + } + ], + "class": "cmpage.model.page", + "module": "cmpage.model" + }, { "file": "src\\cmpage\\model\\page_excel.js", "line": 22, @@ -4150,7 +4214,7 @@ }, { "file": "src\\cmpage\\model\\page_ms.js", - "line": 49, + "line": 50, "description": "取结果数据集，子类中重写本方法可以增加逻辑如：对结果集做进一步的数据处理等", "itemtype": "method", "name": "getDataList", @@ -4161,6 +4225,19 @@ "class": "cmpage.model.utils", "module": "cmpage.model" }, + { + "file": "src\\cmpage\\model\\page_ms.js", + "line": 62, + "description": "取查看页面的设置，组合成打印页面的HTML输出", + "itemtype": "method", + "name": "htmlGetPrint", + "return": { + "description": "HTML页面片段", + "type": "String" + }, + "class": "cmpage.model.utils", + "module": "cmpage.model" + }, { "file": "src\\cmpage\\model\\utils.js", "line": 22, @@ -5107,7 +5184,7 @@ }, { "file": "src\\flow\\model\\act.js", - "line": 280, + "line": 282, "description": "根据ID取活动(流程节点)参数，供其他方法调用", "itemtype": "method", "name": "getActById", @@ -5127,7 +5204,7 @@ }, { "file": "src\\flow\\model\\act.js", - "line": 296, + "line": 298, "description": "根据ID和模板ID取活动(流程节点)参数，供其他方法调用
    \n模板较多的时候，用本方法来改进性能", "itemtype": "method", "name": "getActByIdAndProcId", @@ -5152,7 +5229,7 @@ }, { "file": "src\\flow\\model\\act.js", - "line": 314, + "line": 316, "description": "根据ID取活动节点的名称，一般用于页面模块配置中的‘替换’调用: flow/act:getNameById", "itemtype": "method", "name": "getNameById", @@ -5172,7 +5249,7 @@ }, { "file": "src\\flow\\model\\act.js", - "line": 330, + "line": 332, "description": "取活动节点的列表，一般用于页面模块配置中的‘替换’调用: flow/act:getActs", "itemtype": "method", "name": "getActs", @@ -5185,7 +5262,7 @@ }, { "file": "src\\flow\\model\\act.js", - "line": 342, + "line": 344, "description": "根据流程模板ID取活动节点的列表，一般用于页面模块配置中的‘替换’调用: flow/act:getActsByProcId", "itemtype": "method", "name": "getActsByProcId", @@ -5466,7 +5543,7 @@ }, { "file": "src\\flow\\model\\act_path.js", - "line": 86, + "line": 87, "description": "根据活动节点ID和模板ID取去向的路径列表，供其他方法调用", "itemtype": "method", "name": "getToActPaths", @@ -5491,7 +5568,7 @@ }, { "file": "src\\flow\\model\\act_path.js", - "line": 104, + "line": 106, "description": "根据ID取活动路径对象的名称，一般用于页面模块配置中的‘替换’调用: flow/act_path:getNameById", "itemtype": "method", "name": "getNameById", @@ -5532,6 +5609,19 @@ { "file": "src\\flow\\model\\appr.js", "line": 50, + "description": "取当前记录对象，用于新增和修改的编辑页面展示", + "itemtype": "method", + "name": "getDataRecord", + "return": { + "description": "当前记录对象", + "type": "Object" + }, + "class": "cmpage.model.appr", + "module": "demo.model" + }, + { + "file": "src\\flow\\model\\appr.js", + "line": 62, "description": "编辑页面保存,
    \n保存之前需要更新关联对象的状态", "itemtype": "method", "name": "pageSave", @@ -6498,31 +6588,31 @@ "warnings": [ { "message": "replacing incorrect tag: params with param", - "line": " src\\cmpage\\model\\page.js:849" + "line": " src\\cmpage\\model\\page.js:862" }, { "message": "replacing incorrect tag: params with param", - "line": " src\\cmpage\\model\\page.js:849" + "line": " src\\cmpage\\model\\page.js:862" }, { "message": "replacing incorrect tag: params with param", - "line": " src\\cmpage\\model\\page.js:849" + "line": " src\\cmpage\\model\\page.js:862" }, { "message": "replacing incorrect tag: params with param", - "line": " src\\cmpage\\model\\page.js:1421" + "line": " src\\cmpage\\model\\page.js:1467" }, { "message": "replacing incorrect tag: params with param", - "line": " src\\cmpage\\model\\page.js:1421" + "line": " src\\cmpage\\model\\page.js:1467" }, { "message": "replacing incorrect tag: params with param", - "line": " src\\cmpage\\model\\page.js:1421" + "line": " src\\cmpage\\model\\page.js:1467" }, { "message": "replacing incorrect tag: params with param", - "line": " src\\cmpage\\model\\page.js:1421" + "line": " src\\cmpage\\model\\page.js:1467" }, { "message": "replacing incorrect tag: params with param", @@ -6626,11 +6716,11 @@ }, { "message": "replacing incorrect tag: params with param", - "line": " src\\flow\\model\\act.js:280" + "line": " src\\flow\\model\\act.js:282" }, { "message": "replacing incorrect tag: params with param", - "line": " src\\flow\\model\\act.js:296" + "line": " src\\flow\\model\\act.js:298" }, { "message": "replacing incorrect tag: params with param", @@ -6690,11 +6780,11 @@ }, { "message": "replacing incorrect tag: params with param", - "line": " src\\flow\\model\\act_path.js:86" + "line": " src\\flow\\model\\act_path.js:87" }, { "message": "replacing incorrect tag: params with param", - "line": " src\\flow\\model\\act_path.js:86" + "line": " src\\flow\\model\\act_path.js:87" }, { "message": "replacing incorrect tag: params with param", @@ -6850,11 +6940,11 @@ }, { "message": "Missing item type", - "line": " src\\cmpage\\model\\module.js:450" + "line": " src\\cmpage\\model\\module.js:415" }, { "message": "Missing item type", - "line": " src\\cmpage\\model\\module.js:537" + "line": " src\\cmpage\\model\\module.js:504" }, { "message": "Missing item type\npage_mob model 实现手机APP的模块接口", diff --git a/www/static/doc/files/src_cmpage_controller_page.js.html b/www/static/doc/files/src_cmpage_controller_page.js.html index 890c56a..ae9976c 100644 --- a/www/static/doc/files/src_cmpage_controller_page.js.html +++ b/www/static/doc/files/src_cmpage_controller_page.js.html @@ -577,6 +577,7 @@ export default class extends Base { parms.parmsUrl = JSON.parse(this.post('parmsUrl')); parms.query = this.post(); } + delete parms.parmsUrl['_']; parms.parmsUrl.readonly = !(think.isEmpty(parms.parmsUrl.readonly) || parms.parmsUrl.readonly !=1); parms.user = await this.session('user'); // console.log(page); @@ -597,6 +598,7 @@ export default class extends Base { pageModel.modQuerys = await module.getModuleQuery(parms.id); pageModel.modCols = await module.getModuleCol(parms.id); pageModel.modBtns = await module.getModuleBtn(parms.id,parms.user,parms.modulename); + //debug(pageModel.modBtns,'page.C.list - pageModel.modBtns'); vb.queryHtml = await pageModel.htmlGetQuery(); // cmpage.debug(vb.queryHtml); //cmpage.debug(pageModel.mod, 'controller.page.list - pageModel.mod'); @@ -711,6 +713,8 @@ export default class extends Base { let module = cmpage.model('cmpage/module'); let parms = await module.getModuleByName(this.get('modulename')); parms.parmsUrl = this.get(); + delete parms.parmsUrl['_']; + parms.parmsUrl.readonly = false; parms.editID = think.isEmpty(this.get("id")) ? this.get("c_id") : this.get("id"); parms.listIds = think.isEmpty(this.get('listIds')) ? '':this.get('listIds'); parms.user = await this.session('user'); @@ -734,14 +738,15 @@ export default class extends Base { } /** - * 业务模块的编辑页面，主从页面，一般调用： /cmpage/page/rec_edit?modulename=xxx - * @method recEdit + * 业务模块的编辑页面，主从页面，一般调用： /cmpage/page/edit_ms?modulename=xxx + * @method editMs * @return {promise} HTML片段 */ async editMsAction() { let module = this.model('module'); let parms = await module.getModuleByName(this.get('modulename')); parms.parmsUrl = this.get(); + delete parms.parmsUrl['_']; parms.parmsUrl.readonly = false; parms.editID = think.isEmpty(this.get("id")) ? this.get("c_id") : this.get("id"); parms.user = await this.session('user'); @@ -834,6 +839,7 @@ export default class extends Base { this.assign('btnHtml',btnHtml); return this.display(); } + /** * 主从业务模块的查看页面，一般调用： /cmpage/page/view_ms?modulename=xxx * @method viewMs @@ -862,6 +868,30 @@ export default class extends Base { return this.display(); } + /** + * 业务模块的编辑页面，主从页面，一般调用： /cmpage/page/print?modulename=xxx + * @method print + * @return {promise} HTML片段 + */ + async printAction() { + let module = this.model('module'); + let parms = await module.getModuleByName(this.get('modulename')); + parms.parmsUrl = this.get(); + parms.parmsUrl.readonly = false; + parms.editID = think.isEmpty(this.get("id")) ? this.get("c_id") : this.get("id"); + parms.user = await this.session('user'); + //cmpage.debug(page); + let pageModel = cmpage.model(parms.c_path); + pageModel.mod = parms; + await pageModel.initPage(); + pageModel.modCols = await module.getModuleCol(parms.id); + let printHtml =await pageModel.htmlGetPrint(); + + this.assign('printHtml',printHtml); + this.assign('mod',pageModel.mod); + return this.display(); + } + /** * 查找带回页面，一般调用： /cmpage/page/lookup?modulename=xxx&multiselect=false * @method lookup @@ -882,6 +912,7 @@ export default class extends Base { parms.pageSize = parms.c_page_size; //cmpage.debug(http._get); parms.parmsUrl = this.get(); + delete parms.parmsUrl['_']; parms.query = parms.parmsUrl; }else{ parms.modulename= this.post('modulename'); @@ -892,6 +923,7 @@ export default class extends Base { parms.pageIndex = this.post('pageIndex'); parms.pageSize = this.post('pageSize'); parms.parmsUrl = JSON.parse(this.post('parmsUrl')); + delete parms.parmsUrl['_']; } parms.user = await this.session('user'); let pageModel = cmpage.model(parms.c_path); @@ -977,6 +1009,7 @@ export default class extends Base { parms.pageIndex = 1; parms.pageSize = 50; //parms.c_page_size; parms.parmsUrl = this.get(); + delete parms.parmsUrl['_']; parms.query = parms.parmsUrl; } parms.user = await this.session('user'); diff --git a/www/static/doc/files/src_cmpage_model_base.js.html b/www/static/doc/files/src_cmpage_model_base.js.html index 2d15b49..b2bb91b 100644 --- a/www/static/doc/files/src_cmpage_model_base.js.html +++ b/www/static/doc/files/src_cmpage_model_base.js.html @@ -552,9 +552,9 @@ import Sequelize from 'Sequelize'; export default class extends think.base { sequelize = null; _model = null; //thinkjs.model.base , 目前暂时不用 - fields = ''; + _field = ''; _where = ''; - tableName = ''; + _tableName = ''; pk = 'id'; /** @@ -569,7 +569,7 @@ export default class extends think.base { config = name; name = ""; } - this.tableName = name; + this._tableName = name; this.config = think.parseConfig(config); //debug(this.config, 'base.constructor - this.config'); //debug(this.name, 'base.constructor - this.name'); @@ -599,7 +599,7 @@ export default class extends think.base { } setTableName(name){ - this.tableName = name; + this._tableName = name; return this; } model(name){ @@ -616,7 +616,7 @@ export default class extends think.base { return this; } field(fields){ - this.fields = fields; + this._field = fields; if(this._model) this._model.field(fields); return this; } @@ -661,7 +661,7 @@ export default class extends think.base { if(this._model){ return await this._model.select(); } - let sql = `select ${think.isEmpty(this.fields) ? '*': this.fields} from ${this.tableName} ${this._where} `; + let sql = `select ${think.isEmpty(this._field) ? '*': this._field} from ${this._tableName} ${this._where} `; return await this.query(sql); } async find(){ @@ -679,7 +679,7 @@ export default class extends think.base { if(this._model){ return await this._model.delete(); } - let sql = `delete from ${this.tableName} ${this._where}`; + let sql = `delete from ${this._tableName} ${this._where}`; let ret = await this.query(sql); //debug(ret,'base.delete - ret'); } @@ -687,7 +687,7 @@ export default class extends think.base { if(this._model){ return await this._model.count(); } - let sql = `select count(*) as cnt from ${this.tableName} ${this._where}`; + let sql = `select count(*) as cnt from ${this._tableName} ${this._where}`; let list = await this.query(sql); return list[0]['cnt']; } @@ -697,19 +697,16 @@ export default class extends think.base { return await this._model.add(rec); } let values = []; - let fields = []; + let _field = []; for(let key in rec){ if(/^c_\w+/.test(key) && key !=this.pk) { let val = rec[key]; val = this.parseValue(val); values.push(val); - fields.push(key); + _field.push(key); } } - let sql = `INSERT INTO ${this.tableName}( ${fields.join(',')} ) VALUES( ${values.join(',')} ); `; - if(this.config.type == 'mssql'){ - sql = `insert ${this.tableName}( ${fields.join(',')} ) values( ${values.join(',')}) select @@IDENTITY ` - } + let sql = `INSERT INTO ${this._tableName}( ${_field.join(',')} ) VALUES( ${values.join(',')} ); `; let list = await this.query(sql); list = await this.query('select @@IDENTITY as id;'); // debug(list); @@ -722,16 +719,16 @@ export default class extends think.base { if(this._model){ return await this._model.update(rec); } - let fields = []; + let _field = []; for (let key in rec) { if (/^c_\w+/.test(key) && key != this.pk) { let val = rec[key]; val = this.parseValue(val); - fields.push(key + '=' + val); + _field.push(key + '=' + val); } } if(think.isEmpty(this._where)) this._where = ` where ${this.pk}=${rec[this.pk]}`; - let sql = `UPDATE ${this.tableName} SET ${fields.join(',')} ${this._where}`; + let sql = `UPDATE ${this._tableName} SET ${_field.join(',')} ${this._where}`; //debug(sql,'base.update - sql'); await this.query(sql); @@ -753,25 +750,6 @@ export default class extends think.base { } return value; } - // if(think.isBoolean(val) && think.config("db.type")==='mysql'){ - // obj[key] = val ? 1: 0; - // } - - - // /** - // * 获取 Seqelize 里的 Model - // * @return {[type]} [description] - // */ - // async getModel(name) { - // if (!this._model) { - // if (!this.sequelize) { - // this.getConnection(); - // } - // this._model = await this.sequelize.model(name); - // } - // return this._model; - // } - } diff --git a/www/static/doc/files/src_cmpage_model_module.js.html b/www/static/doc/files/src_cmpage_model_module.js.html index 86d8319..f6a04d2 100644 --- a/www/static/doc/files/src_cmpage_model_module.js.html +++ b/www/static/doc/files/src_cmpage_model_module.js.html @@ -801,29 +801,6 @@ export default class extends think.model.base { return {statusCode:200,message:''}; } -// //按模块名称和ID取模块设置，放入缓存 -// async setModuleCache(){ -// let isSet = await think.cache('isSetModuleCache'); -// if(think.isEmpty(isSet)) { -// let modules = await this.query('select * from t_module where c_status=0 order by id'); -// //let modules = await this.model('t_module').where({c_status:0}).order('id asc').select(); -//// cmpage.debug(modules); -// for (let module of modules) { -// let moduleCol = await this.query(`select * from t_module_col where c_module=${module.id} order by c_order`); -// let moduleQuery = await this.query(`select * from t_module_query where c_module=${module.id} order by c_order`); -// let moduleEdit = await this.query(`select * from t_module_edit where c_module=${module.id} order by c_order`); -// let moduleBtn = await this.query(`select * from t_module_btn where c_module=${module.id} order by c_location`); -// -// await think.cache(`module${module.id}`, module); -// await think.cache(`modulename${module.c_modulename}`, module); -// await think.cache(`moduleCol${module.id}`, moduleCol); -// await think.cache(`moduleQuery${module.id}`, moduleQuery); -// await think.cache(`moduleEdit${module.id}`, moduleEdit); -// await think.cache(`moduleBtn${module.id}`, moduleBtn); -// } -// await think.cache('isSetModuleCache', 'true'); -// } -// } //清空模块缓存 async clearModuleCache(){ let modules = await this.query('select * from t_module where c_status=0 order by id'); @@ -849,20 +826,6 @@ export default class extends think.model.base { } //拷贝模块信息 - // async copyToNewModule(modulename){ - // let list = await this.query(`select * from t_module where c_modulename ='${modulename}_copy'`); - // if(list.length >0) { - // return {statusCode: 300, message: `模块 ${modulename}_copy 已经存在！`}; - // } - // - // if(think.config('db.type')==='postgresql'){ - // await this.query(`select p_module_copy('${modulename}')`); - // }else{ - // await this.query(`call p_module_copy('${modulename}')`); - // } - // - // return {statusCode: 200, message: `模块复制成功！`}; - // } async copyToNewModule(modulename,newName){ newName = think.isEmpty(newName) ? modulename+'_copy':newName; let list = await this.query(`select * from t_module where c_modulename='${modulename}'`); @@ -899,6 +862,8 @@ export default class extends think.model.base { md.c_module = newID; delete md.id; md.c_object = md.c_object.replace(modulename, newName); + md.c_url = md.c_url.replace(modulename, newName); + md.c_options = md.c_options.replace(modulename, newName); await this.model('t_module_btn').add(md); } //复制 edits @@ -1035,7 +1000,7 @@ export default class extends think.model.base { return cols; } async getModuleBtn(moduleID,user,objname){ - let cols = await think.cache(`moduleBtn${moduleID}`, () => { + let btns = await think.cache(`moduleBtn${moduleID}`, () => { return this.query(`select * from t_module_btn where c_module = ${moduleID} order by c_location`); }); let privileges = []; @@ -1049,17 +1014,19 @@ export default class extends think.model.base { } privileges = await cmpage.model('admin/privilege').userGetPrivilegeTree(user.id, user.c_role,rootID ); } - for(let col of cols){ + for(let col of btns){ col.c_isshow = think.isBoolean(col.c_isshow) ? col.c_isshow : (col.c_isshow === 1); - //验证用户权限, 允许优先原则 - for(let priv of privileges){ - if(priv.c_object === col.c_object){ - col.c_isshow = priv.isAllow; - break; + if(col.c_isshow){ + //验证用户权限, 允许优先原则 + for(let priv of privileges){ + if(priv.c_object === col.c_object){ + col.c_isshow = priv.isAllow; + break; + } } } } - return cols; + return btns; } /*******************从缓存中取模块设置，如果没有，则刷新缓存********--end--****************/ diff --git a/www/static/doc/files/src_cmpage_model_page.js.html b/www/static/doc/files/src_cmpage_model_page.js.html index a852acf..e61cf7c 100644 --- a/www/static/doc/files/src_cmpage_model_page.js.html +++ b/www/static/doc/files/src_cmpage_model_page.js.html @@ -561,10 +561,11 @@ export default class extends Base { * @method initPage */ async initPage(){ - if(this.mod.c_proc >0){ + if(this.mod.c_proc >0){ //流程模板的主业务类 this.proc = await cmpage.model('flow/proc').getProcById(this.mod.c_proc); this.proc.c_link_model = this.mod.c_path; //设置流程模板的关联类和表 this.proc.c_link_type = this.mod.c_table; + this.proc.linkModulename = this.mod.c_modulename; } this.mod.c_other = think.isEmpty(this.mod.c_other) ? {}:cmpage.objFromString(this.mod.c_other) ; this.mod.c_module_slave = think.isEmpty(this.mod.c_module_slave) ? {}:cmpage.objFromString(this.mod.c_module_slave) ; @@ -598,15 +599,15 @@ export default class extends Base { if(k !== -1){ k += 1; } } if (col.c_type === "hidden"){ - html.push(`<input name="${col.c_column}" type="hidden" value="${col.c_default}" />`); + html.push(`<input id="query${this.mod.c_modulename}_${col.c_column}" name="${col.c_column}" type="hidden" value="${col.c_default}" />`); }else if (col.c_coltype === "datetime" || col.c_coltype === "date" || col.c_coltype === "timestamp"){ - html.push(`<input type="text" name="${col.c_column}" value="${col.c_default}" data-toggle="datepicker" data-rule="date" size="12" class="form-control" />`); + html.push(`<input type="text" id="query${this.mod.c_modulename}_${col.c_column}" name="${col.c_column}" value="${col.c_default}" data-toggle="datepicker" data-rule="date" size="12" class="form-control" />`); }else if (col.c_coltype === "bool"){ - html.push(`<input type="checkbox" name="${col.c_column}" data-toggle="icheck" value="true" data-label="是" + html.push(`<input type="checkbox" id="query${this.mod.c_modulename}_${col.c_column}" name="${col.c_column}" data-toggle="icheck" value="true" data-label="是" ${col.c_default ? "checked=checked" : ""} class="form-control" />`); }else if (col.c_type === "select"){ let options = await this.getOptions(col,true); - html.push(`<select name="${col.c_column}" data-toggle="selectpicker" > ${options} </select>`); + html.push(`<select id="query${this.mod.c_modulename}_${col.c_column}" name="${col.c_column}" data-toggle="selectpicker" > ${options} </select>`); } else if (col.c_type === "selectTree" || col.c_type === "selectTreeMultiple") { let treeOptions = await this.getOptionsTree(col,true); html.push(`<input id="query${this.mod.c_modulename + col.c_column}" name="${col.c_column}" type="hidden" value="${col.c_default}" /> @@ -615,7 +616,7 @@ export default class extends Base { data-value-input="query${this.mod.c_modulename + col.c_column}" ${(col.c_type === "selectTree" ? ' data-chk-style="radio" data-radio-type="all" ':' ')} data-on-check="selectNodeCheck" data-on-click="selectNodeClick" > ${treeOptions.options} </ul>`); }else if (col.c_type === "lookup"){ - html.push(`<input name="${col.c_column}" type="lookup" size="10" value="${col.c_default}" data-width="800" data-height="600" + html.push(`<input id="query${this.mod.c_modulename}_${col.c_column}" name="${col.c_column}" type="lookup" size="10" value="${col.c_default}" data-width="800" data-height="600" data-toggle="lookup" data-title="${col.c_name} 选择" data-url="${this.getReplaceToSpecialChar(col.c_memo)}" readonly="readonly" />`); }else if (col.c_type === "provinceSelect"){ html.push(`<select name="c_province" data-toggle="selectpicker" data-nextselect="#city${this.mod.c_modulename}Query" @@ -628,7 +629,7 @@ export default class extends Base { }else if (col.c_type === "countrySelect"){ html.push(`<select name="c_country" id="country${this.mod.c_modulename}Query" data-toggle="selectpicker" >${await cmpage.model('cmpage/area').getCountryItems(col.c_default,true,cityValue)} </select>`); }else if( col.c_type !== "fixed"){ - html.push(`<input name="${col.c_column}" type="${col.c_type}" size="${col.c_width}" value="${col.c_default}" data-rule="${col.c_memo}" class="form-control" />`); + html.push(`<input id="query${this.mod.c_modulename}_${col.c_column}" name="${col.c_column}" type="${col.c_type}" size="${col.c_width}" value="${col.c_default}" data-rule="${col.c_memo}" class="form-control" />`); } } } @@ -844,6 +845,7 @@ export default class extends Base { let btnMore = '<div class="btn-group"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">' +'更多<span class="caret"></span> </button> <ul class="dropdown-menu" role="menu">'; for(let btn of this.modBtns){ + //if(btn.c_object == 'OrderApplyList.ToOrder') debug(btn,'page.htmlGetBtnList - btn'); if (btn.c_isshow && btn.c_location > 10 && this.isShowBtn(rec,btn)) { k +=1; if(k === this.mod.user.listBtns +1) html.push(btnMore); @@ -942,7 +944,7 @@ export default class extends Base { if (col.c_coltype === "decimal") { html.push(cmpage.formatNumber(item[col.c_column], {pattern: col.c_format})); } else if(col.c_coltype === "timestamp" || col.c_coltype === "date") { - html.push(cmpage.datetime(item[col.c_column], col.c_format)); + if(!think.isEmpty(item[col.c_column])) html.push(cmpage.datetime(item[col.c_column], col.c_format)); } } else if (col.c_type === "checkbox") { html.push(`<input type="checkbox" data-toggle="icheck" value="1" disabled ${item[col.c_column] || item[col.c_column]===1 ? "checked" : ""} />`); @@ -1031,13 +1033,16 @@ export default class extends Base { let sortCol = this.mod.c_sort_by.toLowerCase().replace(/asc/g,'').replace(/desc/g,''); sql = `QueryPage '${this.mod.c_datasource}','${this.getListFields(this.modCols)}',${this.mod.pageSize},${this.mod.pageIndex}, '${where}','${sortCol}',${sortType},'${this.pk}'`; - //debug(sql,'page.getDataList - sql'); - data = await this.query(sql); - }else{ - data = await this.query(sql); } + //debug(sql,'page.getDataList - sql'); + data = await this.query(sql); } else { - data = await this.query(`select ${this.getListFields()} from ${this.mod.c_datasource} ${where} order by ${this.mod.c_sort_by} `); + let limit = think.isEmpty(this.mod.c_data_limit) ? 2000 : this.mod.c_data_limit; + let sql = `select ${this.getListFields()} from ${this.mod.c_datasource} ${where} order by ${this.mod.c_sort_by} limit ${limit}`; + if(this.config.type == 'mssql'){ + sql = `select top ${limit} ${this.getListFields()} from ${this.mod.c_datasource} ${where} order by ${this.mod.c_sort_by} `; + } + data = await this.query(sql); } for (let rec of data) { @@ -1088,6 +1093,7 @@ export default class extends Base { async getQueryWhere(){ let ret =[' where 1=1']; let parmsUrl =this.mod.parmsUrl; + //debug(parmsUrl,'page.getQueryWhere - parmsUrl'); for(let md of this.modQuerys){ if (md.c_type === "fixed"){ //如果是‘固定’，则直接增加c_memo中的设置值 let wh = ` (${md.c_memo.replace(/#userID#/,this.mod.user.id).replace(/#groupID#/,this.mod.user.groupID).split(/##/).join('\'')})`; @@ -1252,7 +1258,13 @@ export default class extends Base { let md = await this.getDataRecord(); //debug(md,'page.htmlGetEdit - md'); if(think.isEmpty(md)) return ''; - + //子类中可以重写此处之前涉及的方法来改变URL参数值等，例如 getDataRecord， 参见 docu/docu_list + if(this.mod.parmsUrl.readonly){ + this.modCols = await cmpage.model('cmpage/module').getModuleCol(this.mod.id); + //debug(this.mod,'page.htmlGetEdit - this.mod'); + return `<table id="pageViewData" class="table table-condensed table-hover" width="100%"><tbody>${await this.htmlGetView()}</tbody> </table> `; + } + //html.push(`<div id="edit${this.mod.c_modulename}Table" class="bjui-row col-${this.mod.c_edit_column}">`); this.mod.editHeaderHtml = think.isEmpty(this.mod.c_other.editTitle) ? '' : `<div class="bjui-pageHeader"> <label data-height="30px" style="margin: 5px;">${this.mod.c_other.editTitle}</label></div>`; @@ -1271,6 +1283,7 @@ export default class extends Base { colValue = await fnModel[ its[2] ](); } } + debug(colValue,'page.htmlGetEdit.fn - colValue'); } if(col.c_coltype === 'timestamp'){ colValue = think.datetime(colValue); } @@ -1370,7 +1383,7 @@ export default class extends Base { } } - return html.join(''); + return `<div id="edit${this.mod.c_modulename}Table" class="bjui-row col-${this.mod.c_edit_column}">${html.join('')}</div>`; } /** @@ -1407,18 +1420,19 @@ export default class extends Base { let reloadUrl = `/cmpage/page/edit_ms?modulename=${this.mod.c_modulename}&listIds=`; for(let p in this.mod.parmsUrl){ //加入URL参数 - if(!['modulename',this.pk,'_'].includes(p)){ + if(!['modulename',this.pk,'listIds','_'].includes(p)){ reloadUrl += `&${p}=${this.mod.parmsUrl[p]}`; } } defaultSaveBtn = `<li ><button type="button" class="btn-green" onclick="return pageSaveMs('${this.mod.c_modulename}','${reloadUrl}', ${this.mod.editID},'${this.pk}');" data-icon="save">保存</button></li>`; } - //debug(defaultSaveBtn,'page.htmlGetEditBtns - defaultSaveBtn'); - if(think.isEmpty(this.mod.c_other.editHideSaveBtn) && !this.rec.hasOwnProperty('c_task')) { + debug(defaultSaveBtn,'page.htmlGetEditBtns - defaultSaveBtn'); + if(think.isEmpty(this.mod.c_other.editHideSaveBtn) && !this.mod.parmsUrl.readonly && !this.rec.hasOwnProperty('c_task') ) { html.push(defaultSaveBtn); } - if(this.rec.hasOwnProperty('c_task') && this.rec.c_task >0){ + debug(this.rec,'page.htmlGetEditBtns - this.rec'); + if(!think.isEmpty(this.rec['c_task']) && this.rec.c_task >0){ let task = await cmpage.model('flow/task').getTask(this.rec.c_task > 0 ? this.rec.c_task: parmsUrl.taskID); //debug(task,'page.htmlGetEditBtns - task'); if(task.c_link_type === this.mod.c_table){ @@ -1427,7 +1441,7 @@ export default class extends Base { }else{ let reloadUrl = `/cmpage/page/edit?modulename=${this.mod.c_modulename}&taskActID=${parmsUrl.taskActID}&status=${parmsUrl.status}&listIds=`; html.push(`<button type="button" class="btn-green" data-icon="save" - onclick="return pageSaveByTask('${this.mod.c_modulename}',${reloadUrl}, + onclick="return pageSaveByTask('${this.mod.c_modulename}','${reloadUrl}', '${think.isEmpty(this.mod.c_other.editSaveAfter) ? '' : this.mod.c_other.editSaveAfter}');"> ${think.isEmpty(this.mod.c_other.editSaveLabel) ? '保存' : this.mod.c_other.editSaveLabel}</button>`); // html.push(`<button type="button" class="btn-green" data-icon="save" @@ -1438,7 +1452,7 @@ export default class extends Base { } } - if(this.mod.editID >0 && !think.isEmpty(this.mod.c_module_slave.modulename)) { + if(this.mod.editID >0 && think.isEmpty(this.mod.c_module_slave.modulename)) { let listIds = parmsUrl.listIds.split(','); if (listIds.length > 0) { let prevID = 0, nextID = 0; @@ -1505,17 +1519,22 @@ export default class extends Base { let createUserID = think.isEmpty(rec.c_creater) ? 0 : rec.c_creater; //如果主业务模块实现类已经定义了 getStatusById方法，则调用，否则，直接从数据库中取业务记录状态 //如果主业务模块操作的数据表位于和框架不同的数据库，则需要定义 getStatusById 方法 + //debug(this.proc,'page.htmlGetActBtns - this.proc'); let linkRec ={}; linkRec.id = think.isEmpty(this.mod.parmsUrl.linkID) ? rec[this.pk] : this.mod.parmsUrl.linkID; let linkModel = cmpage.model(this.proc.c_link_model); + linkModel.mod = await cmpage.model('cmpage/module').getModuleByName(this.proc.linkModulename); + await linkModel.initPage(); if(think.isEmpty(linkModel['getStatusById'])){ - linkRec = await this.model(this.proc.c_link_type).where(`${this.pk}=${linkRec.id}`).find(); + linkRec = await linkModel.model(this.proc.c_link_type).where(`${linkModel.pk}=${linkRec.id}`).find(); }else{ - linkRec = await cmpage.model(this.proc.c_link_model).getStatusById(linkRec.id); + linkRec = await linkModel.getStatusById(linkRec.id); } + linkRec.id = think.isEmpty(this.mod.parmsUrl.linkID) ? rec[this.pk] : this.mod.parmsUrl.linkID; + debug(linkRec,'page.htmlGetActBtns - linkRec'); + debug(act,'page.htmlGetTaskActBtns - act'); //debug(task,'page.htmlGetTaskActBtns - task'); - //debug(act,'page.htmlGetTaskActBtns - act'); if(act.id >0){ //debug(form,'page.htmlGetActBtns - form'); //if(form.hasOwnProperty('modulename') && form['modulename'] == this.mod.c_modulename ){ @@ -1523,7 +1542,7 @@ export default class extends Base { //debug(linkRec,'page.htmlGetActBtns - linkRec'); //验证当前用户是否有该节点的权限 let actAssign = await cmpage.model('flow/act_assign').getAssignByUser(act.id,this.mod.user, createUserID); - //debug(actAssign,'page.htmlGetActBtns - actAssign'); + debug(actAssign,'page.htmlGetActBtns - actAssign'); if(think.isEmpty(actAssign)) return []; //本表单是流程节点需要打开的表单 @@ -1548,23 +1567,21 @@ export default class extends Base { confirmMsg:'是否确定要${btn.label}？'}">${btn.label}</button>`); } } - if (linkRec.id >0 && this.proc.c_link_type !== this.mod.c_table) { - //debug(linkRec,'page.htmlGetActBtns - linkRec'); - if(linkRec.c_status === act.c_domain_st) { + // debug(linkRec,'page.htmlGetActBtns - linkRec'); + // debug(this.mod,'page.htmlGetActBtns - this.mod'); + // debug(this.proc,'page.htmlGetActBtns - this.proc'); + if (linkRec.id >0 && this.proc.c_link_type != this.mod.c_table) { + if(linkRec.c_status == act.c_domain_st) { html.push('<label style="color: red;">本操作已经执行完毕！</label>'); }else{ //默认的保存或者审核通过按钮 - let reloadUrl = `/cmpage/page/${think.isEmpty(this.mod.c_module_slave.modulename) ? 'edit':'edit_ms'}?modulename=${this.mod.c_modulename}&procID${ - this.proc.id}&actID=${act.id}&status=${act.c_domain_st}&linkID=${linkRec.id}&linkType=${this.proc.c_link_type}&linkModel=${this.proc.c_link_model}&listIds='`; + let reloadUrl = `/cmpage/page/${think.isEmpty(this.mod.c_module_slave.modulename) ? 'edit':'edit_ms'}?modulename=${this.mod.c_modulename}&procID=${ + this.proc.id}&actID=${act.id}&status=${act.c_domain_st}&linkID=${linkRec.id}&linkType=${this.proc.c_link_type}&linkModel=${this.proc.c_link_model}&listIds=`; + debug(reloadUrl,'page.htmlGetActBtns - reloadUrl'); html.push(`<button type="button" class="btn-green" data-icon="save" - onclick="return pageSaveByAct('${this.mod.c_modulename}',${reloadUrl}, + onclick="return pageSaveByAct('${this.mod.c_modulename}','${reloadUrl}', '${think.isEmpty(this.mod.c_other.editSaveAfter) ? '' : this.mod.c_other.editSaveAfter}');"> ${think.isEmpty(this.mod.c_other.editSaveLabel) ? '保存' : this.mod.c_other.editSaveLabel}</button>`); - // html.push(`<button type="button" class="btn-green" data-icon="save" - // onclick="return pageSaveByAct('${this.mod.c_modulename}',${this.proc.id},${act.id}, - // ${linkRec.id},'${this.proc.c_link_type}','${this.proc.c_link_model}',${act.c_domain_st}, - // '${think.isEmpty(this.mod.c_other.editSaveAfter) ? '' : this.mod.c_other.editSaveAfter}');"> - // ${think.isEmpty(this.mod.c_other.editSaveLabel) ? '保存' : this.mod.c_other.editSaveLabel}</button>`); } } }else if(this.proc.c_link_type == this.mod.c_table){ @@ -1674,7 +1691,7 @@ export default class extends Base { //默认的保存或者审核通过按钮 let reloadUrl = `/cmpage/page/edit?modulename=${this.mod.c_modulename}&taskActID=${parmsUrl.taskActID}&status=${parmsUrl.status}&listIds=`; html.push(`<button type="button" class="btn-green" data-icon="save" - onclick="return pageSaveByTask('${this.mod.c_modulename}',${reloadUrl}, + onclick="return pageSaveByTask('${this.mod.c_modulename}','${reloadUrl}', '${think.isEmpty(this.mod.c_other.editSaveAfter) ? '' : this.mod.c_other.editSaveAfter}');"> ${think.isEmpty(this.mod.c_other.editSaveLabel) ? '保存' : this.mod.c_other.editSaveLabel}</button>`); }else{ @@ -1832,8 +1849,10 @@ export default class extends Base { * 如果需要改变查看页面的逻辑，可以重写本方法，或者修改 this.modCols的设置值后调用 super.htmlGetView() * @method htmlGetView * @return {string} HTML页面片段 + * @param {boolean} [isPrintStyle] 是否是打印的风格 */ - async htmlGetView() { + async htmlGetView(isPrintStyle) { + isPrintStyle = !think.isEmpty(isPrintStyle); let html = []; if(this.mod.editID <=0){ return '<tr><td>----</td><td>----</td><td>----</td><td>该数据不存在！</td><td>----</td><td>----</td><td>----</td></tr>'; @@ -1848,9 +1867,17 @@ export default class extends Base { continue; } //html.push(`<td ${think.isEmpty(col.c_style) ? "":"style=" + col.c_style}> - html.push(`<td> <label class="control-label x85">${col.c_name}: </label>`); + if(isPrintStyle){ + html.push(`<td class="td3" width="21%"> ${col.c_name}</td><td>`); + }else{ + html.push(`<td> <label class="control-label x85">${col.c_name}: </label>`); + } if (col.c_type === "checkbox"){ - html.push(`<input type="checkbox" data-toggle="icheck" value="1" disabled ${md[col.c_column] ? "checked" : ""} />`); + // if(isPrintStyle){ + // html.push(md[col.c_column] ? "是" : "否"); + // }else{ + html.push(`<input type="checkbox" data-toggle="icheck" value="1" disabled ${md[col.c_column] ? "checked" : ""} />`); +// } }else if (col.c_type === "kindeditor") { html.push(`<div style="display: inline-block; vertical-align: middle;">${md[col.c_column]} </div>`); }else if(col.c_type === "html"){ @@ -1875,7 +1902,11 @@ export default class extends Base { k =0; } } + if(k>0 && k <this.mod.c_edit_column && isPrintStyle){ + html.push('<td> </td><td> </td>'); + } html.push('</tr>'); + //debug(html.join(' '),'page.htmlGetView - return'); return html.join(' '); } @@ -1905,6 +1936,21 @@ export default class extends Base { html.push('<li><button type="button" class="btn-close" data-icon="close">关闭</button></li>'); return html.join(''); } + + /** + * 取查看页面的设置，组合成打印页面的HTML输出 + * @method htmlGetPrint + * @return {string} HTML页面片段 + */ + async htmlGetPrint() { + let html = []; + //主表部分 + html.push('<table class="printTable" style="BORDER-COLLAPSE: collapse" bordercolor="#000000" cellSpacing=0 width="100%" align="center" bgcolor="#FFFFFF" border="1">'); + html.push(await this.htmlGetView(true)); + html.push('</table>'); + return html.join(''); + } + /** * 删除记录,<br/> * 子类中可以重写本方法，实现其他的删除逻辑，如判断是否可以删除，删除相关联的其他记录等等 @@ -1998,6 +2044,28 @@ ${think.isEmpty(row.c_memo) ? '':'其他备注： ' +row.c_m return html.join(' '); } + + /** + * 根据参数ID取参数的名称，一般用于页面模块配置中的‘替换’调用: admin/cdoe:getNameById </br> + * 子类中重写的时候需要为 this.mod.c_table 和 this.pk 赋值，因为直接调用的时候进行模块设置的初始化 </br> + * 当然也可以重写 constructor 设置这两个值 + * @method getNameById + * @return {string} 参数名称 + * @param {int} id 参数ID + * @param {string} fieldNames 字段名称,逗号分隔 + * @param {string} joinStr 连接的字符串 + */ + async getNameById(id,tableName,pk,fieldNames,joinStr){ + let rec =await this.model(this.mod.c_table).where(`${this.pk}=${id}`).find(); + //debug(rec,'page.getNameById - rec'); + if(think.isEmpty(rec)) return ''; + if(think.isEmpty(fieldNames)){ + return rec.c_name; //默认返回 c_name 字段值 + }else{ + return cmpage.strGetValuesByPropertyName(rec,fieldNames,joinStr) + } + } + } diff --git a/www/static/doc/files/src_cmpage_model_page_lookup.js.html b/www/static/doc/files/src_cmpage_model_page_lookup.js.html index ee5a23a..7468057 100644 --- a/www/static/doc/files/src_cmpage_model_page_lookup.js.html +++ b/www/static/doc/files/src_cmpage_model_page_lookup.js.html @@ -573,7 +573,7 @@ export default class extends CMPage { }else{ let value = 0; for(let col of this.modCols){ - if (col.c_isview && col.c_desc == this.pk) { + if (col.c_isview ) { //&& col.c_desc == this.pk 取第一个返回字段值 value = rec[col.c_column]; break; } diff --git a/www/static/doc/files/src_cmpage_model_page_ms.js.html b/www/static/doc/files/src_cmpage_model_page_ms.js.html index 862e8ba..a79f4d2 100644 --- a/www/static/doc/files/src_cmpage_model_page_ms.js.html +++ b/www/static/doc/files/src_cmpage_model_page_ms.js.html @@ -555,6 +555,7 @@ export default class extends CMPage { // } //暂时考虑一个TAB的情况 let tab = this.mod.c_module_slave; + debug(tab,'page_ms.htmlGetTabs - tab'); html.push(`<li "class=active"><a href="#page${tab.modulename}" role="tab" data-toggle="tab">${tab.title}</a></li>`); html.push(`</ul> <!-- Tab panes --> <div class="tab-content">`); @@ -569,7 +570,7 @@ export default class extends CMPage { data-toggle="autoajaxload"> </div>`); html.push('</div> </fieldset> </div>'); - + //debug(html,'page_ms.htmlGetTabs - html'); return html.join(' '); } @@ -584,6 +585,80 @@ export default class extends CMPage { } + + /** + * 取查看页面的设置，组合成打印页面的HTML输出 + * @method htmlGetPrint + * @return {string} HTML页面片段 + */ + async htmlGetPrint() { + let html = []; + //主表部分 + html.push(await super.htmlGetPrint()); + if(this.mod.editID ==0 || think.isEmpty(this.mod.c_module_slave.modulename)){ + return html.join(''); + } + //子表部分 + let module = await cmpage.model("cmpage/module"); + let md = await module.getModuleByName(this.mod.c_module_slave.modulename); + debug(md,'page_ms.htmlGetPrint - md'); + if(think.isEmpty(md.id)) return html.join(''); + let pageModel = cmpage.model(md.c_path); + if(think.isEmpty(pageModel['htmlGetQuery'])) return html.join(''); + pageModel.mod = md; + pageModel.mod.user = this.mod.user; + pageModel.mod.c_pager = false; //单页 + pageModel.mod.parmsUrl = {modulename:this.mod.c_module_slave.module}; + pageModel.mod.parmsUrl[this.mod.c_module_slave.key]=this.mod.editID; + await pageModel.initPage(); + pageModel.modQuerys = await module.getModuleQuery(md.id); + pageModel.modCols = await module.getModuleCol(md.id); + await pageModel.getDataList(); + html.push('<table class="printTable" style="BORDER-COLLAPSE:collapse; margin-top:-1px;" bordercolor="#000000" cellSpacing=0 width="100%" align="center" bgcolor="#FFFFFF" border="1">'); + //标题 + for(let col of pageModel.modCols){ + if(col.c_isview) html.push(`<td class="td4">${col.c_name}</td>`); + } + //数据行 + for(let item of pageModel.list.data){ + html.push('<tr>'); + for(let col of pageModel.modCols){ + if(col.c_isview){ + html.push(`<td style="${col.c_style}" >`); + if (item[pageModel.pk] !== 0 ) { + if (!think.isEmpty(col.c_format)) { + if (col.c_coltype === "decimal") { + html.push(cmpage.formatNumber(item[col.c_column], {pattern: col.c_format})); + } else if(col.c_coltype === "timestamp" || col.c_coltype === "date") { + html.push(cmpage.datetime(item[col.c_column], col.c_format)); + } + } else if (col.c_type === "checkbox") { + html.push(`<input type="checkbox" data-toggle="icheck" value="1" disabled ${item[col.c_column] || item[col.c_column]===1 ? "checked" : ""} />`); + } else if (!think.isEmpty(item[col.c_column]) && col.c_type === "replace" && !(/^select/.test(col.c_memo))) { + let templete = cmpage.objPropertysReplaceToStr(col.c_memo, item); + html.push(await this.getReplaceText(item[col.c_column],templete)); + } else if (col.c_type === "html") { + let input = think.isEmpty(col.c_memo) ? item[col.c_column] : col.c_memo.replace(/#value#/ig,item[col.c_column]); + // debug(input,page.htmlGetList - input.html); + html.push(input); + } else { + if (!think.isEmpty(col.c_column)) { + html.push(item[col.c_column]); + } + } + } + html.push('</td>') + } + } + html.push('</tr>'); + } + html.push(await pageModel.htmlGetListSumRow(false)); //合计 + html.push('</table>'); + + return html.join(''); + } + + } diff --git a/www/static/doc/files/src_flow_model_act.js.html b/www/static/doc/files/src_flow_model_act.js.html index efdb0bf..c4c5fe8 100644 --- a/www/static/doc/files/src_flow_model_act.js.html +++ b/www/static/doc/files/src_flow_model_act.js.html @@ -641,7 +641,7 @@ export default class extends think.model.base { cmpage.debug(taskAct,'act.fwInit - taskAct'); let act =await this.getActByIdAndProcId(taskAct.c_act, taskAct.c_proc); cmpage.debug(act,'act.fwInit - act'); - this.taskActModel = this.model(think.isEmpty(act.c_class) ? 'flow/task_act': act.c_class); + this.taskActModel = cmpage.model(think.isEmpty(act.c_class) ? 'flow/task_act': act.c_class); this.taskActModel.taskAct = taskAct; this.taskActModel.act = act; this.taskActModel.user = think.isEmpty(user) ? await think.session('user') : user; @@ -662,7 +662,7 @@ export default class extends think.model.base { if(!think.isEmpty(ta.task_link_type)){ ta.domainData = await this.model(ta.task_link_type).where({id:ta.task_link}).find(); } - let user = await this.model('task').getUserFromTask(ta.id); + let user = await think.model('task').getUserFromTask(ta.id); if(await fnModel[form.fn](ta,user)){ //如果执行成功，则继续往下 await this.fwRun(ta.id,user,ta,true); @@ -704,7 +704,7 @@ export default class extends think.model.base { acts = []; async getActsOrder(procID, acts){ this.acts = think.isEmpty(acts) ? await this.getActsByProcId(procID) : acts; - let actPaths = await this.model('act_path').getActPathsByProcId(procID); + let actPaths = await cmpage.model('act_path').getActPathsByProcId(procID); //把节点根据路径走向排序 let order = []; let actStart = {}, actEnd = {}; @@ -786,7 +786,9 @@ export default class extends think.model.base { let ret = []; depth = think.isEmpty(depth) ? 1: depth +1; if(depth >5 ) return []; + //debug(procID,'act.getToActsFromId - procID'); let actIds = await cmpage.model('flow/act_path').getToActIds(actID, procID); + //debug(actIds,'act.getToActsFromId - actIds'); for(let id of actIds){ let act = await this.getActByIdAndProcId(id,procID); if(act.c_type == cmpage.enumActType.END ){ diff --git a/www/static/doc/files/src_flow_model_act_assign.js.html b/www/static/doc/files/src_flow_model_act_assign.js.html index 6baf4d2..fc5dba1 100644 --- a/www/static/doc/files/src_flow_model_act_assign.js.html +++ b/www/static/doc/files/src_flow_model_act_assign.js.html @@ -613,7 +613,7 @@ export default class extends CMPage { if(md.c_type == cmpage.enumActAssignType.DEPT && md.c_link == user.c_dept || md.c_type == cmpage.enumActAssignType.ROLE && md.c_link == user.c_role || md.c_type == cmpage.enumActAssignType.USER && md.c_link == user.id || - md.c_type == cmpage.enumActAssignType.TEAM && await this.model('admin/teamuser').isTeamMember(md.c_link, user.id) || + md.c_type == cmpage.enumActAssignType.TEAM && await cmpage.model('admin/teamuser').isTeamMember(md.c_link, user.id) || md.c_type == cmpage.enumActAssignType.SELF && user.id == createrID ){ //debug(md,'act_assign.getAssignByUser - md'); return md; @@ -633,9 +633,9 @@ export default class extends CMPage { //debug(id,'act_assign.getLinkNameById - id'); //debug(linkType,'act_assign.getLinkNameById - linkType'); if (linkType == cmpage.enumProcAssignType.DEPT || linkType == cmpage.enumProcAssignType.ROLE || linkType == cmpage.enumProcAssignType.TEAM){ - ret = await this.model('admin/code').getNameById(id); + ret = await cmpage.model('admin/code').getNameById(id); }else if (linkType == cmpage.enumProcAssignType.USER ){ - ret = await this.model('admin/user').getNameById(id); + ret = await cmpage.model('admin/user').getNameById(id); } return ret; } diff --git a/www/static/doc/files/src_flow_model_act_path.js.html b/www/static/doc/files/src_flow_model_act_path.js.html index ea66229..71e928f 100644 --- a/www/static/doc/files/src_flow_model_act_path.js.html +++ b/www/static/doc/files/src_flow_model_act_path.js.html @@ -550,7 +550,7 @@ export default class extends think.model.base { async getActPathById(id){ let list =await this.getActPaths(); for(let md of list){ - if(md.id === id){ + if(md.id == id){ return md; } } @@ -568,7 +568,7 @@ export default class extends think.model.base { async getActPathByIdAndProcId(id,procID){ let list =await this.getActPathsByProcId(procID); for(let md of list){ - if(md.id === id){ + if(md.id == id){ return md; } } @@ -586,7 +586,7 @@ export default class extends think.model.base { let list =await this.getActPathsByProcId(procID); let ret = []; for(let md of list){ - if(md.c_to === actID){ + if(md.c_to == actID){ ret.push(md.c_from); } } @@ -602,9 +602,10 @@ export default class extends think.model.base { */ async getToActIds(actID,procID){ let list =await this.getActPathsByProcId(procID); + //debug(list,'act_path.getToActPaths - list'); let ret = []; for(let md of list){ - if(md.c_from === actID){ + if(md.c_from == actID){ ret.push(md.c_to); } } @@ -619,9 +620,10 @@ export default class extends think.model.base { */ async getToActPaths(actID,procID){ let list =await this.getActPathsByProcId(procID); + //debug(list,'act_path.getToActPaths - list'); let ret = []; for(let md of list){ - if(md.c_from === actID){ + if(md.c_from == actID){ ret.push(md); } } @@ -637,7 +639,7 @@ export default class extends think.model.base { async getNameById(id){ let list =await this.getActPaths(); for(let md of list){ - if(md.id === id){ + if(md.id == id){ return md.c_name; } } diff --git a/www/static/doc/files/src_flow_model_appr.js.html b/www/static/doc/files/src_flow_model_appr.js.html index d30464d..e13e53d 100644 --- a/www/static/doc/files/src_flow_model_appr.js.html +++ b/www/static/doc/files/src_flow_model_appr.js.html @@ -570,10 +570,22 @@ export default class extends CMPage { md.c_link = parmsUrl.linkID; md.c_link_type = parmsUrl.linkType; md.c_modulename = parmsUrl.linkModulename; - + debug(md,'appr.pageEditInit - md'); return md } + /** + * 取当前记录对象，用于新增和修改的编辑页面展示 + * @method getDataRecord + * @return {object} 当前记录对象 + */ + async getDataRecord(){ + let md = await super.getDataRecord(); + this.proc.c_link_type = md.c_link_type; + this.proc.linkModulename = md.c_modulename; + return md; + } + /** * 编辑页面保存,<br/> * 保存之前需要更新关联对象的状态 -- Gitee