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

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

@@ -244,7 +244,6 @@ var CheckboxList = function CheckboxList(_ref3) {
       var dropPosition = info.dropPosition,
         dropToGap = info.dropToGap;
       var position = dropPosition === -1 || !dropToGap ? dropPosition + 1 : dropPosition;
-      console.log('newMap info', dragKey, dropKey, position);
       move(dragKey, dropKey, position);
     },
     treeIcon: false,

package/es/vtx-datagrid/ToolBar/components/Density/index.js

@@ -7,7 +7,6 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 function Density() {
   var counter = useContext(TableContext);
   var TextEnum = counter.TextEnum;
-  console.log('tableSize', counter.tableSize);
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(Dropdown, {
       menu: {
@@ -24,7 +23,6 @@ function Density() {
         onClick: function onClick(_ref) {
           var _counter$setTableSize;
           var key = _ref.key;
-          console.log('counter', counter, key);
           (_counter$setTableSize = counter.setTableSize) === null || _counter$setTableSize === void 0 || _counter$setTableSize.call(counter, key);
         },
         selectedKeys: [counter.tableSize]

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-form-layout/FormItem.js

@@ -61,7 +61,6 @@ export default function FormItem(props) {
     }
   });
   var initPlaceholder = function initPlaceholder(placeholder, label, type) {
-    console.log('label, placeholder', placeholder, type === null || type === void 0 ? void 0 : type.displayName);
     if (placeholder) {
       return placeholder;
     }
@@ -81,14 +80,12 @@ export default function FormItem(props) {
   var renderItem = function renderItem(child) {
     if ( /*#__PURE__*/isValidElement(child)) {
       var _child$props;
-      console.log('initPlaceholder', child, label);
       return /*#__PURE__*/React.cloneElement(child, _objectSpread(_objectSpread({}, child.props), {}, {
         placeholder: initPlaceholder(child === null || child === void 0 || (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.placeholder, label, child === null || child === void 0 ? void 0 : child.type)
       }));
     }
     return child;
   };
-  console.log('disableHtmlFor', disableHtmlFor, props.children);
   return /*#__PURE__*/_jsx(Col, {
     span: SPAN * weights / cols,
     className: "".concat(prefixCls, "-col"),

package/es/vtx-image/style/index.js

@@ -20,7 +20,6 @@ var center = function center() {
 };
 var genVtxImageStyle = function genVtxImageStyle(token) {
   var componentCls = token.componentCls;
-  console.log('componentCls', componentCls);
   return _defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-aspectFit', {
     position: 'relative',
     height: '100%',

package/es/vtx-import2/style/index.js

@@ -7,7 +7,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { useStyle as useAntdStyle } from "../../vtx-provider";
 var genVtxImport2Style = function genVtxImport2Style(token) {
   var componentCls = token.componentCls;
-  console.log('componentCls', componentCls);
   return _defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-modal-header-title', {
     color: token.colorText
   }), '&-modal-header-text', {

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/es/vtx-search/index.js

@@ -251,9 +251,6 @@ function VtxSearch(props) {
         return (realColumn - grid.len - 1) * (24 / realColumn);
       }
     } else {
-      console.log('grid.lenWeight', grid.lenWeight);
-      console.log('realColumn', realColumn);
-      console.log('showPosition', showPosition);
       if (grid.lenWeight > realColumn - 1) {
         var _total = Math.ceil((grid.lenWeight + 1) / realColumn);
         return (_total * realColumn - grid.lenWeight - 1) * (24 / realColumn);

package/es/vtx-select/index.js

@@ -93,7 +93,6 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       };
     }
   }, [mode]);
-  console.log(props.options, props.children);
   var newChildren = props.children ? Array.isArray(props.children) ? props.children : [props.children] : ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.map(function (v) {
     return _objectSpread(_objectSpread({}, v), {}, {
       key: v.value,

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

@@ -106,7 +106,6 @@ 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;
@@ -122,7 +121,6 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
     return selectedNodes;
   };
   var selectedNodes = useMemo(function () {
-    console.log('selectedNodes', props);
     return getSelectedNodes(props.value);
   }, [props.value, keyNodesMapping]);
   useEffect(function () {

package/es/vtx-tree-select/style/index.js

@@ -7,7 +7,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { useStyle as useAntdStyle } from "../../vtx-provider";
 var genVtxTreeSelectStyle = function genVtxTreeSelectStyle(token) {
   var componentCls = token.componentCls;
-  console.log('token.controlHeight', token.controlHeight);
   return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-popover', {
     minWidth: '200px',
     height: '300px',

package/es/vtx-wang-editor/index.js

@@ -342,7 +342,6 @@ var VtxWangEditor = function VtxWangEditor(props) {
           try {
             if (res.result == 0) {
               res.data.map(function (item) {
-                console.log('插入附件:', item, insertFn);
                 insertFn(item.fileName, "".concat(downloadUrl).concat(item.id));
               });
             } else {

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

@@ -248,7 +248,6 @@ var CheckboxList = function CheckboxList(_ref3) {
       var dropPosition = info.dropPosition,
         dropToGap = info.dropToGap;
       var position = dropPosition === -1 || !dropToGap ? dropPosition + 1 : dropPosition;
-      console.log('newMap info', dragKey, dropKey, position);
       move(dragKey, dropKey, position);
     },
     treeIcon: false,

package/lib/vtx-datagrid/ToolBar/components/Density/index.js

@@ -13,7 +13,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function Density() {
   var counter = (0, _react.useContext)(_Provide.TableContext);
   var TextEnum = counter.TextEnum;
-  console.log('tableSize', counter.tableSize);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Dropdown, {
       menu: {
@@ -30,7 +29,6 @@ function Density() {
         onClick: function onClick(_ref) {
           var _counter$setTableSize;
           var key = _ref.key;
-          console.log('counter', counter, key);
           (_counter$setTableSize = counter.setTableSize) === null || _counter$setTableSize === void 0 || _counter$setTableSize.call(counter, key);
         },
         selectedKeys: [counter.tableSize]

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-form-layout/FormItem.js

@@ -67,7 +67,6 @@ function FormItem(props) {
     }
   });
   var initPlaceholder = function initPlaceholder(placeholder, label, type) {
-    console.log('label, placeholder', placeholder, type === null || type === void 0 ? void 0 : type.displayName);
     if (placeholder) {
       return placeholder;
     }
@@ -87,14 +86,12 @@ function FormItem(props) {
   var renderItem = function renderItem(child) {
     if ( /*#__PURE__*/(0, _react.isValidElement)(child)) {
       var _child$props;
-      console.log('initPlaceholder', child, label);
       return /*#__PURE__*/_react.default.cloneElement(child, _objectSpread(_objectSpread({}, child.props), {}, {
         placeholder: initPlaceholder(child === null || child === void 0 || (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.placeholder, label, child === null || child === void 0 ? void 0 : child.type)
       }));
     }
     return child;
   };
-  console.log('disableHtmlFor', disableHtmlFor, props.children);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, {
     span: SPAN * weights / cols,
     className: "".concat(prefixCls, "-col"),

package/lib/vtx-image/style/index.js

@@ -26,7 +26,6 @@ var center = function center() {
 };
 var genVtxImageStyle = function genVtxImageStyle(token) {
   var componentCls = token.componentCls;
-  console.log('componentCls', componentCls);
   return _defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-aspectFit', {
     position: 'relative',
     height: '100%',

package/lib/vtx-import2/style/index.js

@@ -13,7 +13,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 var genVtxImport2Style = function genVtxImport2Style(token) {
   var componentCls = token.componentCls;
-  console.log('componentCls', componentCls);
   return _defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-modal-header-title', {
     color: token.colorText
   }), '&-modal-header-text', {

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/lib/vtx-search/index.js

@@ -257,9 +257,6 @@ function VtxSearch(props) {
         return (realColumn - grid.len - 1) * (24 / realColumn);
       }
     } else {
-      console.log('grid.lenWeight', grid.lenWeight);
-      console.log('realColumn', realColumn);
-      console.log('showPosition', showPosition);
       if (grid.lenWeight > realColumn - 1) {
         var _total = Math.ceil((grid.lenWeight + 1) / realColumn);
         return (_total * realColumn - grid.lenWeight - 1) * (24 / realColumn);

package/lib/vtx-select/index.js

@@ -101,7 +101,6 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
       };
     }
   }, [mode]);
-  console.log(props.options, props.children);
   var newChildren = props.children ? Array.isArray(props.children) ? props.children : [props.children] : ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.map(function (v) {
     return _objectSpread(_objectSpread({}, v), {}, {
       key: v.value,

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

@@ -113,7 +113,6 @@ 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;
@@ -129,7 +128,6 @@ 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 () {

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

@@ -13,7 +13,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 var genVtxTreeSelectStyle = function genVtxTreeSelectStyle(token) {
   var componentCls = token.componentCls;
-  console.log('token.controlHeight', token.controlHeight);
   return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-popover', {
     minWidth: '200px',
     height: '300px',

package/lib/vtx-wang-editor/index.js

@@ -347,7 +347,6 @@ var VtxWangEditor = exports.VtxWangEditor = function VtxWangEditor(props) {
           try {
             if (res.result == 0) {
               res.data.map(function (item) {
-                console.log('插入附件:', item, insertFn);
                 insertFn(item.fileName, "".concat(downloadUrl).concat(item.id));
               });
             } else {

package/package.json

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