From ac2994fd5a531608f2a7d40dbc96987621a72ae6 Mon Sep 17 00:00:00 2001
From: unknown <caixiangyi@zoneland.net>
Date: Thu, 22 Oct 2020 21:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=80=89=E6=8B=A9=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=9A=90=E8=97=8F=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 o2web/source/x_component_process_Work/Processor.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/o2web/source/x_component_process_Work/Processor.js b/o2web/source/x_component_process_Work/Processor.js
index 2199b37301..e803a17cc7 100644
--- a/o2web/source/x_component_process_Work/Processor.js
+++ b/o2web/source/x_component_process_Work/Processor.js
@@ -414,6 +414,7 @@ MWF.xApplication.process.Work.Processor = new Class({
         }.bind(this));
         if (!isSelected) {
             this.setSize(0);
+            if( this.orgsArea )this.orgsArea.hide();
         }
     },
     overRoute: function (node) {
@@ -1219,6 +1220,7 @@ MWF.xApplication.process.Work.Processor = new Class({
     },
 
     loadOrgs_mobile: function (route) {
+        debugger;
         if (!this.form || !route) {
             this.orgsArea.hide();
             this.setSize(0);
@@ -1282,7 +1284,7 @@ MWF.xApplication.process.Work.Processor = new Class({
 
         var table_old = this.orgTableObject[route];
         var divsMap_old = {};
-        if (divsMap_old) {
+        if (table_old) {
             var divs = table_old.getChildren("div");
             divs.each(function (div) {
                 divsMap_old[div.retrieve("orgName")] = div;
@@ -1303,6 +1305,8 @@ MWF.xApplication.process.Work.Processor = new Class({
         }).inject(this.orgsArea);
         this.orgTableObject[route] = routeOrgTable;
 
+        var ignoreFirstOrgOldData = false
+
         dataVisable.each(function (config, i) {
             var sNode = new Element("div", {
                 "styles": this.css.routeOrgTr
@@ -1454,9 +1458,7 @@ MWF.xApplication.process.Work.Processor = new Class({
         this.orgItemMap = this.orgItemsMap[route] || {};
         var dataVisable = this.getVisableOrgData(route);
         if (dataVisable.length) {
-            if (this.isSameArray(Object.keys(this.orgItemMap), dataVisable.map(function (d) {
-                return d.name
-            }))) {
+            if (this.isSameArray(Object.keys(this.orgItemMap), dataVisable.map(function (d) { return d.name }))) {
                 this.orgTableObject[route].show();
                 this.orgItems = this.orgItemsObject[route] || [];
                 this.setSize(dataVisable.length);
@@ -2204,6 +2206,9 @@ if (MWF.xApplication.process.Xform && MWF.xApplication.process.Xform.Form) {
             if (node.getStyle("overflow") === "visible" && !height) node.setStyle("overflow", "hidden");
             if (value && value.length) {
                 value.each(function (data) {
+                    if( typeOf(data) === "string" ){
+                        data = { distinguishedName : data, name : o2.name.cn(data) };
+                    }
                     var flag = data.distinguishedName.substr(data.distinguishedName.length - 1, 1);
                     var copyData = Object.clone(data);
                     if (this.json.displayTextScript && this.json.displayTextScript.code) {
-- 
GitLab