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

package/es/utils/useEditableArray/index.js

@@ -40,9 +40,9 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var noteOnce = rcWarning.noteOnce;
 
-/**
- * 显示警告信息
- * @param messageStr
+/**
+ * 显示警告信息
+ * @param messageStr
  */
 var warning = function warning(messageStr) {
   return message.warning(messageStr);
@@ -52,11 +52,11 @@ export var recordKeyToString = function recordKeyToString(rowKey) {
   return rowKey;
 };
 
-/**
- * 使用map 来删除数据，性能一般 但是准确率比较高
- *
- * @param keyProps
- * @param action
+/**
+ * 使用map 来删除数据，性能一般 但是准确率比较高
+ *
+ * @param keyProps
+ * @param action
  */
 export function editableRowByKey(keyProps, action) {
   var _recordKeyToString;
@@ -68,11 +68,11 @@ export function editableRowByKey(keyProps, action) {
   var key = (_recordKeyToString = recordKeyToString(keyProps.key)) === null || _recordKeyToString === void 0 ? void 0 : _recordKeyToString.toString();
   var kvMap = new Map();
 
-  /**
-   * 打平这个数组
-   *
-   * @param records
-   * @param parentKey
+  /**
+   * 打平这个数组
+   *
+   * @param records
+   * @param parentKey
    */
   function dig(records, map_row_parentKey, map_row_index) {
     records.forEach(function (record, index) {
@@ -157,10 +157,10 @@ export function editableRowByKey(keyProps, action) {
   return fill(kvMap);
 }
 
-/**
- * 保存按钮的dom
- *
- * @param ActionRenderConfig
+/**
+ * 保存按钮的dom
+ *
+ * @param ActionRenderConfig
  */
 export function SaveEditableAction(_ref, ref) {
   var recordKey = _ref.recordKey,
@@ -263,10 +263,10 @@ export function SaveEditableAction(_ref, ref) {
   }, "save");
 }
 
-/**
- * 删除按钮 dom
- *
- * @param ActionRenderConfig
+/**
+ * 删除按钮 dom
+ *
+ * @param ActionRenderConfig
  */
 export var DeleteEditableAction = function DeleteEditableAction(_ref4) {
   var recordKey = _ref4.recordKey,
@@ -406,17 +406,17 @@ export function defaultActionRender(row, config) {
   };
 }
 
-/**
- * 一个方便的hooks 用于维护编辑的状态
- *
- * @param props
+/**
+ * 一个方便的hooks 用于维护编辑的状态
+ *
+ * @param props
  */
 export function useEditableArray(props) {
   // Internationalization
   var intl = useIntl();
 
-  /**
-   * 点击开始编辑之前的保存数据用的
+  /**
+   * 点击开始编辑之前的保存数据用的
    */
   var preEditRowRef = useRef(null);
   var _useState = useState(undefined),
@@ -504,10 +504,10 @@ export function useEditableArray(props) {
     };
   });
 
-  /**
-   * 进入编辑状态
-   *
-   * @param recordKey
+  /**
+   * 进入编辑状态
+   *
+   * @param recordKey
    */
   var startEditable = useRefFunction(function (recordKey, record) {
     var _ref7, _props$dataSource;
@@ -526,10 +526,10 @@ export function useEditableArray(props) {
     return true;
   });
 
-  /**
-   * 退出编辑状态
-   *
-   * @param recordKey
+  /**
+   * 退出编辑状态
+   *
+   * @param recordKey
    */
   var cancelEditable = useRefFunction( /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(recordKey, needReTry) {
@@ -635,11 +635,11 @@ export function useEditableArray(props) {
       }
     });
   }, [saveRefsMap, editableKeysSet]);
-  /**
-   * 保存编辑行
-   *
-   * @param recordKey
-   * @param needReTry
+  /**
+   * 保存编辑行
+   *
+   * @param recordKey
+   * @param needReTry
    */
   var saveEditable = useRefFunction( /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(recordKey, needReTry) {
@@ -686,12 +686,12 @@ export function useEditableArray(props) {
     };
   }());
 
-  /**
-   * 同时只能支持一行,取消之后数据消息，不会触发 dataSource
-   *
-   * @param row
-   * @param options
-   * @name 增加新的行
+  /**
+   * 同时只能支持一行,取消之后数据消息，不会触发 dataSource
+   *
+   * @param row
+   * @param options
+   * @name 增加新的行
    */
   var addEditRecord = useRefFunction(function (row, options) {
     if (options !== null && options !== void 0 && options.parentKey && !dataSourceKeyIndexMapRef.current.has(recordKeyToString(options === null || options === void 0 ? void 0 : options.parentKey).toString())) {

package/es/utils/useEditableMap/index.js

@@ -20,19 +20,19 @@ import { useCallback, useMemo, useRef } from 'react';
 import { useIntl } from "../../vtx-provider";
 import { defaultActionRender, recordKeyToString } from "../useEditableArray";
 
-/**
- * 显示警告信息
- * @param messageStr
+/**
+ * 显示警告信息
+ * @param messageStr
  */
 var warning = function warning(messageStr) {
   return message.warning(messageStr);
 };
 
-/**
- * 使用map 来删除数据，性能一般 但是准确率比较高
- *
- * @param params
- * @param action
+/**
+ * 使用map 来删除数据，性能一般 但是准确率比较高
+ *
+ * @param params
+ * @param action
  */
 function editableRowByKey(_ref) {
   var data = _ref.data,
@@ -40,14 +40,14 @@ function editableRowByKey(_ref) {
   return _objectSpread(_objectSpread({}, data), row);
 }
 
-/**
- * 一个方便的hooks 用于维护编辑的状态
- *
- * @param props
+/**
+ * 一个方便的hooks 用于维护编辑的状态
+ *
+ * @param props
  */
 export function useEditableMap(props) {
-  /**
-   * 点击开始编辑之前的保存数据用的
+  /**
+   * 点击开始编辑之前的保存数据用的
    */
   var preEditRowRef = useRef(null);
   var editableType = props.type || 'single';
@@ -79,10 +79,10 @@ export function useEditableMap(props) {
     return false;
   }, [(editableKeys || []).join(',')]);
 
-  /**
-   * 进入编辑状态
-   *
-   * @param recordKey
+  /**
+   * 进入编辑状态
+   *
+   * @param recordKey
    */
   var startEditable = function startEditable(recordKey, recordValue) {
     var _ref2;
@@ -97,10 +97,10 @@ export function useEditableMap(props) {
     return true;
   };
 
-  /**
-   * 退出编辑状态
-   *
-   * @param recordKey
+  /**
+   * 退出编辑状态
+   *
+   * @param recordKey
    */
   var cancelEditable = function cancelEditable(recordKey) {
     // 防止多次渲染

package/es/utils/useMediaQuery/index.js

@@ -37,11 +37,11 @@ export var MediaQueryEnum = {
   }
 };
 
-/**
- * loop query screen className
- * Array.find will throw a error
- * `Rendered more hooks than during the previous render.`
- * So should use Array.forEach
+/**
+ * loop query screen className
+ * Array.find will throw a error
+ * `Rendered more hooks than during the previous render.`
+ * So should use Array.forEach
  */
 export var getScreenClassName = function getScreenClassName() {
   var queryKey = undefined;

package/es/vtx-combogrid/Combogrid.js

@@ -1,5 +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 = ["setPopoverVisible", "multiple", "onChange", "getTableData", "columns", "searchForms", "selectedRowKeys", "setSelectedRowKeys", "spread", "defaultPageSize", "customEnumText", "headFootHeight", "popoverWidth"];
+var _excluded = ["setPopoverVisible", "multiple", "onChange", "getTableData", "columns", "searchForms", "selectedRowKeys", "setSelectedRowKeys", "spread", "defaultPageSize", "customEnumText", "headFootHeight", "popoverWidth", "formProps"];
 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; }
@@ -51,6 +51,8 @@ function VtxCombogrid(props, ref) {
     _props$headFootHeight = props.headFootHeight,
     headFootHeight = _props$headFootHeight === void 0 ? 95 : _props$headFootHeight,
     popoverWidth = props.popoverWidth,
+    _props$formProps = props.formProps,
+    formProps = _props$formProps === void 0 ? {} : _props$formProps,
     rest = _objectWithoutProperties(props, _excluded);
   var prefixCls = getPrefixCls('', 'vtx-combogrid');
   var _useStyle = useStyle(prefixCls, {
@@ -184,8 +186,9 @@ function VtxCombogrid(props, ref) {
   return wrapSSR( /*#__PURE__*/_jsxs("div", {
     className: "".concat(prefixCls, "-popover"),
     ref: ref,
-    children: [formLen > 0 && /*#__PURE__*/_jsx(Form, {
-      form: form,
+    children: [formLen > 0 && /*#__PURE__*/_jsx(Form, _objectSpread(_objectSpread({
+      form: form
+    }, formProps), {}, {
       children: /*#__PURE__*/_jsxs(Row, {
         gutter: 8,
         children: [/*#__PURE__*/_jsxs(Col, {
@@ -223,7 +226,7 @@ function VtxCombogrid(props, ref) {
           })]
         })]
       })
-    }), /*#__PURE__*/_jsx("div", {
+    })), /*#__PURE__*/_jsx("div", {
       className: "".concat(prefixCls, "-main"),
       children: /*#__PURE__*/_jsx(VtxDatagrid, _objectSpread(_objectSpread(_objectSpread({
         toolbar: false

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

@@ -375,10 +375,10 @@ export default function ColumnSetting(props) {
   var checkedColumnKeys = props.checkedColumnKeys,
     onColumnsSave = props.onColumnsSave;
 
-  /**
-   * 设置全部选中，或全部未选中
-   *
-   * @param show
+  /**
+   * 设置全部选中，或全部未选中
+   *
+   * @param show
    */
   var setAllSelectAction = useRefFunction(function () {
     var show = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;

package/es/vtx-datagrid/index.js

@@ -27,6 +27,8 @@ import { Container, TableContext } from "./Store/Provide";
 import ToolBar from "./ToolBar";
 import { mergeComponentsForResize } from "./mergeComponents";
 import { useStyle } from "./style/index";
+import { forwardRef } from 'react';
+import { merge } from 'lodash-es';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var isMac = navigator.userAgent.indexOf('Mac OS') !== -1;
@@ -36,7 +38,7 @@ export var DEFAULT_HEIGHTS = {
   ALERT: 48,
   TOOLBAR: 64
 };
-function VtxTable(props) {
+var VtxTable = /*#__PURE__*/forwardRef(function (props, ref) {
   var _rest$dataSource, _rest$rowSelection, _rest$rowSelection3, _rest$rowSelection4;
   var intl = useIntl();
   var _useContext = useContext(ConfigProvider.ConfigContext),
@@ -386,6 +388,7 @@ function VtxTable(props) {
     ref: rootDomRef,
     style: style,
     children: [toolbarRender, alertRender, /*#__PURE__*/_jsx(Table, _objectSpread(_objectSpread({
+      ref: ref,
       size: counter.tableSize,
       bordered: true
       // virtual
@@ -396,11 +399,11 @@ function VtxTable(props) {
       }, scroll),
       pagination: getPagination(rest.pagination),
       xs: true,
-      styles: {
+      styles: merge({
         root: {
           height: "calc(100% - ".concat(toolbarHeight.current + alertHeight.current, "px)")
         }
-      },
+      }, props.styles),
       locale: _objectSpread({
         emptyText: /*#__PURE__*/_jsx(Empty, {
           description: emptyText
@@ -413,16 +416,19 @@ function VtxTable(props) {
       tableLayout: "fixed"
     }))]
   }));
-}
-function VtxDatagrid(props) {
+});
+VtxTable.displayName = 'VtxTable';
+var VtxDatagrid = /*#__PURE__*/forwardRef(function (props, ref) {
   var ErrorComponent = props.ErrorBoundary === false ? React.Fragment : props.ErrorBoundary || ErrorBoundary;
   return /*#__PURE__*/_jsx(Container, {
     initValue: props,
     children: /*#__PURE__*/_jsx(ErrorComponent, {
-      children: /*#__PURE__*/_jsx(VtxTable, _objectSpread({}, props))
+      children: /*#__PURE__*/_jsx(VtxTable, _objectSpread(_objectSpread({}, props), {}, {
+        ref: ref
+      }))
     })
   });
-}
+});
 VtxDatagrid.displayName = 'VtxDatagrid';
 export { VtxDatagrid };
 export default VtxDatagrid;