diff --git a/module/execution/css/x.task.css b/module/execution/css/x.task.css
index ec1fc3ee78..1edfd18ad9 100644
--- a/module/execution/css/x.task.css
+++ b/module/execution/css/x.task.css
@@ -4,8 +4,10 @@ td .task-toggle {pointer-events: auto !important;}
#main {min-width: unset; overflow-y: overlay;}
#main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;}
-#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
+#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 36px;}
+.main-table {margin-bottom: 40px;}
.main-table a {pointer-events: none;}
+.main-table > .table, .main-table > .table-footer, .main-table > .table-header, .main-table > .table-responsive {border: none!important; box-shadow: none!important; padding: 0!important;}
.checkbox-primary, .table-footer .pager:before {display: none !important;}
.table-footer {position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager {background-color: #fff !important;}
@@ -13,5 +15,7 @@ td .task-toggle {pointer-events: auto !important;}
.table-responsive {margin-bottom: unset;}
.pager a {pointer-events: unset;}
.linkButton {float: right; padding-right: 10px; cursor: pointer;}
-.linkButton i {font-size: 17px !important;}
-.linkButton span {line-height: 40px; display: block;}
+.linkButton i {font-size: 18px !important;}
+.linkButton span {line-height: 36px; display: block;}
+::-webkit-scrollbar {width: 10px; height: 10px;}
+::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 5485f02af6..81ad58febe 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -483,10 +483,24 @@ $(function()
}
})
});
+
+app->getViewType() == 'xhtml'):?>
function handleLinkButtonClick()
{
var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html'));
window.open(xxcUrl);
}
+
+$(function()
+{
+ function handleClientReady()
+ {
+ if(!window.adjustXXCViewHeight) return;
+ window.adjustXXCViewHeight(null, true);
+ }
+ if(window.xuanReady) handleClientReady();
+ else $(window).on('xuan-ready', handleClientReady);
+});
+
diff --git a/module/productplan/css/x.view.css b/module/productplan/css/x.view.css
index 08aa3798e4..63f306b45c 100644
--- a/module/productplan/css/x.view.css
+++ b/module/productplan/css/x.view.css
@@ -1,12 +1,15 @@
#mainMenu, .actions, .pager-size-menu, .tab-btn-container ul li span {display: none;}
-#main {min-width: unset; height:407px; overflow-y: overlay;}
-.main-content {padding: 0;}
+#main {min-width: unset; overflow-y: overlay;}
+.main-content {padding: 0; }
+.main-table {margin-bottom: 40px;}
+.main-content, .main-table > .table, .main-table > .table-footer, .main-table > .table-header, .main-table > .table-responsive {box-shadow: none!important;}
.table-footer {position: fixed; width: 100%; bottom: 0;}
.tab-btn-container {width: 100%; background-color: #f2f2f2;}
-.tab-btn-container ul {display: flex; justify-content: center;}
+.tab-btn-container ul {padding-left: 200px;;}
.tab-btn-container ul li {list-style: none;}
-.plan-title {position: absolute; top: 0; left: 0; padding: 8px 15px; font-weight: bolder;}
+.plan-title {position: absolute; top: 0; left: 0; padding: 8px 15px; font-weight: bolder; width: 200px;}
.tab-btn-container ul li.active span {display: inline-block;}
-.linkButton {float: right; padding-right: 10px; cursor: pointer;}
-.linkButton i {font-size: 17px !important;}
+.linkButton {position: absolute; right: 0; top: 0; padding-right: 10px; cursor: pointer;}
+.linkButton i {font-size: 18px !important;}
.linkButton span {line-height: 36px; display: block;}
+#tabsNav .tab-pane>.cell, #tabsNav .tab-pane>.main-table {border: none}
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 8cc6e0f1b9..142eaa38fc 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -52,14 +52,12 @@
app->getViewType() == 'xhtml'):?>
-
name . ' ' . $plan->title ?>
- app->getViewType() == 'xhtml'):?>
+
name . ' ' . $plan->title ?>
-
@@ -611,11 +609,25 @@
id)?>
+app->getViewType() == 'xhtml'):?>
+