@vtx/components 4.0.0-beta.12 → 4.0.0-beta.14

package/es/vtx-combogrid/index.js

@@ -109,7 +109,7 @@ export { VtxCombogrid };
 VtxCombogrid.propTypes = {
   prefixCls: PropTypes.string,
   placeholder: PropTypes.string,
-  value: PropTypes.string,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
   allowClear: PropTypes.bool,
   disabled: PropTypes.bool,
   className: PropTypes.string,

package/es/vtx-export/index.js

@@ -23,6 +23,7 @@ import { useStyle } from "./style/index";
 import { ConfigProvider, message, Spin, Dropdown, Menu, Button } from 'antd';
 import classnames from 'classnames';
 import { useIntl } from "../vtx-provider";
+import VtxIcon from "../vtx-icon";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -182,7 +183,10 @@ var VtxExport = function VtxExport(props) {
     trigger: ['click'],
     children: /*#__PURE__*/_jsxs(Button, {
       icon: /*#__PURE__*/_jsx(ExportOutlined, {}),
-      children: [exportText, " ", /*#__PURE__*/_jsx(DownOutlined, {})]
+      children: [exportText, " ", /*#__PURE__*/_jsx(VtxIcon, {
+        type: "downOutlined",
+        fileType: "svg"
+      })]
     })
   }));
 };

package/es/vtx-icon/index.js

