@vtx/components 4.0.0-beta.7 → 4.0.0-beta.70

package/es/vtx-icon/index.js1

@@ -0,0 +1,90 @@
+import { lazy, memo, Suspense, useMemo } from 'react';
+import AlignRightOutlined from './svg/alignRightOutlined.js';
+import ColumnHeightOutlined from './svg/columnHeightOutlined.js';
+import DownOutlined from './svg/downOutlined.js';
+import Fullscreen from './svg/fullscreen.js';
+import RedoOutlined from './svg/redoOutlined.js';
+import RightOutlined from './svg/rightOutlined.js';
+import SettingOutlined from './svg/settingOutlined.js';
+
+
+const iconComponents = {
+    alignRightOutlined: AlignRightOutlined,
+    columnHeightOutlined: ColumnHeightOutlined,
+    downOutlined: DownOutlined,
+    fullscreen: Fullscreen,
+    redoOutlined: RedoOutlined,
+    rightOutlined: RightOutlined,
+    settingOutlined: SettingOutlined,
+    // 低频图标如果确实需要，可以再考虑 lazy
+};
+
+// const iconComponents = {
+//     // 核心：添加你需要的所有图标， 动态导入有的组件会失败
+//     alignRightOutlined: lazy(() => import('./svg/alignRightOutlined.js')),
+//     columnHeightOutlined: lazy(() => import('./svg/columnHeightOutlined.js')),
+//     downOutlined: lazy(() => import('./svg/downOutlined.js')),
+//     fullscreen: lazy(() => import('./svg/fullscreen.js')),
+//     redoOutlined: lazy(() => import('./svg/redoOutlined.js')),
+//     rightOutlined: lazy(() => import('./svg/rightOutlined.js')),
+//     settingOutlined: lazy(() => import('./svg/settingOutlined.js')),
+//     // 新增其他图标...
+// };
+
+
+const VtxIcon = memo(({
+    type,
+    size = 16,
+    className = '',
+    style = {},
+    color,
+    fileType = 'webp',
+    ...props
+}) => {
+    const width = props.width || size;
+    const height = props.height || size;
+    if (!type) {
+        return null;
+    }
+    // const SvgComponent = useMemo(() => {
+    //     // 动态导入并缓存结果
+    //     return lazy(() => import(/* @vite-ignore */`./svg/${type}.js`));
+    // }, [type]);
+
+    const SvgComponent = useMemo(() => {
+        // 兜底：找不到对应图标时，返回一个空组件（避免报错）
+        return iconComponents[type] || lazy(() => Promise.resolve({ default: () => <svg width={width} height={height} /> }));
+    }, [type, width, height]);
+
+    // 默认返回空元素
+    if (fileType == 'svg') {
+        try {
+            // const SvgComponent = lazy(() => import(`./svg/${type}.js`));
+            return (
+                <Suspense fallback={<div style={{ width, height, ...style }} />}>
+                    <SvgComponent
+                        className={className}
+                        style={{ width, height, ...style }}
+                        fill={color}
+                        {...props}
+                    />
+                </Suspense>
+            );
+        } catch (error) {
+            // 如果动态导入失败，返回空的 SVG 元素
+            return (
+                <svg width={width} height={height} style={style} className={className} {...props} />
+            );
+        }
+    } else {
+        return (
+            // <img
+            //     src={require(`./assets/${type}.${fileType}`)}
+            //     style={{ width, height, ...style }}
+            // />
+            <></>
+        );
+    }
+});
+export { VtxIcon }
+export default VtxIcon;

package/es/vtx-image/Preview.js

@@ -22,15 +22,12 @@ var VIEWER = 'viewer';
 // 多张
 var GALLERY = 'gallery';
 function checkMode(x) {
-  var mode = '';
-  if (isObject(x)) {
-    mode = VIEWER;
-  }
   if (Array.isArray(x)) {
     var len = x.length;
-    mode = len == 0 ? '' : len == 1 ? VIEWER : GALLERY;
+    if (len === 0) return null;
+    return len === 1 ? VIEWER : GALLERY;
   }
-  return mode;
+  return isObject(x) ? VIEWER : null;
 }
 export default function Preview(props) {
   var _useState = useState(),
@@ -87,6 +84,9 @@ export default function Preview(props) {
     setContainer(container);
     setViewer(viewer);
     return function () {
+      if (container) {
+        container.innerHTML = '';
+      }
       viewer && viewer.destroy();
     };
   }, []);
