@vtx/components 4.0.0-beta.85 → 4.0.0-beta.87

package/es/vtx-select/index.js

@@ -1,5 +1,6 @@
 var _excluded = ["value", "mode", "size", "onChange", "maxTagCount", "maxTagTextLength", "maxTagPlaceholder", "showAll", "selectStyle", "selectAll", "selectSearchAll", "defaultBindBodyToPopupContainer", "customEnumText", "showSearch", "optionFilterProp", "onSearch"],
-  _excluded2 = ["onSearch", "optionFilterProp"];
+  _excluded2 = ["key", "value", "children"],
+  _excluded3 = ["onSearch", "optionFilterProp"];
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -106,14 +107,31 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       };
     }
   }, [mode]);
-  var newChildren = props.children ? React.Children.toArray(props.children) : ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.map(function (v) {
-    return _objectSpread(_objectSpread({}, v), {}, {
+
+  // Merge object-style `options` into React elements so they can be used
+  // interchangeably with <VtxSelect.Option /> children.
+  var mergedChildren = React.Children.toArray(props.children);
+  var optionsAsElements = ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.map(function (v) {
+    return /*#__PURE__*/React.isValidElement(v) ? v : /*#__PURE__*/React.createElement(Select.Option, {
       key: v.value,
-      props: _objectSpread(_objectSpread({}, v), {}, {
-        children: v.label
-      })
+      value: v.value,
+      label: v.label
     });
   })) || [];
+  var normalizeChild = function normalizeChild(child) {
+    if (! /*#__PURE__*/React.isValidElement(child)) return child;
+    var _child$props = child.props,
+      key = _child$props.key,
+      value = _child$props.value,
+      label = _child$props.children,
+      rest = _objectWithoutProperties(_child$props, _excluded2);
+    var optionValue = value !== null && value !== void 0 ? value : key;
+    return /*#__PURE__*/React.cloneElement(child, _objectSpread(_objectSpread({}, rest), {}, {
+      key: key,
+      value: optionValue
+    }));
+  };
+  var finalChildren = [].concat(_toConsumableArray(optionsAsElements), _toConsumableArray(mergedChildren.map(normalizeChild)));
   var getOptionValue = function getOptionValue(item) {
     var _ref, _itemProps$value;
     var itemProps = (item === null || item === void 0 ? void 0 : item.props) || {};
@@ -131,7 +149,7 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     }
     return item;
   };
-  var normalizedOptions = newChildren.map(function (item) {
+  var normalizedOptions = finalChildren.filter(React.isValidElement).map(function (item) {
     return {
       value: getOptionValue(item),
       label: getOptionLabel(item),
@@ -190,7 +208,7 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     if (showSearch && _typeof(showSearch) === 'object') {
       var showSearchOnSearch = showSearch.onSearch,
         showSearchOptionFilterProp = showSearch.optionFilterProp,
-        searchConfig = _objectWithoutProperties(showSearch, _excluded2);
+        searchConfig = _objectWithoutProperties(showSearch, _excluded3);
       return {
         showSearch: _objectSpread(_objectSpread({}, searchConfig), {}, {
           optionFilterProp: showSearchOptionFilterProp || optionFilterProp || defaultOptionFilterProp,
@@ -242,11 +260,11 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
                 return e.preventDefault();
               },
               children: /*#__PURE__*/_jsx(Checkbox, {
-                indeterminate: valueLength && valueLength < newChildren.length,
-                checked: valueLength && valueLength === newChildren.length,
+                indeterminate: valueLength && valueLength < finalChildren.length,
+                checked: valueLength && valueLength === finalChildren.length,
                 onChange: function onChange(e) {
                   if (e.target.checked) {
-                    var tempChildren = newChildren.filter(function (item) {
+                    var tempChildren = finalChildren.filter(function (item) {
                       if (selectSearchAll && searchValue) {
                         return String(getOptionLabel(item)).toLowerCase().indexOf(searchValue) > -1;
                       }
@@ -304,7 +322,7 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
         style: _objectSpread({
           width: '100%'
         }, selectStyle),
-        children: props.children
+        children: finalChildren
       })), (mode == 'multiple' || mode == 'tags') && showAll ? /*#__PURE__*/_jsx(Popover, {
         content: getContent(),
         placement: "bottomRight",

package/es/vtx-tree-select/index.js

@@ -18,15 +18,16 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 { Button, Empty, Popover, Tag, TreeSelect, ConfigProvider, Space } from 'antd';
-import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
-import PropTypes from 'prop-types';
 import { DownOutlined, MoreOutlined } from '@ant-design/icons';
+import { useSize } from 'ahooks';
+import { Button, Empty, Popover, Space, Tag, TreeSelect } from 'antd';
 import classnames from 'classnames';
 import pull from 'lodash-es/pull';
-import { useStyle } from "./style/index";
-import { useSize } from 'ahooks';
+import PropTypes from 'prop-types';
+import { useContext, useEffect, useMemo, useRef, useState } from 'react';
+import VtxIcon from "../vtx-icon";
 import { VtxProvider, useIntl } from "../vtx-provider";
+import { useStyle } from "./style/index";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -40,9 +41,9 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
     style = _ref.style,
     _ref$fieldNames = _ref.fieldNames,
     fieldNames = _ref$fieldNames === void 0 ? {
-      label: "title",
-      value: "value",
-      key: "value",
+      label: 'title',
+      value: 'value',
+      key: 'value',
       children: 'children'
     } : _ref$fieldNames,
     onChange = _ref.onChange,
@@ -188,6 +189,10 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
           showLeafIcon: false
         },
         switcherIcon: /*#__PURE__*/_jsx(DownOutlined, {}),
+        suffixIcon: /*#__PURE__*/_jsx(VtxIcon, {
+          type: "downOutlined",
+          fileType: "svg"
+        }),
         multiple: multiple,
         treeCheckable: treeCheckable,
         className: classnames("".concat(prefixCls, " ").concat(props.prefixCls), hashId),

package/lib/vtx-select/index.js

@@ -14,7 +14,8 @@ var _utils = require("../utils");
 var _vtxProvider = require("../vtx-provider");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["value", "mode", "size", "onChange", "maxTagCount", "maxTagTextLength", "maxTagPlaceholder", "showAll", "selectStyle", "selectAll", "selectSearchAll", "defaultBindBodyToPopupContainer", "customEnumText", "showSearch", "optionFilterProp", "onSearch"],
-  _excluded2 = ["onSearch", "optionFilterProp"];
+  _excluded2 = ["key", "value", "children"],
+  _excluded3 = ["onSearch", "optionFilterProp"];
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -114,14 +115,31 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
       };
     }
   }, [mode]);
-  var newChildren = props.children ? _react.default.Children.toArray(props.children) : ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.map(function (v) {
-    return _objectSpread(_objectSpread({}, v), {}, {
+
+  // Merge object-style `options` into React elements so they can be used
+  // interchangeably with <VtxSelect.Option /> children.
+  var mergedChildren = _react.default.Children.toArray(props.children);
+  var optionsAsElements = ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.map(function (v) {
+    return /*#__PURE__*/_react.default.isValidElement(v) ? v : /*#__PURE__*/_react.default.createElement(_antd.Select.Option, {
       key: v.value,
-      props: _objectSpread(_objectSpread({}, v), {}, {
-        children: v.label
-      })
+      value: v.value,
+      label: v.label
     });
   })) || [];
+  var normalizeChild = function normalizeChild(child) {
+    if (! /*#__PURE__*/_react.default.isValidElement(child)) return child;
+    var _child$props = child.props,
+      key = _child$props.key,
+      value = _child$props.value,
+      label = _child$props.children,
+      rest = _objectWithoutProperties(_child$props, _excluded2);
+    var optionValue = value !== null && value !== void 0 ? value : key;
+    return /*#__PURE__*/_react.default.cloneElement(child, _objectSpread(_objectSpread({}, rest), {}, {
+      key: key,
+      value: optionValue
+    }));
+  };
+  var finalChildren = [].concat(_toConsumableArray(optionsAsElements), _toConsumableArray(mergedChildren.map(normalizeChild)));
   var getOptionValue = function getOptionValue(item) {
     var _ref, _itemProps$value;
     var itemProps = (item === null || item === void 0 ? void 0 : item.props) || {};
@@ -139,7 +157,7 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
     }
     return item;
   };
-  var normalizedOptions = newChildren.map(function (item) {
+  var normalizedOptions = finalChildren.filter(_react.default.isValidElement).map(function (item) {
     return {
       value: getOptionValue(item),
       label: getOptionLabel(item),
@@ -198,7 +216,7 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
     if (showSearch && _typeof(showSearch) === 'object') {
       var showSearchOnSearch = showSearch.onSearch,
         showSearchOptionFilterProp = showSearch.optionFilterProp,
-        searchConfig = _objectWithoutProperties(showSearch, _excluded2);
+        searchConfig = _objectWithoutProperties(showSearch, _excluded3);
       return {
         showSearch: _objectSpread(_objectSpread({}, searchConfig), {}, {
           optionFilterProp: showSearchOptionFilterProp || optionFilterProp || defaultOptionFilterProp,
@@ -250,11 +268,11 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
                 return e.preventDefault();
               },
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Checkbox, {
-                indeterminate: valueLength && valueLength < newChildren.length,
-                checked: valueLength && valueLength === newChildren.length,
+                indeterminate: valueLength && valueLength < finalChildren.length,
+                checked: valueLength && valueLength === finalChildren.length,
                 onChange: function onChange(e) {
                   if (e.target.checked) {
-                    var tempChildren = newChildren.filter(function (item) {
+                    var tempChildren = finalChildren.filter(function (item) {
                       if (selectSearchAll && searchValue) {
                         return String(getOptionLabel(item)).toLowerCase().indexOf(searchValue) > -1;
                       }
@@ -312,7 +330,7 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
         style: _objectSpread({
           width: '100%'
         }, selectStyle),
-        children: props.children
+        children: finalChildren
       })), (mode == 'multiple' || mode == 'tags') && showAll ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popover, {
         content: getContent(),
         placement: "bottomRight",

package/lib/vtx-tree-select/index.js

@@ -5,20 +5,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.VtxTreeSelect = void 0;
-var _antd = require("antd");
-var _react = _interopRequireWildcard(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _icons = require("@ant-design/icons");
+var _ahooks = require("ahooks");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _pull = _interopRequireDefault(require("lodash-es/pull"));
-var _index = require("./style/index");
-var _ahooks = require("ahooks");
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = require("react");
+var _vtxIcon = _interopRequireDefault(require("../vtx-icon"));
 var _vtxProvider = require("../vtx-provider");
+var _index = require("./style/index");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["multiple", "treeData", "placeholder", "treeCheckable", "disabled", "style", "fieldNames", "onChange", "labelInValue"];
 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); }
-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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -47,9 +46,9 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
     style = _ref.style,
     _ref$fieldNames = _ref.fieldNames,
     fieldNames = _ref$fieldNames === void 0 ? {
-      label: "title",
-      value: "value",
-      key: "value",
+      label: 'title',
+      value: 'value',
+      key: 'value',
       children: 'children'
     } : _ref$fieldNames,
     onChange = _ref.onChange,
@@ -195,6 +194,10 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
           showLeafIcon: false
         },
         switcherIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.DownOutlined, {}),
+        suffixIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vtxIcon.default, {
+          type: "downOutlined",
+          fileType: "svg"
+        }),
         multiple: multiple,
         treeCheckable: treeCheckable,
         className: (0, _classnames.default)("".concat(prefixCls, " ").concat(props.prefixCls), hashId),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/components",
-  "version": "4.0.0-beta.85",
+  "version": "4.0.0-beta.87",
   "description": "React components for Vortex",
   "keywords": [
     "react",
@@ -87,6 +87,9 @@
     "@emotion/serialize": "^1.3.3",
     "@rc-component/util": "1.3.0",
     "@types/react": "^18.0.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-react": "^1.0.6",
+    "@wangeditor/plugin-upload-attachment": "^1.1.0",
     "ahooks": "^3.9.6",
     "antd-img-crop": "4.25.0",
     "axios": "^1.13.2",
@@ -115,15 +118,11 @@
     "uninstall": "^0.0.0",
     "use-deep-compare": "^1.3.0",
     "viewerjs": "1.3.3",
-    "xgplayer": "^3.0.23",
-    "@wangeditor/editor": "^5.1.23",
-    "@wangeditor/editor-for-react": "^1.0.6",
-    "@wangeditor/plugin-upload-attachment": "^1.1.0"
+    "xgplayer": "^3.0.23"
   },
   "devDependencies": {
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/icons": "^6.0.0",
-    "dayjs": "^1.11.18",
     "@babel/core": "^7.28.5",
     "@babel/eslint-plugin": "^7.27.1",
     "@babel/parser": "^7.28.5",
@@ -154,11 +153,13 @@
     "@vitest/browser": "^3.2.4",
     "@vitest/coverage-istanbul": "^3.2.4",
     "@vitest/ui": "^3.2.4",
+    "@vtx/utils": "^1.0.25",
     "animated-scroll-to": "^2.3.2",
-    "antd": "^6.3.5",
+    "antd": "^6.6.4",
     "chalk": "^4.1.2",
     "copy-to-clipboard": "^3.3.3",
     "cross-env": "^7.0.3",
+    "dayjs": "^1.11.18",
     "dumi": "^2.4.21",
     "dumi-theme-vortex-style": "^1.0.0",
     "esbuild": "^0.15.18",
@@ -215,18 +216,16 @@
     "write-pkg": "^4.0.0",
     "xhr-mock": "^2.5.1",
     "yorkie": "^2.0.0",
-    "zustand": "^4.5.7",
-    "@vtx/utils": "^1.0.25"
+    "zustand": "^4.5.7"
   },
   "peerDependencies": {
     "@ant-design/icons": "^6.0.0",
+    "@vtx/utils": "^1.0.25",
     "antd": "^6.0.0",
+    "dayjs": "^1.11.18",
     "lodash-es": "^4.17.21",
     "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "dayjs": "^1.11.18",
-    "@vtx/utils": "^1.0.25"
-
+    "react-dom": "^18.3.1"
   },
   "peerDependenciesName": "声明宿主依赖",
   "packageManager": "pnpm@9.6.0",