@lemon-fe/kits 1.0.0-142 → 1.0.0-144

package/es/components/DataGrid/components/Search.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import type { DataGridSearch, DataGridSearchRef } from '../typings';
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<DataGridSearch & React.RefAttributes<DataGridSearchRef>>>;
+export default _default;

package/es/components/DataGrid/components/Search.js

@@ -0,0 +1,183 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { useDebounce } from '@lemon-fe/hooks';
+import { Button, Input, Space } from 'antd';
+import React, { forwardRef, memo, useState, useImperativeHandle, useMemo } from 'react';
+import { useGridStore } from "../hooks";
+export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props, ref) {
+  var placeholder = props.placeholder,
+      searchFields = props.searchFields,
+      focusColumn = props.focusColumn;
+  var defaultState = useMemo(function () {
+    return {
+      keywords: '',
+      nodes: [],
+      index: -1
+    };
+  }, []);
+  var grid = useGridStore(function (state) {
+    return state.grid;
+  });
+
+  var _useState = useState(defaultState),
+      _useState2 = _slicedToArray(_useState, 2),
+      state = _useState2[0],
+      setState = _useState2[1];
+
+  var handleSearch = useDebounce(function (keywords) {
+    if (keywords.length <= 0) {
+      setState(defaultState);
+      return;
+    }
+
+    var cols = [];
+
+    if (searchFields) {
+      searchFields.forEach(function (col) {
+        var result = grid.columnApi.getColumn(col);
+
+        if (result) {
+          cols.push(result);
+        } else {
+          cols.push(col);
+        }
+      });
+    } else {
+      cols = grid.columnApi.getColumns() || [];
+    }
+
+    if (cols.length <= 0) {
+      return;
+    }
+
+    var nodes = [];
+    grid.api.forEachNodeAfterFilterAndSort(function (node) {
+      var idx = node.rowIndex;
+
+      if (idx === null) {
+        return;
+      }
+
+      for (var i = 0; i < cols.length; i++) {
+        var col = cols[i];
+        var value = grid.api.getValue(col, node);
+
+        if (value !== undefined && value !== null && typeof value === 'string' && value.includes(keywords)) {
+          nodes.push({
+            index: idx,
+            id: node.id
+          });
+          break;
+        }
+      }
+    });
+    setState(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, {
+        nodes: nodes,
+        index: -1
+      });
+    });
+  }, 300);
+
+  var focusCell = function focusCell(index) {
+    var node = grid.api.getModel().getRow(index);
+
+    if (node === undefined) {
+      return;
+    }
+
+    grid.api.ensureIndexVisible(index);
+    var col = grid.columnApi.getAllDisplayedColumns()[0];
+
+    if (focusColumn) {
+      col = grid.columnApi.getColumn(focusColumn);
+
+      if (col !== null) {
+        grid.api.setFocusedCell(index, col);
+
+        if (col.isCellEditable(node)) {
+          grid.api.startEditingCell({
+            rowIndex: index,
+            colKey: col
+          });
+        }
+      }
+    } else {
+      node.setSelected(true);
+    }
+  };
+
+  var handlePrev = function handlePrev() {
+    if (state.nodes.length <= 0) {
+      return;
+    }
+
+    var idx = (state.index - 1 + state.nodes.length) % state.nodes.length;
+    focusCell(state.nodes[idx].index);
+    setState(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, {
+        index: idx
+      });
+    });
+  };
+
+  var handleNext = function handleNext() {
+    if (state.nodes.length <= 0) {
+      return;
+    }
+
+    var idx = (state.index + 1) % state.nodes.length;
+    focusCell(state.nodes[idx].index);
+    setState(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, {
+        index: idx
+      });
+    });
+  };
+
+  useImperativeHandle(ref, function () {
+    return {
+      reset: function reset() {
+        setState(defaultState);
+      }
+    };
+  });
+  return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement("span", null, "\u5173\u952E\u5B57"), /*#__PURE__*/React.createElement(Input, {
+    placeholder: placeholder,
+    value: state.keywords,
+    onChange: function onChange(e) {
+      setState(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          keywords: e.target.value
+        });
+      });
+      handleSearch(e.target.value);
+    },
+    suffix: /*#__PURE__*/React.createElement("span", null, "".concat(state.index + 1, "/").concat(state.nodes.length)),
+    onKeyUp: function onKeyUp(e) {
+      if (e.key === 'Enter') {
+        handleNext();
+      }
+    }
+  }), /*#__PURE__*/React.createElement(Button, {
+    onClick: handlePrev
+  }, "\u4E0A\u4E00\u4E2A"), /*#__PURE__*/React.createElement(Button, {
+    onClick: handleNext
+  }, "\u4E0B\u4E00\u4E2A"));
+}));