@@ -96,6 +96,7 @@ export default function Preview(props) {
         container.innerHTML = '';
       }
       var mode = checkMode(photo);
+      if (!mode) return null;
       var newIndex = index;
       // 单张
       if (mode === VIEWER) {
@@ -126,6 +127,10 @@ export default function Preview(props) {
       }
       viewer.update();
       viewer.view(newIndex);
+    } else {
+      if (container) {
+        container.innerHTML = '';
+      }
     }
   }, [visible]);
   return /*#__PURE__*/_jsx(_Fragment, {});

package/es/vtx-image/style/index.js

@@ -20,7 +20,6 @@ var center = function center() {
 };
 var genVtxImageStyle = function genVtxImageStyle(token) {
   var componentCls = token.componentCls;
-  console.log('componentCls', componentCls);
   return _defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-aspectFit', {
     position: 'relative',
     height: '100%',

package/es/vtx-import/index.js

@@ -10,21 +10,25 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); }
 import React, { useRef, useEffect, useContext } from 'react';
-import { ConfigProvider, message, Button, Modal } from 'antd';
+import { message, Button, Tooltip } from 'antd';
 import PropTypes from 'prop-types';
 import useSet from "../utils/useSet";
 import VtxImportResult from "./result";
 import getToken from "../utils/getToken";
-var token = getToken();
 import md5 from 'md5';
 import { getVtxToken, getSignature } from '@vtx/utils';
-import classnames from 'classnames';
 import { useStyle } from "./style/index";
 import { VtxProvider, useIntl } from "../vtx-provider";