@@ -10,6 +10,31 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { lazy, memo, Suspense, useMemo } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
+var iconComponents = {
+  // 核心：添加你需要的所有图标， 动态导入有的组件会失败
+  alignRightOutlined: /*#__PURE__*/lazy(function () {
+    return import("./svg/alignRightOutlined.js");
+  }),
+  columnHeightOutlined: /*#__PURE__*/lazy(function () {
+    return import("./svg/columnHeightOutlined.js");
+  }),
+  downOutlined: /*#__PURE__*/lazy(function () {
+    return import("./svg/downOutlined.js");
+  }),
+  fullscreen: /*#__PURE__*/lazy(function () {
+    return import("./svg/fullscreen.js");
+  }),
+  redoOutlined: /*#__PURE__*/lazy(function () {
+    return import("./svg/redoOutlined.js");
+  }),
+  rightOutlined: /*#__PURE__*/lazy(function () {
+    return import("./svg/rightOutlined.js");
+  }),
+  settingOutlined: /*#__PURE__*/lazy(function () {
+    return import("./svg/settingOutlined.js");
+  })
+  // 新增其他图标...
+};
 var VtxIcon = /*#__PURE__*/memo(function (_ref) {
   var type = _ref.type,
     _ref$size = _ref.size,
@@ -27,12 +52,24 @@ var VtxIcon = /*#__PURE__*/memo(function (_ref) {
   if (!type) {
     return null;
   }
+  // const SvgComponent = useMemo(() => {
+  //     // 动态导入并缓存结果
+  //     return lazy(() => import(/* @vite-ignore */`./svg/${type}.js`));
+  // }, [type]);
+
   var SvgComponent = useMemo(function () {
-    // 动态导入并缓存结果
-    return /*#__PURE__*/lazy(function () {
-      return import( /* @vite-ignore */"./svg/".concat(type, ".js"));
+    // 兜底：找不到对应图标时，返回一个空组件（避免报错）
+    return iconComponents[type] || /*#__PURE__*/lazy(function () {
+      return Promise.resolve({
+        default: function _default() {
+          return /*#__PURE__*/_jsx("svg", {
+            width: width,
+            height: height
+          });
+        }
+      });
     });
-  }, [type]);
+  }, [type, width, height]);
 
   // 默认返回空元素
   if (fileType == 'svg') {

package/es/vtx-tree/index.js

@@ -28,6 +28,7 @@ import { parseTreeData } from '@vtx/utils';
 import classnames from 'classnames';
 import { useStyle } from "./style/index";
 import { VtxProvider, useIntl } from "../vtx-provider";
+import VtxIcon from "../vtx-icon";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var getParentKey = function getParentKey(keyValue, key, tree) {
@@ -193,15 +194,29 @@ var VtxTree = /*#__PURE__*/forwardRef(function (propsAll, ref) {
     };
   });
   useEffect(function () {
-    var resizeObserver = new ResizeObserver(function () {
-      setHeight(treeRef.current.offsetHeight);
+    var element = treeRef.current;
+    if (!element) return; // 提前返回，避免后续问题
+
+    var resizeObserver = new ResizeObserver(function (entries) {
+      var _iterator2 = _createForOfIteratorHelper(entries),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var entry = _step2.value;
+          setHeight(entry.contentRect.height);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
     });
-    if (treeRef.current) {
-      resizeObserver.observe(treeRef.current, {
-        box: 'border-box'
-      });
-    }
-    setHeight(treeRef.current.offsetHeight);
+    resizeObserver.observe(element, {
+      box: 'border-box'
+    });
+
+    // 初始化高度
+    setHeight(element.offsetHeight);
     return function () {
       resizeObserver.disconnect();
     };
@@ -284,7 +299,10 @@ var VtxTree = /*#__PURE__*/forwardRef(function (propsAll, ref) {
       ref: treeRef,
       children: /*#__PURE__*/_jsx(Tree, _objectSpread(_objectSpread(_objectSpread({}, props), {}, {
         height: height,
-        switcherIcon: /*#__PURE__*/_jsx(DownOutlined, {}),
+        switcherIcon: /*#__PURE__*/_jsx(VtxIcon, {
+          type: "downOutlined",
+          fileType: "svg"
+        }),
         showLine: {
           showLeafIcon: false
         },

package/lib/vtx-combogrid/index.js

@@ -117,7 +117,7 @@ var _default = exports.default = VtxCombogrid;
 VtxCombogrid.propTypes = {
   prefixCls: _propTypes.default.string,
   placeholder: _propTypes.default.string,
-  value: _propTypes.default.string,
+  value: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.array]),
   allowClear: _propTypes.default.bool,
   disabled: _propTypes.default.bool,
   className: _propTypes.default.string,

package/lib/vtx-export/index.js

@@ -17,6 +17,7 @@ var _index = require("./style/index");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _vtxProvider = require("../vtx-provider");
+var _vtxIcon = _interopRequireDefault(require("../vtx-icon"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -189,7 +190,10 @@ var VtxExport = exports.VtxExport = function VtxExport(props) {
     trigger: ['click'],
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Button, {
       icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.ExportOutlined, {}),
-      children: [exportText, " ", /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.DownOutlined, {})]
+      children: [exportText, " ", /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxIcon.default, {
+        type: "downOutlined",
+        fileType: "svg"
+      })]
     })
   }));
 };

package/lib/vtx-icon/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,15 +7,55 @@ exports.default = exports.VtxIcon = void 0;
 var _react = require("react");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["type", "size", "className", "style", "color", "fileType"];
+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); }
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var iconComponents = {
+  // 核心：添加你需要的所有图标， 动态导入有的组件会失败
+  alignRightOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/alignRightOutlined.js"));
+    });
+  }),
+  columnHeightOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/columnHeightOutlined.js"));
+    });
+  }),
+  downOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/downOutlined.js"));
+    });
+  }),
+  fullscreen: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/fullscreen.js"));
+    });
+  }),
+  redoOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/redoOutlined.js"));
+    });
+  }),
+  rightOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/rightOutlined.js"));
+    });
+  }),
+  settingOutlined: /*#__PURE__*/(0, _react.lazy)(function () {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require("./svg/settingOutlined.js"));
+    });
+  })
+  // 新增其他图标...
+};
 var VtxIcon = exports.VtxIcon = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var type = _ref.type,
     _ref$size = _ref.size,
