@cqsjjb/jjb-react-admin-component 3.3.9 → 3.3.11

package/Table/index.js

@@ -3,7 +3,7 @@ import React, { useRef, useEffect, useState, useCallback } from 'react';
 import { ProTable } from '@ant-design/pro-components';
 import './index.less';
 import { antPrefix } from './utils';
-export default function TablePro(props) {
+function TablePro(props) {
   const prefix = antPrefix || 'ant';
   const baseCls = `.${prefix}-table`;
   const ref = useRef(null);
@@ -12,6 +12,9 @@ export default function TablePro(props) {
   const tableFooterCls = `${baseCls}-footer`;
   const {
     enableAutoScrollY = true,
+    rowKey,
+    columns,
+    scroll,
     options = {
       reload: false,
       density: true,
@@ -25,6 +28,23 @@ export default function TablePro(props) {
     ...restProps
   } = props;
   const [scrollY, setScrollY] = useState(undefined);
+
+  // 1. rowKey 兜底处理：如果没有 rowKey，使用数据索引下标
+  const finalRowKey = rowKey || ((record, index) => index);
+
+  // 3. scroll 处理：如果没有 scroll，设置 scroll={{ x: 1000 }}，注意要合并 y 值
+  const finalScroll = React.useMemo(() => {
+    const baseScroll = scroll || {
+      x: 1000
+    };
+    if (enableAutoScrollY) {
+      return {
+        ...baseScroll,
+        y: scrollY || 0
+      };
+    }
+    return baseScroll;
+  }, [scroll, enableAutoScrollY, scrollY]);
   const timerRef = useRef(null);
   const calcTableScrollY = () => {
     const tableBody = ref.current?.querySelector?.(tableBodyCls);
@@ -34,7 +54,7 @@ export default function TablePro(props) {
     const tablePagination = ref.current?.querySelector?.(tablePaginationCls);
     const tablePaginationRect = tablePagination?.getBoundingClientRect();
     const tableFooterHeight = tableFooterRect?.height || 0;
-    const tablePaginationMargin = 16;
+    const tablePaginationMargin = 16 * 2;
     const tablePaginationHeight = tablePaginationRect?.height || 0;
     const border = 2;
     const margin = 20;
@@ -54,46 +74,45 @@ export default function TablePro(props) {
   }, []);
   useEffect(() => {
     if (!ref.current || !enableAutoScrollY) return;
-
     // 创建 ResizeObserver 监听元素尺寸变化
-    const resizeObserver = new ResizeObserver(() => {
+    const resizeObserver1 = new ResizeObserver(() => {
       // 等待 table-pagination 元素生成后再计算
       debouncedCalcScrollY();
     });
     const mutationObserver = new MutationObserver(() => {
       debouncedCalcScrollY();
     });
-    mutationObserver.observe(ref.current, {
+    mutationObserver.observe(ref.current.parentElement, {
       childList: true,
       subtree: true,
       attributes: true
     });
 
     // 开始观察 ref.current 的尺寸变化
-    resizeObserver.observe(ref.current);
+    resizeObserver1.observe(ref.current);
     return () => {
       if (timerRef.current) {
         clearTimeout(timerRef.current);
       }
-      resizeObserver.disconnect();
+      resizeObserver1.disconnect();
       mutationObserver.disconnect();
     };
   }, [ref, enableAutoScrollY, debouncedCalcScrollY]);
   return /*#__PURE__*/React.createElement("div", {
-    ref: ref,
-    style: {
-      height: '100%'
-    }
+    ref: ref
   }, /*#__PURE__*/React.createElement(ProTable, _extends({
     ghost: true,
+    bordered: true,
+    defaultSize: "default",
     columnEmptyText: true,
     search: false,
-    scroll: enableAutoScrollY ? {
-      y: scrollY || 0
-    } : undefined,
+    scroll: finalScroll,
+    rowKey: finalRowKey,
     className: `${antPrefix}-gbs-pro-table`,
     options: options
   }, restProps, {
-    columns: restProps.columns
+    columns: columns
   })));
-}
+}
+TablePro.displayName = 'TablePro';
+export default TablePro;

package/TableAction/index.js

@@ -1,16 +1,17 @@
 import React from 'react';
-import { tools } from '@cqsjjb/jjb-common-lib';
 import { Dropdown, Space } from 'antd';
-export default function TableAction({
+import { EllipsisOutlined } from '@ant-design/icons';
+function TableAction({
   maximum = 3,
   children,
   space,
+  enabledIcon = true,
   placement = 'bottomRight',
   // 下拉菜单位置，默认 bottomRight
   trigger = ['hover'] // 下拉触发方式，默认 hover
 }) {
   // 将 children 统一成数组并过滤空值
-  const childArray = (tools.isArray(children) ? children : [].concat(children)).filter(Boolean);
+  const childArray = (Array.isArray(children) ? children : [].concat(children)).filter(Boolean);
   const showArray = childArray.slice(0, maximum);
   const hideArray = childArray.slice(maximum);
   return /*#__PURE__*/React.createElement(Space, {
@@ -22,7 +23,9 @@ export default function TableAction({
         label: child
       }))
     },
-    placement: placement,
-    trigger: trigger
-  }, /*#__PURE__*/React.createElement("a", null, "\u66F4\u591A")));
-}
+    trigger: trigger,
+    placement: placement
+  }, /*#__PURE__*/React.createElement("a", null, enabledIcon ? /*#__PURE__*/React.createElement(EllipsisOutlined, null) : /*#__PURE__*/React.createElement("span", null, "\u66F4\u591A"))));
+}
+TableAction.displayName = 'TableAction';
+export default TableAction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cqsjjb/jjb-react-admin-component",
-  "version": "3.3.9",
+  "version": "3.3.11",
   "description": "jjb-react-admin-组件库@new",
   "main": "index.js",
   "author": "jjb-front-team",
@@ -13,12 +13,10 @@
     "@ant-design/pro-layout": "latest",
     "@cqsjjb-formily/renderer": "latest",
     "@wangeditor-next/editor": "latest",
-    "axios": "^1.6.5",
     "cropperjs": "^1.6.2",
     "lodash": "^4.17.21",
     "react-cropper": "2.3.3",
     "spark-md5": "^3.0.2",
-    "styled-components": "^6.1.19",
-    "use-antd-resizable-header": "latest"
+    "styled-components": "^6.1.19"
   }
 }

package/tools/index.js

@@ -71,7 +71,7 @@ export function isHttpUrl(v) {
  * @return {string}
  */
 export function getPrefixCls() {
-  return window.process?.env?.app?.antd['ant-prefix'] || 'ant';
+  return process?.env?.app?.antd['ant-prefix'] || 'ant';
 }
 export function getAlgorithm() {
   const value = document.documentElement.style.getPropertyValue(