package/es/components/DataGrid/index.d.ts

@@ -15,6 +15,7 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
     private readyQueue;
     private emptyRowData;
     private sideBarDef;
+    private searchRef;
     private prevFocusedCell;
     static defaultProps: {
         stopEditingWhenCellsLoseFocus: boolean;
@@ -68,7 +69,7 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
     private getColumnDefs;
     private isClientMode;
     private clearReadyQueue;
-    private afterReady;
+    afterReady(cb: () => void): void;
     private isPreserveSelected;
     private updateRowData;
     private getDataFromServer;

package/es/components/DataGrid/index.js

@@ -1,7 +1,7 @@
 var _excluded = ["validator"],
     _excluded2 = ["title", "dataIndex", "type", "render", "ellipsis", "cellRenderer", "cellRendererParams", "className", "sorter", "sortable", "editable", "suppressKeyboardEvent"],
     _excluded3 = ["title", "children"],
-    _excluded4 = ["rowKey", "fetch", "dataSource", "rowActions", "columns", "autoLoad", "loading", "summary", "detailCell", "pagination", "rowSelection", "columnTypes", "defaultColDef", "components", "sideBar", "detailCellRendererParams", "context"];
+    _excluded4 = ["rowKey", "fetch", "dataSource", "rowActions", "columns", "autoLoad", "loading", "summary", "detailCell", "pagination", "rowSelection", "columnTypes", "defaultColDef", "components", "sideBar", "detailCellRendererParams", "context", "showSearch"];
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -72,7 +72,7 @@ import Scheme from 'async-validator';
 import classNames from 'classnames';
 import { get, set } from 'lodash';
 import memoizeOne from 'memoize-one';
-import React, { Component } from 'react';
+import React, { Component, createRef } from 'react';
 import shallowEqual from 'shallowequal';
 import DateEditor from "./cell-editors/Date";
 import NumberEditor from "./cell-editors/Number";
@@ -80,6 +80,7 @@ import RowEditor, { RowEditorData } from "./cell-editors/Row";
 import SelectEditor from "./cell-editors/Select";
 import TextEditor from "./cell-editors/Text";
 import EditorWrapper from "./cell-editors/Wrapper";
+import Search from "./components/Search";
 import Selected from "./components/Selected";
 import GridStoreContext from "./context/GridStore";
 import { useGridStore } from "./hooks";
@@ -172,6 +173,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       }]
     });
 
+    _defineProperty(_assertThisInitialized(_this), "searchRef", /*#__PURE__*/createRef());
+
     _defineProperty(_assertThisInitialized(_this), "prevFocusedCell", null);
 
     _defineProperty(_assertThisInitialized(_this), "init", function (args) {
@@ -258,10 +261,13 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       }
 
       if (onDataSourceChange !== undefined) {
+        var _this$searchRef$curre;
+
         /**
          * 这么做是为了解决可编辑表格直接修改了原始数据的问题
          */
         _this.dataSource = _toConsumableArray(_this.dataSource);
+        (_this$searchRef$curre = _this.searchRef.current) === null || _this$searchRef$curre === void 0 ? void 0 : _this$searchRef$curre.reset();
         onDataSourceChange(_this.dataSource, evt);
       }
     });
@@ -294,6 +300,9 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         _this.dataSource = data;
 
         if (onDataSourceChange !== undefined) {
+          var _this$searchRef$curre2;
+
+          (_this$searchRef$curre2 = _this.searchRef.current) === null || _this$searchRef$curre2 === void 0 ? void 0 : _this$searchRef$curre2.reset();
           onDataSourceChange(data, evt);
         }
       }
@@ -1294,6 +1303,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           sideBarProp = _this$props7.sideBar,
           detailCellRendererParams = _this$props7.detailCellRendererParams,
           context = _this$props7.context,
+          showSearch = _this$props7.showSearch,
           restProps = _objectWithoutProperties(_this$props7, _excluded4);
 
       var _this$state2 = this.state,
@@ -1315,6 +1325,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         }));
       }
 
