@vtx/components 4.0.0-beta.67 → 4.0.0-beta.68

package/es/vtx-combogrid/Combogrid.js

@@ -43,7 +43,8 @@ function VtxCombogrid(props, ref) {
     searchForms = _props$searchForms === void 0 ? [] : _props$searchForms,
     selectedRowKeys = props.selectedRowKeys,
     setSelectedRowKeys = props.setSelectedRowKeys,
-    spread = props.spread,
+    _props$spread = props.spread,
+    spread = _props$spread === void 0 ? false : _props$spread,
     defaultPageSize = props.defaultPageSize,
     _props$customEnumText = props.customEnumText,
     customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText,
@@ -130,16 +131,16 @@ function VtxCombogrid(props, ref) {
     });
   }
 
-  // 查询和清空会重置selectedRowKeys，因此也需清空文本中的value值
+  // 重置会清空 selectedRowKeys，因此也需清空文本中的 value 值
   var query = function query() {
     submit();
-    if (multiple && selectedRowKeys.length) {
+    if (!spread && multiple && selectedRowKeys.length) {
       clearSelectedRow();
     }
   };
   var clear = function clear() {
     reset();
-    if (multiple && selectedRowKeys.length) {
+    if (!spread && multiple && selectedRowKeys.length) {
       clearSelectedRow();
     }
   };

package/es/vtx-combogrid/index.js

@@ -1,5 +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 = ["className", "style", "placeholder", "prefixCls", "value", "allowClear", "selectedRowKeys", "popoverProps", "inputProps", "content", "disabled"];
+var _excluded = ["className", "style", "placeholder", "prefixCls", "value", "allowClear", "selectedRowKeys", "popoverProps", "inputProps", "content", "disabled", "spread"];
 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; }
@@ -48,6 +48,8 @@ var VtxCombogrid = /*#__PURE__*/forwardRef(function (props, ref) {
     content = _props$content === void 0 ? null : _props$content,
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
+    _props$spread = props.spread,
+    spread = _props$spread === void 0 ? false : _props$spread,
     rest = _objectWithoutProperties(props, _excluded);
   useEffect(function () {
     setSelectedRowKeys(defaultSelectedRowKeys);
@@ -71,6 +73,7 @@ var VtxCombogrid = /*#__PURE__*/forwardRef(function (props, ref) {
       defaultSelectedRowKeys: defaultSelectedRowKeys,
       setSelectedRowKeys: setSelectedRowKeys,
       setPopoverVisible: setVisible,
+      spread: spread,
       ref: comboRef
     })),
     trigger: "click",

package/lib/vtx-combogrid/Combogrid.js

@@ -51,7 +51,8 @@ function VtxCombogrid(props, ref) {
     searchForms = _props$searchForms === void 0 ? [] : _props$searchForms,
     selectedRowKeys = props.selectedRowKeys,
     setSelectedRowKeys = props.setSelectedRowKeys,
-    spread = props.spread,
+    _props$spread = props.spread,
+    spread = _props$spread === void 0 ? false : _props$spread,
     defaultPageSize = props.defaultPageSize,
     _props$customEnumText = props.customEnumText,
     customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText,
@@ -138,16 +139,16 @@ function VtxCombogrid(props, ref) {
     });
   }
 
-  // 查询和清空会重置selectedRowKeys，因此也需清空文本中的value值
+  // 重置会清空 selectedRowKeys，因此也需清空文本中的 value 值
   var query = function query() {
     submit();
-    if (multiple && selectedRowKeys.length) {
+    if (!spread && multiple && selectedRowKeys.length) {
       clearSelectedRow();
     }
   };
   var clear = function clear() {
     reset();
-    if (multiple && selectedRowKeys.length) {
+    if (!spread && multiple && selectedRowKeys.length) {
       clearSelectedRow();
     }
   };

package/lib/vtx-combogrid/index.js

@@ -10,7 +10,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Combogrid = _interopRequireDefault(require("./Combogrid"));
 var _antd = require("antd");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["className", "style", "placeholder", "prefixCls", "value", "allowClear", "selectedRowKeys", "popoverProps", "inputProps", "content", "disabled"];
+var _excluded = ["className", "style", "placeholder", "prefixCls", "value", "allowClear", "selectedRowKeys", "popoverProps", "inputProps", "content", "disabled", "spread"];
 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; }
@@ -57,6 +57,8 @@ var VtxCombogrid = exports.VtxCombogrid = /*#__PURE__*/(0, _react.forwardRef)(fu
     content = _props$content === void 0 ? null : _props$content,
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
+    _props$spread = props.spread,
+    spread = _props$spread === void 0 ? false : _props$spread,
     rest = _objectWithoutProperties(props, _excluded);
   (0, _react.useEffect)(function () {
     setSelectedRowKeys(defaultSelectedRowKeys);
@@ -80,6 +82,7 @@ var VtxCombogrid = exports.VtxCombogrid = /*#__PURE__*/(0, _react.forwardRef)(fu
       defaultSelectedRowKeys: defaultSelectedRowKeys,
       setSelectedRowKeys: setSelectedRowKeys,
       setPopoverVisible: setVisible,
+      spread: spread,
       ref: comboRef
     })),
     trigger: "click",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/components",
-  "version": "4.0.0-beta.67",
+  "version": "4.0.0-beta.68",
   "description": "React components for Vortex",
   "keywords": [
     "react",