@vtx/components 4.0.0-beta.64 → 4.0.0-beta.65

package/es/vtx-datagrid/index.js

@@ -23,6 +23,7 @@ import useSet from "../utils/useSet";
 import Alert from "./Alert";
 import ToolBar from "./ToolBar";
 import { Container, TableContext } from "./Store/Provide";
+import { mergeComponentsForResize } from "./mergeComponents";
 import { useStyle } from "./style/index";
 import { useAntdColumnResize } from 'react-antd-column-resize';
 import { useIntl } from "../vtx-provider";
@@ -337,11 +338,7 @@ function VtxTable(props) {
     }
   }, [_columns, columnsMap, counter, showTable]);
   var _components = useMemo(function () {
-    if (isDragRef) {
-      return resizeComponents;
-    } else {
-      return components;
-    }
+    return mergeComponentsForResize(components, resizeComponents, isDragRef);
   }, [isDragRef, resizeComponents, components]);
 
   // 工具栏

package/es/vtx-datagrid/mergeComponents.js

@@ -0,0 +1,15 @@
+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); }
+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; }
+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); }
+export function mergeComponentsForResize(components, resizeComponents, isDragRef) {
+  if (!isDragRef) {
+    return components;
+  }
+  return _objectSpread(_objectSpread(_objectSpread({}, resizeComponents || {}), components || {}), {}, {
+    header: _objectSpread(_objectSpread({}, (components === null || components === void 0 ? void 0 : components.header) || {}), (resizeComponents === null || resizeComponents === void 0 ? void 0 : resizeComponents.header) || {}),
+    body: _objectSpread(_objectSpread({}, (resizeComponents === null || resizeComponents === void 0 ? void 0 : resizeComponents.body) || {}), (components === null || components === void 0 ? void 0 : components.body) || {})
+  });
+}

package/es/vtx-export-async/index.js

@@ -32,7 +32,7 @@ var VtxExportAsync = function VtxExportAsync(props) {
   var intl = useIntl();
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('vtx-export-async', props.prefixCls);
+  var prefixCls = getPrefixCls('', 'vtx-export-async');
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;

package/es/vtx-page-layout/style/index.js

@@ -109,7 +109,9 @@ var genVtxStyle = function genVtxStyle(token) {
     '&-left': _defineProperty(_defineProperty({}, "".concat(componentCls, "-ztree-search"), {
       right: 0
     }), '.ant-vtx-tree-wraaper', {})
-  })), "".concat(componentCls, "-button-wrap"), _defineProperty({}, "button + button", {
+  })), "".concat(componentCls, "-button-wrap"), _defineProperty(_defineProperty({}, "button + button", {
+    marginLeft: 8
+  }), "button + .vtx-export-async", {
     marginLeft: 8
   }));
 };

package/lib/vtx-datagrid/index.js

@@ -17,6 +17,7 @@ var _useSet3 = _interopRequireDefault(require("../utils/useSet"));
 var _Alert = _interopRequireDefault(require("./Alert"));
 var _ToolBar = _interopRequireDefault(require("./ToolBar"));
 var _Provide = require("./Store/Provide");
+var _mergeComponents = require("./mergeComponents");
 var _index = require("./style/index");
 var _reactAntdColumnResize = require("react-antd-column-resize");
 var _vtxProvider = require("../vtx-provider");
@@ -347,11 +348,7 @@ function VtxTable(props) {
     }
   }, [_columns, columnsMap, counter, showTable]);
   var _components = (0, _react.useMemo)(function () {
-    if (isDragRef) {
-      return resizeComponents;
-    } else {
-      return components;
-    }
+    return (0, _mergeComponents.mergeComponentsForResize)(components, resizeComponents, isDragRef);
   }, [isDragRef, resizeComponents, components]);
 
   // 工具栏

package/lib/vtx-datagrid/mergeComponents.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeComponentsForResize = mergeComponentsForResize;
+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); }
+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; }
+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 mergeComponentsForResize(components, resizeComponents, isDragRef) {
+  if (!isDragRef) {
+    return components;
+  }
+  return _objectSpread(_objectSpread(_objectSpread({}, resizeComponents || {}), components || {}), {}, {
+    header: _objectSpread(_objectSpread({}, (components === null || components === void 0 ? void 0 : components.header) || {}), (resizeComponents === null || resizeComponents === void 0 ? void 0 : resizeComponents.header) || {}),
+    body: _objectSpread(_objectSpread({}, (resizeComponents === null || resizeComponents === void 0 ? void 0 : resizeComponents.body) || {}), (components === null || components === void 0 ? void 0 : components.body) || {})
+  });
+}

package/lib/vtx-export-async/index.js

@@ -40,7 +40,7 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
   var intl = (0, _vtxProvider.useIntl)();
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('vtx-export-async', props.prefixCls);
+  var prefixCls = getPrefixCls('', 'vtx-export-async');
   var _useStyle = (0, _index.useStyle)(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;

package/lib/vtx-page-layout/style/index.js

@@ -116,7 +116,9 @@ var genVtxStyle = function genVtxStyle(token) {
     '&-left': _defineProperty(_defineProperty({}, "".concat(componentCls, "-ztree-search"), {
       right: 0
     }), '.ant-vtx-tree-wraaper', {})
-  })), "".concat(componentCls, "-button-wrap"), _defineProperty({}, "button + button", {
+  })), "".concat(componentCls, "-button-wrap"), _defineProperty(_defineProperty({}, "button + button", {
+    marginLeft: 8
+  }), "button + .vtx-export-async", {
     marginLeft: 8
   }));
 };

package/package.json

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