From a3a5707cdda73c3c29167dd44082bee9106e4c8e Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Wed, 2 Sep 2020 16:48:04 +0800
Subject: [PATCH] 优化searchList修改后刷新事件 优化标题过长时固定宽度不生效的BUG
---
public/assets/js/bootstrap-table-commonsearch.js | 4 ++--
public/assets/js/require-backend.min.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js
index 8273a37..94afbc2 100644
--- a/public/assets/js/bootstrap-table-commonsearch.js
+++ b/public/assets/js/bootstrap-table-commonsearch.js
@@ -95,7 +95,7 @@
searchList = ret;
}
var optionList = createOptionList(searchList, vObjCol, that);
- $("form.form-commonsearch select[name='" + vObjCol.field + "']", that.$container).html(optionList.join(''));
+ $("form.form-commonsearch select[name='" + vObjCol.field + "']", that.$container).html(optionList.join('')).trigger("change");
});
})(vObjCol, that);
} else {
@@ -292,7 +292,7 @@
this.$header.find('th[data-field]').each(function (i) {
var column = $(this).data();
if (typeof column['width'] !== 'undefined') {
- $(this).css("min-width", column['width']);
+ $(this).css("max-width", column['width']);
}
});
this.options.stateField = this.header.stateField;
diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js
index a569b4d..ecfbc60 100644
--- a/public/assets/js/require-backend.min.js
+++ b/public/assets/js/require-backend.min.js
@@ -10627,7 +10627,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator'], function ($, undef
searchList = ret;
}
var optionList = createOptionList(searchList, vObjCol, that);
- $("form.form-commonsearch select[name='" + vObjCol.field + "']", that.$container).html(optionList.join(''));
+ $("form.form-commonsearch select[name='" + vObjCol.field + "']", that.$container).html(optionList.join('')).trigger("change");
});
})(vObjCol, that);
} else {
@@ -10824,7 +10824,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator'], function ($, undef
this.$header.find('th[data-field]').each(function (i) {
var column = $(this).data();
if (typeof column['width'] !== 'undefined') {
- $(this).css("min-width", column['width']);
+ $(this).css("max-width", column['width']);
}
});
this.options.stateField = this.header.stateField;
--
libgit2 0.24.0