@vtx/components 4.0.0-beta.40 → 4.0.0-beta.41

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-datagrid/ToolBar/components/ColumnSetting/style.js +3 -1
  2. package/es/vtx-tree-select/index.js +8 -4
  3. package/lib/vtx-datagrid/ToolBar/components/ColumnSetting/style.js +3 -1
  4. package/lib/vtx-tree-select/index.js +8 -4
  5. package/package.json +1 -1
package/es/vtx-datagrid/ToolBar/components/ColumnSetting/style.js CHANGED
@@ -29,7 +29,9 @@ var genVtxStyle = function genVtxStyle(token) {
29
29
  }), "".concat(token.antCls, "-tree-draggable-icon"), {
30
30
  cursor: 'grab'
31
31
  }), "".concat(token.antCls, "-tree-treenode"), _defineProperty(_defineProperty({
32
- alignItems: 'center'
32
+ alignItems: 'center',
33
+ paddingRight: 12,
34
+ boxSizing: 'border-box'
33
35
  }, "".concat(token.antCls, "-tree-checkbox"), {
34
36
  marginInlineEnd: 4
35
37
  }), "".concat(token.antCls, "-tree-title"), {
package/es/vtx-tree-select/index.js CHANGED
@@ -1,6 +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 = ["multiple", "treeData", "placeholder", "treeCheckable", "disabled", "style", "fieldNames", "onChange", "labelInValue"],
3
- _excluded2 = ["children"];
2
+ var _excluded = ["multiple", "treeData", "placeholder", "treeCheckable", "disabled", "style", "fieldNames", "onChange", "labelInValue"];
4
3
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
5
4
  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."); }
6
5
  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 =
10
9
  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; }
11
10
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
12
11
  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); }
12
+ function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
13
13
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
14
14
  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."); }
15
15
  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); }
@@ -42,6 +42,7 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
42
42
  fieldNames = _ref$fieldNames === void 0 ? {
43
43
  label: "title",
44
44
  value: "value",
45
+ key: "value",
45
46
  children: 'children'
46
47
  } : _ref$fieldNames,
47
48
  onChange = _ref.onChange,
@@ -74,8 +75,8 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
74
75
  }
