es-grid-template 0.0.7 → 0.0.13

package/lib/{ColumnsChoose.js → grid-component/ColumnsChoose.js}

@@ -4,97 +4,90 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ColumnsChoose = exports.BoxInputFilterColumn = void 0;
+exports.ColumnsChoose = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _hooks = require("./hooks");
+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; }
-const {
-  Search
-} = _antd.Input;
+// import type { TreeDataNode} from "antd";
 
-// const RowStyle = styled.div`
-//   padding: 6px 0;
-//
-//   height: 35px;
-//
-//   .ellipsis {
-//     overflow: hidden;
-//     white-space: nowrap;
-//     text-overflow: ellipsis;
-//     word-break: keep-all;
-//   }
-// `
+// const { Search } = Input;
 
 const BoxAction = _styledComponents.default.div.withConfig({
   displayName: "BoxAction",
-  componentId: "es-grid-template__sc-1k89i9w-0"
+  componentId: "es-grid-template__sc-1ix8yky-0"
 })(["border-top:1px solid #c4c4c4;padding-top:.75rem;display:flex;justify-content:end;gap:10px;.btn-action{background:none !important;border:none !important;&.btn-action-submit{color:#df4318;&:disabled{background-color:#f0f0f0 !important;}&:hover{color:#df4318 !important;}}&:hover{background-color:#f0f0f0 !important;}}"]);
