@clake/react-bootstrap4-window 1.1.8 → 1.1.10

package/lib/CTable.js

@@ -1,6 +1,6 @@
-/* @clake/react-bootstrap4-window v1.1.8 | by Clake
+/* @clake/react-bootstrap4-window v1.1.10 | by Clake
  * Copyright (c) 2024 Clake,
- * 2024-12-09T17:54:50+0800
+ * 2024-12-19T11:06:41+0800
  */
 "use strict";
 
@@ -304,6 +304,31 @@ function (_React$Component) {
       }
     });
 
+    _defineProperty(_assertThisInitialized(_this), "deleteRow", function (row_index) {
+      if (row_index < 0 || row_index >= _this.state.data.length) {
+        return;
+      }
+
+      var data = _this.state.data.slice(0);
+
+      data.splice(row_index, 1);
+
+      if (_this.editRows.indexOf(row_index) !== -1) {
+        _this.editRows.splice(_this.editRows.indexOf(row_index), 1);
+      }
+
+      _this.editRows.forEach(function (item, index) {
+        if (item > row_index) {
+          _this.editRows[index] = item - 1;
+        }
+      });
+
+      _this.setState({
+        data: data,
+        dataCount: data.length
+      });
+    });
+
     //全屏查看
     _defineProperty(_assertThisInitialized(_this), "fullHandler", function () {
       if (_this.isFull) {
@@ -769,13 +794,35 @@ function (_React$Component) {
           _this7.mainMenu.show({
             evt: e,
             type: 'mouse',
-            data: data
+            data: data,
+            close: function close() {
+              _this7.setState({
+                filter: {
+                  start: '',
+                  end: '',
+                  contain: '',
+                  equal: '',
+                  condition: ''
+                }
+              });
+            }
           });
         } else {
           _this7.numMenu.show({
             evt: e,
             type: 'mouse',
-            data: data
+            data: data,
+            close: function close() {
+              _this7.setState({
+                filter: {
+                  start: '',
+                  end: '',
+                  contain: '',
+                  equal: '',
+                  condition: ''
+                }
+              });
+            }
           });
         }
       };
@@ -832,6 +879,7 @@ function (_React$Component) {
           start: '',
           end: '',
           contain: '',
+          equal: '',
           condition: ''
         }
       });
@@ -859,7 +907,8 @@ function (_React$Component) {
           start: '',
           end: '',
           contain: '',
-          equal: ''
+          equal: '',
+          condition: ''
         }
       });
 
@@ -948,32 +997,6 @@ function (_React$Component) {
         this.deleteRow(row_index);
       }
     }
