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] =?UTF-8?q?=E4=BC=98=E5=8C=96searchList=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=8E=E5=88=B7=E6=96=B0=E4=BA=8B=E4=BB=B6=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=A0=87=E9=A2=98=E8=BF=87=E9=95=BF=E6=97=B6=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E5=AE=BD=E5=BA=A6=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 8273a376..94afbc24 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 a569b4de..ecfbc606 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;