@arim-aisdc/public-components 0.0.11 → 0.0.13

package/dist/components/SplitPane/SplitPane.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Size } from 'react-split-pane';
 import { SplitPrimary, SplitType } from './config';
-import './index.less';
+import './splitPane.less';
 export type SplitPaneModuleType = {
     defaultSize: Size;
     minSize?: Size;
@@ -23,6 +23,7 @@ export type SplitPaneModuleType = {
     routerName: string;
     pane1Name: string;
     pane2Name: string;
+    userId: string;
     dragFinished?: () => void;
 };
 declare const _default: React.NamedExoticComponent<SplitPaneModuleType>;

package/dist/components/SplitPane/SplitPane.js

@@ -13,7 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useRef, useState } from 'react';
 import SplitPane from 'react-split-pane';
 import { DomNames, PrimaryList, SplitSizeType, SplitTypeList } from "./config";
-import "./index.less";
+import "./splitPane.less";
 import { getCurrentRouterName, getLocalStorageItem, getProAndUserKey, setLocalStorageItem, setSplitSizeData } from "./util";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var defaultMinSize = 50;
@@ -38,6 +38,7 @@ var SplitPaneModule = function SplitPaneModule(_ref) {
     splitStep = _ref.splitStep,
     pane1Dom = _ref.pane1Dom,
     pane2Dom = _ref.pane2Dom,
+    userId = _ref.userId,
     dragFinished = _ref.dragFinished,
     resizerClassName = _ref.resizerClassName,
     currentModulePageName = _ref.currentModulePageName,
@@ -47,20 +48,20 @@ var SplitPaneModule = function SplitPaneModule(_ref) {
     pane2Name = _ref.pane2Name;
   var sizeType = SplitSizeType[splitType];
   var SpalitPaneModuleRef = useRef(null);
-  var _useState = useState(setSplitSizeData(currentModulePageName, currentModuleDataName) || null),
+  var _useState = useState(setSplitSizeData(currentModulePageName, currentModuleDataName, userId) || null),
     _useState2 = _slicedToArray(_useState, 2),
     currentComponentSize = _useState2[0],
     setCurrentComponentSize = _useState2[1];
   var setLocalSize = function setLocalSize(size) {
     if (SpalitPaneModuleRef !== null && SpalitPaneModuleRef !== void 0 && SpalitPaneModuleRef.current && getCurrentRouterName() === routerName) {
       var _SpalitPaneModuleRef$, _currentUserData$curr, _objectSpread2;
-      var _currentRouterData = getLocalStorageItem(getProAndUserKey()) || {};
+      var _currentRouterData = getLocalStorageItem(getProAndUserKey(userId)) || {};
       var _currentUserData = _currentRouterData[getCurrentRouterName()] || {};
       var _anotherPaneName = splitPrimary === PrimaryList.firstComponent ? DomNames.secondName : DomNames.firstName;
       var _anotherSize = SpalitPaneModuleRef === null || SpalitPaneModuleRef === void 0 || (_SpalitPaneModuleRef$ = SpalitPaneModuleRef.current) === null || _SpalitPaneModuleRef$ === void 0 || (_SpalitPaneModuleRef$ = _SpalitPaneModuleRef$[_anotherPaneName]) === null || _SpalitPaneModuleRef$ === void 0 ? void 0 : _SpalitPaneModuleRef$[offsetName + sizeType];
       _currentRouterData[getCurrentRouterName()] = _objectSpread(_objectSpread({}, _currentUserData), {}, _defineProperty({}, currentModulePageName, _defineProperty({}, currentModuleDataName, _objectSpread(_objectSpread({}, _currentUserData === null || _currentUserData === void 0 || (_currentUserData$curr = _currentUserData[currentModulePageName]) === null || _currentUserData$curr === void 0 ? void 0 : _currentUserData$curr[currentModuleDataName]), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, pane1Name + sizeType, splitPrimary === PrimaryList.firstComponent ? size || (currentComponentSize === null || currentComponentSize === void 0 ? void 0 : currentComponentSize[pane1Name + sizeType]) : _anotherSize), _defineProperty(_objectSpread2, pane2Name + sizeType, splitPrimary === PrimaryList.secondComponent ? size || (currentComponentSize === null || currentComponentSize === void 0 ? void 0 : currentComponentSize[pane2Name + sizeType]) : _anotherSize), _objectSpread2)))));
-      setCurrentComponentSize(_objectSpread(_objectSpread({}, currentComponentSize), setSplitSizeData(currentModulePageName, currentModuleDataName)));
-      setLocalStorageItem(getProAndUserKey(), _currentRouterData);
+      setCurrentComponentSize(_objectSpread(_objectSpread({}, currentComponentSize), setSplitSizeData(currentModulePageName, currentModuleDataName, userId)));
+      setLocalStorageItem(getProAndUserKey(userId), _currentRouterData);
       dragFinished === null || dragFinished === void 0 || dragFinished();
     }
   };