+      if (showSearch) {
+        footer.push( /*#__PURE__*/React.createElement(Search, _extends({
+          ref: this.searchRef
+        }, _typeof(showSearch) === 'object' ? showSearch : {})));
+      }
+
       if (enablePagination) {
         footer.push( /*#__PURE__*/React.createElement(Pagination, _extends({
           key: "pagination",

package/es/components/DataGrid/typings.d.ts

@@ -112,6 +112,22 @@ export declare type DetailCell<TData, Params = Record<string, never>> = {
     /** 这是一个render函数不是组件 */
     render: (params: ICellRendererParams<TData> & Params) => ReactNode;
 };
+export interface DataGridSearch {
+    /**
+     * @description
+     * 不传入就根据所有字符类型的列数据搜索
+     */
+    searchFields?: string[];
+    placeholder?: string;
+    /**
+     * @description
+     * 搜索后聚焦到哪个单元格，一般情况不要使用
+     */
+    focusColumn?: string;
+}
+export interface DataGridSearchRef {
+    reset: () => void;
+}
 export interface DataGridProps<TData> extends Omit<AgGridReactProps<TData>, 'rowSelection' | 'pagination'> {
     dataSource?: TData[];
     /**
@@ -169,4 +185,8 @@ export interface DataGridProps<TData> extends Omit<AgGridReactProps<TData>, 'row
      * @description 没有行数据时显示的文本
      */
     emptyText?: string;
+    /**
+     * @description 显示底部搜索栏，只支持非远程模式
+     */
+    showSearch?: boolean | DataGridSearch;
 }

package/es/components/EditableTable/Table.js

@@ -185,7 +185,7 @@ function EditableTable(props, ref) {
                   onFocus: opts.onFocus
                 }, /*#__PURE__*/cloneElement(renderFormItem, {
                   bordered: false,
-                  value: value,
+                  value: val,
                   onChange: function onChange(e) {
                     var result = e;
 

package/es/layouts/BasicLayout/components/Main.js

@@ -24,12 +24,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import React, { useState, useMemo, useEffect, useRef } from 'react';
 import { Modal } from 'antd';
-import { useHistory, useLocation, matchPath, useRouteMatch } from 'react-router';
 import moment from 'moment';
-import MainFramework from "./MainFramework";
+import React, { useState, useMemo, useEffect, useRef } from 'react';
+import { useHistory, useLocation, matchPath, useRouteMatch } from 'react-router';
 import RouteTab from "../../components/RouteTab";
+import MainFramework from "./MainFramework";
 
 function mapTree(tree, childrenKey, mapper) {
   var traverse = function traverse(nodes) {
@@ -264,6 +264,38 @@ export default function Main(props) {
 
     prevUrl.current = window.location.pathname;
   }, [state]);
+  useEffect(function () {
+    var handler = function handler(e) {
+      if (window._czc) {
+        var _node = e.target;
+        var tab = undefined;
+        var eventType = undefined;
+
+        while (_node) {
+          if (!eventType) {
+            eventType = _node.dataset.trackEvent;
+          }
+
+          tab = _node.dataset.trackTab;
+
+          if (tab) {
+            break;
+          }
+
+          _node = _node.parentElement;
+        }
+
+        if (eventType) {
+          window._czc.push('_trackEvent', title, '功能', tab || '--', eventType);
+        }
+      }
+    };
+
+    window.addEventListener('click', handler, false);
+    return function () {
+      window.removeEventListener('click', handler, false);
+    };
+  }, []);
 
   var handleClick = function handleClick(index) {
     if (state.active !== index) {
@@ -375,7 +407,8 @@ export default function Main(props) {
       key: key,
       style: state.active === index ? undefined : {
         display: 'none'
-      }
+      },
+      "data-track-tab": tab.title
     }, /*#__PURE__*/React.createElement(RouteTab, {
       authorities: mAuths,
       route: route,

package/es/layouts/BasicLayout/components/MainFramework/index.less

@@ -74,6 +74,21 @@
   display: flex;
   flex: 1;
   min-height: 0;
+
+  .@{prefixCls}-layout {
+    background-color: transparent;
+
+    &-header {
+      padding: 8px 0;
+    }
+
+    &-body {
+      overflow: hidden;
+      background-color: #fff;
+      border-top-left-radius: 8px;
+      border-top-right-radius: 8px;
+    }
+  }
 }
 
 .@{prefixCls}-content {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-142",
+  "version": "1.0.0-144",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",