@vtx/components 4.0.0-beta.8 → 4.0.0-beta.80

package/es/vtx-icon/index.js

@@ -1,5 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["type", "size", "className", "style", "color", "fileType"];
+var _excluded = ["width", "height", "style", "className"],
+  _excluded2 = ["type", "size", "className", "style", "color", "fileType"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -7,62 +8,70 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { lazy, memo, Suspense, useMemo } from 'react';
+import { memo } 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";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-var VtxIcon = /*#__PURE__*/memo(function (_ref) {
-  var type = _ref.type,
-    _ref$size = _ref.size,
-    size = _ref$size === void 0 ? 16 : _ref$size,
-    _ref$className = _ref.className,
-    className = _ref$className === void 0 ? '' : _ref$className,
-    _ref$style = _ref.style,
-    style = _ref$style === void 0 ? {} : _ref$style,
-    color = _ref.color,
-    _ref$fileType = _ref.fileType,
-    fileType = _ref$fileType === void 0 ? 'webp' : _ref$fileType,
+var iconComponents = {
+  alignRightOutlined: AlignRightOutlined,
+  columnHeightOutlined: ColumnHeightOutlined,
+  downOutlined: DownOutlined,
+  fullscreen: Fullscreen,
+  redoOutlined: RedoOutlined,
+  rightOutlined: RightOutlined,
+  settingOutlined: SettingOutlined
+  // 低频图标如果确实需要，可以再考虑 lazy
+};
+var EmptySvg = function EmptySvg(_ref) {
+  var width = _ref.width,
+    height = _ref.height,
+    style = _ref.style,
+    className = _ref.className,
     props = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/_jsx("svg", _objectSpread({
+    width: width,
+    height: height,
+    style: style,
+    className: className
+  }, props));
+};
+var VtxIcon = /*#__PURE__*/memo(function (_ref2) {
+  var type = _ref2.type,
+    _ref2$size = _ref2.size,
+    size = _ref2$size === void 0 ? 16 : _ref2$size,
+    _ref2$className = _ref2.className,
+    className = _ref2$className === void 0 ? '' : _ref2$className,
+    _ref2$style = _ref2.style,
+    style = _ref2$style === void 0 ? {} : _ref2$style,
+    color = _ref2.color,
+    _ref2$fileType = _ref2.fileType,
+    fileType = _ref2$fileType === void 0 ? 'webp' : _ref2$fileType,
+    props = _objectWithoutProperties(_ref2, _excluded2);
   var width = props.width || size;
   var height = props.height || size;
   if (!type) {
     return null;
   }
-  var SvgComponent = useMemo(function () {
-    // 动态导入并缓存结果
-    return /*#__PURE__*/lazy(function () {
-      return import( /* @vite-ignore */"./svg/".concat(type, ".js"));
-    });
-  }, [type]);
 
   // 默认返回空元素
   if (fileType == 'svg') {
-    try {
-      // const SvgComponent = lazy(() => import(`./svg/${type}.js`));
-      return /*#__PURE__*/_jsx(Suspense, {
-        fallback: /*#__PURE__*/_jsx("div", {
-          style: _objectSpread({
-            width: width,
-            height: height
-          }, style)
-        }),
-        children: /*#__PURE__*/_jsx(SvgComponent, _objectSpread({
-          className: className,
-          style: _objectSpread({
-            width: width,
-            height: height
-          }, style),
-          fill: color
-        }, props))
-      });
-    } catch (error) {
-      // 如果动态导入失败，返回空的 SVG 元素
-      return /*#__PURE__*/_jsx("svg", _objectSpread({
+    var SvgComponent = iconComponents[type] || EmptySvg;
+    return /*#__PURE__*/_jsx(SvgComponent, _objectSpread({
+      className: className,
+      style: _objectSpread({
         width: width,
-        height: height,
-        style: style,
-        className: className
-      }, props));
-    }
+        height: height
+      }, style),
+      width: width,
+      height: height,
+      fill: color
+    }, props));
   } else {
     return (
       /*#__PURE__*/

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%',