@vtx/components 4.0.0-beta.95 → 4.0.0-beta.97

package/README.md

@@ -10,6 +10,15 @@ $ pnpm add @vtx/components -S
 
 ## 使用
 
+推荐通过组件子入口按需导入，避免业务工程解析完整的组件库根入口：
+
+```js
+import { VtxDatePicker } from '@vtx/components/vtx-date-picker';
+import { VtxDatagrid } from '@vtx/components/vtx-datagrid';
+```
+
+根入口导入仍保持兼容：
+
 ```js
 import { VtxDatePicker } from '@vtx/components';
 ```

package/es/vtx-datagrid/columnState.js

@@ -18,13 +18,14 @@ export function buildColumnKeyMap() {
     indexColumn = _ref$indexColumn === void 0 ? true : _ref$indexColumn;
   var hasVisibleColumnKeys = Array.isArray(visibleColumnKeys);
   var hasDefaultVisibleColumnKeys = Array.isArray(defaultVisibleColumnKeys);
-  return (tableColumn || []).reduce(function (columnKeyMap, _ref2, index) {
+  return (tableColumn || []).reduce(function loop(columnKeyMap, _ref2, index) {
     var _previousConfig$fixed, _previousConfig$width;
     var key = _ref2.key,
       dataIndex = _ref2.dataIndex,
       fixed = _ref2.fixed,
       disable = _ref2.disable,
-      width = _ref2.width;
+      width = _ref2.width,
+      children = _ref2.children;
     var columnKey = genColumnKey(key !== null && key !== void 0 ? key : dataIndex, index);
     var previousConfig = previousColumnsMap[columnKey] || {};
     var show = previousConfig.show;
@@ -46,6 +47,9 @@ export function buildColumnKeyMap() {
     if (previousConfig.order !== undefined) {
       columnKeyMap[columnKey].order = previousConfig.order;
     }
+    if (children !== null && children !== void 0 && children.length) {
+      children.reduce(loop, columnKeyMap);
+    }
     return columnKeyMap;
   }, {});
 }

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

@@ -10,21 +10,23 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, forwardRef, useContext, useMemo, useRef } from 'react';
 import { ExportOutlined } from '@ant-design/icons';
-import PropTypes from 'prop-types';
 import { useSetState } from 'ahooks';
-import { Button, Form, message, Modal, Radio, ConfigProvider } from 'antd';
+import { Button, ConfigProvider, Form, message, Radio } from 'antd';
+import PropTypes from 'prop-types';
+import { useContext, useEffect, useRef } from 'react';
+import { Input } from 'antd';
+import classnames from 'classnames';
 import dayjs from 'dayjs';
-import { postData } from "./util";
-import History from "./History";
+import { cloneDeep } from 'lodash-es';
+import { SpecialCharacters } from "../utils/filterSpecialCharacters";
+import VtxInput from "../vtx-input";
+import VtxModal from "../vtx-modal";
+import { useIntl } from "../vtx-provider";
 import ColumnsSelect from "./ColumnsSelect";
+import History from "./History";
 import { useStyle } from "./style/index";
-import classnames from 'classnames';
-import { useIntl } from "../vtx-provider";
-import VtxModal from "../vtx-modal";
-import VtxInput from "../vtx-input";
-import { SpecialCharacters } from "../utils/filterSpecialCharacters";
+import { postData } from "./util";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var Includes = ['\\\\', '\\/', ':', '*', '?', '"', '<', '>', '|'];
@@ -85,7 +87,9 @@ var VtxExportAsync = function VtxExportAsync(props) {
     _props$historyHeaders = props.historyHeaders,
     historyHeaders = _props$historyHeaders === void 0 ? {} : _props$historyHeaders,
     _props$hideContent = props.hideContent,
-    hideContent = _props$hideContent === void 0 ? false : _props$hideContent;
+    hideContent = _props$hideContent === void 0 ? false : _props$hideContent,
+    _props$extraFormItems = props.extraFormItems,
+    extraFormItems = _props$extraFormItems === void 0 ? [] : _props$extraFormItems;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -204,6 +208,10 @@ var VtxExportAsync = function VtxExportAsync(props) {
           downloadAll = false,
           flag = true,
           columnJson = '';
+        var extraValues = cloneDeep(values);
+        delete extraValues.type;
+        delete extraValues.fileName;
+        delete extraValues.content;
         if (enableCustomSelect) {
           columnJson = JSON.stringify(allColumns.filter(function (item) {
             return item.key !== 'action' && values.content.includes(item.key);
@@ -254,13 +262,13 @@ var VtxExportAsync = function VtxExportAsync(props) {
             break;
         }
         if (flag && requestExportUrl) {
-          postData(requestExportUrl, _objectSpread({
+          postData(requestExportUrl, _objectSpread(_objectSpread({
             downloadAll: downloadAll,
             columnJson: columnJson,
             ids: ids.join(','),
             fileName: values.fileName,
             uniqueKey: uniqueKey
-          }, typeof getExportParams == 'function' ? getExportParams(values.type) : params), headers).then(function (res) {
+          }, typeof getExportParams == 'function' ? getExportParams(values.type) : params), extraValues), headers).then(function (res) {
             if ((res === null || res === void 0 ? void 0 : res.result) == 0) {
               setState({
                 showHistoryModal: true,
@@ -376,6 +384,13 @@ var VtxExportAsync = function VtxExportAsync(props) {
               }, item.key);
             })
           })
+        }), extraFormItems === null || extraFormItems === void 0 ? void 0 : extraFormItems.map(function (v) {
+          return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
+            label: v.name,
+            name: v.key
+          }, (v === null || v === void 0 ? void 0 : v.formItemProps) || {}), {}, {
+            children: (v === null || v === void 0 ? void 0 : v.dom) || /*#__PURE__*/_jsx(Input, {})
+          }), v.key);
         })]
       })
     }), state.showHistoryModal && /*#__PURE__*/_jsx(History, {
@@ -426,7 +441,8 @@ VtxExportAsync.propTypes = {
   enableCustomSelect: PropTypes.bool,
   headers: PropTypes.object,
   beforeExport: PropTypes.object,
-  historyHeaders: PropTypes.object
+  historyHeaders: PropTypes.object,
+  extraFormItems: PropTypes.array
 };
 export { VtxExportAsync };
 export default VtxExportAsync;

package/lib/vtx-datagrid/columnState.js

@@ -27,13 +27,14 @@ function buildColumnKeyMap() {
     indexColumn = _ref$indexColumn === void 0 ? true : _ref$indexColumn;
   var hasVisibleColumnKeys = Array.isArray(visibleColumnKeys);
   var hasDefaultVisibleColumnKeys = Array.isArray(defaultVisibleColumnKeys);
-  return (tableColumn || []).reduce(function (columnKeyMap, _ref2, index) {
+  return (tableColumn || []).reduce(function loop(columnKeyMap, _ref2, index) {
     var _previousConfig$fixed, _previousConfig$width;
     var key = _ref2.key,
       dataIndex = _ref2.dataIndex,
       fixed = _ref2.fixed,
       disable = _ref2.disable,
-      width = _ref2.width;
+      width = _ref2.width,
+      children = _ref2.children;
     var columnKey = (0, _genColumnKey.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
     var previousConfig = previousColumnsMap[columnKey] || {};
     var show = previousConfig.show;
@@ -55,6 +56,9 @@ function buildColumnKeyMap() {
     if (previousConfig.order !== undefined) {
       columnKeyMap[columnKey].order = previousConfig.order;
     }
+    if (children !== null && children !== void 0 && children.length) {
+      children.reduce(loop, columnKeyMap);
+    }
     return columnKeyMap;
   }, {});
 }

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

@@ -5,25 +5,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.VtxExportAsync = void 0;
-var _react = _interopRequireWildcard(require("react"));
 var _icons = require("@ant-design/icons");
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _ahooks = require("ahooks");
 var _antd = require("antd");
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = require("react");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
-var _util = require("./util");
-var _History = _interopRequireDefault(require("./History"));
+var _lodashEs = require("lodash-es");
+var _filterSpecialCharacters = require("../utils/filterSpecialCharacters");
+var _vtxInput = _interopRequireDefault(require("../vtx-input"));
+var _vtxModal = _interopRequireDefault(require("../vtx-modal"));
+var _vtxProvider = require("../vtx-provider");
 var _ColumnsSelect = _interopRequireDefault(require("./ColumnsSelect"));
+var _History = _interopRequireDefault(require("./History"));
 var _index = require("./style/index");
-var _classnames = _interopRequireDefault(require("classnames"));
-var _vtxProvider = require("../vtx-provider");
-var _vtxModal = _interopRequireDefault(require("../vtx-modal"));
-var _vtxInput = _interopRequireDefault(require("../vtx-input"));
-var _filterSpecialCharacters = require("../utils/filterSpecialCharacters");
+var _util = require("./util");
 var _jsxRuntime = require("react/jsx-runtime");
 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; }
 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; }
@@ -93,7 +92,9 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
     _props$historyHeaders = props.historyHeaders,
     historyHeaders = _props$historyHeaders === void 0 ? {} : _props$historyHeaders,
     _props$hideContent = props.hideContent,
-    hideContent = _props$hideContent === void 0 ? false : _props$hideContent;
+    hideContent = _props$hideContent === void 0 ? false : _props$hideContent,
+    _props$extraFormItems = props.extraFormItems,
+    extraFormItems = _props$extraFormItems === void 0 ? [] : _props$extraFormItems;
   var _Form$useForm = _antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -212,6 +213,10 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
           downloadAll = false,
           flag = true,
           columnJson = '';
+        var extraValues = (0, _lodashEs.cloneDeep)(values);
+        delete extraValues.type;
+        delete extraValues.fileName;
+        delete extraValues.content;
         if (enableCustomSelect) {
           columnJson = JSON.stringify(allColumns.filter(function (item) {
             return item.key !== 'action' && values.content.includes(item.key);
@@ -262,13 +267,13 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
             break;
         }
         if (flag && requestExportUrl) {
-          (0, _util.postData)(requestExportUrl, _objectSpread({
+          (0, _util.postData)(requestExportUrl, _objectSpread(_objectSpread({
             downloadAll: downloadAll,
             columnJson: columnJson,
             ids: ids.join(','),
             fileName: values.fileName,
             uniqueKey: uniqueKey
-          }, typeof getExportParams == 'function' ? getExportParams(values.type) : params), headers).then(function (res) {
+          }, typeof getExportParams == 'function' ? getExportParams(values.type) : params), extraValues), headers).then(function (res) {
             if ((res === null || res === void 0 ? void 0 : res.result) == 0) {
               setState({
                 showHistoryModal: true,
@@ -384,6 +389,13 @@ var VtxExportAsync = exports.VtxExportAsync = function VtxExportAsync(props) {
               }, item.key);
             })
           })
+        }), extraFormItems === null || extraFormItems === void 0 ? void 0 : extraFormItems.map(function (v) {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({
+            label: v.name,
+            name: v.key
+          }, (v === null || v === void 0 ? void 0 : v.formItemProps) || {}), {}, {
+            children: (v === null || v === void 0 ? void 0 : v.dom) || /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {})
+          }), v.key);
         })]
       })
     }), state.showHistoryModal && /*#__PURE__*/(0, _jsxRuntime.jsx)(_History.default, {
@@ -434,6 +446,7 @@ VtxExportAsync.propTypes = {
   enableCustomSelect: _propTypes.default.bool,
   headers: _propTypes.default.object,
   beforeExport: _propTypes.default.object,
-  historyHeaders: _propTypes.default.object
+  historyHeaders: _propTypes.default.object,
+  extraFormItems: _propTypes.default.array
 };
 var _default = exports.default = VtxExportAsync;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/components",
-  "version": "4.0.0-beta.95",
+  "version": "4.0.0-beta.97",
   "description": "React components for Vortex",
   "keywords": [
     "react",
@@ -12,6 +12,19 @@
     "es"
   ],
   "main": "lib/index.js",
+  "exports": {
+    ".": {
+      "import": "./es/index.js",
+      "require": "./lib/index.js",
+      "default": "./lib/index.js"
+    },
+    "./vtx-*": {
+      "import": "./es/vtx-*/index.js",
+      "require": "./lib/vtx-*/index.js",
+      "default": "./lib/vtx-*/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "scripts": {
     "start": "dumi dev",
     "compile": "father build",