Merge branch 'hotfix/query.permission' into 'master'

Merge of hotfix/query.permission 修复查询视图和数据表执行人设置为身份的问题 to master

See merge request o2oa/o2oa!386

o2web/source/x_component_query_StatementDesigner/$Statement/statement.html

@@ -49,7 +49,7 @@
             <tr id="text{$.pid}executePersonListTr" style="display:text{($.anonymousAccessible==true)?'none':''}">
                 <td class="editTableTitle">{{$.lp.executePerson}}:</td>
                 <td class="editTableValue">
-                    <div class="MWFPersonIdentity" name="executePersonList"></div>
+                    <div class="MWFPersonPerson" name="executePersonList"></div>
                 </td>
             </tr>
             <tr id="text{$.pid}executeUnitListTr" style="display:text{($.anonymousAccessible==true)?'none':''}">

o2web/source/x_component_query_TableDesigner/$Table/table.html

@@ -37,7 +37,7 @@
             <tr>
                 <td class="editTableTitle">{{$.lp.readPersonList}}:</td>
                 <td class="editTableValue">
-                    <div class="MWFPersonIdentity" name="readPersonList"></div>
+                    <div class="MWFPersonPerson" name="readPersonList"></div>
                 </td>
             </tr>
             <tr>
@@ -49,7 +49,7 @@
             <tr>
                 <td class="editTableTitle">{{$.lp.editPersonList}}:</td>
                 <td class="editTableValue">
-                    <div class="MWFPersonIdentity" name="editPersonList"></div>
+                    <div class="MWFPersonPerson" name="editPersonList"></div>
                 </td>
             </tr>
             <tr>

o2web/source/x_component_query_TableDesigner/Property.js

@@ -328,6 +328,7 @@ MWF.xApplication.query.TableDesigner.Property = MWF.FTProperty = new Class({
 	},
     loadPersonInput: function(){
         var personIdentityNodes = this.propertyContent.getElements(".MWFPersonIdentity");
+        var personPersonNodes = this.propertyContent.getElements(".MWFPersonPerson");
         var personUnitNodes = this.propertyContent.getElements(".MWFPersonUnit");
         var dutyNodes = this.propertyContent.getElements(".MWFDutySelector");
         var dutyNameNodes = this.propertyContent.getElements(".MWFPersonDuty");
@@ -344,6 +345,14 @@ MWF.xApplication.query.TableDesigner.Property = MWF.FTProperty = new Class({
                 });
             }.bind(this));
 
+            personPersonNodes.each(function(node){
+                new MWF.xApplication.process.ProcessDesigner.widget.PersonSelector(node, this.view.designer, {
+                    "type": "person",
+                    "names": this.data[node.get("name")],
+                    "onChange": function(ids){this.savePersonItem(node, ids);}.bind(this)
+                });
+            }.bind(this));
+
             personUnitNodes.each(function(node){
                 new MWF.xApplication.process.ProcessDesigner.widget.PersonSelector(node, this.view.designer, {
                     "type": "unit",

o2web/source/x_component_query_ViewDesigner/Property.js

@@ -447,6 +447,7 @@ MWF.xApplication.query.ViewDesigner.Property = MWF.FVProperty = new Class({
     },
     loadPersonInput: function () {
         var identityNodes = this.propertyContent.getElements(".MWFPersonIdentity");
+        var personNodes = this.propertyContent.getElements(".MWFPersonPerson");
         var personUnitNodes = this.propertyContent.getElements(".MWFPersonUnit");
 
         MWF.xDesktop.requireApp("process.ProcessDesigner", "widget.PersonSelector", function () {
@@ -460,6 +461,16 @@ MWF.xApplication.query.ViewDesigner.Property = MWF.FVProperty = new Class({
                 });
             }.bind(this));
 
+            personNodes.each(function (node) {
+                new MWF.xApplication.process.ProcessDesigner.widget.PersonSelector(node, this.view.designer, {
+                    "type": "person",
+                    "names": this.data[node.get("name")],
+                    "onChange": function (ids) {
+                        this.savePersonItem(node, ids);
+                    }.bind(this)
+                });
+            }.bind(this));
+
             personUnitNodes.each(function (node) {
                 new MWF.xApplication.process.ProcessDesigner.widget.PersonSelector(node, this.view.designer, {
                     "type": "unit",