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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/es/vtx-combogrid/Combogrid.js +5 -4
  2. package/es/vtx-combogrid/index.js +4 -1
  3. package/lib/vtx-combogrid/Combogrid.js +5 -4
  4. package/lib/vtx-combogrid/index.js +4 -1
  5. package/package.json +1 -1
package/es/vtx-combogrid/Combogrid.js CHANGED
@@ -43,7 +43,8 @@ function VtxCombogrid(props, ref) {
43
43
  searchForms = _props$searchForms === void 0 ? [] : _props$searchForms,
44
44
  selectedRowKeys = props.selectedRowKeys,
45
45
  setSelectedRowKeys = props.setSelectedRowKeys,
46
- spread = props.spread,
46
+ _props$spread = props.spread,
47
+ spread = _props$spread === void 0 ? false : _props$spread,
47
48
  defaultPageSize = props.defaultPageSize,
48
49
  _props$customEnumText = props.customEnumText,
49
50
  customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText,
@@ -130,16 +131,16 @@ function VtxCombogrid(props, ref) {
130
131
  });
131
132
  }
132
133
 
133
- // 查询和清空会重置selectedRowKeys，因此也需清空文本中的value值
134
+ // 重置会清空 selectedRowKeys，因此也需清空文本中的 value 值
134
135
  var query = function query() {
135
136
  submit();
136
- if (multiple && selectedRowKeys.length) {
137
+ if (!spread && multiple && selectedRowKeys.length) {
137
138
  clearSelectedRow();
138
139
  }
139
140
  };
140
141
  var clear = function clear() {
141
142
  reset();
142
- if (multiple && selectedRowKeys.length) {
143
+ if (!spread && multiple && selectedRowKeys.length) {
143
144
  clearSelectedRow();
144
145
  }
145
146
  };
package/es/vtx-combogrid/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  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); }
2
- var _excluded = ["className", "style", "placeholder", "prefixCls", "value", "allowClear", "selectedRowKeys", "popoverProps", "inputProps", "content", "disabled"];
2
+ var _excluded = ["className", "style", "placeholder", "prefixCls", "value", "allowClear", "selectedRowKeys", "popoverProps", "inputProps", "content", "disabled", "spread"];
3
3
  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; }
4
4
  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; }
5
5
  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) {
48
48
  content = _props$content === void 0 ? null : _props$content,
49
49
  _props$disabled = props.disabled,
50
50
  disabled = _props$disabled === void 0 ? false : _props$disabled,
51
+ _props$spread = props.spread,
52
+ spread = _props$spread === void 0 ? false : _props$spread,
51
53
  rest = _objectWithoutProperties(props, _excluded);
52
54
  useEffect(function () {
53
55
  setSelectedRowKeys(defaultSelectedRowKeys);
@@ -71,6 +73,7 @@ var VtxCombogrid = /*#__PURE__*/forwardRef(function (props, ref) {
71
73
  defaultSelectedRowKeys: defaultSelectedRowKeys,
72
74
  setSelectedRowKeys: setSelectedRowKeys,
73
75
  setPopoverVisible: setVisible,
76
+ spread: spread,
74
77
  ref: comboRef
75
78
  })),
76
79
  trigger: "click",
package/lib/vtx-combogrid/Combogrid.js CHANGED
@@ -51,7 +51,8 @@ function VtxCombogrid(props, ref) {
51
51
  searchForms = _props$searchForms === void 0 ? [] : _props$searchForms,
52
52
  selectedRowKeys = props.selectedRowKeys,
53
53
  setSelectedRowKeys = props.setSelectedRowKeys,
54
- spread = props.spread,
54
+ _props$spread = props.spread,
55
+ spread = _props$spread === void 0 ? false : _props$spread,
55
56
  defaultPageSize = props.defaultPageSize,
56
57
  _props$customEnumText = props.customEnumText,
57
58
  customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText,
@@ -138,16 +139,16 @@ function VtxCombogrid(props, ref) {
138
139
  });
139
140
  }
140
141
 
141
- // 查询和清空会重置selectedRowKeys，因此也需清空文本中的value值
142
+ // 重置会清空 selectedRowKeys，因此也需清空文本中的 value 值
142
143
  var query = function query() {
143
144
  submit();
144
- if (multiple && selectedRowKeys.length) {
145
+ if (!spread && multiple && selectedRowKeys.length) {
145
146
  clearSelectedRow();
146
147
  }
147
148
  };
148
149
  var clear = function clear() {
149
150
  reset();
150
- if (multiple && selectedRowKeys.length) {
151
+ if (!spread && multiple && selectedRowKeys.length) {
151
152
  clearSelectedRow();
152
153
  }
153
154
  };
package/lib/vtx-combogrid/index.js CHANGED
@@ -10,7 +10,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
10
10
  var _Combogrid = _interopRequireDefault(require("./Combogrid"));
11
11
  var _antd = require("antd");
12
12
  var _jsxRuntime = require("react/jsx-runtime");
13
- var _excluded = ["className", "style", "placeholder", "prefixCls", "value", "allowClear", "selectedRowKeys", "popoverProps", "inputProps", "content", "disabled"];
13
+ var _excluded = ["className", "style", "placeholder", "prefixCls", "value", "allowClear", "selectedRowKeys", "popoverProps", "inputProps", "content", "disabled", "spread"];
14
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
15
  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); }
16
16
  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
57
57
  content = _props$content === void 0 ? null : _props$content,
58
58
  _props$disabled = props.disabled,
59
59
  disabled = _props$disabled === void 0 ? false : _props$disabled,
60
+ _props$spread = props.spread,
61
+ spread = _props$spread === void 0 ? false : _props$spread,
60
62
  rest = _objectWithoutProperties(props, _excluded);
61
63
  (0, _react.useEffect)(function () {
62
64
  setSelectedRowKeys(defaultSelectedRowKeys);
@@ -80,6 +82,7 @@ var VtxCombogrid = exports.VtxCombogrid = /*#__PURE__*/(0, _react.forwardRef)(fu
80
82
  defaultSelectedRowKeys: defaultSelectedRowKeys,
81
83
  setSelectedRowKeys: setSelectedRowKeys,
82
84
  setPopoverVisible: setVisible,
85
+ spread: spread,
83
86
  ref: comboRef
84
87
  })),
85
88
  trigger: "click",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vtx/components",
3
- "version": "4.0.0-beta.67",
3
+ "version": "4.0.0-beta.68",
4
4
  "description": "React components for Vortex",
5
5
  "keywords": [
6
6
  "react",