+import VtxModal from "../vtx-modal";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 function VtxImport(props) {
+  var token = getToken();
+  if (props.token) {
+    props.token, _readOnlyError("token");
+  }
   var intl = useIntl();
   var _useContext = useContext(VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
@@ -32,14 +36,19 @@ function VtxImport(props) {
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
+
+  // 用 useRef 管理 DOM 引用，而不是 state
+  var fileInputRef = useRef(null);
+  var iframeRef = useRef(null);
+  var formRef = useRef(null);
+
+  // 用于追踪当前 XHR 请求，方便取消
+  var xhrRef = useRef(null);
   var indexRef = useRef(0);
   var _useSet = useSet({
-      fileForm: null,
-      // form表单
-      fileInput: null,
-      // 保存上传的文件
-      iframe: null,
-      // form表单提交之后跳转的
+      // fileForm: null, // form表单
+      // fileInput: null, // 保存上传的文件
+      // iframe: null, // form表单提交之后跳转的
       useFormData: window.FormData ? true : false,
       // 是否查看
       uploading: false,
@@ -67,7 +76,8 @@ function VtxImport(props) {
       currentIndex: 0,
       chunkId: '',
       chunks: [],
-      operation: props.operation || intl.getMessage('import.operation', '导入')
+      operation: props.operation || intl.getMessage('import.operation', '导入'),
+      fileName: ''
     }),
     _useSet2 = _slicedToArray(_useSet, 2),
     state = _useSet2[0],
@@ -102,7 +112,7 @@ function VtxImport(props) {
       data.append('chunkNo', i + 1);
       data.append('chunkId', state.chunkId);
       data.append('tenantId', getVtxToken('tenantId'));
-      data.append('file', new File([e], state.fileInput.files[0].name));
+      data.append('file', new File([e], fileInputRef.current.files[0].name));
       dataArr.push(data);
     });
     uploadAsync(dataArr);
@@ -112,6 +122,7 @@ function VtxImport(props) {
   function uploadAsync(list) {
     if (indexRef.current < list.length) {
       var xhr = new XMLHttpRequest();
+      xhrRef.current = xhr;
       xhr.onload = function () {
         if (xhr.status === 200) {
           setState({
@@ -135,15 +146,27 @@ function VtxImport(props) {
   // 合并分片
   function mergeFile() {
     var xhr = new XMLHttpRequest();
+    xhrRef.current = xhr;
     // 当上传完成时调用
     xhr.onload = function () {
       if (xhr.status === 200) {
-        var res = JSON.parse(xhr.responseText);
-        if ((res === null || res === void 0 ? void 0 : res.result) == 0) {
+        var _res;
+        var res;
+        try {
+          res = JSON.parse(xhr.responseText);
+        } catch (e) {
+          message.error(intl.getMessage('import.error', '解析响应失败'));
+          setState({
+            uploading: false
+          });
+          return;
+        }
+        if (((_res = res) === null || _res === void 0 ? void 0 : _res.result) == 0) {
           message.success(intl.getMessage('import.success', '上传成功'));
           chunkUpload(res.data);
         } else {
-          message.error((res === null || res === void 0 ? void 0 : res.msg) || intl.getMessage('import.error', '上传失败'));
+          var _res2;
+          message.error(((_res2 = res) === null || _res2 === void 0 ? void 0 : _res2.msg) || intl.getMessage('import.error', '上传失败'));
         }
       }
     };
@@ -152,11 +175,13 @@ function VtxImport(props) {
     };
     // 发送请求
     xhr.open('POST', '/cloudFile/common/mergeChunk', true);
+    xhr.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
+    xhr.setRequestHeader('access_token', token ? "".concat(token) : '');
     var data = new FormData();
     data.append('chunkId', state.chunkId);
     data.append('tenantId', getVtxToken('tenantId'));
     data.append('chunkSize', state.chunks.length);
-    data.append('fileName', state.fileInput.files[0].name);
+    data.append('fileName', fileInputRef.current.files[0].name);
     xhr.send(data);
   }
 
@@ -166,6 +191,7 @@ function VtxImport(props) {
     var postData = props.postData || {};
     if (state.useFormData) {
       var request = new XMLHttpRequest();
+      xhrRef.current = request;
       // 发送请求
       request.open('POST', postUrl);
       request.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
@@ -196,6 +222,7 @@ function VtxImport(props) {
     var postData = props.postData || {};
     if (state.useFormData) {
       var request = new XMLHttpRequest();
+      xhrRef.current = request;
       // 发送请求
       request.open('POST', postUrl);
       request.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
@@ -216,7 +243,7 @@ function VtxImport(props) {
       };
       //创建formdata对象
       var fmd = new FormData();
-      fmd.append(state.fileKey, state.fileInput.files[0]);
+      fmd.append(state.fileKey, fileInputRef.current.files[0]);
       request.send(fmd);
     }
   }
@@ -247,7 +274,9 @@ function VtxImport(props) {
     return postArray.length > 0 ? "".concat(postUrl, "?").concat(postArray.join('&')) : postUrl;
   };
   var closeModal = function closeModal() {
-    state.fileInput.value = '';
+    if (fileInputRef.current) {
+      fileInputRef.current.value = '';
+    }
     if (typeof props.close === 'function') {
       props.close();
     } else {
@@ -258,15 +287,24 @@ function VtxImport(props) {
   };
   // 上传之后的回调 - 展示报错信息
   var uploadSuccess = function uploadSuccess(data) {
-    state.fileInput.value = '';
+    var _parseData;
+    if (fileInputRef.current) {
+      fileInputRef.current.value = '';
+    }
     setState({
       uploading: false
     });
+    var parseData;
+    try {
+      parseData = JSON.parse(data);
+    } catch (e) {
+      message.error(intl.getMessage('import.error', '解析响应数据失败'));
+      return;
+    }
     if (typeof props.afterUpload === 'function') {
       afterUpload(data);
     }
-    var parseData = JSON.parse(data);
-    if (Array.isArray(parseData === null || parseData === void 0 ? void 0 : parseData.data)) {
+    if (Array.isArray((_parseData = parseData) === null || _parseData === void 0 ? void 0 : _parseData.data)) {
       setState({
         resultVisible: true,
         resultData: parseData.data.map(function (item, index) {
@@ -281,7 +319,8 @@ function VtxImport(props) {
     } else {
       // 新增其他错误提示
       if (parseData.result !== 0) {
-        message.error((parseData === null || parseData === void 0 ? void 0 : parseData.msg) || intl.getMessage('import.success', '上传成功'));
+        var _parseData2;
+        message.error(((_parseData2 = parseData) === null || _parseData2 === void 0 ? void 0 : _parseData2.msg) || intl.getMessage('import.success', '上传成功'));
       }
     }
   };
@@ -296,7 +335,10 @@ function VtxImport(props) {
     onCancel: function onCancel() {
       return closeModal();
     },
-    maskClosable: false,
+    // maskClosable: false,
+    mask: {
+      closable: false
+    },
     footer: [templateURL ? /*#__PURE__*/_jsx(Button, {
       onClick: function onClick() {
         window.open(templateURL);
@@ -306,22 +348,21 @@ function VtxImport(props) {
       type: "primary",
       loading: state.uploading,
       onClick: function onClick() {
+        var _fileInputRef$current2;
         if (typeof props.beforeUpload === 'function') {
-          var flag = beforeUpload(state.fileInput.files[0]);
+          var _fileInputRef$current;
+          var flag = beforeUpload((_fileInputRef$current = fileInputRef.current) === null || _fileInputRef$current === void 0 || (_fileInputRef$current = _fileInputRef$current.files) === null || _fileInputRef$current === void 0 ? void 0 : _fileInputRef$current[0]);
           if (!flag) {
-            state.fileInput.value = '';
-            setState({
-              fileInput: null
-            });
+            fileInputRef.current.value = '';
             return;
           }
         }
-        if (state.fileInput.value) {
+        if ((_fileInputRef$current2 = fileInputRef.current) !== null && _fileInputRef$current2 !== void 0 && _fileInputRef$current2.value) {
           setState({
             uploading: true
           });
           // 上传文件
-          checkFile(state.fileInput.files[0]);
+          checkFile(fileInputRef.current.files[0]);
           // const postUrl = getPostURL();
           // if (state.useFormData) {
           //     const request = new XMLHttpRequest();
@@ -350,7 +391,8 @@ function VtxImport(props) {
         closeModal();
       },
       children: intl.getMessage('switch.close', '关闭')
-    }, "closeWindow")]
+    }, "closeWindow")],
+    width: 520
   };
   var resultProps = {
     visible: state.resultVisible,
@@ -363,36 +405,106 @@ function VtxImport(props) {
     },
     modalWidth: state.modalWidth
   };
+
+  // 组件卸载时清理
+  useEffect(function () {
+    return function () {
+      // 取消进行中的 XHR 请求
+      if (xhrRef.current) {
+        xhrRef.current.abort();
+        xhrRef.current = null;
+      }
+      // 清理文件输入
+      if (fileInputRef.current) {
+        fileInputRef.current.value = '';
+      }
+    };
+  }, []);
   useEffect(function () {
     if (state.chunkId) {
       startUpload();
     }
   }, [state.chunkId]);
-  return wrapSSR( /*#__PURE__*/_jsxs(Modal, _objectSpread(_objectSpread({}, modalProps), {}, {
-    children: [props.children, /*#__PURE__*/_jsx("form", {
+  var truncateFileName = function truncateFileName(fileName) {
+    var maxLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 28;
+    if (fileName.length <= maxLength) return fileName;
+    var extIndex = fileName.lastIndexOf('.');
+    var ext = extIndex !== -1 ? fileName.slice(extIndex) : '';
+    var name = extIndex !== -1 ? fileName.slice(0, extIndex) : fileName;
+    var availableLength = maxLength - ext.length - 3; // 3 是 "..."
+    if (availableLength <= 0) return "...".concat(ext);
+    var startLength = Math.ceil(availableLength / 2);
+    var endLength = Math.floor(availableLength / 2);
+    var start = name.slice(0, startLength);
+    var end = name.slice(-endLength);
+    return "".concat(start, "...").concat(end).concat(ext);
+  };
+
+  // 处理文件选择变化
+  var handleFileChange = function handleFileChange(event) {
+    var _event$target$files;
+    var file = (_event$target$files = event.target.files) === null || _event$target$files === void 0 ? void 0 : _event$target$files[0];
+    if (file) {
+      setState(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          fileName: truncateFileName(file.name)
+        });
+      });
+      // 这里可以添加文件上传或其他处理逻辑
+      // 例如：uploadFile(file);
+    } else {
+      setState(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          fileName: ''
+        });
+      });
+    }
+  };
+  var handleSelectFile = function handleSelectFile() {
+    var _fileInputRef$current3;
+    (_fileInputRef$current3 = fileInputRef.current) === null || _fileInputRef$current3 === void 0 || _fileInputRef$current3.click();
+  };
+  return wrapSSR( /*#__PURE__*/_jsxs(VtxModal, _objectSpread(_objectSpread({}, modalProps), {}, {
+    children: [props.children, /*#__PURE__*/_jsxs("form", {
       encType: "multipart/form-data",
       method: "post",
       target: "tmp",
       action: uploadURL,
-      ref: function ref(dom) {
-        if (dom) state.fileForm = dom;
-      },
-      children: /*#__PURE__*/_jsx("input", {
+      ref: formRef,
+      children: [/*#__PURE__*/_jsxs("div", {
+        className: "".concat(prefixCls, "-btn"),
+        children: [/*#__PURE__*/_jsx(Button, {
+          onClick: handleSelectFile,
+          children: /*#__PURE__*/_jsx("span", {
+            className: "".concat(prefixCls, "-label"),
+            children: intl.getMessage('import.selectFile', '选择文件')
+          })
+        }), state.fileName ? /*#__PURE__*/_jsx(Tooltip, {
+          title: state.fileName,
+          children: /*#__PURE__*/_jsx("div", {
+            className: "".concat(prefixCls, "-file-name"),
+            children: state.fileName
+          })
+        }) : /*#__PURE__*/_jsx("div", {
+          className: "".concat(prefixCls, "-file-name"),
+          children: intl.getMessage('import.noFileSelected', '未选择任何文件')
+        })]
+      }), /*#__PURE__*/_jsx("input", {
         type: "file",
         name: state.fileKey,
         accept: state.accept,
-        ref: function ref(dom) {
-          if (dom) state.fileInput = dom;
-        }
-      })
+        ref: fileInputRef,
+        style: {
+          display: 'none'
+        },
+        onChange: handleFileChange
+      })]
     }), /*#__PURE__*/_jsx("iframe", {
       name: "tmp",
       style: {
         display: 'none'
       },
-      ref: function ref(dom) {
-        if (dom) state.iframe = dom;
-      }
+      ref: iframeRef
     }), state.resultVisible && /*#__PURE__*/_jsx(VtxImportResult, _objectSpread({}, resultProps))]
   })));
 }

package/es/vtx-import/result.js

@@ -16,6 +16,7 @@ import PropTypes from 'prop-types';
 import useSet from "../utils/useSet";
 import VtxDatagrid from "../vtx-datagrid";
 import { useIntl } from "../vtx-provider";
+import VtxModal from "../vtx-modal";
 import { jsx as _jsx } from "react/jsx-runtime";
 function VtxImportResult(props) {
   var intl = useIntl();
@@ -39,7 +40,10 @@ function VtxImportResult(props) {
       }
     },
     width: state.modalWidth,
-    maskClosable: false,
+    // maskClosable: false,
+    mask: {
+      closable: false
+    },
     footer: [/*#__PURE__*/_jsx(Button, {
       onClick: function onClick() {
         if (typeof props.hideVisible === 'function') {
@@ -58,7 +62,7 @@ function VtxImportResult(props) {
     pagination: false,
     autoFit: false
   };
-  return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({}, modalProps), {}, {
+  return /*#__PURE__*/_jsx(VtxModal, _objectSpread(_objectSpread({}, modalProps), {}, {
     children: /*#__PURE__*/_jsx("div", {
       style: {
         maxHeight: 600,

package/es/vtx-import/style/index.js

@@ -7,7 +7,22 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { useStyle as useAntdStyle } from "../../vtx-provider";
 var genVtxImportStyle = function genVtxImportStyle(token) {
   var componentCls = token.componentCls;
-  return _defineProperty({}, componentCls, {});
+  return _defineProperty({}, componentCls, _defineProperty({
+    '.ant-modal-container': {
+      padding: 0,
+      '.ant-modal-header': {
+        padding: 20
+      },
+      '.ant-modal-body': {
+        padding: 20
+      }
+    }
+  }, '&-btn', {
+    display: 'flex',
+    justifyContent: 'flex-start',
+    alignItems: 'center',
+    gap: 8
+  }));
 };
 export function useStyle(prefixCls) {
   return useAntdStyle('VtxImport', function (token) {

package/es/vtx-import2/Content.js

@@ -98,6 +98,7 @@ Content.propTypes = {
   customText: PropTypes.string,
   extraText: PropTypes.string,
   TextEnum: PropTypes.object,
-  extraDom: [PropTypes.string, PropTypes.node]
+  // extraDom: [PropTypes.string, PropTypes.node],
+  extraDom: PropTypes.object
 };
 export default Content;