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

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

@@ -1,6 +1,5 @@
 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 = ["multiple", "treeData", "placeholder", "treeCheckable", "disabled", "style"],
-  _excluded2 = ["children"];
+var _excluded = ["multiple", "treeData", "placeholder", "treeCheckable", "disabled", "style", "fieldNames", "onChange", "labelInValue"];
 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); }
@@ -10,6 +9,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -38,7 +38,18 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     style = _ref.style,
+    _ref$fieldNames = _ref.fieldNames,
+    fieldNames = _ref$fieldNames === void 0 ? {
+      label: "title",
+      value: "value",
+      key: "value",
+      children: 'children'
+    } : _ref$fieldNames,
+    onChange = _ref.onChange,
+    labelInValue = _ref.labelInValue,
     props = _objectWithoutProperties(_ref, _excluded);
+  // checkable 状态下节点选择完全受控（父子节点选中状态不再关联），会使得 labelInValue 强制为 true
+  var _labelInValue = treeCheckable && props.treeCheckStrictly ? true : labelInValue;
   var intl = useIntl();
   var _useContext = useContext(VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
@@ -58,13 +69,15 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
   var size = useSize(ref);
   var keyNodesMapping = useMemo(function () {
     var keyNodesMapping = {};
+    // 建议：添加树数据有效性检查
+    if (!treeData || !Array.isArray(treeData)) {
+      return keyNodesMapping;
+    }
     (function genNodes(nodes) {
       nodes.map(function (item) {
-        var children = item.children,
-          rest = _objectWithoutProperties(item, _excluded2);
-        keyNodesMapping[item.value || item.key] = _objectSpread(_objectSpread({}, rest), {}, {
-          id: item.value || item.key
-        });
+        var rest = Object.assign({}, (_objectDestructuringEmpty(item), item));
+        var children = item[fieldNames.children];
+        keyNodesMapping[item[fieldNames.value]] = _objectSpread(_objectSpread({}, rest), {}, _defineProperty(_defineProperty({}, fieldNames.value, item[fieldNames.value]), fieldNames.label, item[fieldNames.label]));
         if (Array.isArray(children) && children.length > 0) {
           genNodes(children);
         }
@@ -73,19 +86,17 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
     return keyNodesMapping;
   }, [treeData]);
   var clear = function clear() {
-    var _props$onChange;
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, [], [], {});
+    onChangeTreeSelect === null || onChangeTreeSelect === void 0 || onChangeTreeSelect([], [], {});
   };
   var clearKey = function clearKey(id) {
-    var _props$onChange2;
     var newValue = _toConsumableArray(props.value);
     pull(newValue, id);
     var label = newValue.map(function (item) {
-      return keyNodesMapping[item].title;
+      return keyNodesMapping[item[fieldNames.label]];
     });
-    (_props$onChange2 = props.onChange) === null || _props$onChange2 === void 0 || _props$onChange2.call(props, newValue, label, {});
+    onChangeTreeSelect === null || onChangeTreeSelect === void 0 || onChangeTreeSelect(newValue, label, {});
   };
-  var selectedNodes = useMemo(function () {
+  var getSelectedNodes = function getSelectedNodes(value) {
     var value_arr = function (val) {
       if (Array.isArray(val)) {
         return val;
@@ -94,90 +105,29 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
       } else {
         return [];
       }
-    }(props.value);
+    }(value);
     var selectedNodes = value_arr.filter(function (k) {
-      return k in keyNodesMapping;
+      if (_labelInValue) {
+        return k.value in keyNodesMapping;
+      } else {
+        return k in keyNodesMapping;
+      }
     }).map(function (item) {
-      return {
-        id: item,
-        name: keyNodesMapping[item].title
-      };
+      if (_labelInValue) {
+        return _objectSpread({}, keyNodesMapping[item.value]);
+      }
+      return _objectSpread({}, keyNodesMapping[item]);
     });
     return selectedNodes;
+  };
+  var selectedNodes = useMemo(function () {
+    return getSelectedNodes(props.value);
   }, [props.value, keyNodesMapping]);
   useEffect(function () {
     if (size !== null && size !== void 0 && size.width) {
       setPopWidth(size === null || size === void 0 ? void 0 : size.width);
     }
   }, [size === null || size === void 0 ? void 0 : size.width]);
-
-  // let suffixIconObj = {};
-  // if (multiple || treeCheckable) {
-  //     suffixIconObj.suffixIcon = (
-  //         <Popover
-  //             content={
-  //                 <>
-  //                     <div
-  //                         className={classnames(`${prefixCls}-count-head`, hashId,)}
-
-  //                     >
-  //                         <span>已选择：{selectedNodes.length}</span>
-  //                         <span
-  //                             className={classnames(
-  //                                 selectedNodes.length > 0 && !disabled
-  //                                     ? 'clear-count'
-  //                                     : 'disabled-count',
-  //                             )}
-  //                             onClick={e => {
-  //                                 if (!disabled) {
-  //                                     e.stopPropagation();
-  //                                     clear();
-  //                                 }
-  //                             }}
-  //                         >
-  //                             清空已选项
-  //                         </span>
-  //                     </div>
-  //                     {selectedNodes.length > 0 ? (
-  //                         selectedNodes.map(item => (
-  //                             <Tag
-  //                                 key={`tab-${item.id}`}
-  //                                 closable={!disabled}
-  //                                 onClose={e => {
-  //                                     e.stopPropagation();
-  //                                     clearKey(item.id);
-  //                                 }}
-  //                                 style={{ marginBottom: '5px' }}
-  //                             >
-  //                                 {item.name && item.name.length > 20
-  //                                     ? `${item.name.slice(0, 20)}...`
-  //                                     : item.name}
-  //                             </Tag>
-  //                         ))
-  //                     ) : (
-  //                         <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
-  //                     )}
-  //                 </>
-  //             }
-  //             placement="bottomRight"
-  //             trigger="click"
-  //             // overlayStyle={{ width: popWidth }}
-  //             styles={{ root: { width: popWidth } }}
-  //         >
-  //             <Button
-  //                 className={classnames(`${prefixCls}-count`, hashId,)}
-
-  //                 icon={<MoreOutlined />}
-  //                 size="default"
-  //                 onClick={e => {
-  //                     console.log('click', e)
-  //                     e.stopPropagation();
-  //                 }}
-  //             />
-  //         </Popover>
-  //     );
-  // }
-
   var popoverContent = /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs("div", {
       className: classnames("".concat(prefixCls, "-count-head"), hashId),
@@ -193,22 +143,33 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
         },
         children: intl.getMessage('treeSelect.clearSelectedItems', '清空已选项')
       })]
-    }), selectedNodes.length > 0 ? selectedNodes.map(function (item) {
-      return /*#__PURE__*/_jsx(Tag, {
-        closable: !disabled,
-        onClose: function onClose(e) {
-          e.stopPropagation();
-          clearKey(item.id);
-        },
-        style: {
-          marginBottom: 5
-        },
-        children: item.name.length > 20 ? "".concat(item.name.slice(0, 20), "...") : item.name
-      }, "tab-".concat(item.id));
-    }) : /*#__PURE__*/_jsx(Empty, {
-      image: Empty.PRESENTED_IMAGE_SIMPLE
+    }), /*#__PURE__*/_jsx("div", {
+      className: classnames("".concat(prefixCls, "-all-list"), hashId),
+      children: selectedNodes.length > 0 ? selectedNodes.map(function (item) {
+        var _item$fieldNames$labe;
+        return /*#__PURE__*/_jsx(Tag, {
+          closable: !disabled,
+          onClose: function onClose(e) {
+            e.stopPropagation();
+            clearKey(item[fieldNames.value]);
+          },
+          styles: {
+            root: {
+              marginBottom: 5,
+              marginRight: 5
+            }
+          },
+          children: ((_item$fieldNames$labe = item[fieldNames.label]) === null || _item$fieldNames$labe === void 0 ? void 0 : _item$fieldNames$labe.length) > 20 ? "".concat(item[fieldNames.label].slice(0, 20), "...") : item[fieldNames.label]
+        }, "tab-".concat(item[fieldNames.value]));
+      }) : /*#__PURE__*/_jsx(Empty, {
+        image: Empty.PRESENTED_IMAGE_SIMPLE
+      })
     })]
   });
