From 7dd0c6708930d230901afe7b67ce1a67a8617665 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 19 Mar 2020 18:24:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=86=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- o2web/source/o2_core/o2/xScript/Macro.js | 44 + .../o2_core/o2/xScript/ViewEnvironment.js | 1094 +++++++++++++++++ .../source/x_component_query_Query/Viewer.js | 30 +- .../$View/view_bak.json | 40 - .../x_component_query_ViewDesigner/View.js | 2 +- 5 files changed, 1159 insertions(+), 51 deletions(-) create mode 100644 o2web/source/o2_core/o2/xScript/ViewEnvironment.js delete mode 100644 o2web/source/x_component_query_ViewDesigner/$View/view_bak.json diff --git a/o2web/source/o2_core/o2/xScript/Macro.js b/o2web/source/o2_core/o2/xScript/Macro.js index d902a09cbb..fbee8950fe 100644 --- a/o2web/source/o2_core/o2/xScript/Macro.js +++ b/o2web/source/o2_core/o2/xScript/Macro.js @@ -165,5 +165,49 @@ MWF.Macro.PageContext = new Class({ } }); +MWF.Macro.ViewContext = new Class({ + macroFunction: null, + environment: {}, + initialize: function(view){ + this.form = view; + var environment = { + "view": view, + "viewInfor": view.viewInfor, + "target": null, + "event": null + }; + MWF.require("MWF.xScript.ViewEnvironment", null, false); + this.environment = new MWF.xScript.ViewEnvironment(environment); + }, + setTarget: function(target){ + if (target){ + this.environment.target = target; + }else{ + this.environment.target = null; + } + }, + setEvent: function(event){ + if (event){ + this.environment.event = event; + }else{ + this.environment.event = null; + } + }, + exec: function(code, target){ + this.setTarget(target); + var returnValue = MWF.Macro.exec(code, this.environment); + //this.form.businessData.data = Object.merge(this.form.businessData.data, this.environment.data); + + return returnValue; + //this.environment.data + + }, + fire: function(code, target, event){ + this.setTarget(target); + this.setEvent(event); + return MWF.Macro.exec(code, this.environment); + } +}); + JSONObject = function(o){ }; diff --git a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js new file mode 100644 index 0000000000..4d1fcae40f --- /dev/null +++ b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js @@ -0,0 +1,1094 @@ +MWF.xScript = MWF.xScript || {}; +MWF.xScript.ViewEnvironment = function (ev) { + var _form = ev.view; + + this.library = COMMON; + //this.library.version = "4.0"; + + //data + // var getJSONData = function (jData) { + // return new MWF.xScript.JSONData(jData, function (data, key, _self) { + // var p = { "getKey": function () { return key; }, "getParent": function () { return _self; } }; + // while (p && !_forms[p.getKey()]) p = p.getParent(); + // if (p) if (p.getKey()) if (_forms[p.getKey()]) _forms[p.getKey()].resetData(); + // }); + // }; + // this.setData = function (data) { + // this.data = getJSONData(data); + // this.data.save = function (callback) { + // var formData = { + // "data": data, + // "sectionList": _form.getSectionList() + // }; + // form.workAction.saveData(function (json) { if (callback) callback(); }.bind(this), null, work.id, jData); + // } + // }; + // this.setData(_data); + + this.viewContext = { + + }; + + //dict + this.Dict = MWF.xScript.createDict(); + //org + var orgActions = null; + var getOrgActions = function () { + if (!orgActions) { + MWF.require("MWF.xScript.Actions.UnitActions", null, false); + orgActions = new MWF.xScript.Actions.UnitActions(); + } + }; + var getNameFlag = function (name) { + var t = typeOf(name); + if (t === "array") { + var v = []; + name.each(function (id) { + v.push((typeOf(id) === "object") ? (id.distinguishedName || id.id || id.unique || id.name) : id); + }); + return v; + } else { + return [(t === "object") ? (name.distinguishedName || name.id || name.unique || name.name) : name]; + } + }; + this.org = { + //群组*************** + //获取群组--返回群组的对象数组 + getGroup: function (name) { + getOrgActions(); + var data = { "groupList": getNameFlag(name) }; + var v = null; + orgActions.listGroup(data, function (json) { v = json.data; }, null, false); + return (v && v.length === 1) ? v[0] : v; + }, + //查询下级群组--返回群组的对象数组 + //nested 布尔 true嵌套下级；false直接下级；默认false； + listSubGroup: function (name, nested) { + getOrgActions(); + var data = { "groupList": getNameFlag(name) }; + var v = null; + if (nested) { + orgActions.listSubGroupNested(data, function (json) { v = json.data; }, null, false); + } else { + orgActions.listSubGroupDirect(data, function (json) { v = json.data; }, null, false); + } + return v; + }, + //查询上级群组--返回群组的对象数组 + //nested 布尔 true嵌套上级；false直接上级；默认false； + listSupGroup: function (name, nested) { + getOrgActions(); + var data = { "groupList": getNameFlag(name) }; + var v = null; + if (nested) { + orgActions.listSupGroupNested(data, function (json) { v = json.data; }, null, false); + } else { + orgActions.listSupGroupDirect(data, function (json) { v = json.data; }, null, false); + } + return v; + }, + //人员所在群组（嵌套）--返回群组的对象数组 + listGroupWithPerson: function (name) { + getOrgActions(); + var data = { "personList": getNameFlag(name) }; + var v = null; + orgActions.listGroupWithPerson(data, function (json) { v = json.data; }, null, false); + return v; + }, + //群组是否拥有角色--返回true, false + groupHasRole: function (name, role) { + getOrgActions(); + nameFlag = (typeOf(name) === "object") ? (name.distinguishedName || name.id || name.unique || name.name) : name; + var data = { "group": nameFlag, "roleList": getNameFlag(role) }; + var v = false; + orgActions.groupHasRole(data, function (json) { v = json.data.value; }, null, false); + return v; + }, + + //角色*************** + //获取角色--返回角色的对象数组 + getRole: function (name) { + getOrgActions(); + var data = { "roleList": getNameFlag(name) }; + var v = null; + orgActions.listRole(data, function (json) { v = json.data; }, null, false); + return (v && v.length === 1) ? v[0] : v; + }, + //人员所有角色（嵌套）--返回角色的对象数组 + listRoleWithPerson: function (name) { + getOrgActions(); + var data = { "personList": getNameFlag(name) }; + var v = null; + orgActions.listRoleWithPerson(data, function (json) { v = json.data; }, null, false); + return v; + }, + + //人员*************** + //人员是否拥有角色--返回true, false + personHasRole: function (name, role) { + getOrgActions(); + nameFlag = (typeOf(name) === "object") ? (name.distinguishedName || name.id || name.unique || name.name) : name; + var data = { "person": nameFlag, "roleList": getNameFlag(role) }; + var v = false; + orgActions.personHasRole(data, function (json) { v = json.data.value; }, null, false); + return v; + }, + //获取人员--返回人员的对象数组 + getPerson: function (name) { + getOrgActions(); + var data = { "personList": getNameFlag(name) }; + var v = null; + orgActions.listPerson(data, function (json) { v = json.data; }, null, false); + return (v && v.length === 1) ? v[0] : v; + }, + //查询下级人员--返回人员的对象数组 + //nested 布尔 true嵌套下级；false直接下级；默认false； + listSubPerson: function (name, nested) { + getOrgActions(); + var data = { "personList": getNameFlag(name) }; + var v = null; + if (nested) { + orgActions.listPersonSubNested(data, function (json) { v = json.data; }, null, false); + } else { + orgActions.listPersonSubDirect(data, function (json) { v = json.data; }, null, false); + } + return v; + }, + //查询上级人员--返回人员的对象数组 + //nested 布尔 true嵌套上级；false直接上级；默认false； + listSupPerson: function (name, nested) { + getOrgActions(); + var data = { "personList": getNameFlag(name) }; + var v = null; + if (nested) { + orgActions.listPersonSupNested(data, function (json) { v = json.data; }, null, false); + } else { + orgActions.listPersonSupDirect(data, function (json) { v = json.data; }, null, false); + } + return v; + }, + //获取群组的所有人员--返回人员的对象数组 + listPersonWithGroup: function (name) { + getOrgActions(); + var data = { "groupList": getNameFlag(name) }; + var v = null; + orgActions.listPersonWithGroup(data, function (json) { v = json.data; }, null, false); + return v; + }, + //获取角色的所有人员--返回人员的对象数组 + listPersonWithRole: function (name) { + getOrgActions(); + var data = { "roleList": getNameFlag(name) }; + var v = null; + orgActions.listPersonWithRole(data, function (json) { v = json.data; }, null, false); + return v; + }, + //获取身份的所有人员--返回人员的对象数组 + listPersonWithIdentity: function (name) { + getOrgActions(); + var data = { "identityList": getNameFlag(name) }; + var v = null; + orgActions.listPersonWithIdentity(data, function (json) { v = json.data; }, null, false); + return v; + }, + //查询组织成员的人员--返回人员的对象数组 + //nested 布尔 true嵌套的所有成员；false直接成员；默认false； + listPersonWithUnit: function (name, nested) { + getOrgActions(); + var data = { "unitList": getNameFlag(name) }; + var v = null; + if (nested) { + orgActions.listPersonWithUnitNested(data, function (json) { v = json.data; }, null, false); + } else { + orgActions.listPersonWithUnitDirect(data, function (json) { v = json.data; }, null, false); + } + return v; + }, + //根据属性查询人员--返回人员的对象数组 + //name string 属性名 + //value string 属性值 + listPersonWithAttribute: function (name, value) { + getOrgActions(); + var data = { "name": name, "attribute": value }; + var v = null; + orgActions.listPersonWithAttribute(data, function (json) { v = json.data; }, null, false); + return v; + }, + //根据属性查询人员--返回人员的全称数组 + //name string 属性名 + //value string 属性值 + listPersonNameWithAttribute: function (name, value) { + getOrgActions(); + var data = { "name": name, "attribute": value }; + var v = null; + orgActions.listPersonWithAttributeValue(data, function (json) { v = json.data.personList; }, null, false); + return v; + }, + + //人员属性************ + //添加人员属性值(在属性中添加values值，如果没有此属性，则创建一个) + appendPersonAttribute: function (person, attr, values, success, failure) { + getOrgActions(); + var personFlag = (typeOf(person) === "object") ? (person.distinguishedName || person.id || person.unique || person.name) : person; + var data = { "attributeList": values, "name": attr, "person": personFlag }; + orgActions.appendPersonAttribute(data, function (json) { + if (json.data.value) { + if (success) success(); + } else { + if (failure) failure(null, "", "append values failed"); + } + }, function (xhr, text, error) { + if (failure) failure(xhr, text, error); + }, false); + }, + //设置人员属性值(将属性值修改为values，如果没有此属性，则创建一个) + setPersonAttribute: function (person, attr, values, success, failure) { + getOrgActions(); + var personFlag = (typeOf(person) === "object") ? (person.distinguishedName || person.id || person.unique || person.name) : person; + var data = { "attributeList": values, "name": attr, "person": personFlag }; + orgActions.setPersonAttribute(data, function (json) { + if (json.data.value) { + if (success) success(); + } else { + if (failure) failure(null, "", "append values failed"); + } + }, function (xhr, text, error) { + if (failure) failure(xhr, text, error); + }, false); + }, + //获取人员属性值 + getPersonAttribute: function (person, attr) { + getOrgActions(); + var personFlag = (typeOf(person) === "object") ? (person.distinguishedName || person.id || person.unique || person.name) : person; + var data = { "name": attr, "person": personFlag }; + var v = null; + orgActions.getPersonAttribute(data, function (json) { v = json.data.attributeList; }, null, false); + return v; + }, + //列出人员所有属性的名称 + listPersonAttributeName: function (name) { + getOrgActions(); + var data = { "personList": getNameFlag(name) }; + var v = null; + orgActions.listPersonAttributeName(data, function (json) { v = json.data.nameList; }, null, false); + return v; + }, + //列出人员的所有属性 + listPersonAllAttribute: function (name) { + getOrgActions(); + var data = { "personList": getNameFlag(name) }; + var v = null; + orgActions.listPersonAllAttribute(data, function (json) { v = json.data; }, null, false); + return v; + }, + + //身份********** + //获取身份 + getIdentity: function (name) { + getOrgActions(); + var data = { "identityList": getNameFlag(name) }; + var v = null; + orgActions.listIdentity(data, function (json) { v = json.data; }, null, false); + return (v && v.length === 1) ? v[0] : v; + }, + //列出人员的身份 + listIdentityWithPerson: function (name) { + getOrgActions(); + var data = { "personList": getNameFlag(name) }; + var v = null; + orgActions.listIdentityWithPerson(data, function (json) { v = json.data; }, null, false); + return v; + }, + //查询组织成员身份--返回身份的对象数组 + //nested 布尔 true嵌套的所有成员；false直接成员；默认false； + listIdentityWithUnit: function (name, nested) { + getOrgActions(); + var data = { "unitList": getNameFlag(name) }; + var v = null; + if (nested) { + orgActions.listIdentityWithUnitNested(data, function (json) { v = json.data; }, null, false); + } else { + orgActions.listIdentityWithUnitDirect(data, function (json) { v = json.data; }, null, false); + } + return v; + }, + + //组织********** + //获取组织 + getUnit: function (name) { + getOrgActions(); + var data = { "unitList": getNameFlag(name) }; + var v = null; + orgActions.listUnit(data, function (json) { v = json.data; }, null, false); + return (v && v.length === 1) ? v[0] : v; + }, + //查询组织的下级--返回组织的对象数组 + //nested 布尔 true嵌套下级；false直接下级；默认false； + listSubUnit: function (name, nested) { + getOrgActions(); + var data = { "unitList": getNameFlag(name) }; + var v = null; + if (nested) { + orgActions.listUnitSubNested(data, function (json) { v = json.data; }, null, false); + } else { + orgActions.listUnitSubDirect(data, function (json) { v = json.data; }, null, false); + } + return v; + }, + //查询组织的上级--返回组织的对象数组 + //nested 布尔 true嵌套上级；false直接上级；默认false； + listSupUnit: function (name, nested) { + getOrgActions(); + var data = { "unitList": getNameFlag(name) }; + var v = null; + if (nested) { + orgActions.listUnitSupNested(data, function (json) { v = json.data; }, null, false); + } else { + orgActions.listUnitSupDirect(data, function (json) { v = json.data; }, null, false); + } + return v; + }, + //根据个人身份获取组织 + //flag 数字 表示获取第几层的组织 + // 字符串 表示获取指定类型的组织 + // 空 表示获取直接所在的组织 + getUnitByIdentity: function (name, flag) { + getOrgActions(); + var getUnitMethod = "current"; + var v; + if (flag) { + if (typeOf(flag) === "string") getUnitMethod = "type"; + if (typeOf(flag) === "number") getUnitMethod = "level"; + } + switch (getUnitMethod) { + case "current": + var data = { "identityList": getNameFlag(name) }; + orgActions.listUnitWithIdentity(data, function (json) { v = json.data; v = (v && v.length === 1) ? v[0] : v }, null, false); + break; + case "type": + var data = { "identity": (typeOf(name) === "object") ? (name.distinguishedName || name.id || name.unique || name.name) : name, "type": flag }; + orgActions.getUnitWithIdentityAndType(data, function (json) { v = json.data; }, null, false); + break; + case "level": + var data = { "identity": (typeOf(name) === "object") ? (name.distinguishedName || name.id || name.unique || name.name) : name, "level": flag }; + orgActions.getUnitWithIdentityAndLevel(data, function (json) { v = json.data; }, null, false); + break; + } + return v; + }, + //列出身份所在组织的所有上级组织 + listAllSupUnitWithIdentity: function (name) { + getOrgActions(); + var data = { "identityList": getNameFlag(name) }; + var v = null; + orgActions.listUnitSupNestedWithIdentity(data, function (json) { v = json.data; }, null, false); + return v; + }, + //获取人员所在的所有组织 + listUnitWithPerson: function (name) { + getOrgActions(); + var data = { "personList": getNameFlag(name) }; + var v = null; + orgActions.listUnitWithPerson(data, function (json) { v = json.data; }, null, false); + return v; + }, + //列出身份所在组织的所有上级组织 + listAllSupUnitWithPerson: function (name) { + getOrgActions(); + var data = { "personList": getNameFlag(name) }; + var v = null; + orgActions.listUnitSupNestedWithPerson(data, function (json) { v = json.data; }, null, false); + return v; + }, + //根据组织属性，获取所有符合的组织 + listUnitWithAttribute: function (name, attribute) { + getOrgActions(); + var data = { "name": name, "attribute": attribute }; + var v = null; + orgActions.listUnitWithAttribute(data, function (json) { v = json.data; }, null, false); + return v; + }, + //根据组织职务，获取所有符合的组织 + listUnitWithDuty: function (name, id) { + getOrgActions(); + var data = { "name": "", "identity": (typeOf(id) === "object") ? (id.distinguishedName || id.id || id.unique || id.name) : id }; + var v = null; + orgActions.listUnitWithDuty(data, function (json) { v = json.data; }, null, false); + return v; + }, + //列出顶层组织 + listTopUnit: function () { + var action = MWF.Actions.get("x_organization_assemble_control"); + var v = null; + action.listTopUnit(function (json) { + v = json.data; + }, null, false); + return v; + }, + + //组织职务*********** + //获取指定的组织职务的身份 + getDuty: function (duty, id) { + getOrgActions(); + var data = { "name": duty, "unit": (typeOf(id) === "object") ? (id.distinguishedName || id.id || id.unique || id.name) : id }; + var v = null; + orgActions.getDuty(data, function (json) { v = json.data; }, null, false); + return v; + }, + //获取身份的所有职务名称 + listDutyNameWithIdentity: function (name) { + getOrgActions(); + var data = { "identityList": getNameFlag(name) }; + var v = null; + orgActions.listDutyNameWithIdentity(data, function (json) { v = json.data.nameList; }, null, false); + return v; + }, + //获取组织的所有职务名称 + listDutyNameWithUnit: function (name) { + getOrgActions(); + var data = { "unitList": getNameFlag(name) }; + var v = null; + orgActions.listDutyNameWithUnit(data, function (json) { v = json.data.nameList; }, null, false); + return v; + }, + //获取组织的所有职务 + listUnitAllDuty: function (name) { + getOrgActions(); + var data = { "unitList": getNameFlag(name) }; + var v = null; + orgActions.listUnitAllDuty(data, function (json) { v = json.data; }, null, false); + return v; + }, + + //组织属性************** + //添加组织属性值(在属性中添加values值，如果没有此属性，则创建一个) + appendUnitAttribute: function (unit, attr, values, success, failure) { + getOrgActions(); + var unitFlag = (typeOf(unit) === "object") ? (unit.distinguishedName || unit.id || unit.unique || unit.name) : unit; + var data = { "attributeList": values, "name": attr, "unit": unitFlag }; + orgActions.appendUnitAttribute(data, function (json) { + if (json.data.value) { + if (success) success(); + } else { + if (failure) failure(null, "", "append values failed"); + } + }, function (xhr, text, error) { + if (failure) failure(xhr, text, error); + }, false); + }, + //设置组织属性值(将属性值修改为values，如果没有此属性，则创建一个) + setUnitAttribute: function (unit, attr, values, success, failure) { + getOrgActions(); + var unitFlag = (typeOf(unit) === "object") ? (unit.distinguishedName || unit.id || unit.unique || unit.name) : unit; + var data = { "attributeList": values, "name": attr, "unit": unitFlag }; + orgActions.setUnitAttribute(data, function (json) { + if (json.data.value) { + if (success) success(); + } else { + if (failure) failure(null, "", "append values failed"); + } + }, function (xhr, text, error) { + if (failure) failure(xhr, text, error); + }, false); + }, + //获取组织属性值 + getUnitAttribute: function (unit, attr) { + getOrgActions(); + var unitFlag = (typeOf(unit) === "object") ? (unit.distinguishedName || unit.id || unit.unique || unit.name) : unit; + var data = { "name": attr, "unit": unitFlag }; + var v = null; + orgActions.getUnitAttribute(data, function (json) { v = json.data.attributeList; }, null, false); + return v; + }, + //列出组织所有属性的名称 + listUnitAttributeName: function (name) { + getOrgActions(); + var data = { "unitList": getNameFlag(name) }; + var v = null; + orgActions.listUnitAttributeName(data, function (json) { v = json.data.nameList; }, null, false); + return v; + }, + //列出组织的所有属性 + listUnitAllAttribute: function (name) { + getOrgActions(); + var data = { "unitList": getNameFlag(name) }; + var v = null; + orgActions.listUnitAllAttribute(data, function (json) { v = json.data; }, null, false); + return v; + } + }; + + this.Action = (function () { + var actions = []; + return function (root, json) { + var action = actions[root] || (actions[root] = new MWF.xDesktop.Actions.RestActions("", root, "")); + action.getActions = function (callback) { + if (!this.actions) this.actions = {}; + Object.merge(this.actions, json); + if (callback) callback(); + }; + this.invoke = function (option) { + action.invoke(option) + } + } + })(); + this.service = { + "jaxwsClient": {}, + "jaxrsClient": {} + }; + + var lookupAction = null; + var getLookupAction = function (callback) { + if (!lookupAction) { + MWF.require("MWF.xDesktop.Actions.RestActions", function () { + lookupAction = new MWF.xDesktop.Actions.RestActions("", "x_processplatform_assemble_surface", ""); + lookupAction.getActions = function (actionCallback) { + this.actions = { + //"lookup": {"uri": "/jaxrs/view/flag/{view}/application/flag/{application}"}, + //"getView": {"uri": "/jaxrs/view/{id}/design"} + "lookup": { "uri": "/jaxrs/queryview/flag/{view}/application/flag/{application}/execute", "method": "PUT" }, + "getView": { "uri": "/jaxrs/queryview/flag/{view}/application/flag/{application}" } + }; + if (actionCallback) actionCallback(); + } + if (callback) callback(); + }); + } else { + if (callback) callback(); + } + }; + + this.view = { + "lookup": function (view, callback, async) { + var filterList = { "filterList": (view.filter || null) }; + MWF.Actions.get("x_query_assemble_surface").loadView(view.view, view.application, filterList, function (json) { + var data = { + "grid": json.data.grid || json.data.groupGrid, + "groupGrid": json.data.groupGrid + }; + if (callback) callback(data); + }, null, async); + }, + + "lookupV1": function (view, callback) { + getLookupAction(function () { + lookupAction.invoke({ + "name": "lookup", "async": true, "parameter": { "view": view.view, "application": view.application }, "success": function (json) { + var data = { + "grid": json.data.grid, + "groupGrid": json.data.groupGrid + }; + if (callback) callback(data); + }.bind(this) + }); + }.bind(this)); + }, + "select": function (view, callback, options) { + if (view.view) { + var viewJson = { + "application": view.application || _form.json.application, + "viewName": view.view || "", + "isTitle": (view.isTitle === false) ? "no" : "yes", + "select": (view.isMulti === false) ? "single" : "multi", + "filter": view.filter + }; + if (!options) options = {}; + options.width = view.width; + options.height = view.height; + options.title = view.caption; + + var width = options.width || "700"; + var height = options.height || "400"; + + if (layout.mobile) { + var size = document.body.getSize(); + width = size.x; + height = size.y; + options.style = "viewmobile"; + } + width = width.toInt(); + height = height.toInt(); + + var size = _form.app.content.getSize(); + var x = (size.x - width) / 2; + var y = (size.y - height) / 2; + if (x < 0) x = 0; + if (y < 0) y = 0; + if (layout.mobile) { + x = 20; + y = 0; + } + + var _self = this; + MWF.require("MWF.xDesktop.Dialog", function () { + var dlg = new MWF.xDesktop.Dialog({ + "title": options.title || "select view", + "style": options.style || "view", + "top": y, + "left": x - 20, + "fromTop": y, + "fromLeft": x - 20, + "width": width, + "height": height, + "html": "
", + "maskNode": _form.app.content, + "container": _form.app.content, + "buttonList": [ + { + "text": MWF.LP.process.button.ok, + "action": function () { + //if (callback) callback(_self.view.selectedItems); + if (callback) callback(_self.view.getData()); + this.close(); + } + }, + { + "text": MWF.LP.process.button.cancel, + "action": function () { this.close(); } + } + ] + }); + dlg.show(); + + if (layout.mobile) { + var backAction = dlg.node.getElement(".MWF_dialod_Action_back"); + var okAction = dlg.node.getElement(".MWF_dialod_Action_ok"); + if (backAction) backAction.addEvent("click", function (e) { + dlg.close(); + }.bind(this)); + if (okAction) okAction.addEvent("click", function (e) { + //if (callback) callback(this.view.selectedItems); + if (callback) callback(this.view.getData()); + dlg.close(); + }.bind(this)); + } + + MWF.xDesktop.requireApp("query.Query", "Viewer", function () { + this.view = new MWF.xApplication.query.Query.Viewer(dlg.content.getFirst(), viewJson, { "style": "select" }); + }.bind(this)); + }.bind(this)); + } + } + }; + + //include 引用脚本 + //optionsOrName : { + // type : "", 默认为portal, 可以为 portal process cms + // application : "", 门户/流程/CMS的名称/别名/id, 默认为当前应用 + // name : "" // 脚本名称/别名/id + //} + //或者name: "" // 脚本名称/别名/id + // if( !window.includedScripts ){ + // var includedScripts = window.includedScripts = []; + // }else{ + // var includedScripts = window.includedScripts; + // } + var includedScripts = []; + this.include = function (optionsOrName, callback) { + var options = optionsOrName; + if (typeOf(options) == "string") { + options = { name: options }; + } + var name = options.name; + var type = (options.type && options.application) ? options.type : "portal"; + var application = options.application || _form.json.application; + var key = type + "-" + application + "-" + name; + if (includedScripts.indexOf(key) > -1) { + if (callback) callback.apply(this); + return; + } + //if (includedScripts.indexOf( name )> -1){ + // if (callback) callback.apply(this); + // return; + //} + var scriptAction; + switch (type) { + case "portal": + if (this.scriptActionPortal) { + scriptAction = this.scriptActionPortal; + } else { + MWF.require("MWF.xScript.Actions.PortalScriptActions", null, false); + scriptAction = this.scriptActionPortal = new MWF.xScript.Actions.PortalScriptActions(); + } + break; + case "process": + if (this.scriptActionProcess) { + scriptAction = this.scriptActionProcess; + } else { + MWF.require("MWF.xScript.Actions.ScriptActions", null, false); + scriptAction = this.scriptActionProcess = new MWF.xScript.Actions.ScriptActions(); + } + break; + case "cms": + if (this.scriptActionCMS) { + scriptAction = this.scriptActionCMS; + } else { + MWF.require("MWF.xScript.Actions.CMSScriptActions", null, false); + scriptAction = this.scriptActionCMS = new MWF.xScript.Actions.CMSScriptActions(); + } + break; + } + scriptAction.getScriptByName(application, name, includedScripts, function (json) { + if (json.data) { + includedScripts.push(key); + includedScripts = includedScripts.concat(json.data.importedList); + MWF.Macro.exec(json.data.text, this); + if (callback) callback.apply(this); + } else { + if (callback) callback.apply(this); + } + }.bind(this), null, false); + }; + + this.define = function (name, fun, overwrite) { + var over = true; + if (overwrite === false) over = false; + var o = {}; + o[name] = { "value": fun, "configurable": over }; + MWF.defineProperties(this, o); + }.bind(this); + + + //仅前台对象----------------------------------------- + //form + this.page = this.form = { + // "getInfor": function () { return ev.pageInfor; }, + // "infor": ev.pageInfor, + "getApp": function () { return _form.app; }, + "app": _form.app, + "node": function () { return _form.node; }, + // "get": function (name) { return (_form.all) ? _form.all[name] : null; }, + // "getWidgetModule": function (widget, moduleName) { + // if (!_form.widgetModules || !_form.widgetModules[widget]) return null; + // var module = _form.widgetModules[widget][moduleName]; + // return module || null; + // }, + // "getField": function (name) { return _forms[name]; }, + // "getAction": function () { return _form.workAction }, + "getDesktop": function () { return _form.app.desktop }, + // "getData": function () { return new MWF.xScript.JSONData(_form.getData()); }, + //"save": function(callback){_form.saveWork(callback);}, + "close": function () { _form.closeWork(); }, + + // "print": function (application, form) { + // _form.printWork(application, form); + // }, + + "confirm": function (type, title, text, width, height, ok, cancel, callback, mask, style) { + // var p = MWF.getCenter({"x": width, "y": height}); + // e = {"event": {"clientX": p.x,"x": p.x,"clientY": p.y,"y": p.y}}; + // _form.confirm(type, e, title, text, width, height, ok, cancel, callback, mask, style); + if ((arguments.length <= 1) || o2.typeOf(arguments[1]) === "string") { + var p = MWF.getCenter({ "x": width, "y": height }); + e = { "event": { "clientX": p.x, "x": p.x, "clientY": p.y, "y": p.y } }; + _form.confirm(type, e, title, text, width, height, ok, cancel, callback, mask, style); + } else { + e = (arguments.length > 1) ? arguments[1] : null; + title = (arguments.length > 2) ? arguments[2] : null; + text = (arguments.length > 3) ? arguments[3] : null; + width = (arguments.length > 4) ? arguments[4] : null; + height = (arguments.length > 5) ? arguments[5] : null; + ok = (arguments.length > 6) ? arguments[6] : null; + cancel = (arguments.length > 7) ? arguments[7] : null; + callback = (arguments.length > 8) ? arguments[8] : null; + mask = (arguments.length > 9) ? arguments[9] : null; + style = (arguments.length > 10) ? arguments[10] : null; + _form.confirm(type, e, title, text, width, height, ok, cancel, callback, mask, style); + } + }, + "alert": function(type, title, text, width, height){ + _form.alert(type, title, text, width, height); + }, + "notice": function (content, type, target, where, offset, option) { + _form.notice(content, type, target, where, offset, option); + }, + "addEvent": function (e, f) { _form.addEvent(e, f); }, + "openWindow": function (form, app) { + _form.openWindow(form, app); + }, + // "toPage": function (name, par, nohis) { + // _form.app.toPage(name, par, nohis); + // }, + // "toPortal": function (portal, page, par) { + // _form.app.toPortal(portal, page, par); + // }, + "openWork": function (id, completedId, title, options) { + var op = options || {}; + op.workId = id; + op.workCompletedId = completedId; + op.docTitle = title; + op.appId = "process.Work" + (op.workId || op.workCompletedId); + return layout.desktop.openApplication(this.event, "process.Work", op); + }, + "openJob": function (id, choice, options) { + var workData = null; + o2.Actions.get("x_processplatform_assemble_surface").listWorkByJob(id, function (json) { + if (json.data) workData = json.data; + }.bind(this), null, false); + + if (workData) { + var len = workData.workList.length + workData.workCompletedList.length; + if (len) { + if (len > 1 && choice) { + var node = new Element("div", { "styles": { "padding": "20px", "width": "500px" } }).inject(_form.node); + workData.workList.each(function (work) { + var workNode = new Element("div", { + "styles": { + "background": "#ffffff", + "border-radius": "10px", + "clear": "both", + "margin-bottom": "10px", + "height": "40px", + "padding": "10px 10px" + } + }).inject(node); + var html = "
" + + "
" + o2.LP.widget.open + "
" + + "
" + work.title + "
" + + "
" + work.activityName + "
" + + "
" + work.activityArrivedTime + "
" + + "
" + (work.manualTaskIdentityText || "") + "
"; + workNode.set("html", html); + var action = workNode.getElement(".MWFAction"); + action.store("work", work); + action.addEvent("click", function (e) { + var work = e.target.retrieve("work"); + if (work) this.openWork(work.id, null, work.title, options); + dlg.close(); + }.bind(this)); + + }.bind(this)); + workData.workCompletedList.each(function (work) { + var workNode = new Element("div", { + "styles": { + "background": "#ffffff", + "border-radius": "10px", + "clear": "both", + "margin-bottom": "10px", + "height": "40px", + "padding": "10px 10px" + } + }).inject(node); + var html = "
" + + "
" + o2.LP.widget.open + "
" + + "
" + work.title + "
" + + "
" + o2.LP.widget.workcompleted + "
" + + "
" + work.completedTime + "
"; + workNode.set("html", html); + var action = workNode.getElement(".MWFAction"); + action.store("work", work); + action.addEvent("click", function (e) { + var work = e.target.retrieve("work"); + if (work) this.openWork(null, work.id, work.title, options); + dlg.close(); + }.bind(this)); + + }.bind(this)); + var height = node.getSize().y + 20; + if (height > 600) height = 600; + + var dlg = o2.DL.open({ + "title": o2.LP.widget.choiceWork, + "style": "user", + "isResize": false, + "content": node, + "buttonList": [ + { + "type": "cancel", + "text": o2.LP.widget.close, + "action": function () { dlg.close(); } + } + ] + }); + } else { + if (workData.workList.length) { + var work = workData.workList[0]; + return this.openWork(work.id, null, work.title, options); + } else { + var work = workData.workCompletedList[0]; + return this.openWork(null, work.id, work.title, options); + } + } + } + } + }, + "openDocument": function (id, title, options) { + var op = options || {}; + op.documentId = id; + op.docTitle = title || ""; + layout.desktop.openApplication(this.event, "cms.Document", op); + }, + "openPortal": function (name, page, par) { + var action = MWF.Actions.get("x_portal_assemble_surface"); + action.getApplication(name, function (json) { + if (json.data) { + if (page) { + action.getPageByName(page, json.data.id, function (pageJson) { + layout.desktop.openApplication(null, "portal.Portal", { + "portalId": json.data.id, + "pageId": (pageJson.data) ? pageJson.data.id : "", + "parameters": par, + "appId": "portal.Portal" + json.data.id + }) + }); + } else { + layout.desktop.openApplication(null, "portal.Portal", { + "portalId": json.data.id, + "parameters": par, + "appId": "portal.Portal" + json.data.id + }) + } + } + + }); + }, + "openCMS": function (name) { + var action = MWF.Actions.get("x_cms_assemble_control"); + action.getColumn(name, function (json) { + if (json.data) { + layout.desktop.openApplication(null, "cms.Module", { + "columnId": json.data.id, + "appId": "cms.Module" + json.data.id + }); + } + }); + }, + "openProcess": function (name) { + var action = MWF.Actions.get("x_processplatform_assemble_surface"); + action.getApplication(name, function (json) { + if (json.data) { + layout.desktop.openApplication(null, "process.Application", { + "id": json.data.id, + "appId": "process.Application" + json.data.id + }); + } + }); + }, + "openApplication": function (name, options) { + layout.desktop.openApplication(null, name, options); + }, + "createDocument": function (columnOrOptions, category, data, identity, callback, target, latest, selectColumnEnable, ignoreTitle) { + var column = columnOrOptions; + if (typeOf(columnOrOptions) == "object") { + column = columnOrOptions.column; + category = columnOrOptions.category; + data = columnOrOptions.data; + identity = columnOrOptions.identity; + callback = columnOrOptions.callback; + target = columnOrOptions.target; + latest = columnOrOptions.latest; + selectColumnEnable = columnOrOptions.selectColumnEnable; + ignoreTitle = columnOrOptions.ignoreTitle; + } + if (target) { + if (layout.app && layout.app.inBrowser) { + layout.app.content.empty(); + layout.app = null; + } + } + + MWF.xDesktop.requireApp("cms.Index", "Newer", function () { + var starter = new MWF.xApplication.cms.Index.Newer(null, null, _form.app, null, { + "documentData": data, + "identity": identity, + + "ignoreTitle": ignoreTitle === true, + "ignoreDrafted": latest === false, + "selectColumnEnable": !category || selectColumnEnable === true, + "restrictToColumn": !!category && selectColumnEnable !== true, + + "categoryFlag": category, //category id or name + "columnFlag": column, //column id or name, + "onStarted": function (documentId, data) { + if (callback) callback(); + }, + "onPostLoad": function () { + }, + "onPostPublish": function () { + } + }); + starter.load(); + }) + }, + "startProcess": function (app, process, data, identity, callback, target, latest) { + debugger; + if (arguments.length > 2) { + for (var i = 2; i < arguments.length; i++) { + if (typeOf(arguments[i]) == "boolean") { + target = arguments[i]; + break; + } + } + } + + if (target) { + if (layout.app && layout.app.inBrowser) { + //layout.app.content.empty(); + layout.app.$openWithSelf = true; + } + } + var action = MWF.Actions.get("x_processplatform_assemble_surface").getProcessByName(process, app, function (json) { + if (json.data) { + MWF.xDesktop.requireApp("process.TaskCenter", "ProcessStarter", function () { + var starter = new MWF.xApplication.process.TaskCenter.ProcessStarter(json.data, _form.app, { + "workData": data, + "identity": identity, + "latest": latest, + "onStarted": function (data, title, processName) { + var currentTask = []; + data.each(function (work) { + if (work.currentTaskIndex != -1) currentTask.push(work.taskList[work.currentTaskIndex].work); + }.bind(this)); + + if (currentTask.length == 1) { + var options = { "workId": currentTask[0], "appId": currentTask[0] }; + layout.desktop.openApplication(null, "process.Work", options); + } else { } + + if (callback) callback(data); + }.bind(this) + }); + starter.load(); + }.bind(this)); + } + }); + }, + "parameters": _form.options.parameters, + "getWidgetPrameters": function () { + if (!this.target) return null; + if (!this.target.widget) return null; + if (!this.widgetParameters) return null; + var pageId = this.target.widget.json.id; + return this.widgetParameters[pageId]; + }.bind(this) + //"app": _form.app + }; + // this.form.currentRouteName = _form.json.currentRouteName; + // this.form.opinion = _form.json.opinion; + + this.target = ev.target; + this.event = ev.event; + this.status = ev.status; + this.session = layout.desktop.session; + this.Actions = o2.Actions; + + this.query = function (option) { + // options = { + // "name": "statementName", + // "data": "json data", + // "firstResult": 1, + // "maxResults": 100, + // "success": function(){}, + // "error": function(){}, + // "async": true or false, default is true + // } + if (option) { + var json = (option.data) || {}; + if (option.firstResult) json.firstResult = option.firstResult.toInt(); + if (option.maxResults) json.maxResults = option.maxResults.toInt(); + o2.Actions.get("x_query_assemble_surface").executeStatement(option.name, json, success, error, options.async); + } + }; + // this.Table = MWF.xScript.createTable(); +}; + diff --git a/o2web/source/x_component_query_Query/Viewer.js b/o2web/source/x_component_query_Query/Viewer.js index 75fea9bcaf..eb36578803 100644 --- a/o2web/source/x_component_query_Query/Viewer.js +++ b/o2web/source/x_component_query_Query/Viewer.js @@ -74,12 +74,14 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({ } }, load: function(){ - this._loadModuleEvents(); - if (this.fireEvent("queryLoad")){ - this._loadUserInterface(); - //this._loadStyles(); - this._loadDomEvents(); - } + this.loadMacro( function () { + this._loadModuleEvents(); + if (this.fireEvent("queryLoad")){ + this._loadUserInterface(); + //this._loadStyles(); + this._loadDomEvents(); + } + }) }, _loadUserInterface : function(){ this.loadLayout(); @@ -102,6 +104,16 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({ this.viewPageNode = new Element("div", {"styles": this.css.viewPageNode}).inject(this.node); this.viewPageAreaNode = new Element("div", {"styles": this.css.viewPageAreaNode}).inject(this.viewPageNode); }, + loadMacro: function (callback) { + if( !this.Macro ){ //有可能是page\cms\process传入的macro + MWF.require("MWF.xScript.Macro", function () { + this.Macro = new MWF.Macro.ViewContext(this); + if (callback) callback(); + }.bind(this)); + }else{ + if (callback) callback(); + } + }, createExportNode: function(){ if (this.options.export){ MWF.require("MWF.widget.Toolbar", function(){ @@ -958,7 +970,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({ if (e.code){ if (this.options.moduleEvents.indexOf(key)!==-1){ this.addEvent(key, function(event){ - return this.form.Macro.fire(e.code, this, event); + return this.Macro.fire(e.code, this, event); }.bind(this)); } } @@ -969,7 +981,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({ if (e.code){ if (this.options.moduleEvents.indexOf(key)===-1){ this.node.addEvent(key, function(event){ - return this.form.Macro.fire(e.code, this, event); + return this.Macro.fire(e.code, this, event); }.bind(this)); } } @@ -1436,8 +1448,6 @@ MWF.xApplication.query.Query.Viewer.Filter = new Class({ } }); - - MWF.xApplication.query.Query.Viewer.Actionbar = new Class({ Implements: [Events], options: { diff --git a/o2web/source/x_component_query_ViewDesigner/$View/view_bak.json b/o2web/source/x_component_query_ViewDesigner/$View/view_bak.json deleted file mode 100644 index 4746c66ebc..0000000000 --- a/o2web/source/x_component_query_ViewDesigner/$View/view_bak.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "", - "id": "", - "application": "", - "alias": "", - "description": "", - "display": true, - - "data": { - "exportGrid": true, - "exportGoupGrid": true, - "scopeType": "work", - "selectEntryList": [], - "restrictWhereEntry": { - "applicationList": [], - "processList": [], - "companyList": [], - "departmentList": [], - "personList": [], - "identityList": [] - }, - "restrictFilterEntryList": [], - "restrictDateRangeEntry": { - "dateRangeType": "none", - "dateEffectType": "start", - "year": "", - "month": "", - "date": "", - "season": 0, - "week": 0, - "adjust": 0 - }, - "orderEntryList": [], - "groupEntry": {}, - "calculate": {} - }, - "availableIdentityList": [], - "availableDepartmentList": [], - "availableCompanyList": [] -} \ No newline at end of file diff --git a/o2web/source/x_component_query_ViewDesigner/View.js b/o2web/source/x_component_query_ViewDesigner/View.js index aad0c3e64c..1f1ffdb80f 100644 --- a/o2web/source/x_component_query_ViewDesigner/View.js +++ b/o2web/source/x_component_query_ViewDesigner/View.js @@ -171,7 +171,7 @@ MWF.xApplication.query.ViewDesigner.View = new Class({ json.data.groupGrid.each(function(line, idx){ var groupTr = new Element("tr", {"styles": this.css.viewContentTrNode}).inject(this.viewContentTableNode); - var colSpan = this.items.length + 1 ; + var colSpan = this.items.length ; var td = new Element("td", {"styles": this.css.viewContentGroupTdNode, "colSpan": colSpan}).inject(groupTr); var groupAreaNode = new Element("div", {"styles": this.css.viewContentTdGroupNode}).inject(td); var groupIconNode = new Element("div", {"styles": this.css.viewContentTdGroupIconNode}).inject(groupAreaNode); -- GitLab