zc

.env.production

@@ -19,15 +19,15 @@ VUE_APP_VERSION_DIFFERENCE_FIELD = 'kuangYeDaXue_nanHu'
 # ####################外网接口配置####################
 
 # 1.8外网地址
-# VUE_APP_BASE_API = 'lab.zjznai.com/nwsuaf/api'
+VUE_APP_BASE_API = 'lab.zjznai.com/nwsuaf/api'
 
 # 43外网地址
-VUE_APP_BASE_API = '192.168.1.43/api'
+# VUE_APP_BASE_API = '192.168.1.43/api'
 
 # ####################内网接口配置####################
 
 # 1.8内网地址
-# VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
+VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
 # 43内网地址
-VUE_APP_BASE_LOCAL_API = '192.168.1.43/api'
+# VUE_APP_BASE_LOCAL_API = '192.168.1.43/api'
 

public/UEditor/dialogs/image/image.html

@@ -21,8 +21,8 @@
         <div id="tabhead" class="tabhead">
             <span class="tab" data-content-id="remote"><var id="lang_tab_remote"></var></span>
             <span class="tab focus" data-content-id="upload"><var id="lang_tab_upload"></var></span>
-            <span class="tab" data-content-id="online"><var id="lang_tab_online"></var></span>
-            <span class="tab" data-content-id="search"><var id="lang_tab_search"></var></span>
+            <!--<span class="tab" data-content-id="online"><var id="lang_tab_online"></var></span>-->
+            <!--<span class="tab" data-content-id="search"><var id="lang_tab_search"></var></span>-->
         </div>
         <div class="alignBar">
             <label class="algnLabel"><var id="lang_input_align"></var></label>
@@ -117,4 +117,4 @@
     <script type="text/javascript" src="image.js"></script>
 
 </body>
-</html>
+</html>

public/UEditor/ueditor.all.min.js

@@ -17674,7 +17674,7 @@ UE.plugins['video'] = function (){
                 if(ext == 'ogv') ext = 'ogg';
                 str = '<video' + (id ? ' id="' + id + '"' : '') + ' class="' + classname + ' video-js" ' + (align ? ' style="float:' + align + '"': '') +
                     ' controls preload="none" width="' + width + '" height="' + height + '" src="' + url + '" data-setup="{}">' +
-                    '<source src="' + url + '" type="video/' + ext + '" /></video><br/>';
+                    '<source src="' + url + '" type="video/' + ext + '" /></video>';
                 break;
         }
         return str;
@@ -20027,15 +20027,22 @@ UE.plugins['table'] = function () {
 
                 var caption = domUtils.findParentByTagName(me.selection.getStart(), 'caption', true),
                     range = me.selection.getRange();
-                if (range.collapsed && caption && isEmptyBlock(caption)) {
-                    me.fireEvent('saveScene');
-                    var table = caption.parentNode;
-                    domUtils.remove(caption);
-                    if (table) {
-                        range.setStart(table.rows[0].cells[0], 0).setCursor(false, true);
-                    }
-                    me.fireEvent('saveScene');
+              var child = range.startContainer;
+              if (child != null) {
+                var previouNode=child.previousElementSibling;
+                if (child.length==1&&previouNode != null&&previouNode.tagName == "VIDEO") {
+                  domUtils.remove(previouNode);
+                }
+              }
+              if (range.collapsed && caption && isEmptyBlock(caption)) {
+                me.fireEvent('saveScene');
+                var table = caption.parentNode;
+                domUtils.remove(caption);
+                if (table) {
+                  range.setStart(table.rows[0].cells[0], 0).setCursor(false, true);
                 }
+                me.fireEvent('saveScene');
+              }
 
             }
 

public/UEditor/ueditor.config.js

@@ -41,7 +41,7 @@
             'directionalityltr', 'directionalityrtl', 'indent', '|',
             'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|',
             'link', 'unlink', 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|',
-            'simpleupload', 'insertimage',/* 'emotion', 'scrawl',*/ 'insertvideo', /*'music',*/ 'attachment', /*'map', 'gmap', 'insertframe', 'insertcode', 'webapp',*/ 'pagebreak', 'template', 'background', '|',
+            /*'simpleupload',*/ 'insertimage',/* 'emotion', 'scrawl',*/ 'insertvideo', /*'music', 'attachment','map', 'gmap', 'insertframe', 'insertcode', 'webapp',*/ 'pagebreak', 'template', 'background', '|',
             'horizontal', 'date', 'time', 'spechars', /*'snapscreen', 'wordimage',*/ '|',
             'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|',
             /*'print', 'preview',*/ 'searchreplace', /*'drafts', 'help'*/

src/components/UEditor/index.vue

@@ -51,6 +51,8 @@
 
 <style scoped lang="scss">
   #UEditor-page{
-
+    ::v-deep .edui-toolbar{
+      line-height: 20px !important;
+    }
   }
 </style>