es-grid-template 0.1.1 → 0.1.2-2

package/es/grid-component/ColumnsChoose.js

@@ -3,6 +3,8 @@ import styled from "styled-components";
 import { Button, Input, Popover, Tooltip } from "antd";
 import { SettingOutlined } from "@ant-design/icons";
 import { getVisibleColumnKeys, updateColumns } from "./hooks";
+
+// import type {TableColumnsType} from "rc-master-ui";
 import Tree from "rc-master-ui/es/tree";
 import SearchOutlined from "@ant-design/icons/SearchOutlined";
 const BoxAction = styled.div.withConfig({
@@ -25,20 +27,32 @@ export const ColumnsChoose = props => {
   // const columnsChooseRef: any = useRef()
   // const searchRef: any = useRef()
 
-  const [columns, setColumns] = useState([]);
+  // const [columns, setColumns] = useState<TableColumnsType>([])
   const [selectedKeys, setSelectedKeys] = useState([]);
+  const [isManualUpdate, setIsManualUpdate] = useState(false);
+
+  // useEffect(() => {
+  //
+  //   const defaultColumns = propsColumns.filter((it) => it.key || it.dataIndex && it.showInColumnChoose !== false)
+  //   setColumns(defaultColumns as TableColumnsType)
+  //
+  // }, [propsColumns])
+
+  const columns = useMemo(() => {
+    return propsColumns.filter(it => it.key || it.dataIndex && it.showInColumnChoose !== false);
+    // setColumns(defaultColumns as TableColumnsType)
+  }, [propsColumns]);
   useEffect(() => {
     const defaultColumns = propsColumns.filter(it => it.key || it.dataIndex && it.showInColumnChoose !== false);
-    const defaultSelectedKeys = getVisibleColumnKeys(propsColumns);
-    setSelectedKeys(defaultSelectedKeys);
-    setColumns(defaultColumns);
+    const defaultSelectedKeys = getVisibleColumnKeys(defaultColumns);
+    if (!isManualUpdate) {
+      setSelectedKeys(defaultSelectedKeys);
+    }
+    setIsManualUpdate(false);
   }, [propsColumns]);
   const defaultSelectedKeys = useMemo(() => {
     return getVisibleColumnKeys(propsColumns);
   }, [propsColumns]);
-
-  // console.log('defaultSelectedKeys', defaultSelectedKeys)
-
   const [clicked, setClicked] = useState(false);
   const [autoExpandParent, setAutoExpandParent] = useState(true);
   // const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
@@ -119,6 +133,7 @@ export const ColumnsChoose = props => {
   };
   const onCheck = keys => {
     setSelectedKeys(keys);
+    setIsManualUpdate(true);
   };
   const handleAccept = () => {
     const rs1 = updateColumns(propsColumns, selectedKeys);
@@ -178,7 +193,9 @@ export const ColumnsChoose = props => {
       onCheck: keys => onCheck(keys),
       multiple: true,
       checkedKeys: selectedKeys,
-      defaultCheckedKeys: selectedKeys,
+      defaultCheckedKeys: selectedKeys
+      // defaultCheckedKeys={defaultSelectedKeys}
+      ,
       selectedKeys: [],
       height: window.innerHeight - 200
     }), /*#__PURE__*/React.createElement(BoxAction, {

package/es/grid-component/Command.js

@@ -5,7 +5,7 @@ import classnames from "classnames";
 import { useFloating, autoUpdate, offset, flip, shift, useHover, useFocus, useDismiss, useRole, useInteractions, FloatingPortal
 // useClick
 } from "@floating-ui/react";
-import { Button } from "antd";
+// import {Button} from "antd";
 import styled from "styled-components";
 import { getTemplate } from "./hooks";
 const TooltipStyle = styled.div.withConfig({
@@ -50,20 +50,21 @@ const Command = props => {
     onClick: onClick
   }), getTemplate(item.template)) : /*#__PURE__*/React.createElement("div", _extends({
     ref: refs.setReference
-  }, getReferenceProps()), /*#__PURE__*/React.createElement(Button, {
-    id: 'tooltip',
+  }, getReferenceProps(), {
     tabIndex: -1,
     style: {
       padding: '3px',
       maxWidth: 45,
-      height: '100%'
+      height: '100%',
+      display: 'flex',
+      cursor: 'pointer'
     },
     className: classnames('command-item', {
       'btn-icon': item.title === ''
     }),
     color: item.color ? item.color : 'primary',
     onClick: onClick
-  }, item.icon ? getTemplate(item.icon) : item.title))
+  }), item.icon ? getTemplate(item.icon) : item.title)
 
   // <span>{item.title}</span>
   , isOpen && item.tooltip && /*#__PURE__*/React.createElement(FloatingPortal, {

package/es/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/es/grid-component/ContextMenu.js

@@ -1,4 +1,5 @@
 import * as React from "react";
+// import type { MenuProps } from "antd";
 import { Dropdown, Menu } from "antd";
 export const findItemByKey = (array, key, value) => {
   for (let i = 0; i < array.length; i++) {