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

package/lib/vtx-form-layout/Divider.js

@@ -22,7 +22,7 @@ function VtxDivider(props) {
   var prefixCls = getPrefixCls('', 'vtx-form-layout-divider');
   var size = props.size;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Divider, {
-    className: (0, _classnames2.default)(prefixCls, _defineProperty({}, "".concat(prefixCls, "--small'"), size === 'small'))
+    className: (0, _classnames2.default)(prefixCls, _defineProperty({}, "".concat(prefixCls, "--small"), size === 'small'))
   });
 }
 VtxDivider.propTypes = {

package/lib/vtx-form-layout/FormItem.js

@@ -10,6 +10,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _antd = require("antd");
 var _classnames7 = _interopRequireDefault(require("classnames"));
 var _context = require("./context");
+var _vtxProvider = require("../vtx-provider");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["weights", "label", "inline", "hideTooltip", "disableHtmlFor", "tooltip", "hidden", "nameExtra"]; // 24 栅格
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -25,6 +26,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 var SPAN = 24;
 function FormItem(props) {
   var _rest$rules;
+  var intl = (0, _vtxProvider.useIntl)();
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('', 'vtx-form-layout-item');
@@ -68,27 +70,25 @@ function FormItem(props) {
     if (placeholder) {
       return placeholder;
     }
-    if (typeof label === 'string') {
-      if (!['Input', 'Select', 'RangePicker', 'VtxInput', 'InputNumber', 'VtxSelect', 'TextArea'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        // console.log(type?.displayName)
-      }
-      if (['Input', 'InputNumber', 'VtxInput', 'TextArea'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        return '请输入' + label;
-      }
-      if (['Select', 'VtxColorPicker', 'VtxSelect', 'VtxCombogrid'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        return '请选择' + label;
-      }
-      if (['RangePicker'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        return undefined;
-      }
+    if (['Input', 'InputNumber', 'VtxInput', 'TextArea', 'VtxEditor'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      // return '请输入' + label
+      return intl.getMessage('tableForm.inputPlaceholder', '请输入');
+    }
+    if (['Select', 'VtxColorPicker', 'VtxSelect', 'VtxCombogrid', 'VtxTreeSelect', 'VtxZtreeSelect', 'VtxSearchMapInput'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      // return '请选择' + label
+      return intl.getMessage('tableForm.selectPlaceholder', '请选择');
+    }
+    if (['DatePicker', 'RangePicker', 'TimePicker', 'VtxDatePicker', 'VtxRangePicker', 'VtxTimePicker', 'VtxTimeRangePicker'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      return undefined;
     }
     return null;
   };
   var renderItem = function renderItem(child) {
     if ( /*#__PURE__*/(0, _react.isValidElement)(child)) {
-      return /*#__PURE__*/_react.default.cloneElement(child, {
-        placeholder: initPlaceholder(props.placeholder, label, child === null || child === void 0 ? void 0 : child.type)
-      });
+      var _child$props;
+      return /*#__PURE__*/_react.default.cloneElement(child, _objectSpread(_objectSpread({}, child.props), {}, {
+        placeholder: initPlaceholder(child === null || child === void 0 || (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.placeholder, label, child === null || child === void 0 ? void 0 : child.type)
+      }));
     }
     return child;
   };

package/lib/vtx-form-layout/Pane.js

@@ -17,18 +17,29 @@ function Pane(props) {
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('', 'vtx-form-layout-pane');
-  var title = props.title;
-  var items = [{
-    key: '1',
-    label: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "".concat(prefixCls, "-title"),
-      children: title
-    }),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+  var title = props.title,
+    children = props.children;
+
+  // 无标题时直接渲染内容
+  if (!title) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "".concat(prefixCls, "-content"),
-      children: props.children
-    })
-  }];
+      children: children
+    });
+  }
+  var items = (0, _react.useMemo)(function () {
+    return [{
+      key: '1',
+      label: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "".concat(prefixCls, "-title"),
+        children: title
+      }),
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "".concat(prefixCls, "-content"),
+        children: children
+      })
+    }];
+  }, [title, children, prefixCls]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Collapse, {
     className: prefixCls,
     bordered: false,

package/lib/vtx-icon/index.js

@@ -6,76 +6,78 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.VtxIcon = void 0;
 var _react = require("react");
+var _alignRightOutlined = _interopRequireDefault(require("./svg/alignRightOutlined.js"));
+var _columnHeightOutlined = _interopRequireDefault(require("./svg/columnHeightOutlined.js"));
+var _downOutlined = _interopRequireDefault(require("./svg/downOutlined.js"));
+var _fullscreen = _interopRequireDefault(require("./svg/fullscreen.js"));
+var _redoOutlined = _interopRequireDefault(require("./svg/redoOutlined.js"));
+var _rightOutlined = _interopRequireDefault(require("./svg/rightOutlined.js"));
+var _settingOutlined = _interopRequireDefault(require("./svg/settingOutlined.js"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["type", "size", "className", "style", "color", "fileType"];
+var _excluded = ["width", "height", "style", "className"],
+  _excluded2 = ["type", "size", "className", "style", "color", "fileType"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
-var VtxIcon = exports.VtxIcon = /*#__PURE__*/(0, _react.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.default,
+  columnHeightOutlined: _columnHeightOutlined.default,
+  downOutlined: _downOutlined.default,
+  fullscreen: _fullscreen.default,
+  redoOutlined: _redoOutlined.default,
+  rightOutlined: _rightOutlined.default,
+  settingOutlined: _settingOutlined.default
+  // 低频图标如果确实需要，可以再考虑 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__*/(0, _jsxRuntime.jsx)("svg", _objectSpread({
+    width: width,
+    height: height,
+    style: style,
+    className: className
+  }, props));
+};
+var VtxIcon = exports.VtxIcon = /*#__PURE__*/(0, _react.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 = (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"));
-    });
-  }, [type]);
 
   // 默认返回空元素
   if (fileType == 'svg') {
-    try {
-      // const SvgComponent = lazy(() => import(`./svg/${type}.js`));
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Suspense, {
-        fallback: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          style: _objectSpread({
-            width: width,
-            height: height
-          }, style)
-        }),
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(SvgComponent, _objectSpread({
-          className: className,
-          style: _objectSpread({
-            width: width,
-            height: height
-          }, style),
-          fill: color
-        }, props))
-      });
-    } catch (error) {
-      // 如果动态导入失败，返回空的 SVG 元素
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", _objectSpread({
+    var SvgComponent = iconComponents[type] || EmptySvg;
+    return /*#__PURE__*/(0, _jsxRuntime.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/lib/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/lib/vtx-image/Preview.js

@@ -28,15 +28,12 @@ var VIEWER = 'viewer';
 // 多张
 var GALLERY = 'gallery';
 function checkMode(x) {
-  var mode = '';
-  if ((0, _utils.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 (0, _utils.isObject)(x) ? VIEWER : null;
 }
 function Preview(props) {
   var _useState = (0, _react.useState)(),
@@ -93,6 +90,9 @@ function Preview(props) {
     setContainer(container);
     setViewer(viewer);
     return function () {
+      if (container) {
+        container.innerHTML = '';
+      }
       viewer && viewer.destroy();
     };
   }, []);
@@ -102,6 +102,7 @@ function Preview(props) {
         container.innerHTML = '';
       }
       var mode = checkMode(photo);
+      if (!mode) return null;
       var newIndex = index;
       // 单张
       if (mode === VIEWER) {
@@ -132,6 +133,10 @@ function Preview(props) {
       }
       viewer.update();
       viewer.view(newIndex);
+    } else {
+      if (container) {
+        container.innerHTML = '';
+      }
     }
   }, [visible]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});

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

@@ -26,7 +26,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%',