@cqsjjb/jjb-react-admin-component 3.3.13 → 3.3.15

package/AdaptiveTree/index.js

@@ -1,45 +1,45 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-/**
- * 自适应树组件
- * @param {Object} props - 组件属性
- * @param {Function} [props.titleAction] - 节点操作按钮生成函数
- *   @param {Object} node - 当前节点数据
- *   @returns {Array} 操作按钮配置数组，每项包含：
- *     @property {ReactNode} content - 按钮内容（文本或元素）
- *     @property {Function} onClick - 点击事件回调
- * @param {Function} [props.titleIcon] - 节点标题图标生成函数
- *   @param {Object} node - 当前节点数据
- *   @returns {ReactNode} 图标元素（如 img、Icon 组件等）
- * 
- * @note 说明：
- * 1. 自动继承全局 Ant Design 前缀配置（window.process.env.app.antd['ant-prefix']）
- * 2. 节点容器默认占满父元素空间，支持纵向滚动
- * 3. 节点标题超长自动换行，且不会挤压标题图标和操作图标的空间
- * 4. 节点选中时，返回的节点数据为当前节点及其所有父节点id（二维数组）、选中的节点数据（一维数组）
- * 
- * @example
- * <AdaptiveTree
- *     treeData={[]}
- *     fieldNames={{
- *         title: 'name',
- *         key: 'id'
- *     }}
- *     titleAction={(node) => [
- *      {
- *         content: '添加',
- *         onClick: (node) => {
- *             console.warn("添加", node)
- *         }
- *      },
- *      {
- *         content: '编辑',
- *         onClick: (node) => {
- *             console.warn("编辑", node)
- *         }
- *      }
- *     ]}
- *     titleIcon={(node) => <FolderOpenOutlined />}
- * />
+/**
+ * 自适应树组件
+ * @param {Object} props - 组件属性
+ * @param {Function} [props.titleAction] - 节点操作按钮生成函数
+ *   @param {Object} node - 当前节点数据
+ *   @returns {Array} 操作按钮配置数组，每项包含：
+ *     @property {ReactNode} content - 按钮内容（文本或元素）
+ *     @property {Function} onClick - 点击事件回调
+ * @param {Function} [props.titleIcon] - 节点标题图标生成函数
+ *   @param {Object} node - 当前节点数据
+ *   @returns {ReactNode} 图标元素（如 img、Icon 组件等）
+ * 
+ * @note 说明：
+ * 1. 自动继承全局 Ant Design 前缀配置（window.process.env.app.antd['ant-prefix']）
+ * 2. 节点容器默认占满父元素空间，支持纵向滚动
+ * 3. 节点标题超长自动换行，且不会挤压标题图标和操作图标的空间
+ * 4. 节点选中时，返回的节点数据为当前节点及其所有父节点id（二维数组）、选中的节点数据（一维数组）
+ * 
+ * @example
+ * <AdaptiveTree
+ *     treeData={[]}
+ *     fieldNames={{
+ *         title: 'name',
+ *         key: 'id'
+ *     }}
+ *     titleAction={(node) => [
+ *      {
+ *         content: '添加',
+ *         onClick: (node) => {
+ *             console.warn("添加", node)
+ *         }
+ *      },
+ *      {
+ *         content: '编辑',
+ *         onClick: (node) => {
+ *             console.warn("编辑", node)
+ *         }
+ *      }
+ *     ]}
+ *     titleIcon={(node) => <FolderOpenOutlined />}
+ * />
  */
 import React, { useState } from 'react';
 import { Tree, Space } from "antd";
