bird-grid支持自定义查询按钮文字

liuxx-u · Jun 26, 2018 · 39b38b2 · 39b38b2
1 parent fbb648c
commit 39b38b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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()