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

package/es/vtx-datagrid/ToolBar/components/ColumnSetting/style.js

@@ -29,7 +29,9 @@ var genVtxStyle = function genVtxStyle(token) {
   }), "".concat(token.antCls, "-tree-draggable-icon"), {
     cursor: 'grab'
   }), "".concat(token.antCls, "-tree-treenode"), _defineProperty(_defineProperty({
-    alignItems: 'center'
+    alignItems: 'center',
+    paddingRight: 12,
+    boxSizing: 'border-box'
   }, "".concat(token.antCls, "-tree-checkbox"), {
     marginInlineEnd: 4
   }), "".concat(token.antCls, "-tree-title"), {

package/es/vtx-import2/index.js

@@ -26,7 +26,7 @@ import getToken from "../utils/getToken";
 import getSignature from '@vtx/utils/lib/getSignature';
 import useSet from "../utils/useSet";
 import md5 from 'md5';
-import { getVtxToken } from '@vtx/utils';
+import { getVtxToken, getUrlParam } from '@vtx/utils';
 import classnames from 'classnames';
 import { useStyle } from "./style/index";
 import { VtxProvider, useIntl } from "../vtx-provider";

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", "fieldNames", "onChange", "labelInValue"],
-  _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); }
@@ -42,6 +42,7 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
     fieldNames = _ref$fieldNames === void 0 ? {
       label: "title",
       value: "value",
+      key: "value",
       children: 'children'
     } : _ref$fieldNames,
     onChange = _ref.onChange,
@@ -74,8 +75,8 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
     }
     (function genNodes(nodes) {
       nodes.map(function (item) {
-        var children = item.children,
-          rest = _objectWithoutProperties(item, _excluded2);
+        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);
@@ -105,6 +106,7 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
         return [];
       }
     }(value);
+    console.log('value_arr', value_arr, keyNodesMapping);
     var selectedNodes = value_arr.filter(function (k) {
       if (_labelInValue) {
         return k.value in keyNodesMapping;
@@ -120,6 +122,7 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
     return selectedNodes;
   };
   var selectedNodes = useMemo(function () {
+    console.log('selectedNodes', props);
     return getSelectedNodes(props.value);
   }, [props.value, keyNodesMapping]);
   useEffect(function () {
@@ -205,7 +208,8 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
         maxTagCount: "responsive",
         treeDefaultExpandAll: true,
         fieldNames: fieldNames,
-        labelInValue: _labelInValue
+        labelInValue: _labelInValue,
+        disabled: disabled
       }, props), {}, {
         onChange: function onChange(value, label, extra) {
           return onChangeTreeSelect(value, label, extra, selectedNodes);

package/lib/vtx-datagrid/ToolBar/components/ColumnSetting/style.js

@@ -35,7 +35,9 @@ var genVtxStyle = function genVtxStyle(token) {
   }), "".concat(token.antCls, "-tree-draggable-icon"), {
     cursor: 'grab'
   }), "".concat(token.antCls, "-tree-treenode"), _defineProperty(_defineProperty({
-    alignItems: 'center'
+    alignItems: 'center',
+    paddingRight: 12,
+    boxSizing: 'border-box'
   }, "".concat(token.antCls, "-tree-checkbox"), {
     marginInlineEnd: 4
   }), "".concat(token.antCls, "-tree-title"), {

package/lib/vtx-import2/index.js

@@ -257,7 +257,7 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
     }
     request.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
     request.setRequestHeader('access_token', token ? "".concat(token) : '');
-    request.setRequestHeader('systemCode', getUrlParam('systemCode') ? getUrlParam('systemCode') : '');
+    request.setRequestHeader('systemCode', (0, _utils.getUrlParam)('systemCode') ? (0, _utils.getUrlParam)('systemCode') : '');
     // 添加操作日志
     request.setRequestHeader('operation', encodeURIComponent(JSON.stringify({
       menuId: sessionStorage.getItem('vtxmenuselectedKeys'),

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

@@ -15,8 +15,7 @@ var _index = require("./style/index");
 var _ahooks = require("ahooks");
 var _vtxProvider = require("../vtx-provider");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["multiple", "treeData", "placeholder", "treeCheckable", "disabled", "style", "fieldNames", "onChange", "labelInValue"],
-  _excluded2 = ["children"];
+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; }
@@ -29,6 +28,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); }
@@ -49,6 +49,7 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
     fieldNames = _ref$fieldNames === void 0 ? {
       label: "title",
       value: "value",
+      key: "value",
       children: 'children'
     } : _ref$fieldNames,
     onChange = _ref.onChange,
@@ -81,8 +82,8 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
     }
     (function genNodes(nodes) {
       nodes.map(function (item) {
-        var children = item.children,
-          rest = _objectWithoutProperties(item, _excluded2);
+        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);
@@ -112,6 +113,7 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
         return [];
       }
     }(value);
+    console.log('value_arr', value_arr, keyNodesMapping);
     var selectedNodes = value_arr.filter(function (k) {
       if (_labelInValue) {
         return k.value in keyNodesMapping;
@@ -127,6 +129,7 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
     return selectedNodes;
   };
   var selectedNodes = (0, _react.useMemo)(function () {
+    console.log('selectedNodes', props);
     return getSelectedNodes(props.value);
   }, [props.value, keyNodesMapping]);
   (0, _react.useEffect)(function () {
@@ -212,7 +215,8 @@ var VtxTreeSelect = exports.VtxTreeSelect = function VtxTreeSelect(_ref) {
         maxTagCount: "responsive",
         treeDefaultExpandAll: true,
         fieldNames: fieldNames,
-        labelInValue: _labelInValue
+        labelInValue: _labelInValue,
+        disabled: disabled
       }, props), {}, {
         onChange: function onChange(value, label, extra) {
           return onChangeTreeSelect(value, label, extra, selectedNodes);

package/package.json

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