diff --git a/app_ui_enhance/static/src/css/app_report_enhance.css b/app_ui_enhance/static/src/css/app_report_enhance.css
deleted file mode 100644
index 8d69b38c..00000000
--- a/app_ui_enhance/static/src/css/app_report_enhance.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* report更紧凑,无边框 */
-.table-tight td {
- padding: 2px !important;
- border-top: 0px !important;
-}
-.table-tight > thead > tr > th, .table-tight > tbody > tr > th, .table-tight > tfoot > tr > th,
-.table-tight > thead > tr > td, .table-tight > tbody > tr > td, .table-tight > tfoot > tr > td{
- padding: 2px !important;
- border-top: 0px !important;
-}
\ No newline at end of file
diff --git a/app_ui_enhance/static/src/css/app_web_enhance.css b/app_ui_enhance/static/src/css/app_web_enhance.css
index 05039982..da9e0d88 100644
--- a/app_ui_enhance/static/src/css/app_web_enhance.css
+++ b/app_ui_enhance/static/src/css/app_web_enhance.css
@@ -25,7 +25,7 @@ sheet全宽
}
/*
-强制表格滚动,企业版/社区版中生效
+强制表格滚动,企业版/社区版中生效,table加上 class="force_scroll"生效
*/
.force_scroll .table-responsive {
diff --git a/app_ui_enhance/static/src/js/pivot.js b/app_ui_enhance/static/src/js/pivot.js
index f98ce534..b972c7a9 100644
--- a/app_ui_enhance/static/src/js/pivot.js
+++ b/app_ui_enhance/static/src/js/pivot.js
@@ -70,15 +70,18 @@ PivotView.include({
$(QWeb.render("odooApp.TreeSearch.Placeholder", {})).appendTo($node);
var date_fields = [];
- // 增加参数控制app_ui_show_search_date
+ var canShow = 1;
+ // 增加参数控制app_ui_show_search_date,特殊处理
new Model('ir.config_parameter').call('search_read', [[['key', '=', 'app_ui_show_search_date']], ['value']]).then(function (show) {
- if (show.length >= 1 && (show[0]['value'] == "True")) {
+ if (show.length >= 1 && (show[0]['value'] == "False")) {
+ canShow = 0;
+ }
+ if (canShow) {
_.each(self.fields, function (value, key, list) {
if (value.store && value.type === "datetime" || value.type === "date") {
date_fields.push([key, value.string]);
}
});
-
if (date_fields.length > 0) {
self.$search_date = $(QWeb.render('odooApp.SearchDate', {'date_fields': date_fields}))
self.$search_date.find('.app_start_date').datetimepicker(datepickers_options);
@@ -122,7 +125,6 @@ PivotView.include({
}
}
});
-
//显示搜索键,因为pivot特殊,故要单独处理
},
diff --git a/app_ui_enhance/static/src/js/tree.js b/app_ui_enhance/static/src/js/tree.js
index ce587996..f7680449 100644
--- a/app_ui_enhance/static/src/js/tree.js
+++ b/app_ui_enhance/static/src/js/tree.js
@@ -23,6 +23,12 @@ ListView.include({
this.ts_fields = [];
},
+ willStart: function() {
+ //代码自定义默认每页记录数
+ // the view's number of records per page (|| section)
+ this._limit = 200;
+ return this._super();
+ },
on_button_click: function (event) {
var self = this;
var $target = $(event.target),
diff --git a/app_ui_enhance/static/src/xml/pivot_view.xml b/app_ui_enhance/static/src/xml/pivot_view.xml
index 413f6204..ee9b8464 100644
--- a/app_ui_enhance/static/src/xml/pivot_view.xml
+++ b/app_ui_enhance/static/src/xml/pivot_view.xml
@@ -15,11 +15,11 @@
-
+
-
+
@@ -95,8 +95,5 @@
-
-
-
\ No newline at end of file
diff --git a/app_ui_enhance/views/template_view.xml b/app_ui_enhance/views/template_view.xml
index ff147b7d..aaccc6fb 100644
--- a/app_ui_enhance/views/template_view.xml
+++ b/app_ui_enhance/views/template_view.xml
@@ -11,12 +11,5 @@
-
-
-
-
-
-
-
\ No newline at end of file