-  }, {
-    key: "deleteRow",
-    value: function deleteRow(row_index) {
-      var _this9 = this;
-
-      if (row_index < 0 || row_index >= this.state.data.length) {
-        return;
-      }
-
-      var data = this.state.data.slice(0);
-      data.splice(row_index, 1);
-
-      if (this.editRows.indexOf(row_index) !== -1) {
-        this.editRows.splice(this.editRows.indexOf(row_index), 1);
-      }
-
-      this.editRows.forEach(function (item, index) {
-        if (item > row_index) {
-          _this9.editRows[index] = item - 1;
-        }
-      });
-      this.setState({
-        data: data,
-        dataCount: data.length
-      });
-    }
   }, {
     key: "cloneRow",
     value: function cloneRow(row_index) {
@@ -999,10 +1022,10 @@ function (_React$Component) {
      * 得到所有选中的行
      */
     value: function getSelectRows() {
-      var _this10 = this;
+      var _this9 = this;
 
       return this.state.selectRows.map(function (item) {
-        return _this10.state.data[item];
+        return _this9.state.data[item];
       });
     }
     /**
@@ -1032,50 +1055,50 @@ function (_React$Component) {
   }, {
     key: "bindSplit",
     value: function bindSplit() {
-      var _this11 = this;
+      var _this10 = this;
 
       if (this.props.move) {
         this.headerSplits.forEach(function (split) {
-          if (!_this11.drag) {
-            _this11.dragColumnLeft = 0;
-            _this11.dragWidth = 0;
-            _this11.drag = new _Drag["default"](_this11.split, split, {
+          if (!_this10.drag) {
+            _this10.dragColumnLeft = 0;
+            _this10.dragWidth = 0;
+            _this10.drag = new _Drag["default"](_this10.split, split, {
               start: function start(dragDom, eventDom) {
-                var xy = _reactBootstrap.Common.GetDomXY(eventDom, _this11.mainDom);
+                var xy = _reactBootstrap.Common.GetDomXY(eventDom, _this10.mainDom);
 
-                _this11.dragWidth = parseInt((eventDom === null || eventDom === void 0 ? void 0 : eventDom.parentNode).style.width);
-                _this11.dragColumnLeft = xy.left - _this11.table_rows.scrollLeft;
-                dragDom.style.left = _this11.dragColumnLeft + 'px';
+                _this10.dragWidth = parseInt((eventDom === null || eventDom === void 0 ? void 0 : eventDom.parentNode).style.width);
+                _this10.dragColumnLeft = xy.left - _this10.table_rows.scrollLeft;
+                dragDom.style.left = _this10.dragColumnLeft + 'px';
                 dragDom.classList.remove('d-none');
                 return true;
               },
               move: function move(_move, dragDom, eventDom) {
-                if (_this11.dragWidth + (_move.x - _this11.dragColumnLeft) < 50) {
-                  _move.x = _this11.dragColumnLeft - _this11.dragWidth + 50;
+                if (_this10.dragWidth + (_move.x - _this10.dragColumnLeft) < 50) {
+                  _move.x = _this10.dragColumnLeft - _this10.dragWidth + 50;
                 }
               },
               end: function end(dragDom, eventDom) {
                 dragDom.classList.add('d-none');
                 var column_key = eventDom.dataset.key;
 
-                var diff = parseInt(dragDom.style.left) - _this11.dragColumnLeft;
+                var diff = parseInt(dragDom.style.left) - _this10.dragColumnLeft;
 
-                _this11.width = parseInt(_this11.width) + diff + 'px';
-                _this11.table_head.style.width = _this11.width;
-                _this11.table_body.style.width = _this11.width;
+                _this10.width = parseInt(_this10.width) + diff + 'px';
+                _this10.table_head.style.width = _this10.width;
+                _this10.table_body.style.width = _this10.width;
 
-                if (_this11.table_total) {
-                  _this11.table_total.style.width = _this11.width;
+                if (_this10.table_total) {
+                  _this10.table_total.style.width = _this10.width;
                 }
 
                 document.querySelectorAll("#".concat(column_key)).forEach(function (item) {
-                  item.style.width = "".concat(_this11.dragWidth + diff, "px");
+                  item.style.width = "".concat(_this10.dragWidth + diff, "px");
                 });
                 return true;
               }
             });
           } else {
-            _this11.drag.setEventDom(split);
+            _this10.drag.setEventDom(split);
           }
         });
       }
@@ -1214,20 +1237,20 @@ function (_React$Component) {
   }, {
     key: "calcLocalTotal",
     value: function calcLocalTotal(field) {
-      var _this12 = this;
+      var _this11 = this;
 
       return function (e) {
-        var list = _this12.state.data;
+        var list = _this11.state.data;
         var total = 0;
         list.forEach(function (item) {
           if (!!parseFloat(item[field])) {
             total += parseFloat(item[field]);
           }
         });
-        var totalData = Object.assign({}, _this12.state.total);
+        var totalData = Object.assign({}, _this11.state.total);
         totalData[field] = total.toFixed(2);
 
-        _this12.setState({
+        _this11.setState({
           total: totalData
         });
       };
@@ -1235,17 +1258,17 @@ function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this13 = this;
+      var _this12 = this;
 
       return _react["default"].createElement("div", {
         ref: function ref(c) {
-          return _this13.mainDom = c;
+          return _this12.mainDom = c;
         },
         className: this.getMainClasses(),
         style: this.getStyles()
       }, _react["default"].createElement("div", {
         ref: function ref(c) {
-          return _this13.conDom = c;
+          return _this12.conDom = c;
         },
         className: this.getBodyClasses()
       }, this.renderHeader(), this.renderRows(), this.renderTotal(), _react["default"].createElement(_reactBootstrap.Scroll, {
@@ -1254,7 +1277,7 @@ function (_React$Component) {
         selector: "#table-body-com-".concat(this.domId)
       })), this.renderFoot(), _react["default"].createElement("div", {
         ref: function ref(c) {
-          return _this13.split = c;
+          return _this12.split = c;
         },
         className: "ck-split d-none"
       }));
@@ -1262,15 +1285,15 @@ function (_React$Component) {
   }, {
     key: "renderHeader",
     value: function renderHeader() {
-      var _this14 = this;
+      var _this13 = this;
 
       return _react["default"].createElement("div", {
         ref: function ref(c) {
-          return _this14.tableHeader = c;
+          return _this13.tableHeader = c;
         }
       }, _react["default"].createElement("table", {
         ref: function ref(c) {
-          return _this14.table_head = c;
+          return _this13.table_head = c;
         },
         id: "table-head-".concat(this.domId),
         className: this.getClasses(''),
@@ -1286,7 +1309,7 @@ function (_React$Component) {
         icon: "list"
       }) : _react["default"].createElement(_reactBootstrap.CCheckbox, {
         ref: function ref(c) {
-          return _this14.allchk = c;
+          return _this13.allchk = c;
         },
         onChange: this.selectAll,
         checked: this.state.selectAll,
@@ -1299,7 +1322,7 @@ function (_React$Component) {
       }) : null, _react["default"].Children.map(this.props.children, function (item, key) {
         var _ref, _item$props;
 
-        _this14.cacheRow[item.props.field] = (_ref = (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.def) !== null && _ref !== void 0 ? _ref : '';
+        _this13.cacheRow[item.props.field] = (_ref = (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.def) !== null && _ref !== void 0 ? _ref : '';
 
         if (!item || item.props.hide) {
           return null;
@@ -1316,28 +1339,28 @@ function (_React$Component) {
 
         var sort_icon = '';
 
-        if (_this14.sortList[item.props.field]) {
-          sort_icon = 'sort-alpha-' + (_this14.sortList[item.props.field] === 'asc' ? 'down' : 'up');
+        if (_this13.sortList[item.props.field]) {
+          sort_icon = 'sort-alpha-' + (_this13.sortList[item.props.field] === 'asc' ? 'down' : 'up');
         }
 
         return _react["default"].createElement("th", {
-          onContextMenu: _this14.menuContextHandler(''),
-          id: _this14.domId + '-' + key,
+          onContextMenu: _this13.menuContextHandler(''),
+          id: _this13.domId + '-' + key,
           "data-key": 'head_' + key,
           style: style
-        }, _this14.is_sort ? _react["default"].createElement("a", {
+        }, _this13.is_sort ? _react["default"].createElement("a", {
           className: "ck-ctable-sort",
           href: "javascript://",
-          id: "".concat(_this14.domId, "-sort-").concat(item.props.field),
+          id: "".concat(_this13.domId, "-sort-").concat(item.props.field),
           "data-field": item.props.field,
-          onClick: _this14.sortHandler
+          onClick: _this13.sortHandler
         }, item.props.text, " ", _react["default"].createElement(_reactBootstrap.Icon, {
           icon: sort_icon
-        })) : item.props.text, _this14.props.move ? _react["default"].createElement("span", {
+        })) : item.props.text, _this13.props.move ? _react["default"].createElement("span", {
           ref: function ref(c) {
-            return _this14.headerSplits.push(c);
+            return _this13.headerSplits.push(c);
           },
-          "data-key": _this14.domId + '-' + key,
+          "data-key": _this13.domId + '-' + key,
           className: "ck-column-split"
         }) : null);
       })))));
@@ -1345,34 +1368,34 @@ function (_React$Component) {
   }, {
     key: "renderRows",
     value: function renderRows() {
-      var _this15 = this;
+      var _this14 = this;
 
       return _react["default"].createElement("div", {
         ref: function ref(c) {
-          return _this15.table_rows = c;
+          return _this14.table_rows = c;
         },
         id: "table-body-com-".concat(this.domId),
         className: "flex-grow-1 rows",
         onScroll: this.scrollHandler
       }, _react["default"].createElement("table", {
         ref: function ref(c) {
-          return _this15.table_body = c;
+          return _this14.table_body = c;
         },
         id: "table-body-".concat(this.domId),
         className: this.getClasses(),
         style: this.getTableStyles()
       }, _react["default"].createElement("tbody", null, this.state.data.map(function (row, i) {
-        if (_this15.props.edit) {
-          return _this15.renderEditRow(row, i);
+        if (_this14.props.edit) {
+          return _this14.renderEditRow(row, i);
         }
 
-        return _this15.renderRow(row, i, null);
+        return _this14.renderRow(row, i, null);
       }), this.props.edit && this.props.newBar ? this.renderEditAddRow() : null)), this.props.menu ? this.renderMenu() : null, this.props.menu ? this.renderNumberMenu() : null);
     }
   }, {
     key: "renderRow",
     value: function renderRow(row, i, parentRow) {
-      var _this16 = this;
+      var _this15 = this;
 
       var checked = this.state.selectRows.indexOf(i) !== -1;
       var focus = i === this.state.focus && this.props.focus;
@@ -1395,9 +1418,9 @@ function (_React$Component) {
         } //set style
 
 
-        var style = _objectSpread({}, _this16.props.columnStyle);
+        var style = _objectSpread({}, _this15.props.columnStyle);
 
-        style.textAlign = item.props.align || _this16.props.align;
+        style.textAlign = item.props.align || _this15.props.align;
 
         if (item.props.width) {
           style.width = item.props.width;
@@ -1429,8 +1452,8 @@ function (_React$Component) {
 
         if (item.props.children) {
           return _react["default"].createElement("td", {
-            onContextMenu: _this16.menuContextHandler(dataType),
-            id: _this16.domId + '-' + key,
+            onContextMenu: _this15.menuContextHandler(dataType),
+            id: _this15.domId + '-' + key,
             "data-row": "".concat(i),
             "data-field": item.props.field,
             className: item.props.className,
@@ -1446,8 +1469,8 @@ function (_React$Component) {
           }
 
           return _react["default"].createElement("td", {
-            onContextMenu: _this16.menuContextHandler(dataType),
-            id: _this16.domId + '-' + key,
+            onContextMenu: _this15.menuContextHandler(dataType),
+            id: _this15.domId + '-' + key,
             "data-field": item.props.field,
             style: style,
             onClick: function onClick(e) {
@@ -1461,14 +1484,14 @@ function (_React$Component) {
               }
             },
             "data-row": "".concat(i)
-          }, item.props.type ? _this16.renderEditComponent(item.props, row, i) : item.props.onFormat ? item.props.onFormat(row[item.props.field], row, item.props.field) : row[item.props.field]);
+          }, item.props.type ? _this15.renderEditComponent(item.props, row, i) : item.props.onFormat ? item.props.onFormat(row[item.props.field], row, item.props.field) : row[item.props.field]);
         }
       })));
     }
   }, {
     key: "renderEditRow",
     value: function renderEditRow(row, i) {
-      var _this17 = this;
+      var _this16 = this;
 
       return _react["default"].createElement(_react["default"].Fragment, null, _react["default"].createElement("tr", {
         className: this.props.onClick ? 'click-row' : undefined,
@@ -1493,7 +1516,7 @@ function (_React$Component) {
         className: this.props.disabled ? 'text-secondary' : 'text-danger',
         text: "delete",
         onClick: function onClick() {
-          _this17.deleteRowHandler(i);
+          _this16.deleteRowHandler(i);
         }
       })) : null, _react["default"].Children.map(this.props.children, function (item, key) {
         if (!item || item.props.hide) {
@@ -1501,9 +1524,9 @@ function (_React$Component) {
         } //set style
 
 
-        var style = _objectSpread({}, _this17.props.columnStyle);
+        var style = _objectSpread({}, _this16.props.columnStyle);
 
-        style.textAlign = item.props.align || _this17.props.align;
+        style.textAlign = item.props.align || _this16.props.align;
 
         if (item.props.width) {
           style.width = item.props.width;
@@ -1511,9 +1534,9 @@ function (_React$Component) {
 
         var dataType = 'text';
         return _react["default"].createElement("td", {
-          onContextMenu: _this17.menuContextHandler(dataType),
+          onContextMenu: _this16.menuContextHandler(dataType),
           className: item.props.disabled ? 'disabled' : '',
-          id: _this17.domId + '-' + key,
+          id: _this16.domId + '-' + key,
           "data-field": item.props.field,
           style: style,
           onClick: function onClick(e) {
@@ -1527,13 +1550,13 @@ function (_React$Component) {
             }
           },
           "data-row": "".concat(i)
-        }, item.props.disabled ? item.props.onFormat ? item.props.onFormat(row[item.props.field], row, item.props.field) : row[item.props.field] : _this17.renderEditComponent(item.props, row, i));
+        }, item.props.disabled ? item.props.onFormat ? item.props.onFormat(row[item.props.field], row, item.props.field) : row[item.props.field] : _this16.renderEditComponent(item.props, row, i));
       })));
     }
   }, {
     key: "renderEditAddRow",
     value: function renderEditAddRow() {
-      var _this18 = this;
+      var _this17 = this;
 
       if (this.props.disabled) {
         return null;
@@ -1563,9 +1586,9 @@ function (_React$Component) {
         };
         return _react["default"].createElement("td", {
           style: style,
-          id: _this18.domId + '-' + key
+          id: _this17.domId + '-' + key
         }, _react["default"].createElement(_CTableInput["default"], {
-          onFocus: _this18.addNewHandler
+          onFocus: _this17.addNewHandler
         }));
       }));
     }
@@ -1574,7 +1597,7 @@ function (_React$Component) {
     value: function renderEditComponent(item, row, i) {
       var _item$disabled,
           _item$disabled2,
-          _this19 = this,
+          _this18 = this,
           _item$disabled3,
           _item$disabled4,
           _item$disabled5;
@@ -1609,7 +1632,7 @@ function (_React$Component) {
             className: "d-inline",
             width: "20px",
             onChange: function onChange(chk, e) {
-              _this19.editHandler(e, chk, 'chk');
+              _this18.editHandler(e, chk, 'chk');
             },
             "data-row": i,
             "data-field": item.field,
@@ -1646,7 +1669,7 @@ function (_React$Component) {
       var _this$props$showNumbe,
           _this$props$showPages,
           _this$props$edit,
-          _this20 = this;
+          _this19 = this;
 
       if (!this.props.foot) {
         return null;
@@ -1663,21 +1686,21 @@ function (_React$Component) {
         noPage: (_this$props$edit = this.props.edit) !== null && _this$props$edit !== void 0 ? _this$props$edit : false
       }), _react["default"].createElement("div", {
         ref: function ref(c) {
-          _this20.fullButton = c;
+          _this19.fullButton = c;
         },
         className: "full-btn align-self-center ms-auto pe-2 text-primary",
         onClick: function onClick() {
-          _this20.fullHandler();
+          _this19.fullHandler();
         }
       }, _react["default"].createElement(_reactBootstrap.Icon, {
         icon: "expand"
       })), _react["default"].createElement("div", {
         ref: function ref(c) {
-          _this20.fullButton2 = c;
+          _this19.fullButton2 = c;
         },
         className: "right-full-btn d-none",
         onClick: function onClick() {
-          _this20.fullHandler();
+          _this19.fullHandler();
         }
       }, _react["default"].createElement(_reactBootstrap.Icon, {
         icon: "times"
@@ -1686,7 +1709,7 @@ function (_React$Component) {
   }, {
     key: "renderTotal",
     value: function renderTotal() {
-      var _this21 = this;
+      var _this20 = this;
 
       if (!this.state.total) {
         return null;
@@ -1695,12 +1718,12 @@ function (_React$Component) {
       var total = this.state.total;
       return _react["default"].createElement("div", {
         ref: function ref(c) {
-          return _this21.tableTotal = c;
+          return _this20.tableTotal = c;
         },
         className: "ck-ctable-total"
       }, _react["default"].createElement("table", {
         ref: function ref(c) {
-          return _this21.table_total = c;
+          return _this20.table_total = c;
         },
         id: "table-total-".concat(this.domId),
         className: this.getClasses(),
@@ -1719,7 +1742,7 @@ function (_React$Component) {
           return null;
         }
 
-        var align = item.props.align || _this21.props.align;
+        var align = item.props.align || _this20.props.align;
         var style = {
           'textAlign': align
         };
@@ -1729,7 +1752,7 @@ function (_React$Component) {
         }
 
         return _react["default"].createElement("td", {
-          id: _this21.domId + '-' + key,
+          id: _this20.domId + '-' + key,
           "data-field": item.props.field,
           style: style
         }, item.props.onFormat ? item.props.onFormat(total[item.props.field], total, item.props.field) : total[item.props.field]);
@@ -1738,7 +1761,7 @@ function (_React$Component) {
   }, {
     key: "renderMenu",
     value: function renderMenu() {
-      var _this22 = this;
+      var _this21 = this;
 
       var lang;
 
@@ -1757,7 +1780,7 @@ function (_React$Component) {
 
       return _react["default"].createElement(_react["default"].Fragment, null, _react["default"].createElement(_reactBootstrap.Menu, {
         ref: function ref(c) {
-          return _this22.mainMenu = c;
+          return _this21.mainMenu = c;
         },
         onClick: this.menuClickHandler
       }, _react["default"].createElement(_reactBootstrap.Menu.Item, {
@@ -1777,7 +1800,7 @@ function (_React$Component) {
           var select = document.getSelection();
           if (!select) return;
 
-          _this22.filterHandler(select.toString(), data.field, 'contain');
+          _this21.filterHandler(select.toString(), data.field, 'contain');
         }
       }, _react["default"].createElement(_reactBootstrap.Icon, {
         className: "me-1",
@@ -1788,7 +1811,7 @@ function (_React$Component) {
           var select = document.getSelection();
           if (!select) return;
 
-          _this22.filterHandler(select.toString(), data.field, 'exclude');
+          _this21.filterHandler(select.toString(), data.field, 'exclude');
         }
       }, _react["default"].createElement(_reactBootstrap.Icon, {
         className: "me-1",
@@ -1796,7 +1819,7 @@ function (_React$Component) {
       }), lang['Filter Excluding Selection']) : null, this.is_filter || this.is_sort ? _react["default"].createElement(_reactBootstrap.Menu.Item, {
         field: "clear_filter",
         onClick: function onClick() {
-          _this22.clearFilter();
+          _this21.clearFilter();
         }
       }, _react["default"].createElement("span", {
         className: "text-danger"
@@ -1813,7 +1836,7 @@ function (_React$Component) {
         style: inputStyle
       }, lang['Equal With']), _react["default"].createElement(_reactBootstrap.Input, {
         ref: function ref(c) {
-          return _this22.filter.equal = c;
+          return _this21.filter.equal = c;
         },
         className: "me-1",
         size: "xs",
@@ -1822,13 +1845,13 @@ function (_React$Component) {
         onChange: this.filterChangeHandler('equal'),
         onMouseDown: stopEvent,
         onEnter: function onEnter() {
-          _this22.filterHandler(_this22.state.filter.equal, _this22.mainMenu.data.field, 'equal');
+          _this21.filterHandler(_this21.state.filter.equal, _this21.mainMenu.data.field, 'equal');
         }
       }), _react["default"].createElement(_reactBootstrap.Button, {
         size: "xs",
         onMouseDown: stopEvent,
         onClick: function onClick(e) {
-          _this22.filterHandler(_this22.state.filter.equal, _this22.mainMenu.data.field, 'equal');
+          _this21.filterHandler(_this21.state.filter.equal, _this21.mainMenu.data.field, 'equal');
         },
         icon: "search"
       })) : null, this.is_filter ? _react["default"].createElement(_reactBootstrap.Menu.Item, {
@@ -1838,7 +1861,7 @@ function (_React$Component) {
         style: inputStyle
       }, lang['Start With']), _react["default"].createElement(_reactBootstrap.Input, {
         ref: function ref(c) {
-          return _this22.filter.start = c;
+          return _this21.filter.start = c;
         },
         className: "me-1",
         size: "xs",
@@ -1847,13 +1870,13 @@ function (_React$Component) {
         onChange: this.filterChangeHandler('start'),
         onMouseDown: stopEvent,
         onEnter: function onEnter() {
-          _this22.filterHandler(_this22.state.filter.start, _this22.mainMenu.data.field, 'start');
+          _this21.filterHandler(_this21.state.filter.start, _this21.mainMenu.data.field, 'start');
         }
       }), _react["default"].createElement(_reactBootstrap.Button, {
         size: "xs",
         onMouseDown: stopEvent,
         onClick: function onClick(e) {
-          _this22.filterHandler(_this22.state.filter.start, _this22.mainMenu.data.field, 'start');
+          _this21.filterHandler(_this21.state.filter.start, _this21.mainMenu.data.field, 'start');
         },
         icon: "search"
       })) : null, this.is_filter ? _react["default"].createElement(_reactBootstrap.Menu.Item, {
@@ -1863,7 +1886,7 @@ function (_React$Component) {
         style: inputStyle
       }, lang['End With']), _react["default"].createElement(_reactBootstrap.Input, {
         ref: function ref(c) {
-          return _this22.filter.end = c;
+          return _this21.filter.end = c;
         },
         className: "me-1",
         size: "xs",
@@ -1872,13 +1895,13 @@ function (_React$Component) {
         onChange: this.filterChangeHandler('end'),
         onMouseDown: stopEvent,
         onEnter: function onEnter() {
-          _this22.filterHandler(_this22.state.filter.end, _this22.mainMenu.data.field, 'end');
+          _this21.filterHandler(_this21.state.filter.end, _this21.mainMenu.data.field, 'end');
         }
       }), _react["default"].createElement(_reactBootstrap.Button, {
         size: "xs",
         onMouseDown: stopEvent,
         onClick: function onClick(e) {
-          _this22.filterHandler(_this22.state.filter.end, _this22.mainMenu.data.field, 'end');
+          _this21.filterHandler(_this21.state.filter.end, _this21.mainMenu.data.field, 'end');
         },
         icon: "search"
       })) : null, this.is_filter ? _react["default"].createElement(_reactBootstrap.Menu.Item, {
@@ -1888,7 +1911,7 @@ function (_React$Component) {
         style: inputStyle
       }, lang['Contain with']), _react["default"].createElement(_reactBootstrap.Input, {
         ref: function ref(c) {
-          return _this22.filter.contain = c;
+          return _this21.filter.contain = c;
         },
         className: "me-1",
         size: "xs",
@@ -1897,13 +1920,13 @@ function (_React$Component) {
         onChange: this.filterChangeHandler('contain'),
         onMouseDown: stopEvent,
         onEnter: function onEnter() {
-          _this22.filterHandler(_this22.state.filter.contain, _this22.mainMenu.data.field, 'contain');
+          _this21.filterHandler(_this21.state.filter.contain, _this21.mainMenu.data.field, 'contain');
         }
       }), _react["default"].createElement(_reactBootstrap.Button, {
         size: "xs",
         onMouseDown: stopEvent,
         onClick: function onClick(e) {
-          _this22.filterHandler(_this22.state.filter.contain, _this22.mainMenu.data.field, 'contain');
+          _this21.filterHandler(_this21.state.filter.contain, _this21.mainMenu.data.field, 'contain');
         },
         icon: "search"
       })) : null, this.is_filter ? _react["default"].createElement(_reactBootstrap.Menu.Item, {
@@ -1915,13 +1938,16 @@ function (_React$Component) {
       }, _react["default"].createElement("div", {
         className: "w-100"
       }, lang['Condition Filter']), _react["default"].createElement(_reactBootstrap.Input, {
+        ref: function ref(c) {
+          return _this21.filter.condition = c;
+        },
         size: "xs",
         width: "100%",
         data: this.state.filter.condition,
         onChange: this.filterChangeHandler('condition'),
         onMouseDown: stopEvent,
         onEnter: function onEnter() {
-          _this22.filterHandler(_this22.state.filter.condition, _this22.mainMenu.data.field, 'condition');
+          _this21.filterHandler(_this21.state.filter.condition, _this21.mainMenu.data.field, 'condition');
         }
       })) : null, this.props.edit && (!this.props.nodel || this.props.newBar) ? _react["default"].createElement(_reactBootstrap.Menu.Item, {
         field: "",
@@ -1934,14 +1960,14 @@ function (_React$Component) {
         field: "",
         step: true
       }) : null, this.props.customMenu ? this.props.customMenu.map(function (menu) {
-        return _this22.explainCustomMenu(menu);
+        return _this21.explainCustomMenu(menu);
       }) : null));
     } // MARK:-生成数字菜单
 
   }, {
     key: "renderNumberMenu",
     value: function renderNumberMenu() {
-      var _this23 = this;
+      var _this22 = this;
 
       var lang;
 
@@ -1960,7 +1986,7 @@ function (_React$Component) {
 
       return _react["default"].createElement(_react["default"].Fragment, null, _react["default"].createElement(_reactBootstrap.Menu, {
         ref: function ref(c) {
-          return _this23.numMenu = c;
+          return _this22.numMenu = c;
         },
         onClick: this.menuClickHandler
       }, _react["default"].createElement(_reactBootstrap.Menu.Item, {
@@ -1980,7 +2006,7 @@ function (_React$Component) {
           var select = document.getSelection();
           if (!select) return;
 
-          _this23.filterHandler(select.toString(), data.field, 'contain');
+          _this22.filterHandler(select.toString(), data.field, 'contain');
         }
       }, _react["default"].createElement(_reactBootstrap.Icon, {
         className: "me-1",
@@ -1991,7 +2017,7 @@ function (_React$Component) {
           var select = document.getSelection();
           if (!select) return;
 
-          _this23.filterHandler(select.toString(), data.field, 'exclude');
+          _this22.filterHandler(select.toString(), data.field, 'exclude');
         }
       }, _react["default"].createElement(_reactBootstrap.Icon, {
         className: "me-1",
@@ -1999,7 +2025,7 @@ function (_React$Component) {
       }), lang['Filter Excluding Selection']) : null, this.is_filter || this.is_sort ? _react["default"].createElement(_reactBootstrap.Menu.Item, {
         field: "clear_filter",
         onClick: function onClick() {
-          _this23.clearFilter();
+          _this22.clearFilter();
         }
       }, _react["default"].createElement("span", {
         className: "text-danger"
@@ -2022,20 +2048,20 @@ function (_React$Component) {
         onMouseDown: stopEvent,
         onEnter: function onEnter() {
           var reg = /(>=|<=|<|>|=|!=)+\s*(\d+)/i;
-          var m = String(_this23.state.filter.condition).match(reg);
+          var m = String(_this22.state.filter.condition).match(reg);
 
           if (m) {
-            _this23.filterHandler(m[2], _this23.numMenu.data.field, numberCondition[m[1]]);
+            _this22.filterHandler(m[2], _this22.numMenu.data.field, numberCondition[m[1]]);
           } else {
-            _this23.filterHandler(_this23.state.filter.condition, _this23.numMenu.data.field, 'condition');
+            _this22.filterHandler(_this22.state.filter.condition, _this22.numMenu.data.field, 'condition');
           }
         }
-      }), _react["default"].createElement("div", null, "and,or,between,>,>=,<,<=,=")) : null));
+      })) : null));
     }
   }, {
     key: "explainCustomMenu",
     value: function explainCustomMenu(menu) {
-      var _this24 = this;
+      var _this23 = this;
 
       if (menu.children && menu.children instanceof Array) {
         return _react["default"].createElement(_reactBootstrap.Menu.Item, {
@@ -2043,7 +2069,7 @@ function (_React$Component) {
           text: menu.text,
           child: true
         }, menu.children.map(function (item) {
-          return _this24.explainCustomMenu(item);
+          return _this23.explainCustomMenu(item);
         }));
       } else {
         return _react["default"].createElement(_reactBootstrap.Menu.Item, {