Merge branch 'cherry-pick-ec8283fc' into 'develop'

修复会议管理的会议链接过长时显示异常的问题

See merge request o2oa/o2oa!2168

o2web/source/x_component_Meeting/Common.js

@@ -1200,7 +1200,7 @@ MWF.xApplication.Meeting.MeetingForm = new Class({
             new Element("a", {
                 style: "font-size:14px;",
                 href: this.data.roomLink,
-                text: this.data.roomLink,
+                text: this.lp.openMeetingUrl,
                 target: "_blank"
             }).inject( node );
         }
@@ -1209,17 +1209,17 @@ MWF.xApplication.Meeting.MeetingForm = new Class({
             node = this.formTableArea.getElement("[item='roomId']");
             node.empty();
             new Element("span", { text: this.data.roomId, name: "roomId" }).inject( node );
-            this.app.isCopyEnable().then(function(flag){
-                if( flag ){
-                    new Element("div", {
-                        "text": this.lp.copy,
-                        "styles": this.app.css.inputDenyButton,
-                        "events": {
-                            "click": function (){ this.app.copyTextToClipboard(this.data.roomId) }.bind(this)
-                        }
-                    }).inject( node );
-                }
-            }.bind(this))
+            // this.app.isCopyEnable().then(function(flag){
+            //     if( flag ){
+            //         new Element("div", {
+            //             "text": this.lp.copy,
+            //             "styles": this.app.css.inputDenyButton,
+            //             "events": {
+            //                 "click": function (){ this.app.copyTextToClipboard(this.data.roomId) }.bind(this)
+            //             }
+            //         }).inject( node );
+            //     }
+            // }.bind(this))
         }
     },
     reloadinviteDelPerson: function(){
@@ -1980,26 +1980,26 @@ MWF.xApplication.Meeting.MeetingTooltip = new Class({
             new Element("a", {
                 style: "font-size:13px;",
                 href: this.data.roomLink,
-                text: this.data.roomLink,
+                text: this.lp.openMeetingUrl,
                 target: "_blank"
             }).inject( node );
         }
-        if( this.data.roomId ){
-            this.app.isCopyEnable().then(function(flag){
-                if( flag ){
-                    node = this.node.getElement("[item='roomId']");
-                    node.empty();
-                    new Element("span", { text: this.data.roomId, name: "roomId" }).inject( node );
-                    new Element("div", {
-                        "text": this.lp.copy,
-                        "styles": this.app.css.inputDenyButton,
-                        "events": {
-                            "click": function (){ this.app.copyTextToClipboard(this.data.roomId) }.bind(this)
-                        }
-                    }).inject( node );
-                }
-            }.bind(this))
-        }
+        // if( this.data.roomId ){
+        //     this.app.isCopyEnable().then(function(flag){
+        //         if( flag ){
+        //             node = this.node.getElement("[item='roomId']");
+        //             node.empty();
+        //             new Element("span", { text: this.data.roomId, name: "roomId" }).inject( node );
+        //             new Element("div", {
+        //                 "text": this.lp.copy,
+        //                 "styles": this.app.css.inputDenyButton,
+        //                 "events": {
+        //                     "click": function (){ this.app.copyTextToClipboard(this.data.roomId) }.bind(this)
+        //                 }
+        //             }).inject( node );
+        //         }
+        //     }.bind(this))
+        //}
     },
     loadRoom: function( callback ){
         var area = this.node.getElement("[item='meetingRoom']");

o2web/source/x_component_Meeting/Main.js

@@ -128,7 +128,7 @@ MWF.xApplication.Meeting.Main = new Class({
     isCopyEnable: function(){
         return Promise.resolve(false);
         // if( typeOf(this.copyEnable) === "boolean" )return Promise.resolve(this.copyEnable);
-        // var text = "";
+        // var text = " ";
         // if (navigator.clipboard) {
         //     return navigator.clipboard.writeText(text).then(function() {
         //         this.copyEnable = true;

o2web/source/x_component_Meeting/lp/en.js

@@ -167,8 +167,9 @@ MWF.xApplication.Meeting.LP = {
     "meetingMode": "meeting mode",
     "meetingModeSelectText": ["offline meeting","online meeting"],
     "meetingModeSelectValue": ["offline","online"],
-    "meeting Url": "meeting link",
-    "meeting Number": "meeting number",
+    "meetingUrl": "meeting link",
+    "openMeetingUrl": "Open meeting link",
+    "meetingNumber": "meeting number",
     "netMeetingAbb": "Net",
     "yes": "Yes",
     "no": "No",

o2web/source/x_component_Meeting/lp/es.js

@@ -167,8 +167,9 @@ MWF.xApplication.Meeting.LP = {
     "meetingMode": "metodo de encuentro",
     "meetingModeSelectText": ["reunión fuera de línea","reunión en línea"],
     "meetingModeSelectValue": ["desconectado","en línea"],
-    "meeting Url": "URL de la reunión",
-    "meeting Number": "número de reunión",
+    "meetingUrl": "URL de la reunión",
+    "openMeetingUrl": "Abrir URL de la reunión",
+    "meetingNumber": "número de reunión",
     "netMeetingAbb": "neto",
     "yes": "Sí",
     "no": "No",

o2web/source/x_component_Meeting/lp/zh-cn.js

@@ -168,6 +168,7 @@ MWF.xApplication.Meeting.LP = {
     "meetingModeSelectText": ["线下会议","线上会议"],
     "meetingModeSelectValue": ["offline","online"],
     "meetingUrl": "会议链接",
+    "openMeetingUrl": "打开会议链接",
     "meetingNumber": "会议号",
     "netMeetingAbb": "网",
     "yes": "是",