From 39b38b239a3464edd50cf460c607f8207340cb67 Mon Sep 17 00:00:00 2001
From: liuxx <381334617@qq.com>
Date: Tue, 26 Jun 2018 18:21:43 +0800
Subject: [PATCH] =?UTF-8?q?bird-grid=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/AutoField.js | 2 +-
 src/components/Grid/BirdGrid.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Form/AutoField.js b/src/components/Form/AutoField.js
index 9b4a506..ce1cb8f 100644
--- a/src/components/Form/AutoField.js
+++ b/src/components/Form/AutoField.js
@@ -195,7 +195,7 @@ class AutoField extends React.Component {
           onChange={(date, dateString) => self.onChange(dateString)} />;
       case "datetime":
         return <DatePicker value={field.value ? moment(field.value) : null} disabled={field.disabled}
-          format={"YYYY-MM-DD HH:mm"}
+          format={"YYYY-MM-DD HH:mm:ss"}
           style={{ width: '100%' }}
           onChange={(date, dateString) => self.onChange(dateString)} showTime={true} />;
       case "richtext":
diff --git a/src/components/Grid/BirdGrid.js b/src/components/Grid/BirdGrid.js
index e8e033d..95ecc74 100644
--- a/src/components/Grid/BirdGrid.js
+++ b/src/components/Grid/BirdGrid.js
@@ -125,7 +125,7 @@ class BirdGrid extends React.Component {
     optionActions = optionActions.concat(defaultActions);
     if (queryColumns.length > 0) {
       optionActions.unshift({
-        name: '查询',
+        name: gridOption.queryText || '查询',
         icon: 'search',
         onClick: () => {
           this.query()