package/dist/components/SplitPane/index.d.ts

@@ -2,5 +2,5 @@ import SplitPane from './SplitPane';
 export type { SplitPaneModuleType } from './SplitPane';
 export { DomNames, PrimaryList, SplitSizeType, SplitTypeList } from './config';
 export type { SplitPrimary, SplitType } from './config';
-export { ProjectName, delLocalStorageItem, emptyValueList, getComponentsSize, getCurrentRouterName, getLocalStorageItem, getProAndUserKey, getUserId, setLocalStorageItem, setSplitSizeData, } from './util';
+export { ProjectName, delLocalStorageItem, emptyValueList, getComponentsSize, getCurrentRouterName, getLocalStorageItem, getProAndUserKey, setLocalStorageItem, setSplitSizeData, } from './util';
 export default SplitPane;

package/dist/components/SplitPane/index.js

@@ -1,4 +1,4 @@
 import SplitPane from "./SplitPane";
 export { DomNames, PrimaryList, SplitSizeType, SplitTypeList } from "./config";
-export { ProjectName, delLocalStorageItem, emptyValueList, getComponentsSize, getCurrentRouterName, getLocalStorageItem, getProAndUserKey, getUserId, setLocalStorageItem, setSplitSizeData } from "./util";
+export { ProjectName, delLocalStorageItem, emptyValueList, getComponentsSize, getCurrentRouterName, getLocalStorageItem, getProAndUserKey, setLocalStorageItem, setSplitSizeData } from "./util";
 export default SplitPane;

package/dist/components/SplitPane/splitPane.less

@@ -0,0 +1,16 @@
+.split-pane-section {
+  > div {
+    overflow: hidden !important;
+    background: @globalColor7 !important;
+  }
+
+  > span {
+    opacity: 1 !important;
+    border: none !important;
+    background: @globalColor8 !important;
+
+    &:hover {
+      border: none !important;
+    }
+  }
+}

package/dist/components/SplitPane/util.d.ts

@@ -1,18 +1,17 @@
 import { SplitType } from './config';
-export declare const ProjectName = "HBIS_TG";
+export declare const ProjectName = "ARIM_AISDC";
 export declare const getCurrentRouterName: () => string;
 export declare const emptyValueList: Array<any>;
 export declare const getLocalStorageItem: (item: string) => any;
 export declare const delLocalStorageItem: (item: string) => void;
 export declare const setLocalStorageItem: (item: string, data: any) => void;
-export declare const getUserId: () => any;
-export declare const getProAndUserKey: () => string;
+export declare const getProAndUserKey: (userId: string) => string;
 /**
  * 更新split各组件宽高
  * @param modulePageName 页面名称
  * @param moduleDataName 数据名称
  */
-export declare const setSplitSizeData: (modulePageName: string, moduleDataName: string) => any;
+export declare const setSplitSizeData: (modulePageName: string, moduleDataName: string, userId: string) => any;
 /**
  * 获取split两组件宽高
  * @param splitType split类型
@@ -20,5 +19,6 @@ export declare const setSplitSizeData: (modulePageName: string, moduleDataName:
  * @param moduleDataName 数据名称
  * @param pane1Name 组件1名称
  * @param pane2Name 组件2名称
+ * @param userId 用户id
  */
