diff --git a/public/static/common/lib/ueditor/dialogs/image/image.js b/public/static/common/lib/ueditor/dialogs/image/image.js
index 5889c3a6b..be12333a1 100755
--- a/public/static/common/lib/ueditor/dialogs/image/image.js
+++ b/public/static/common/lib/ueditor/dialogs/image/image.js
@@ -133,7 +133,7 @@
                 'border': $G('border'),
                 'vhSpace': $G('vhSpace'),
                 'title': $G('title'),
-                'align': $G('align')
+                'align': 'none'
             };
             var img = editor.selection.getRange().getClosedNode();
             if (img) {
diff --git a/public/static/common/lib/ueditor/dialogs/video/video.css b/public/static/common/lib/ueditor/dialogs/video/video.css
index bdc620cf7..a78d94acf 100755
--- a/public/static/common/lib/ueditor/dialogs/video/video.css
+++ b/public/static/common/lib/ueditor/dialogs/video/video.css
@@ -776,7 +776,7 @@ i.file-preview.file-type-psd{
         height: 315px;
     }
     #videoUrl {
-        width: auto;
+        width: calc(100vw - 92px);
     }
     #preview {
         width: calc(100% - 150px);
diff --git a/public/static/common/lib/ueditor/ueditor.all.js b/public/static/common/lib/ueditor/ueditor.all.js
index 9c480bcaa..ad129047a 100755
--- a/public/static/common/lib/ueditor/ueditor.all.js
+++ b/public/static/common/lib/ueditor/ueditor.all.js
@@ -11020,18 +11020,20 @@ UE.commands['imagefloat'] = {
 
                             me.execCommand('insertHtml', '<p id="_img_parent_tmp" style="text-align:center">' + pN.innerHTML + '</p>');
 
-                            tmpNode = me.document.getElementById('_img_parent_tmp');
-                            tmpNode.removeAttribute('id');
-                            tmpNode = tmpNode.firstChild;
-                            range.selectNode(tmpNode).select();
-                            //去掉后边多余的元素
-                            next = tmpNode.parentNode.nextSibling;
-                            if (next && domUtils.isEmptyNode(next)) {
-                                domUtils.remove(next);
+                            tmpNode = me.document.getElementById('_img_parent_tmp') || null;
+                            if(tmpNode != null)
+                            {
+                                tmpNode.removeAttribute('id');
+                                tmpNode = tmpNode.firstChild;removeAttribute
+                            
+                                range.selectNode(tmpNode).select();
+                                //去掉后边多余的元素
+                                next = tmpNode.parentNode.nextSibling;
+                                if (next && domUtils.isEmptyNode(next)) {
+                                    domUtils.remove(next);
+                                }
                             }
-
                         }
-
                         break;
                 }