75
76
  (function genNodes(nodes) {
76
77
  nodes.map(function (item) {
77
- var children = item.children,
78
- rest = _objectWithoutProperties(item, _excluded2);
78
+ var rest = Object.assign({}, (_objectDestructuringEmpty(item), item));
79
+ var children = item[fieldNames.children];
79
80
  keyNodesMapping[item[fieldNames.value]] = _objectSpread(_objectSpread({}, rest), {}, _defineProperty(_defineProperty({}, fieldNames.value, item[fieldNames.value]), fieldNames.label, item[fieldNames.label]));
80
81
  if (Array.isArray(children) && children.length > 0) {
81
82
  genNodes(children);
@@ -105,6 +106,7 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
105
106
  return [];
106
107
  }
107
108
  }(value);
109
+ console.log('value_arr', value_arr, keyNodesMapping);
108
110
  var selectedNodes = value_arr.filter(function (k) {
109
111
  if (_labelInValue) {
110
112
  return k.value in keyNodesMapping;
@@ -120,6 +122,7 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
120
122
  return selectedNodes;
121
123
  };
122
124
  var selectedNodes = useMemo(function () {
125
+ console.log('selectedNodes', props);
123
126
  return getSelectedNodes(props.value);
124
127
  }, [props.value, keyNodesMapping]);
125
128
  useEffect(function () {
@@ -127,6 +130,7 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
127
130
  setPopWidth(size === null || size === void 0 ? void 0 : size.width);
128
131
  }
129
132
  }, [size === null || size === void 0 ? void 0 : size.width]);
133
+ console.log('selectedNodes', selectedNodes);
130
134
  var popoverContent = /*#__PURE__*/_jsxs(_Fragment, {
131
135
  children: [/*#__PURE__*/_jsxs("div", {
132
136
  className: classnames("".concat(prefixCls, "-count-head"), hashId),
package/lib/vtx-datagrid/ToolBar/components/ColumnSetting/style.js CHANGED
@@ -35,7 +35,9 @@ var genVtxStyle = function genVtxStyle(token) {
35
35
  }), "".concat(token.antCls, "-tree-draggable-icon"), {
36
36
  cursor: 'grab'
37
37
  }), "".concat(token.antCls, "-tree-treenode"), _defineProperty(_defineProperty({
38
- alignItems: 'center'
38
+ alignItems: 'center',
39
+ paddingRight: 12,
40
+ boxSizing: 'border-box'
39
41
  }, "".concat(token.antCls, "-tree-checkbox"), {
40
42
  marginInlineEnd: 4
41
43
  }), "".concat(token.antCls, "-tree-title"), {
package/lib/vtx-tree-select/index.js CHANGED
@@ -15,8 +15,7 @@ var _index = require("./style/index");
15
15
  var _ahooks = require("ahooks");
16
16
  var _vtxProvider = require("../vtx-provider");
17
17
  var _jsxRuntime = require("react/jsx-runtime");
18
- var _excluded = ["multiple", "treeData", "placeholder", "treeCheckable", "disabled", "style", "fieldNames", "onChange", "labelInValue"],
19
- _excluded2 = ["children"];
18
+ var _excluded = ["multiple", "treeData", "placeholder", "treeCheckable", "disabled", "style", "fieldNames", "onChange", "labelInValue"];
20
19
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
21
20
  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); }
22
21
  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; }
@@ -29,6 +28,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
29
28
  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; }
30
29
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
31
30
  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); }
31
+ function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
32
32
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
33
33
  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."); }
34
34
  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); }
@@ -49,6 +49,7 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
49
49
  fieldNames = _ref$fieldNames === void 0 ? {
50
50
  label: "title",
51
51
  value: "value",
52
+ key: "value",
52
53
  children: 'children'
53
54
  } : _ref$fieldNames,
54
55
  onChange = _ref.onChange,
@@ -81,8 +82,8 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
81
82
  }
82
83
  (function genNodes(nodes) {
83
84
  nodes.map(function (item) {
84
- var children = item.children,
85
- rest = _objectWithoutProperties(item, _excluded2);
85
+ var rest = Object.assign({}, (_objectDestructuringEmpty(item), item));
86
+ var children = item[fieldNames.children];
86
87
  keyNodesMapping[item[fieldNames.value]] = _objectSpread(_objectSpread({}, rest), {}, _defineProperty(_defineProperty({}, fieldNames.value, item[fieldNames.value]), fieldNames.label, item[fieldNames.label]));
87
88
  if (Array.isArray(children) && children.length > 0) {
88
89
  genNodes(children);
@@ -112,6 +113,7 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
112
113
  return [];
113
114
  }
114
115
  }(value);
116
+ console.log('value_arr', value_arr, keyNodesMapping);
115
117
  var selectedNodes = value_arr.filter(function (k) {
116
118
  if (_labelInValue) {
117
119
  return k.value in keyNodesMapping;
@@ -127,6 +129,7 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
127
129
  return selectedNodes;
128
130
  };
129
131
  var selectedNodes = (0, _react.useMemo)(function () {
132
+ console.log('selectedNodes', props);
130
133
  return getSelectedNodes(props.value);
131
134
  }, [props.value, keyNodesMapping]);
132
135
  (0, _react.useEffect)(function () {
@@ -134,6 +137,7 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
134
137
  setPopWidth(size === null || size === void 0 ? void 0 : size.width);
135
138
  }
136
139
  }, [size === null || size === void 0 ? void 0 : size.width]);
140
+ console.log('selectedNodes', selectedNodes);
137
141
  var popoverContent = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
138
142
  children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
139
143
  className: (0, _classnames.default)("".concat(prefixCls, "-count-head"), hashId),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vtx/components",
3
- "version": "4.0.0-beta.40",
3
+ "version": "4.0.0-beta.41",
4
4
  "description": "React components for Vortex",
5
5
  "keywords": [
6
6
  "react",