From 5e5652ed8fe8f1f5d237c4721c5984f682d8e347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E7=A5=A5=E7=86=A0?= Date: Tue, 1 Mar 2022 07:26:45 +0000 Subject: [PATCH] Merge branch 'hotfix/api' into 'master' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge of hotfix/api 修复api职务描述不正确的问题 to master See merge request o2oa/o2oa!322 (cherry picked from commit 9dc76c5d1eba1278453a00327cb861bb3032293e) e411d1ed 修复api的问题 --- .../actionOut/examples/x_organization_assemble_express.json | 4 ++++ o2web/source/o2_core/o2/xScript/ViewEnvironment.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/o2web/jsdoc_static/actionOut/examples/x_organization_assemble_express.json b/o2web/jsdoc_static/actionOut/examples/x_organization_assemble_express.json index 2e84c7ef4b..8d2a7d2295 100644 --- a/o2web/jsdoc_static/actionOut/examples/x_organization_assemble_express.json +++ b/o2web/jsdoc_static/actionOut/examples/x_organization_assemble_express.json @@ -40,6 +40,10 @@ "levelName": "浙江兰德纵横/开发部", "superior": "浙江兰德纵横@a706f5f0-4a3b-4785-8e1d-0a944bfad4eb@U" }, + "Duty": { + "name": "部门领导", + "unit": "开发部@kfb@U" + }, "UnitDuty" : { "name": "李四", "unique": "23dd1b53-feed-485d-8c9c-1a4e64ff58a2", diff --git a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js index 826200a732..eb8e98e880 100644 --- a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js +++ b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js @@ -1904,7 +1904,7 @@ MWF.xScript.ViewEnvironment = function (ev) { * @return {Promise|Object[]} 当async为true时，返回 * {@link https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/Promise|Promise}。 * 否则返回职务数组 - * @o2ActionOut x_organization_assemble_express.UnitDutyAction.listWithUnitObject|example=UnitDuty + * @o2ActionOut x_organization_assemble_express.UnitDutyAction.listWithUnitObject|example=Duty * @o2syntax * //同步执行，返回职务数组。 * var dutyList = this.org.listUnitAllDuty( unit ); -- GitLab