+  var onChangeTreeSelect = function onChangeTreeSelect(value, label, extra) {
+    extra.list = getSelectedNodes(value);
+    onChange === null || onChange === void 0 || onChange(value, label, extra);
+  };
   return wrapSSR( /*#__PURE__*/_jsx("div", {
     ref: ref,
     style: style,
@@ -217,8 +178,10 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
       style: {
         width: '100%'
       },
-      children: [/*#__PURE__*/_jsx(TreeSelect, _objectSpread({
-        showSearch: true,
+      children: [/*#__PURE__*/_jsx(TreeSelect, _objectSpread(_objectSpread({
+        showSearch: {
+          treeNodeFilterProp: fieldNames.label
+        },
         placeholder: placeholder,
         treeData: treeData,
         treeLine: {
@@ -241,8 +204,15 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
           popup: classnames("".concat(prefixCls, "-popup"), hashId)
         },
         maxTagCount: "responsive",
-        treeDefaultExpandAll: true
-      }, props)), (multiple || treeCheckable) && /*#__PURE__*/_jsx(Popover, {
+        treeDefaultExpandAll: true,
+        fieldNames: fieldNames,
+        labelInValue: _labelInValue,
+        disabled: disabled
+      }, props), {}, {
+        onChange: function onChange(value, label, extra) {
+          return onChangeTreeSelect(value, label, extra, selectedNodes);
+        }
+      })), (multiple || treeCheckable) && /*#__PURE__*/_jsx(Popover, {
         open: popOpen,
         onOpenChange: setPopOpen,
         placement: "bottomRight",

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

@@ -7,7 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { useStyle as useAntdStyle } from "../../vtx-provider";
 var genVtxTreeSelectStyle = function genVtxTreeSelectStyle(token) {
   var componentCls = token.componentCls;
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-popover', {
+  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-popover', {
     minWidth: '200px',
     height: '300px',
     overflow: 'auto',
@@ -28,14 +28,16 @@ var genVtxTreeSelectStyle = function genVtxTreeSelectStyle(token) {
     color: '@input-placeholder-color'
   }), '&-count', {
     marginRight: '-12px'
-  })), "".concat(componentCls, "-popup"), _defineProperty({}, '&', _defineProperty(_defineProperty({}, '.ant-select-tree .ant-select-tree-treenode:not(.ant-select-tree .ant-select-tree-treenode-disabled).filter-node .ant-select-tree-title', {
+  })), "".concat(componentCls, "-popup"), _defineProperty({}, '&', _defineProperty(_defineProperty(_defineProperty({}, '.ant-select-tree .ant-select-tree-treenode:not(.ant-select-tree .ant-select-tree-treenode-disabled).filter-node .ant-select-tree-title', {
     color: '#1890ff'
   }), '.ant-select-tree .ant-select-tree-node-content-wrapper .ant-select-tree-node-selected', {
     backgroundColor: '#e6f7ff'
+  }), '.ant-select-tree .ant-select-tree-list-holder-inner .ant-select-tree-treenode .ant-select-tree-node-content-wrapper', {
+    flex: 1
   }))), "".concat(componentCls, "-count-head"), {
     display: 'flex',
     justifyContent: 'space-between',
-    marginBottom: '5px',
+    marginBottom: 5,
     '.disabled-count': {
       color: '#aaa',
       cursor: 'not-allowed'
@@ -45,6 +47,9 @@ var genVtxTreeSelectStyle = function genVtxTreeSelectStyle(token) {
     }, '&:hover', {
       color: '#40a9ff'
     })
+  }), "".concat(componentCls, "-all-list"), {
+    maxHeight: 300,
+    overflowY: "auto"
   }), "".concat(componentCls, "-outer"), {
     position: 'relative',
     display: 'inline-flex',
@@ -57,6 +62,7 @@ var genVtxTreeSelectStyle = function genVtxTreeSelectStyle(token) {
     color: token.colorTextDescription,
     display: 'inline-flex',
     alignItems: 'center',
+    width: token.controlHeight,
     '&:hover': {
       color: token.colorPrimary
     }

package/es/vtx-upload/FilePreview.js

@@ -10,6 +10,7 @@ import PropTypes from 'prop-types';
 // import { volume, playbackRate } from 'xgplayer/dist/controls';
 import { Modal, Button } from 'antd';
 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 Preview(props) {
@@ -77,7 +78,7 @@ function Preview(props) {
     timer && clearTimeout(timer);
     onCancel();
   };
-  return /*#__PURE__*/_jsxs(Modal, _objectSpread(_objectSpread({}, modalProps), {}, {
+  return /*#__PURE__*/_jsxs(VtxModal, _objectSpread(_objectSpread({}, modalProps), {}, {
     children: [type == 'file' ? /*#__PURE__*/_jsx("iframe", {
       src: url,
       style: {