@@ -34,18 +73,24 @@ var VtxIcon = exports.VtxIcon = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   if (!type) {
     return null;
   }
+  // const SvgComponent = useMemo(() => {
+  //     // 动态导入并缓存结果
+  //     return lazy(() => import(/* @vite-ignore */`./svg/${type}.js`));
+  // }, [type]);
+
   var SvgComponent = (0, _react.useMemo)(function () {
-    // 动态导入并缓存结果
-    return /*#__PURE__*/(0, _react.lazy)(function () {
-      return function (specifier) {
-        return new Promise(function (r) {
-          return r(specifier);
-        }).then(function (s) {
-          return _interopRequireWildcard(require(s));
-        });
-      }( /* @vite-ignore */"./svg/".concat(type, ".js"));
+    // 兜底：找不到对应图标时，返回一个空组件（避免报错）
+    return iconComponents[type] || /*#__PURE__*/(0, _react.lazy)(function () {
+      return Promise.resolve({
+        default: function _default() {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", {
+            width: width,
+            height: height
+          });
+        }
+      });
     });
-  }, [type]);
+  }, [type, width, height]);
 
   // 默认返回空元素
   if (fileType == 'svg') {
@@ -87,4 +132,4 @@ var VtxIcon = exports.VtxIcon = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     );
   }
 });
-var _default = exports.default = VtxIcon;
+var _default2 = exports.default = VtxIcon;

package/lib/vtx-tree/index.js

@@ -15,6 +15,7 @@ var _utils2 = require("@vtx/utils");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _index = require("./style/index");
 var _vtxProvider = require("../vtx-provider");
+var _vtxIcon = _interopRequireDefault(require("../vtx-icon"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["showSearch", "treeData", "searchPlaceholder", "renderMenuList", "fieldNames", "titleClassName", "expandAction", "maxButtonCount"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -201,15 +202,29 @@ var VtxTree = exports.VtxTree = /*#__PURE__*/(0, _react.forwardRef)(function (pr
     };
   });
   (0, _react.useEffect)(function () {
-    var resizeObserver = new ResizeObserver(function () {
-      setHeight(treeRef.current.offsetHeight);
+    var element = treeRef.current;
+    if (!element) return; // 提前返回，避免后续问题
+
+    var resizeObserver = new ResizeObserver(function (entries) {
+      var _iterator2 = _createForOfIteratorHelper(entries),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var entry = _step2.value;
+          setHeight(entry.contentRect.height);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
     });
-    if (treeRef.current) {
-      resizeObserver.observe(treeRef.current, {
-        box: 'border-box'
-      });
-    }
-    setHeight(treeRef.current.offsetHeight);
+    resizeObserver.observe(element, {
+      box: 'border-box'
+    });
+
+    // 初始化高度
+    setHeight(element.offsetHeight);
     return function () {
       resizeObserver.disconnect();
     };
@@ -292,7 +307,10 @@ var VtxTree = exports.VtxTree = /*#__PURE__*/(0, _react.forwardRef)(function (pr
       ref: treeRef,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tree, _objectSpread(_objectSpread(_objectSpread({}, props), {}, {
         height: height,
-        switcherIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.DownOutlined, {}),
+        switcherIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxIcon.default, {
+          type: "downOutlined",
+          fileType: "svg"
+        }),
         showLine: {
           showLeafIcon: false
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/components",
-  "version": "4.0.0-beta.12",
+  "version": "4.0.0-beta.14",
   "description": "React components for Vortex",
   "keywords": [
     "react",
@@ -115,6 +115,7 @@
     "react-syntax-highlighter": "^15.6.6",
     "safe-stable-stringify": "^2.5.0",
     "signature_pad": "3.0.0-beta.4",
+    "swr": "1.3.0",
     "uninstall": "^0.0.0",
     "use-deep-compare": "^1.3.0",
     "viewerjs": "1.3.3",