-const BoxInputFilterColumn = exports.BoxInputFilterColumn = _styledComponents.default.div.withConfig({
-  displayName: "BoxInputFilterColumn",
-  componentId: "es-grid-template__sc-1k89i9w-1"
-})(["display:flex;position:relative;align-items:center;.input__value{z-index:1;border-radius:0;border-top:0;border-left:0;border-right:0;&:focus{box-shadow:none !important;}&.is-clearable{padding-right:25px !important;}}.input__clear-icon{cursor:pointer;position:absolute;right:5px;z-index:10;}"]);
 const ColumnsChoose = props => {
   const {
     columns: propsColumns,
     setColumns: changeHiddenColumn
     // t,
-    // columnsGrouped,
-    // onChangeDisplay
-    // frozen
   } = props;
 
   // const dataList: { key: React.Key; title: string }[] = [];
 
-  const defaultColumns = (0, _react.useMemo)(() => {
-    const rs = propsColumns.filter(it => it.key || it.dataIndex);
-    return rs;
+  // const defaultColumns = useMemo(() => {
+  //   return propsColumns.filter((it) => it.key || it.dataIndex && it.showColumnChoose !== false)
+  // }, [propsColumns])
+
+  // const columnsChooseRef: any = useRef()
+  // const searchRef: any = useRef()
+
+  const [columns, setColumns] = (0, _react.useState)([]);
+  const [selectedKeys, setSelectedKeys] = (0, _react.useState)([]);
+  (0, _react.useEffect)(() => {
+    const defaultColumns = propsColumns.filter(it => it.key || it.dataIndex && it.showColumnChoose !== false);
+    const defaultSelectedKeys = (0, _hooks.getVisibleColumnKeys)(propsColumns);
+    setSelectedKeys(defaultSelectedKeys);
+    setColumns(defaultColumns);
   }, [propsColumns]);
   const defaultSelectedKeys = (0, _react.useMemo)(() => {
     return (0, _hooks.getVisibleColumnKeys)(propsColumns);
   }, [propsColumns]);
 
-  // const columnsChooseRef: any = useRef()
-  // const searchRef: any = useRef()
+  // console.log('defaultSelectedKeys', defaultSelectedKeys)
 
-  const [columns] = (0, _react.useState)(defaultColumns);
   const [clicked, setClicked] = (0, _react.useState)(false);
   const [autoExpandParent, setAutoExpandParent] = (0, _react.useState)(true);
   // const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
-  const [searchValue, setSearchValue] = (0, _react.useState)('');
-  const [selectedKeys, setSelectedKeys] = (0, _react.useState)(defaultSelectedKeys);
-  const treeData = (0, _react.useMemo)(() => {
-    const loop = data => data.map(item => {
-      const strTitle = item.title;
-      const index = strTitle.indexOf(searchValue);
-      const beforeStr = strTitle.substring(0, index);
-      const afterStr = strTitle.slice(index + searchValue.length);
-      const title = index > -1 ? /*#__PURE__*/_react.default.createElement("span", {
-        key: item.key
-      }, beforeStr, /*#__PURE__*/_react.default.createElement("span", {
-        className: "site-tree-search-value"
-      }, searchValue), afterStr) : /*#__PURE__*/_react.default.createElement("span", {
-        key: item.key
-      }, strTitle);
-      if (item.children) {
-        return {
-          title,
-          key: item.key,
-          children: loop(item.children)
-        };
-      }
-      return {
-        title,
-        key: item.key
-      };
-    });
+  // const [searchValue, setSearchValue] = useState('');
+
+  // const treeData = useMemo(() => {
+  //   const loop = (data: TreeDataNode[]): TreeDataNode[] =>
+  //     data.map((item) => {
+  //       const strTitle = item.title as string;
+  //       const index = strTitle.indexOf(searchValue);
+  //       const beforeStr = strTitle.substring(0, index);
+  //       const afterStr = strTitle.slice(index + searchValue.length);
+  //       const title =
+  //         index > -1 ? (
+  //           <span key={item.key}>
+  //             {beforeStr}
+  //             <span className="site-tree-search-value">{searchValue}</span>
+  //             {afterStr}
+  //           </span>
+  //         ) : (
+  //           <span key={item.key}>{strTitle}</span>
+  //         );
+  //       if (item.children) {
+  //         return { title, key: item.key, children: loop(item.children) };
+  //       }
+  //
+  //       return {
+  //         title,
+  //         key: item.key,
+  //       };
+  //     });
+  //
+  //   // return loop(defaultData);
+  //   return loop(columns as any);
+  // }, [searchValue, columns]);
 
-    // return loop(defaultData);
-    return loop(columns);
-  }, [searchValue]);
   const hide = () => {
     setClicked(false);
   };
@@ -121,10 +114,9 @@ const ColumnsChoose = props => {
   //   return parentKey!
   // }
 
-  const onChange = e => {
-    const {
-      value
-    } = e.target;
+  // const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const onChange = () => {
+    // const { value } = e.target
     // const newExpandedKeys = dataList
     //   .map((item) => {
     //     if (item.title.indexOf(value) > -1) {
@@ -134,14 +126,15 @@ const ColumnsChoose = props => {
     //   })
     //   .filter((item, i, self): item is React.Key => !!(item && self.indexOf(item) === i))
     // setExpandedKeys(newExpandedKeys)
-    setSearchValue(value);
+
+    // setSearchValue(value)
     setAutoExpandParent(true);
   };
   const onCheck = keys => {
     setSelectedKeys(keys);
   };
   const handleAccept = () => {
-    const rs1 = (0, _hooks.updateColumns)(columns, selectedKeys);
+    const rs1 = (0, _hooks.updateColumns)(propsColumns, selectedKeys);
     changeHiddenColumn(rs1);
     hide();
   };
@@ -155,18 +148,21 @@ const ColumnsChoose = props => {
       style: {
         minWidth: 250
       }
-    }, /*#__PURE__*/_react.default.createElement(Search, {
+    }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
       style: {
         marginBottom: 8
       },
       placeholder: "Search",
+      prefix: /*#__PURE__*/_react.default.createElement(_SearchOutlined.default, null),
       onChange: onChange
-    }), /*#__PURE__*/_react.default.createElement(_antd.Tree, {
+    }), /*#__PURE__*/_react.default.createElement(_tree.default, {
       onExpand: onExpand
       // expandedKeys={expandedKeys}
       ,
-      autoExpandParent: autoExpandParent,
-      treeData: treeData,
+      autoExpandParent: autoExpandParent
+      // treeData={treeData}
+      ,
+      treeData: columns,
       defaultExpandAll: true,
       checkable: true
       // onSelect={(keys, info) => {

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

@@ -0,0 +1,19 @@
+import React from "react";
+import type { ColumnEditType, IFormat } from "./type";
+import type { EditType } from "rc-master-ui";
+interface EditableCellProps<DataType> extends React.HTMLAttributes<HTMLElement> {
+    t?: any;
+    editing: boolean;
+    dataIndex: string;
+    title: any;
+    editType: EditType;
+    record: DataType;
+    index: number;
+    format?: IFormat;
+    column: ColumnEditType<DataType>;
+    indexRow: number;
+    indexCol: number;
+    rowKey: any;
+}
+declare const EditableCell: <T>(props: React.PropsWithChildren<EditableCellProps<T>>) => React.JSX.Element;
+export default EditableCell;