-export declare const getComponentsSize: (splitType: SplitType, modulePageName: string, moduleDataName: string, pane1Name: string, pane2Name: string) => any[];
+export declare const getComponentsSize: (splitType: SplitType, modulePageName: string, moduleDataName: string, pane1Name: string, pane2Name: string, userId: string) => any[];

package/dist/components/SplitPane/util.js

@@ -1,5 +1,5 @@
 import { SplitSizeType } from "./config";
-export var ProjectName = 'HBIS_TG';
+export var ProjectName = 'ARIM_AISDC';
 
 // 当前页面路由
 export var getCurrentRouterName = function getCurrentRouterName() {
@@ -22,15 +22,9 @@ export var setLocalStorageItem = function setLocalStorageItem(item, data) {
   }
 };
 
-// 获取用户id
-export var getUserId = function getUserId() {
-  var _getLocalStorageItem;
-  return ((_getLocalStorageItem = getLocalStorageItem('poi-permission')) === null || _getLocalStorageItem === void 0 || (_getLocalStorageItem = _getLocalStorageItem.currentUser) === null || _getLocalStorageItem === void 0 ? void 0 : _getLocalStorageItem.id) || '';
-};
-
 // 唯一路由拼接key（根据 项目名称+用户id）
-export var getProAndUserKey = function getProAndUserKey() {
-  return "".concat(ProjectName, "-").concat(getUserId());
+export var getProAndUserKey = function getProAndUserKey(userId) {
+  return "".concat(ProjectName, "-").concat(userId);
 };
 
 /**
@@ -38,9 +32,9 @@ export var getProAndUserKey = function getProAndUserKey() {
  * @param modulePageName 页面名称
  * @param moduleDataName 数据名称
  */
-export var setSplitSizeData = function setSplitSizeData(modulePageName, moduleDataName) {
-  var _getLocalStorageItem2;
-  return (_getLocalStorageItem2 = getLocalStorageItem(getProAndUserKey())) === null || _getLocalStorageItem2 === void 0 || (_getLocalStorageItem2 = _getLocalStorageItem2[getCurrentRouterName()]) === null || _getLocalStorageItem2 === void 0 || (_getLocalStorageItem2 = _getLocalStorageItem2[modulePageName]) === null || _getLocalStorageItem2 === void 0 ? void 0 : _getLocalStorageItem2[moduleDataName];
+export var setSplitSizeData = function setSplitSizeData(modulePageName, moduleDataName, userId) {
+  var _getLocalStorageItem;
+  return (_getLocalStorageItem = getLocalStorageItem(getProAndUserKey(userId))) === null || _getLocalStorageItem === void 0 || (_getLocalStorageItem = _getLocalStorageItem[getCurrentRouterName()]) === null || _getLocalStorageItem === void 0 || (_getLocalStorageItem = _getLocalStorageItem[modulePageName]) === null || _getLocalStorageItem === void 0 ? void 0 : _getLocalStorageItem[moduleDataName];
 };
 
 /**
@@ -50,10 +44,11 @@ export var setSplitSizeData = function setSplitSizeData(modulePageName, moduleDa
  * @param moduleDataName 数据名称
  * @param pane1Name 组件1名称
  * @param pane2Name 组件2名称
+ * @param userId 用户id
  */
-export var getComponentsSize = function getComponentsSize(splitType, modulePageName, moduleDataName, pane1Name, pane2Name) {
+export var getComponentsSize = function getComponentsSize(splitType, modulePageName, moduleDataName, pane1Name, pane2Name, userId) {
   var sizeType = SplitSizeType[splitType];
-  var _ref = setSplitSizeData(modulePageName, moduleDataName) || {},
+  var _ref = setSplitSizeData(modulePageName, moduleDataName, userId) || {},
     pane1Size = _ref[pane1Name + sizeType],
     pane2Size = _ref[pane2Name + sizeType];
   return [pane1Size, pane2Size];

package/dist/components/TableMax/TableBody/index.d.ts

@@ -14,6 +14,7 @@ type TableBodyPropsType = {
     canFilter: boolean;
     canSelection: boolean;
     selectionWithoutChecked?: boolean;
+    tableBodyHeight: number;
     bodyContentHeight: number;
     tableContainerWidth: number;
     selectedRowDragging: boolean;
@@ -52,5 +53,5 @@ type TableBodyPropsType = {
     };
     dragBeforeStart: (datas: any) => boolean;
 };
-declare const TableBody: ({ table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, hasVerticalScrollBar, datas, emptyDataHeight, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, pinShadowVisible, dragBeforeStart, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const TableBody: ({ table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableBodyHeight, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, hasVerticalScrollBar, datas, emptyDataHeight, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, pinShadowVisible, dragBeforeStart, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
 export default TableBody;

package/dist/components/TableMax/TableBody/index.js

@@ -12,6 +12,7 @@ import { useDrop } from 'react-dnd';
 import { CustomDragLayer } from "../components/CustomDragerLayer";
 // import RowContent from "../components/RowContent";
 
+import { useEffect } from 'react';
 import { createPortal } from 'react-dom';
 import Row from "./Row";
 import "./index.less";
@@ -30,6 +31,7 @@ var TableBody = function TableBody(_ref) {
     onSelectChange = _ref.onSelectChange,
     canSelection = _ref.canSelection,
     selectionWithoutChecked = _ref.selectionWithoutChecked,
+    tableBodyHeight = _ref.tableBodyHeight,
     tableContainerWidth = _ref.tableContainerWidth,
     selectedRowDragging = _ref.selectedRowDragging,
     setSelectedRowDragging = _ref.setSelectedRowDragging,
@@ -237,11 +239,9 @@ var TableBody = function TableBody(_ref) {
     }
     return EmptyContent();
   };
-
-  // useEffect(() => {
-  //   console.log(tableBodyHeight, 'tableBodyHeight*******************');
-  // }, [tableBodyHeight]);
-
+  useEffect(function () {
+    console.log(tableBodyHeight, 'tableBodyHeight*******************');
+  }, [tableBodyHeight]);
   return (
     /*#__PURE__*/
     // 修复筛选数据为空时，滚动条丢失

package/dist/components/TableMax/TableHeader/index.less

@@ -3,6 +3,7 @@ table {
   // background: @globalColor_14;
   width: 100%;
   border-collapse: collapse;
+  overflow: hidden;
 
   th {
     position: relative;

package/dist/components/TableMax/TableMax.js

@@ -81,7 +81,8 @@ var TableMax = function TableMax(_ref) {
     _ref$showSizeChanger = _ref.showSizeChanger,
     showSizeChanger = _ref$showSizeChanger === void 0 ? true : _ref$showSizeChanger,
     changePagination = _ref.changePagination,
-    defaultScrollY = _ref.defaultScrollY,
+    _ref$defaultScrollY = _ref.defaultScrollY,
+    defaultScrollY = _ref$defaultScrollY === void 0 ? 600 : _ref$defaultScrollY,
     _ref$columnResizeMode = _ref.columnResizeMode,
     columnResizeMode = _ref$columnResizeMode === void 0 ? 'onChange' : _ref$columnResizeMode,
     rowKey = _ref.rowKey,
@@ -366,19 +367,18 @@ var TableMax = function TableMax(_ref) {
     var _tableHeaderRef$curre;
     setTableHeadHeight(tableHeaderRef === null || tableHeaderRef === void 0 || (_tableHeaderRef$curre = tableHeaderRef.current) === null || _tableHeaderRef$curre === void 0 ? void 0 : _tableHeaderRef$curre.clientHeight);
   }, [tableHeaderRef === null || tableHeaderRef === void 0 || (_tableHeaderRef$curre2 = tableHeaderRef.current) === null || _tableHeaderRef$curre2 === void 0 ? void 0 : _tableHeaderRef$curre2.clientHeight, enableFilters]);
-  var bodyContentHeight = useMemo(function () {
-    return datas.length * Number(rowHeight);
-  }, [datas.length, rowHeight]);
 
   /**table-body高度 */
   useEffect(function () {
     var _tableContentRef$curr, _tableContentRef$curr2;
     var horizontalScrollHeight = table.getTotalSize() > (tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.offsetWidth) ? 10 : 0;
-    setTableBodyHeight(autoHeight ? (tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 ? void 0 : _tableContentRef$curr2.clientHeight) - tableHeadHeight - horizontalScrollHeight : defaultScrollY ? defaultScrollY - tableHeadHeight - horizontalScrollHeight : bodyContentHeight);
-  }, [table.getTotalSize(), defaultScrollY, autoHeight, tableContentRef === null || tableContentRef === void 0 ? void 0 : tableContentRef.current, tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr3 = tableContentRef.current) === null || _tableContentRef$curr3 === void 0 ? void 0 : _tableContentRef$curr3.clientHeight, tableHeadHeight, bodyContentHeight]);
+    setTableBodyHeight(autoHeight ? (tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 ? void 0 : _tableContentRef$curr2.clientHeight) - tableHeadHeight - horizontalScrollHeight : defaultScrollY - tableHeadHeight - horizontalScrollHeight);
+  }, [table.getTotalSize(), defaultScrollY, autoHeight, tableContentRef === null || tableContentRef === void 0 ? void 0 : tableContentRef.current, tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr3 = tableContentRef.current) === null || _tableContentRef$curr3 === void 0 ? void 0 : _tableContentRef$curr3.clientHeight, tableHeadHeight]);
 
   /**table-body-content 高度 */
-
+  var bodyContentHeight = useMemo(function () {
+    return datas.length * Number(rowHeight);
+  }, [datas.length, rowHeight]);
   var hasVerticalScrollBar = useMemo(function () {
     return tableBodyHeight - bodyContentHeight + 10 < 0;
   }, [tableBodyHeight, bodyContentHeight]);
@@ -967,7 +967,7 @@ var TableMax = function TableMax(_ref) {
     selectionWithoutChecked: selectionWithoutChecked,
     // scroll,
     // setScroll,
-    // tableBodyHeight,
+    tableBodyHeight: tableBodyHeight,
     // tableHeadHeight,
     // setTableHeadHeight,
     bodyContentHeight: bodyContentHeight,
@@ -1126,7 +1126,7 @@ var TableMax = function TableMax(_ref) {
             className: "table-center",
             ref: tableContentRef,
             style: {
-              height: !autoHeight && defaultScrollY ? defaultScrollY : 'fix-content'
+              height: !autoHeight ? defaultScrollY : 'fix-content'
             },
             children: [/*#__PURE__*/_jsx("div", {
               ref: tableHeaderRef,

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { default as Foo } from './components/Foo';
+export * from './components/SplitPane';
 export { default as SplitPane } from './components/SplitPane';
 export * from './components/TableMax';
 export { default as TableMax } from './components/TableMax';

package/dist/index.js

@@ -1,4 +1,4 @@
-export { default as Foo } from "./components/Foo";
+export * from "./components/SplitPane";
 export { default as SplitPane } from "./components/SplitPane";
 export * from "./components/TableMax";
 export { default as TableMax } from "./components/TableMax";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",
@@ -49,7 +49,6 @@
     "@tanstack/react-table": "^8.9.1",
     "ahooks": "^3.7.8",
     "css-vars-ponyfill": "^2.4.8",
-    "f": "^1.4.0",
     "fs": "^0.0.1-security",
     "lodash": "^4.17.21",
     "path": "^0.12.7",
@@ -91,4 +90,4 @@
   "authors": [
     "na.xu2278@foxmail.com"
   ]
-}
+}

package/dist/components/SplitPane/index.less

@@ -1,33 +0,0 @@
-.split-pane-section {
-  > div {
-    overflow: hidden !important;
-    background: @globalColor7 !important;
-  }
-
-  > span {
-    opacity: 1 !important;
-    border: none !important;
-    background: @globalColor8 !important;
-
-    &:hover {
-      border: none !important;
-    }
-  }
-
-  // :global {
-  //   .Pane {
-  //     overflow: hidden;
-  //     background: @globalColor7;
-  //   }
-
-  //   .Resizer {
-  //     opacity: 1;
-  //     border: none;
-  //     background: @globalColor8;
-
-  //     &:hover {
-  //       border: none;
-  //     }
-  //   }
-  // }
-}