es-grid-template 0.1.1 → 0.1.2-2

package/es/grid-component/useContext.d.ts

@@ -16,12 +16,13 @@ export interface IContext<RecordType> {
     handleSubmit?: any;
     onSubmit?: SubmitHandler<any>;
     getValues?: any;
-    handleCellChange?: ({ key, record, type, option }: ContextCellChange<RecordType>) => void;
+    handleCellChange?: (args: ContextCellChange<RecordType>) => void;
     getRowKey?: GetRowKey<RecordType>;
 }
 export type ContextCellChange<RecordType = AnyObject> = {
     key: string | keyof RecordType | GetRowKey<RecordType>;
     record: any;
+    field: string | undefined;
     option: any;
     newState?: any;
     prevState?: any;

package/es/index.d.ts

@@ -1,2 +1,2 @@
 export { default as GridComponent } from './grid-component';
-export type { ColumnsTable, TableProps, ColumnTable } from './grid-component';
+export type { ColumnsTable, TableProps, ColumnTable, CommandItem, ToolbarItem, ContextMenuItem } from './grid-component';

package/lib/grid-component/ColumnsChoose.js

@@ -14,6 +14,8 @@ var _tree = _interopRequireDefault(require("rc-master-ui/es/tree"));
 var _SearchOutlined = _interopRequireDefault(require("@ant-design/icons/SearchOutlined"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+// import type {TableColumnsType} from "rc-master-ui";
+
 const BoxAction = _styledComponents.default.div.withConfig({
   displayName: "BoxAction",
   componentId: "es-grid-template__sc-1ix8yky-0"
@@ -34,20 +36,32 @@ const ColumnsChoose = props => {
   // const columnsChooseRef: any = useRef()
   // const searchRef: any = useRef()
 
-  const [columns, setColumns] = (0, _react.useState)([]);
+  // const [columns, setColumns] = useState<TableColumnsType>([])
   const [selectedKeys, setSelectedKeys] = (0, _react.useState)([]);
+  const [isManualUpdate, setIsManualUpdate] = (0, _react.useState)(false);
+
+  // useEffect(() => {
+  //
+  //   const defaultColumns = propsColumns.filter((it) => it.key || it.dataIndex && it.showInColumnChoose !== false)
+  //   setColumns(defaultColumns as TableColumnsType)
+  //
+  // }, [propsColumns])
+
+  const columns = (0, _react.useMemo)(() => {
+    return propsColumns.filter(it => it.key || it.dataIndex && it.showInColumnChoose !== false);
+    // setColumns(defaultColumns as TableColumnsType)
+  }, [propsColumns]);
   (0, _react.useEffect)(() => {
     const defaultColumns = propsColumns.filter(it => it.key || it.dataIndex && it.showInColumnChoose !== false);
-    const defaultSelectedKeys = (0, _hooks.getVisibleColumnKeys)(propsColumns);
-    setSelectedKeys(defaultSelectedKeys);
-    setColumns(defaultColumns);
+    const defaultSelectedKeys = (0, _hooks.getVisibleColumnKeys)(defaultColumns);
+    if (!isManualUpdate) {
+      setSelectedKeys(defaultSelectedKeys);
+    }
+    setIsManualUpdate(false);
   }, [propsColumns]);
   const defaultSelectedKeys = (0, _react.useMemo)(() => {
     return (0, _hooks.getVisibleColumnKeys)(propsColumns);
   }, [propsColumns]);
-
-  // console.log('defaultSelectedKeys', defaultSelectedKeys)
-
   const [clicked, setClicked] = (0, _react.useState)(false);
   const [autoExpandParent, setAutoExpandParent] = (0, _react.useState)(true);
   // const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
@@ -128,6 +142,7 @@ const ColumnsChoose = props => {
   };
   const onCheck = keys => {
     setSelectedKeys(keys);
+    setIsManualUpdate(true);
   };
   const handleAccept = () => {
     const rs1 = (0, _hooks.updateColumns)(propsColumns, selectedKeys);
@@ -187,7 +202,9 @@ const ColumnsChoose = props => {
       onCheck: keys => onCheck(keys),
       multiple: true,
       checkedKeys: selectedKeys,
-      defaultCheckedKeys: selectedKeys,
+      defaultCheckedKeys: selectedKeys
+      // defaultCheckedKeys={defaultSelectedKeys}
+      ,
       selectedKeys: [],
       height: window.innerHeight - 200
     }), /*#__PURE__*/_react.default.createElement(BoxAction, {

package/lib/grid-component/Command.js

@@ -9,13 +9,14 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react2 = require("@floating-ui/react");
-var _antd = require("antd");
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _hooks = require("./hooks");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 // import {getTemplate} from "../../hooks"
 
+// import {Button} from "antd";
+
 const TooltipStyle = _styledComponents.default.div.withConfig({
   displayName: "TooltipStyle",
   componentId: "es-grid-template__sc-1iotu11-0"
@@ -58,20 +59,21 @@ const Command = props => {
     onClick: onClick
   }), (0, _hooks.getTemplate)(item.template)) : /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     ref: refs.setReference
-  }, getReferenceProps()), /*#__PURE__*/_react.default.createElement(_antd.Button, {
-    id: 'tooltip',
+  }, getReferenceProps(), {
     tabIndex: -1,
     style: {
       padding: '3px',
       maxWidth: 45,
-      height: '100%'
+      height: '100%',
+      display: 'flex',
+      cursor: 'pointer'
     },
     className: (0, _classnames.default)('command-item', {
       'btn-icon': item.title === ''
     }),
     color: item.color ? item.color : 'primary',
     onClick: onClick
-  }, item.icon ? (0, _hooks.getTemplate)(item.icon) : item.title))
+  }), item.icon ? (0, _hooks.getTemplate)(item.icon) : item.title)
 
   // <span>{item.title}</span>
   , isOpen && item.tooltip && /*#__PURE__*/_react.default.createElement(_react2.FloatingPortal, {

package/lib/grid-component/ContextMenu.d.ts

@@ -1,10 +1,10 @@
 import * as React from "react";
-import type { MenuProps } from "antd";
 import type { ContextInfo } from "./type";
+import type { ContextMenuItem } from "./type";
 export declare const findItemByKey: (array: any[], key: string, value: any) => any;
 type Props<RecordType> = {
     rowData: RecordType | null;
-    contextMenuItems: MenuProps["items"];
+    contextMenuItems: ContextMenuItem[];
     contextMenuClick?: (args: ContextInfo<RecordType>) => void;
     open: boolean;
     menuRef?: any;

package/lib/grid-component/ContextMenu.js

@@ -8,6 +8,8 @@ var React = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+// import type { MenuProps } from "antd";
+
 const findItemByKey = (array, key, value) => {
   for (let i = 0; i < array.length; i++) {
     const item = array[i];