From f77214be222ed355e24a75b604234a3cfe027b3d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 28 Jul 2017 13:37:05 +0800
Subject: [PATCH]  * adjust for merge ext model.

---
 framework/base/router.class.php       | 2 +-
 module/common/view/datatable.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index 4792a335be..d700da5fc4 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -1428,7 +1428,7 @@ class baseRouter
         $modelLines  = "<?php\n";
         $modelLines .= "global \$app;\n";
         $modelLines .= "helper::cd(\$app->getBasePath());\n";
-        $modelLines .= "helper::import('$mainModelFile');\n";
+        $modelLines .= "helper::import('" . str_replace($this->getBasePath(), '', $mainModelFile) . "');\n";
         $modelLines .= "helper::cd();\n";
         $modelLines .= "class $tmpModelClass extends $modelClass \n{\n";
 
diff --git a/module/common/view/datatable.html.php b/module/common/view/datatable.html.php
index 4d441faa9c..8ab39192b0 100644
--- a/module/common/view/datatable.html.php
+++ b/module/common/view/datatable.html.php
@@ -2,7 +2,7 @@
 <?php if(!empty($lang->datatable)):?>
 <style>
 .table-datatable tbody > tr td,
-.table-datatable thead > tr th {height: 34px; line-height: 20px;}
+.table-datatable thead > tr th {height: 35px; line-height: 20px;}
 .table-datatable tbody > tr td .btn-icon > i {line-height: 19px;}
 .hide-side .table-datatable thead > tr > th.check-btn i {visibility: hidden;}
 .hide-side .side-handle {line-height: 33px}