Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.cshtml

@@ -21,7 +21,7 @@
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第几级</div>
+                                    <div class="lr-form-item-title">年级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DatabaseLink/Form.js

@@ -16,7 +16,10 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#F_DbType').lrDataItemSelect({ code: 'DbVersion' });
+            $('#F_DbType').lrselect({
+                value: 'F_ItemValue',
+                text: 'F_ItemName',
+                url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList?itemCode=DbVersion' });
 
             $('#lr_test').on('click', function () {
                 var dbType = $('#F_DbType').lrselectGet();

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.all.js

@@ -19831,7 +19831,13 @@ UE.plugins['video'] = function (){
             utils.each(domUtils.getElementsByTagName(table,'td'),function(td){
                 td.style.borderWidth = '1px';
                 td.style.borderStyle = 'solid';
-            })
+            });
+            //增加下面一段  
+            utils.each(domUtils.getElementsByTagName(table, 'th'), function (th) {
+                th.style.borderWidth = domUtils.getComputedStyle(th, "border-width");
+                th.style.borderStyle = 'solid';
+                th.style.borderColor = 'windowtext';
+            });
         }
     };
     function resetTdWidth(table, editor) {
@@ -19990,9 +19996,9 @@ UE.plugins['table'] = function () {
                 'table.noBorderTable td,table.noBorderTable th,table.noBorderTable caption{border:1px dashed #ddd !important}' +
                 //插入的表格的默认样式
                 'table{margin-bottom:10px;border-collapse:collapse;display:table;}' +
-                'td,th{padding: 5px 10px;border: 1px solid #DDD;}' +
+                'td,th{padding: 5px 10px;border: 1px dashed #DDD;}' +
                 'caption{border:1px dashed #DDD;border-bottom:0;padding:3px;text-align:center;}' +
-                'th{border-top:1px solid #BBB;background-color:#F7F7F7;}' +
+                'th{border-top:1px dashed #BBB;background-color:#F7F7F7;}' +
                 'table tr.firstRow th{border-top-width:2px;}' +
                 '.ue-table-interlace-color-single{ background-color: #fcfcfc; } .ue-table-interlace-color-double{ background-color: #f7faff; }' +
                 'td p{margin:0;padding:0;}', me.document);
@@ -20240,7 +20246,7 @@ UE.plugins['table'] = function () {
                 } else {
                     utils.each(tables, function (table) {
                         removeStyleSize(table, true);
-                        domUtils.removeAttributes(table, ['style', 'border']);
+                        domUtils.removeAttributes(table, ['style']);
                         utils.each(domUtils.getElementsByTagName(table, "td"), function (td) {
                             if (isEmptyBlock(td)) {
                                 domUtils.fillNode(me.document, td);

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml

@@ -35,7 +35,8 @@
     @*<script src="~/Content/datepicker/WdatePicker.js"></script>*@
     <script src="~/Content/ueditor/ueditor.config.js"></script>
     <script src="~/Content/jquery/plugin/jqprint/jQuery.print.js"></script>
-    <script src="~/Content/ueditor/ueditor.all.min.js"></script>
+    @*<script src="~/Content/ueditor/ueditor.all.min.js"></script>*@
+    <script src="~/Content/ueditor/ueditor.all.js"></script>
     <script src="~/Content/ueditor/lang/zh-cn/zh-cn.js"></script>
 
     <!--[if lt IE 9]>