@@ -162,22 +162,21 @@ export default props => {
       key: node[key]
     }, /*#__PURE__*/React.createElement("div", {
       className: "title-left"
-    }, titleIcon ? /*#__PURE__*/React.createElement("div", {
+    }, titleIcon && /*#__PURE__*/React.createElement("div", {
       className: "icon"
-    }, titleIcon(node)) : '', /*#__PURE__*/React.createElement("span", {
+    }, titleIcon(node)), /*#__PURE__*/React.createElement("span", {
       style: {
         marginLeft: 6
       }
-    }, node[title])), /*#__PURE__*/React.createElement(Space, null, titleAction ? (titleAction(node) || []).map(item => {
-      return /*#__PURE__*/React.createElement("div", {
-        onClick: e => {
-          e.stopPropagation();
-          e.preventDefault();
-          item.onClick && item.onClick(node);
-        },
-        className: "operation"
-      }, item?.content || '');
-    }) : ''));
+    }, node[title])), /*#__PURE__*/React.createElement(Space, null, titleAction && (titleAction(node) || []).map((item, index) => /*#__PURE__*/React.createElement("div", {
+      key: index,
+      onClick: e => {
+        e.stopPropagation();
+        e.preventDefault();
+        item.onClick && item.onClick(node);
+      },
+      className: "operation"
+    }, item?.content || ''))));
   };
   const onExpand = keys => {
     setExpandedKeys(keys);

package/ControlWrapper/index.js

@@ -2,10 +2,10 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
 import React from 'react';
 import { Input as OriginInput, Select as OriginSelect, Cascader as OriginCascader, DatePicker as OriginDatePicker, TreeSelect as OriginTreeSelect } from 'antd';
 
-/**
- * 通用包裹组件
- * @param {*} WrappedComponent antd 原生组件
- * @param {*} extraProps 额外的透传配置
+/**
+ * 通用包裹组件
+ * @param {*} WrappedComponent antd 原生组件
+ * @param {*} extraProps 额外的透传配置
  */
 function withLabel(WrappedComponent, extraProps = {}) {
   return function Wrapper(props) {

package/Editor/index.js

@@ -4,8 +4,8 @@ import { message } from 'antd';
 import { http, tools } from '@cqsjjb/jjb-common-lib';
 import { createEditor, createToolbar } from '@wangeditor-next/editor';
 
-/**
- * 工具函数：标准化 HTML 内容为空值
+/**
+ * 工具函数：标准化 HTML 内容为空值
  */
 function normalizeEmptyHtml(html) {
   if (!html) return '';
@@ -13,8 +13,8 @@ function normalizeEmptyHtml(html) {
   return cleaned === '<p><br></p>' || cleaned === '<p></p>' || cleaned === '' ? '' : html;
 }
 
-/**
- * 校验上传文件类型和大小
+/**
+ * 校验上传文件类型和大小
  */
 function validateFile(file, {
   validTypes,
@@ -34,8 +34,8 @@ function validateFile(file, {
   return true;
 }
 
-/**
- * 通用上传函数
+/**
+ * 通用上传函数
  */
 async function handleUpload(file, insertFn, options) {
   const {

package/FileUploader/index.js

@@ -19,9 +19,9 @@ class FileUploader extends React.Component {
   };
   inputFile = /*#__PURE__*/React.createRef();
 
-  /**
-   * @description http配置
-   * @returns {{headers: object, fieldName: string, data: object, action: string, url: string}}
+  /**
+   * @description http配置
+   * @returns {{headers: object, fieldName: string, data: object, action: string, url: string}}
    */
   get httpConfig() {
     const {
@@ -46,9 +46,9 @@ class FileUploader extends React.Component {
     };
   }
 
-  /**
-   * @description 填充值
-   * @returns {string[]}
+  /**
+   * @description 填充值
+   * @returns {string[]}
    */
   get value() {
     const {
@@ -57,9 +57,9 @@ class FileUploader extends React.Component {
     return Array.isArray(value) ? value : value ? [value] : [];
   }
 
-  /**
-   * @description 获取禁用状态
-   * @return {boolean}
+  /**
+   * @description 获取禁用状态
+   * @return {boolean}
    */
   get disabled() {
     const {
@@ -78,11 +78,11 @@ class FileUploader extends React.Component {
     }
   }
 
-  /**
-   * @description 验证文件类型
-   * @param fileType {string}
-   * @param accept {string}
-   * @returns {Promise<never>|Promise<void>}
+  /**
+   * @description 验证文件类型
+   * @param fileType {string}
+   * @param accept {string}
+   * @returns {Promise<never>|Promise<void>}
    */
   verifyFileAccept(fileType, accept) {
     const {
@@ -110,11 +110,11 @@ class FileUploader extends React.Component {
     }
   }
 
-  /**
-   * @description 验证文件大小
-   * @param fileSize {number}
-   * @param maxSize {number}
-   * @returns {Promise<never>|Promise<void>}
+  /**
+   * @description 验证文件大小
+   * @param fileSize {number}
+   * @param maxSize {number}
+   * @returns {Promise<never>|Promise<void>}
    */
   verifyFileSize(fileSize, maxSize) {
     const {
@@ -137,10 +137,10 @@ class FileUploader extends React.Component {
     }
   }
 
-  /**
-   * @description 发起上传请求
-   * @param file {File}
-   * @returns {Promise<{url: string, fileName: string, respDesc: string}>}
+  /**
+   * @description 发起上传请求
+   * @param file {File}
+   * @returns {Promise<{url: string, fileName: string, respDesc: string}>}
    */
   onFormRequest(file) {
     const {
@@ -196,9 +196,9 @@ class FileUploader extends React.Component {
     });
   }
 
-  /**
-   * @description 回调
-   * @param value {string}
+  /**
+   * @description 回调
+   * @param value {string}
    */
   onChange(value) {
     const {
@@ -207,17 +207,17 @@ class FileUploader extends React.Component {
     onChange && onChange(value || undefined);
   }
 
-  /**
-   * @description 删除
-   * @param sup {number}
+  /**
+   * @description 删除
+   * @param sup {number}
    */
   onDelete(sup) {
     this.onChange(this.props.multiple ? this.value.filter((_, sub) => sub !== sup) : undefined);
   }
 
-  /**
-   * @description 上传
-   * @param target {{files: FileList, value: any}}
+  /**
+   * @description 上传
+   * @param target {{files: FileList, value: any}}
    */
   onUpload({
     target

package/FormilyDescriptions/index.js

@@ -1,18 +1,14 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-import React, { useState, useEffect, Fragment } from 'react';
+import React from 'react';
 import { tools } from '@cqsjjb/jjb-common-lib';
 import { FileOutlined, LinkOutlined } from '@ant-design/icons';
-import { Modal, Descriptions, Empty, Image, Tooltip, Spin, Table, Space, TreeSelect } from 'antd';
+import { Modal, Descriptions, Empty, Image, Tooltip, Spin, Table, Space } from 'antd';
 const formilyItemMargin = new Map([['small', 8], ['middle', 12], ['default', 16]]);
 const IS_PDF_REG = /\.pdf$/;
 const IS_VIDEO_REG = /\.(mp4|ogg|mkv|webm)$/;
-export default function FormilyDescriptions({
-  schema,
-  values,
-  ...props
-}) {
-  const [regions, setRegions] = useState([]);
-  useEffect(() => {
+export default function FormilyDescriptions(props) {
+  const [regions, setRegions] = React.useState([]);
+  React.useEffect(() => {
     fetch(`${window.process.env.app.API_HOST}/system/operation/regions`, {
       headers: {
         token: sessionStorage.token
@@ -20,49 +16,43 @@ export default function FormilyDescriptions({
     }).then(res => res.json()).then(res => {
       if (res.success) {
         setRegions(res.data);
-        props.onLoad && props.onLoad();
       }
     });
   }, []);
-  const dataSource = tools.getDynamicFormilyFields(schema, values, {
+  const dataSource = tools.getDynamicFormilyFields(props.schema, props.values, {
     regions
   });
-  if (!dataSource.length) return /*#__PURE__*/React.createElement(Empty, {
+  return dataSource.length === 0 ? /*#__PURE__*/React.createElement(Empty, {
     image: Empty.PRESENTED_IMAGE_SIMPLE
-  });
-  return /*#__PURE__*/React.createElement(DescriptionsRender, _extends({
+  }) : /*#__PURE__*/React.createElement(DescriptionsRender, _extends({
     dataSource: dataSource
   }, props));
 }
-export function DescriptionsRender({
-  dataSource,
-  size = 'default',
-  ...props
-}) {
-  return dataSource.map((item, index) => {
-    const isLast = index === dataSource.length - 1;
-    const marginBottom = isLast ? 0 : formilyItemMargin.get(size);
-    const items = item.fromComponentEnum === 'GRID_FORM' ? item.children.map((child, childIndex) => ({
-      key: childIndex,
-      span: child.formType === 'Table' ? props.column : 1,
-      label: child.name,
-      children: /*#__PURE__*/React.createElement(ItemRender, _extends({
-        data: child
-      }, props))
-    })) : [{
-      key: 1,
-      label: item.name,
-      children: /*#__PURE__*/React.createElement(ItemRender, _extends({
-        data: item
-      }, props))
-    }];
+function DescriptionsRender(props) {
+  return props.dataSource.map((item, index) => {
+    const isLast = index === props.dataSource.length - 1;
     return /*#__PURE__*/React.createElement(Descriptions, {
       key: index,
-      size: size,
+      size: props.size,
       style: {
-        marginBottom
+        marginBottom: isLast ? 0 : formilyItemMargin.get(props.size || 'default')
       },
-      items: items,
+      items: item.fromComponentEnum === 'GRID_FORM' ? item.children.map((child, childIndex) => {
+        return {
+          key: childIndex,
+          span: child.formType === 'Table' ? props.column : 1,
+          label: child.name,
+          children: /*#__PURE__*/React.createElement(ItemRender, _extends({
+            data: child
+          }, props))
+        };
+      }) : [{
+        key: 1,
+        label: item.name,
+        children: /*#__PURE__*/React.createElement(ItemRender, _extends({
+          data: item
+        }, props))
+      }],
       colon: props.colon,
       title: props.title,
       extra: props.extra,
@@ -73,67 +63,69 @@ export function DescriptionsRender({
     });
   });
 }
-export function ItemRender({
-  data,
-  imageWidth,
-  imageHeight,
-  imagePreview,
-  extraFileLink,
-  ...props
-}) {
-  const [open, setOpen] = useState(false);
-  const [previewUrl, setPreviewUrl] = useState('');
-  const handlePreview = url => {
-    setPreviewUrl(url);
-    setOpen(true);
-  };
-  const renderContent = () => {
-    const systemStyle = props.systemStyle ? props.systemStyle(data.fieldCode) : {};
-    if (tools.isArray(data.value)) {
-      if (tools.isStringArray(data.value) || tools.isNumberArray(data.value)) {
-        return /*#__PURE__*/React.createElement("div", {
-          style: systemStyle
-        }, data.value.join('、'));
-      }
-      if (tools.isObjectArray(data.value)) {
-        return data.formType === 'Table' ? /*#__PURE__*/React.createElement(RenderTable, {
-          columns: data.tableColumns,
-          dataSource: data.value,
-          imageWidth: imageWidth,
-          imageHeight: imageHeight,
-          imagePreview: imagePreview,
-          extraFileLink: extraFileLink,
-          onPreview: handlePreview,
-          systemStyle: systemStyle
-        }) : data.value.map((file, index) => /*#__PURE__*/React.createElement(RenderFileItem, {
-          key: index,
-          url: file.url,
-          name: file.name,
-          isImage: file.isImage,
-          imageWidth: imageWidth,
-          imageHeight: imageHeight,
-          imagePreview: imagePreview,
-          extraFileLink: extraFileLink,
-          onPreview: () => handlePreview(file.url),
-          systemStyle: systemStyle
-        }));
-      }
-      return tools.textPlaceholder();
+function ItemRender(props) {
+  const [open, setOpen] = React.useState(false);
+  const [previewUrl, setPreviewUrl] = React.useState('');
+  const {
+    data,
+    imageWidth,
+    imageHeight,
+    imagePreview,
+    extraFileLink
+  } = props;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, tools.isArray(data.value)
+  // 如果数据是字符串集合 或 数字集合
+  ? tools.isStringArray(data.value) || tools.isNumberArray(data.value)
+  // 直接字符串拼接
+  ? data.value.join('、')
+  // 如果是对象集合
+  : tools.isObjectArray(data.value)
+  // 如果数据表单类型是 数据表格
+  ? data.formType === 'Table'
+  // 处理数据表格
+  ? /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: '100%'
     }
-    return /*#__PURE__*/React.createElement(RenderText, {
-      name: data.name,
-      value: data.value,
-      maxTagCount: props.maxTagCount,
-      renderItemText: props.renderItemText,
-      systemStyle: systemStyle
-    });
-  };
-  return /*#__PURE__*/React.createElement(Fragment, null, renderContent(), /*#__PURE__*/React.createElement(Modal, {
+  }, /*#__PURE__*/React.createElement(RenderTable, {
+    columns: data.tableColumns,
+    dataSource: data.value,
+    imageWidth: imageWidth,
+    imageHeight: imageHeight,
+    imagePreview: imagePreview,
+    extraFileLink: extraFileLink,
+    onPreview: url => {
+      setOpen(true);
+      setPreviewUrl(url);
+    }
+  }))
+
+  // 否则就是文件数据
+  : /*#__PURE__*/React.createElement("div", null, data.value.map((file, index) => /*#__PURE__*/React.createElement(RenderFileItem, {
+    key: index,
+    url: file.url,
+    name: file.name,
+    isImage: file.isImage,
+    imageWidth: imageWidth,
+    imageHeight: imageHeight,
+    imagePreview: imagePreview,
+    extraFileLink: extraFileLink,
+    onPreview: () => {
+      setOpen(true);
+      setPreviewUrl(file.url);
+    }
+  }))) : tools.textPlaceholder()
+  // 处理文本数据
+  : /*#__PURE__*/React.createElement(RenderText, {
+    name: data.name,
+    value: data.value,
+    renderItemText: props.renderItemText
+  }), /*#__PURE__*/React.createElement(Modal, {
     destroyOnClose: true,
     title: "\u67E5\u770B\u6587\u4EF6",
     open: open,
     width: 1100,
-    footer: null,
+    footer: false,
     onCancel: () => setOpen(false)
   }, IS_PDF_REG.test(previewUrl) && /*#__PURE__*/React.createElement("embed", {
     src: previewUrl,
@@ -143,120 +135,126 @@ export function ItemRender({
     controls: true,
     src: previewUrl,
     width: "100%",
-    height: 350
+    height: "350"
   })));
 }
-export function RenderText({
-  value,
-  name,
-  maxTagCount = 1,
-  renderItemText,
-  systemStyle
-}) {
-  const [text, setText] = useState();
-  const [options, setOptions] = useState([]);
-  const [loading, setLoading] = useState(false);
-  useEffect(() => {
-    if (!value) return;
-    if (value.load) {
-      setLoading(true);
-      value.load().then(res => res.json()).then(res => {
-        if (res.success) {
-          setOptions(res.data);
-          setText(value?.selected?.map(i => `${i.key}&${i.label}`));
-        }
-        setLoading(false);
-      });
-    } else {
-      setText(value);
+function RenderText(props) {
+  const {
+    value
+  } = props;
+  const [text, setText] = React.useState();
+  const [loading, setLoading] = React.useState(false);
+  const getVal = item => item?.value ?? item?.key ?? item?.id ?? item?.code ?? item?.bizTypeCode ?? item?.classificationCode ?? '';
+  const getLab = item => item?.label ?? item?.name ?? item?.title ?? item?.bizTypeName ?? item?.classificationName ?? '';
+  const getSelectedDisplayValue = item => {
+    const val = getVal(item);
+    const lab = getLab(item);
+    return val && lab ? `${val}&${lab}` : lab || val || '';
+  };
+  const findInTree = (nodes, id) => {
+    if (!Array.isArray(nodes)) return null;
+    for (const node of nodes) {
+      const val = getVal(node);
+      if (val === id || String(val) === String(id)) return node;
+      if (node.children) {
+        const found = findInTree(node.children, id);
+        if (found) return found;
+      }
     }
-  }, [value]);
-  if (Array.isArray(text)) {
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        gap: 6,
-        width: '100%',
-        display: 'flex',
-        minHeight: 22,
-        flexDirection: 'column',
-        ...systemStyle
+    return null;
+  };
+  const toDisplayLabels = displayArr => {
+    return (displayArr || []).map(s => typeof s === 'string' && s.includes('&') ? s.split('&').pop() : s).filter(Boolean).join('、') || tools.textPlaceholder();
+  };
+  React.useEffect(() => {
+    if (value) {
+      if (value.load) {
+        setLoading(true);
+        value.load().then(res => res.json()).then(res => {
+          try {
+            if (res.success) {
+              const rawData = res.data || [];
+              let displayText = [];
+              const rawSelected = value?.selected ?? value?.value;
+              const selected = tools.isArray(rawSelected) ? rawSelected : rawSelected !== undefined && rawSelected !== null && rawSelected !== '' ? [rawSelected] : [];
+              if (selected.length > 0) {
+                const isIdArray = selected.every(s => tools.isNumber(s) || tools.isString(s));
+                if (isIdArray) {
+                  displayText = selected.map(id => {
+                    const matched = findInTree(rawData, id);
+                    return matched ? getSelectedDisplayValue(matched) : String(id);
+                  }).filter(Boolean);
+                } else {
+                  displayText = selected.map(getSelectedDisplayValue).filter(Boolean);
+                }
+              }
+              setText(displayText);
+            }
+          } finally {
+            setLoading(false);
+          }
+        }).catch(() => setLoading(false));
+      } else {
+        setText(value);
       }
-    }, /*#__PURE__*/React.createElement(Spin, {
-      spinning: loading
-    }, /*#__PURE__*/React.createElement(TreeSelect, {
-      treeCheckable: true,
-      treeDefaultExpandAll: true,
-      style: {
-        width: '100%'
-      },
-      value: text,
-      variant: "borderless",
-      treeData: options,
-      showSearch: false,
-      maxTagCount: maxTagCount
-    })));
-  }
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      ...systemStyle
     }
-  }, renderItemText ? renderItemText({
-    text,
-    name
-  }) : tools.textPlaceholder(text));
-}
-export function RenderFileItem(props) {
-  const {
-    isImage,
-    url,
-    name,
-    imageWidth,
-    imageHeight,
-    imagePreview,
-    extraFileLink,
-    onPreview,
-    systemStyle
-  } = props;
-  return isImage ? /*#__PURE__*/React.createElement(RenderImage, {
-    url: url,
-    imageWidth: imageWidth,
-    imageHeight: imageHeight,
-    imagePreview: imagePreview,
-    extraFileLink: extraFileLink,
-    systemStyle: systemStyle
-  }) : /*#__PURE__*/React.createElement(Tooltip, {
-    title: url
+  }, [props.value]);
+  return Array.isArray(text) ? /*#__PURE__*/React.createElement(Spin, {
+    spinning: loading
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      ...systemStyle
+      width: '100%',
+      wordBreak: 'break-word',
+      whiteSpace: 'normal'
     }
-  }, IS_PDF_REG.test(url) || IS_VIDEO_REG.test(url) ? /*#__PURE__*/React.createElement(RenderValidFile, {
-    url: url,
-    name: name,
-    onPreview: onPreview,
-    extraFileLink: extraFileLink
-  }) : /*#__PURE__*/React.createElement(RenderInvalidFile, {
-    url: url,
-    name: name
-  })));
+  }, toDisplayLabels(text))) : props.renderItemText ? props.renderItemText({
+    text,
+    name: props.name
+  }) : tools.textPlaceholder(text);
 }
-export function RenderImage({
+function RenderFileItem({
   url,
+  name,
+  isImage,
   imageWidth,
   imageHeight,
   imagePreview,
   extraFileLink,
-  systemStyle
+  onPreview
+}) {
+  if (isImage) {
+    return /*#__PURE__*/React.createElement(RenderImage, {
+      url: url,
+      imageWidth: imageWidth,
+      imageHeight: imageHeight,
+      imagePreview: imagePreview,
+      extraFileLink: extraFileLink
+    });
+  } else {
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      title: url
+    }, IS_PDF_REG.test(url) || IS_VIDEO_REG.test(url) ? /*#__PURE__*/React.createElement(RenderValidFile, {
+      url: url,
+      name: name,
+      onPreview: onPreview
+    }) : /*#__PURE__*/React.createElement(RenderInvalidFile, {
+      url: url,
+      name: name
+    }));
+  }
+}
+function RenderImage({
+  url,
+  imageWidth,
+  imageHeight,
+  imagePreview,
+  extraFileLink
 }) {
   return /*#__PURE__*/React.createElement("span", {
     style: {
       display: 'inline-block',
       marginRight: 4,
-      marginBottom: 4,
-      ...(systemStyle ? {
-        ...systemStyle,
-        border: `1px solid ${systemStyle?.color || '#d9d9d9'}`
-      } : {})
+      marginBottom: 4
     }
   }, /*#__PURE__*/React.createElement(Image, {
     src: url,
@@ -264,83 +262,89 @@ export function RenderImage({
     height: imageHeight || 64,
     preview: extraFileLink ? {
       visible: false,
-      onVisibleChange: () => window.open(url)
+      onVisibleChange: () => {
+        window.open(url);
+      }
     } : imagePreview
   }));
 }
-export function RenderValidFile({
+function RenderValidFile({
   url,
   name,
   extraFileLink,
   onPreview
 }) {
-  const handleClick = () => extraFileLink ? window.open(url) : onPreview();
   return /*#__PURE__*/React.createElement("a", {
     style: {
       gap: 4,
       display: 'flex',
       alignItems: 'center'
     },
-    onClick: handleClick
+    onClick: () => {
+      if (extraFileLink) {
+        window.open(url);
+      } else {
+        onPreview();
+      }
+    }
   }, /*#__PURE__*/React.createElement(FileOutlined, null), name);
 }
-export function RenderInvalidFile({
+function RenderInvalidFile({
   url,
   name
 }) {
   return /*#__PURE__*/React.createElement("a", {
     href: url,
-    target: "_blank",
     style: {
       gap: 4,
       display: 'flex',
       alignItems: 'center'
-    }
+    },
+    target: "_blank"
   }, /*#__PURE__*/React.createElement(LinkOutlined, null), name);
 }
-export function RenderTable({
+function RenderTable({
   columns,
   dataSource,
   imageWidth,
   imageHeight,
   imagePreview,
   extraFileLink,
-  onPreview,
-  systemStyle
+  onPreview
 }) {
-  const renderColumn = col => {
-    const originalRender = col.render;
-    col.render = row => {
-      if (tools.isNumberArray(row) || tools.isStringArray(row)) {
-        return /*#__PURE__*/React.createElement("div", {
-          style: systemStyle
-        }, row.join(','));
-      }
-      if (tools.isUploadFileListArray(row)) {
-        return /*#__PURE__*/React.createElement(Space, {
-          direction: "vertical"
-        }, tools.getDynamicUploadFileList(row).map((file, index) => /*#__PURE__*/React.createElement(RenderFileItem, {
-          key: index,
-          url: file.url,
-          name: file.name,
-          isImage: file.isImage,
-          imageWidth: imageWidth,
-          imageHeight: imageHeight,
-          imagePreview: imagePreview,
-          extraFileLink: extraFileLink,
-          onPreview: () => onPreview(file.url),
-          systemStyle: systemStyle
-        })));
-      }
-      if (tools.isObject(row)) return '数据错误';
-      return originalRender ? originalRender(row) : row;
-    };
-    return col;
-  };
   return /*#__PURE__*/React.createElement(Table, {
     rowKey: (record, index) => index,
-    columns: columns.map(renderColumn),
-    dataSource: dataSource,
-    style: systemStyle
+    columns: columns.map(item => {
+      item.render = row => {
+        if (tools.isNumberArray(row) || tools.isStringArray(row)) {
+          return row?.join(',');
+        }
+        if (tools.isUploadFileListArray(row)) {
+          return /*#__PURE__*/React.createElement(Space, {
+            direction: "vertical"
+          }, tools.getDynamicUploadFileList(row).map((file, index) => {
+            return /*#__PURE__*/React.createElement(RenderFileItem, {
+              key: index,
+              url: file.url,
+              name: file.name,
+              isImage: file.isImage,
+              imageWidth: imageWidth,
+              imageHeight: imageHeight,
+              imagePreview: imagePreview,
+              extraFileLink: extraFileLink,
+              onPreview: () => {
+                onPreview(file.url);
+              }
+            });
+          }));
+        }
+        if (tools.isObject(row)) {
+          return '数据错误';
+        }
+        return row;
+      };
+      return item;
+    }),
+    dataSource: dataSource
   });
 }

package/ListDataContainer/index.js

@@ -5,45 +5,45 @@ import { isEqual } from 'lodash';
 import SearchForm from '@cqsjjb/jjb-react-admin-component/SearchForm';
 import ProTable from '@cqsjjb/jjb-react-admin-component/Table';
 
-/**
- * @component ListDataContainer
- * @description 通用列表数据容器组件，提供搜索表单、数据表格、分页等功能的完整列表页面解决方案
- * 
- * @props {Array} columns - 表格列配置，遵循Ant Design Table组件的columns规范
- * @props {Function} fetchDataApi - 数据获取API函数，接收分页和搜索参数，返回包含list和total的对象
- * @props {Array} searchFormConfig - 搜索表单配置数组
- *   @param {React.Component} searchFormConfig[].field - 表单项组件(如ControlWrapper.Select)
- *   @param {string} searchFormConfig[].name - 表单项字段名
- *   @param {string} searchFormConfig[].label - 表单项标签
- *   @param {Object} searchFormConfig[].fieldProps - 传递给字段组件的属性
- *   @param {Object} searchFormConfig[].itemProps - 传递给Form.Item的属性
- *   @param {React.ReactNode} searchFormConfig[].content - 字段组件的子元素(如Select.Option列表)
- *   @param {boolean} searchFormConfig[].required - 是否必填
- * @props {string} rowKey - 表格行键值，默认为'id'
- * @props {Object} initialPagination - 初始分页配置，包含current、pageSize等分页属性
- * @props {Object} tableProps - 传递给Table组件的属性
- * @props {Object} searchFormProps - 传递给SearchForm组件的属性
- * @props {boolean} proTable - 是否使用ProTable组件，默认为false
- * @example
- * // 基础用法
- * <ListDataContainer
- *   columns={tableColumns}
- *   fetchDataApi={getCourseList}
- *   searchFormConfig={[
- *     {
- *       field: Select,
- *       name: 'status',
- *       label: '状态',
- *     }
- *     {
- *       field: Input,
- *       name: 'name',
- *       label: '名称',
- *       required: true,
- *     }
- *   ]}
- * />
- * 
+/**
+ * @component ListDataContainer
+ * @description 通用列表数据容器组件，提供搜索表单、数据表格、分页等功能的完整列表页面解决方案
+ * 
+ * @props {Array} columns - 表格列配置，遵循Ant Design Table组件的columns规范
+ * @props {Function} fetchDataApi - 数据获取API函数，接收分页和搜索参数，返回包含list和total的对象
+ * @props {Array} searchFormConfig - 搜索表单配置数组
+ *   @param {React.Component} searchFormConfig[].field - 表单项组件(如ControlWrapper.Select)
+ *   @param {string} searchFormConfig[].name - 表单项字段名
+ *   @param {string} searchFormConfig[].label - 表单项标签
+ *   @param {Object} searchFormConfig[].fieldProps - 传递给字段组件的属性
+ *   @param {Object} searchFormConfig[].itemProps - 传递给Form.Item的属性
+ *   @param {React.ReactNode} searchFormConfig[].content - 字段组件的子元素(如Select.Option列表)
+ *   @param {boolean} searchFormConfig[].required - 是否必填
+ * @props {string} rowKey - 表格行键值，默认为'id'
+ * @props {Object} initialPagination - 初始分页配置，包含current、pageSize等分页属性
+ * @props {Object} tableProps - 传递给Table组件的属性
+ * @props {Object} searchFormProps - 传递给SearchForm组件的属性
+ * @props {boolean} proTable - 是否使用ProTable组件，默认为false
+ * @example
+ * // 基础用法
+ * <ListDataContainer
+ *   columns={tableColumns}
+ *   fetchDataApi={getCourseList}
+ *   searchFormConfig={[
+ *     {
+ *       field: Select,
+ *       name: 'status',
+ *       label: '状态',
+ *     }
+ *     {
+ *       field: Input,
+ *       name: 'name',
+ *       label: '名称',
+ *       required: true,
+ *     }
+ *   ]}
+ * />
+ * 
  */
 
 const SELECT_COMPONENTS = ['Select', 'TreeSelect', 'Cascader', 'DatePicker', 'TimePicker', 'Checkbox', 'Radio', 'Switch', 'Slider', 'Upload'];
@@ -76,10 +76,10 @@ const ListDataContainer = /*#__PURE__*/forwardRef(({
     return Component.displayName || Component.constructor.name;
   };
 
-  /**
-   * 数据加载与刷新方法
-   * @param {Object} [overrideParams={}] - 可选，用于覆盖内部参数的键值对
-   *   若传入，会覆盖同名的表单参数和分页参数（如page、pageSize或搜索字段）
+  /**
+   * 数据加载与刷新方法
+   * @param {Object} [overrideParams={}] - 可选，用于覆盖内部参数的键值对
+   *   若传入，会覆盖同名的表单参数和分页参数（如page、pageSize或搜索字段）
    */
   const loadDataSource = useCallback(async (overrideParams = {}) => {
     if (!fetchDataApi) return;
@@ -250,6 +250,10 @@ const ListDataContainer = /*#__PURE__*/forwardRef(({
     }).filter(Boolean);
   };
   const TableComponent = proTable ? ProTable : Table;
+  const {
+    scroll,
+    ...restTableProps
+  } = tableProps;
   return /*#__PURE__*/React.createElement("div", {
     ref: containerRef,
     style: {
@@ -288,12 +292,6 @@ const ListDataContainer = /*#__PURE__*/forwardRef(({
       y: tableScrollY !== undefined ? tableScrollY : tableProps.scroll?.y || undefined
     },
     bordered: true
-  }, (() => {
-    const {
-      scroll,
-      ...restTableProps
-    } = tableProps;
-    return restTableProps;
-  })()))));
+  }, restTableProps))));
 });
 export default ListDataContainer;

package/PhoneBox/index.js

@@ -173,9 +173,9 @@ export default props => {
       className: "qrcode-preview-container"
     }, /*#__PURE__*/React.createElement(QRCode, {
       value: qrcodeUrl
-    }), isQrcodeExpire ? /*#__PURE__*/React.createElement("div", {
+    }), isQrcodeExpire && /*#__PURE__*/React.createElement("div", {
       className: "qrcode-preview-container-expire-mask"
-    }, "\u4E8C\u7EF4\u7801\u8FC7\u671F") : '', /*#__PURE__*/React.createElement("div", {
+    }, "\u4E8C\u7EF4\u7801\u8FC7\u671F"), /*#__PURE__*/React.createElement("div", {
       className: "qrcode-preview-container-text"
     }, "\u4E34\u65F6\u9884\u89C8\uFF0C", qrcodeExpireTime ? `${qrcodeExpireTime}分钟后失效` : '已失效'), /*#__PURE__*/React.createElement("a", {
       onClick: () => {

package/SearchForm/index.js

@@ -91,10 +91,10 @@ const SearchForm = ({
     onClick: handleToggle
   }, isOpen ? '收起' : '展开'));
 
-  /**
-   * 处理 formLine，确保所有 Form.Item 都有 noStyle 属性
-   * @param {ReactNode[]} nodes - 表单节点数组
-   * @returns {ReactNode[]} - 处理后的节点数组
+  /**
+   * 处理 formLine，确保所有 Form.Item 都有 noStyle 属性
+   * @param {ReactNode[]} nodes - 表单节点数组
+   * @returns {ReactNode[]} - 处理后的节点数组
    */
   const processFormLine = nodes => {
     return nodes.map(node => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cqsjjb/jjb-react-admin-component",
-  "version": "3.3.13",
+  "version": "3.3.15",
   "description": "jjb-react-admin-组件库-稳定版",
   "main": "index.js",
   "author": "jjb-front-team",