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

package/lib/utils/useEditableMap/index.js

@@ -25,19 +25,19 @@ 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); } /* eslint-disable react-hooks/exhaustive-deps */
-/**
- * 显示警告信息
- * @param messageStr
+/**
+ * 显示警告信息
+ * @param messageStr
  */
 var warning = function warning(messageStr) {
   return _antd.message.warning(messageStr);
 };
 
-/**
- * 使用map 来删除数据，性能一般 但是准确率比较高
- *
- * @param params
- * @param action
+/**
+ * 使用map 来删除数据，性能一般 但是准确率比较高
+ *
+ * @param params
+ * @param action
  */
 function editableRowByKey(_ref) {
   var data = _ref.data,
@@ -45,14 +45,14 @@ function editableRowByKey(_ref) {
   return _objectSpread(_objectSpread({}, data), row);
 }
 
-/**
- * 一个方便的hooks 用于维护编辑的状态
- *
- * @param props
+/**
+ * 一个方便的hooks 用于维护编辑的状态
+ *
+ * @param props
  */
 function useEditableMap(props) {
-  /**
-   * 点击开始编辑之前的保存数据用的
+  /**
+   * 点击开始编辑之前的保存数据用的
    */
   var preEditRowRef = (0, _react.useRef)(null);
   var editableType = props.type || 'single';
@@ -84,10 +84,10 @@ function useEditableMap(props) {
     return false;
   }, [(editableKeys || []).join(',')]);
 
-  /**
-   * 进入编辑状态
-   *
-   * @param recordKey
+  /**
+   * 进入编辑状态
+   *
+   * @param recordKey
    */
   var startEditable = function startEditable(recordKey, recordValue) {
     var _ref2;
@@ -102,10 +102,10 @@ function useEditableMap(props) {
     return true;
   };
 
-  /**
-   * 退出编辑状态
-   *
-   * @param recordKey
+  /**
+   * 退出编辑状态
+   *
+   * @param recordKey
    */
   var cancelEditable = function cancelEditable(recordKey) {
     // 防止多次渲染

package/lib/utils/useMediaQuery/index.js

@@ -44,11 +44,11 @@ var MediaQueryEnum = exports.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
  */
 var getScreenClassName = exports.getScreenClassName = function getScreenClassName() {
   var queryKey = undefined;

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

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

package/lib/vtx-datagrid/index.js

@@ -4,9 +4,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_HEIGHTS = void 0;
-exports.VtxDatagrid = VtxDatagrid;
-exports.indexColumnKey = exports.default = void 0;
+exports.indexColumnKey = exports.default = exports.VtxDatagrid = exports.DEFAULT_HEIGHTS = void 0;
 var _ahooks = require("ahooks");
 var _antd = require("antd");
 var _classnames2 = _interopRequireDefault(require("classnames"));
@@ -21,6 +19,7 @@ var _Provide = require("./Store/Provide");
 var _ToolBar = _interopRequireDefault(require("./ToolBar"));
 var _mergeComponents = require("./mergeComponents");
 var _index = require("./style/index");
+var _lodashEs = require("lodash-es");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["toolbar", "toolbarClassName", "toolbarTilte", "buttonGroup", "refreshIconVisible", "fullScreenVisible", "hideColumnSetting", "hideColumnHeight", "onRefresh", "bordered", "startIndex", "autoFit", "headFootHeight", "columnResizable", "components", "className", "style", "emptyText", "onRowSelectionClear", "onColumnsSave", "uniqueKey", "prefixUrl", "hideSelectionClear", "customEnumText"];
 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); }
@@ -46,7 +45,7 @@ var DEFAULT_HEIGHTS = exports.DEFAULT_HEIGHTS = {
   ALERT: 48,
   TOOLBAR: 64
 };
-function VtxTable(props) {
+var VtxTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _rest$dataSource, _rest$rowSelection, _rest$rowSelection3, _rest$rowSelection4;
   var intl = (0, _vtxProvider.useIntl)();
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
@@ -396,6 +395,7 @@ function VtxTable(props) {
     ref: rootDomRef,
     style: style,
     children: [toolbarRender, alertRender, /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Table, _objectSpread(_objectSpread({
+      ref: ref,
       size: counter.tableSize,
       bordered: true
       // virtual
@@ -406,11 +406,11 @@ function VtxTable(props) {
       }, scroll),
       pagination: getPagination(rest.pagination),
       xs: true,
-      styles: {
+      styles: (0, _lodashEs.merge)({
         root: {
           height: "calc(100% - ".concat(toolbarHeight.current + alertHeight.current, "px)")
         }
-      },
+      }, props.styles),
       locale: _objectSpread({
         emptyText: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Empty, {
           description: emptyText
@@ -423,16 +423,19 @@ function VtxTable(props) {
       tableLayout: "fixed"
     }))]
   }));
-}
-function VtxDatagrid(props) {
+});
+VtxTable.displayName = 'VtxTable';
+var VtxDatagrid = exports.VtxDatagrid = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var ErrorComponent = props.ErrorBoundary === false ? _react.default.Fragment : props.ErrorBoundary || _utils.ErrorBoundary;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Provide.Container, {
     initValue: props,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ErrorComponent, {
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(VtxTable, _objectSpread({}, props))
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(VtxTable, _objectSpread(_objectSpread({}, props), {}, {
+        ref: ref
+      }))
     })
   });
-}
+});
 VtxDatagrid.displayName = 'VtxDatagrid';
 var _default = exports.default = VtxDatagrid;
 VtxDatagrid.propTypes = {

package/lib/vtx-datagrid/style/index.less

@@ -1,242 +1,242 @@
-
-
-@prefix-cls: vtx-datagrid;
-
-.@{prefix-cls} {
-    position: relative;
-    width: 100%;
-    overflow: hidden;
-
-    &-fit {
-        height: 100%;
-        .ant-table-container {
-            border-left: none !important;
-            table > thead > tr th:first-child {
-                border-left: 1px solid @table-border-color;
-            }
-        }
-        .ant-table-body {
-            // overflow-y: auto !important;
-        }
-        .ant-table-header,
-        .ant-table-body {
-            &::-webkit-scrollbar {
-                width: @webkit-scrollbar-width;
-                height: @webkit-scrollbar-height;
-                background-color: @webkit-scrollbar-color;
-            }
-
-            &::-webkit-scrollbar-thumb {
-                background-color: @webkit-scrollbar-thumb-color;
-                border-radius: @webkit-scrollbar-thumb-radius;
-            }
-            > table {
-                min-height: 1px;
-            }
-        }
-        .ant-table-tbody > tr {
-            &:nth-child(odd) {
-                background: @table-row-odd;
-                > td {
-                    background: @table-row-odd !important;
-                }
-            }
-            > td:first-child {
-                border-left: 1px solid @table-border-color;
-            }
-        }
-        .ant-table-fixed-header .ant-table-scroll .ant-table-header {
-            min-width: 5px !important;
-        }
-        .ant-table-pagination {
-            position: absolute;
-            right: 0;
-            bottom: 0;
-        }
-        .ant-spin-nested-loading {
-            height: 100%;
-            .ant-spin-container {
-                position: relative;
-                height: 100%;
-                .ant-table {
-                    height: 100%;
-                }
-            }
-        }
-    }
-    &-noFit {
-        .ant-table-tbody > tr {
-            &:nth-child(even) when(@theme=default) {
-                background: #f6f6f6;
-                > td {
-                    background: #f6f6f6 !important;
-                }
-            }
-        }
-    }
-    .ant-table-container {
-        position: relative;
-        height: 100%;
-    }
-    .ant-table-middle {
-        .ant-table-thead > tr > th {
-            padding-left: 12px !important;
-            padding-right: 12px !important;
-        }
-        .ant-table-tbody > tr > td {
-            padding-left: 12px !important;
-            padding-right: 12px !important;
-        }
-    }
-    .ant-table-tbody > tr.ant-table-row-selected > td {
-        // background: transparent !important;
-        border-color: @table-border-color !important;
-    }
-
-    .ant-table-thead > tr > th when(@theme=default) {
-        // antd4.0 半透明会重叠
-        // background-color: fade(#1890ff, 8);
-        font-weight: bold;
-        background-color: rgba(237, 246, 255, 1);
-    }
-    .ant-table-tbody > tr {
-        // &:nth-child(even) when(@theme=default) {
-        // background: #f6f6f6;
-        // }
-        & > .ant-table-cell {
-            color: @text-color;
-        }
-        
-        &.ant-table-placeholder {
-            position: absolute;
-            top: 25%;
-            // top: auto;
-            right: 0;
-            // bottom: auto;
-            left: 0;
-            background-color: transparent;
-            border-top: none;
-            // height: 100%;
-            & > td.ant-table-cell {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                width: 100%;
-                height: 100%;
-                // border-right: @border-width-base @border-style-base @table-border-color;
-                // border-left: @border-width-base @border-style-base @table-border-color;
-                border: none;
-            }
-        }
-    }
-    // fix: checkbox 选中时 固定列 最上面一层透明会 和下面重叠
-    // .ant-table-tbody > tr.ant-table-row-selected td {
-    //     background: transparent;
-    // }
-    &-alert {
-        margin-bottom: 8px;
-        &-message when(@theme=default) {
-            color: fade(@black, 65%);
-        }
-        &-message when(@theme=dark) {
-            color: @text-color;
-        }
-        &-info-content > strong {
-            margin: 0 4px;
-            color: #13c2c2;
-        }
-        &-info-option {
-            margin-left: 10px;
-        }
-    }
-    &-nodata {
-        .ant-table-scroll {
-            overflow-y: hidden;
-        }
-    }
-    &-toolbar {
-        display: table;
-        width: 100%;
-        margin: 16px 0;
-        color: @text-color;
-    }
-    &-toolbar-left,
-    &-toolbar-right {
-        display: inline-block;
-        display: table-cell;
-        vertical-align: middle;
-    }
-    &-toolbar-left {
-        color: @text-color;
-        font-size: 16px;
-    }
-    &-toolbar-right {
-        float: right;
-    }
-    // &-toolbar-line {
-    //     width: 1px;
-    //     height: 14px;
-    //     display: inline-block;
-    //     vertical-align: middle;
-    //     background: #e8e8e8;
-    //     margin: 0 -2px 0 12px;
-    // }
-    &-toolbar-setting-item {
-        display: inline-block;
-        margin-left: 16px;
-        color: @icon-color;
-        font-size: 16px;
-        vertical-align: middle;
-        cursor: pointer;
-        color: #707070;
-        &:hover {
-            color: @icon-color-hover;
-        }
-    }
- 
-    &-space-item {
-        display: inline-block;
-        vertical-align: middle;
-    }
-    .react-resizable {
-        position: relative;
-        background-clip: padding-box;
-    }
-    .react-resizable-handle {
-        position: absolute;
-        right: -5px;
-        bottom: 0;
-        z-index: 1;
-        width: 10px;
-        height: 100%;
-        cursor: col-resize;
-    }
-
-    &-column-setting {
-        &-title {
-            height: 32px;
-            line-height: 32px;
-
-            a {
-                display: inline-block;
-                float: right;
-                vertical-align: middle;
-            }
-        }
-
-        &-checkbox-wrapper {
-            color: @text-color;
-            vertical-align: middle;
-        }
-
-        &-list {
-            &-list-item {
-                display: flex;
-
-                &-title {
-                    flex: 1;
-                }
-            }
-        }
-    }
-}
+
+
+@prefix-cls: vtx-datagrid;
+
+.@{prefix-cls} {
+    position: relative;
+    width: 100%;
+    overflow: hidden;
+
+    &-fit {
+        height: 100%;
+        .ant-table-container {
+            border-left: none !important;
+            table > thead > tr th:first-child {
+                border-left: 1px solid @table-border-color;
+            }
+        }
+        .ant-table-body {
+            // overflow-y: auto !important;
+        }
+        .ant-table-header,
+        .ant-table-body {
+            &::-webkit-scrollbar {
+                width: @webkit-scrollbar-width;
+                height: @webkit-scrollbar-height;
+                background-color: @webkit-scrollbar-color;
+            }
+
+            &::-webkit-scrollbar-thumb {
+                background-color: @webkit-scrollbar-thumb-color;
+                border-radius: @webkit-scrollbar-thumb-radius;
+            }
+            > table {
+                min-height: 1px;
+            }
+        }
+        .ant-table-tbody > tr {
+            &:nth-child(odd) {
+                background: @table-row-odd;
+                > td {
+                    background: @table-row-odd !important;
+                }
+            }
+            > td:first-child {
+                border-left: 1px solid @table-border-color;
+            }
+        }
+        .ant-table-fixed-header .ant-table-scroll .ant-table-header {
+            min-width: 5px !important;
+        }
+        .ant-table-pagination {
+            position: absolute;
+            right: 0;
+            bottom: 0;
+        }
+        .ant-spin-nested-loading {
+            height: 100%;
+            .ant-spin-container {
+                position: relative;
+                height: 100%;
+                .ant-table {
+                    height: 100%;
+                }
+            }
+        }
+    }
+    &-noFit {
+        .ant-table-tbody > tr {
+            &:nth-child(even) when(@theme=default) {
+                background: #f6f6f6;
+                > td {
+                    background: #f6f6f6 !important;
+                }
+            }
+        }
+    }
+    .ant-table-container {
+        position: relative;
+        height: 100%;
+    }
+    .ant-table-middle {
+        .ant-table-thead > tr > th {
+            padding-left: 12px !important;
+            padding-right: 12px !important;
+        }
+        .ant-table-tbody > tr > td {
+            padding-left: 12px !important;
+            padding-right: 12px !important;
+        }
+    }
+    .ant-table-tbody > tr.ant-table-row-selected > td {
+        // background: transparent !important;
+        border-color: @table-border-color !important;
+    }
+
+    .ant-table-thead > tr > th when(@theme=default) {
+        // antd4.0 半透明会重叠
+        // background-color: fade(#1890ff, 8);
+        font-weight: bold;
+        background-color: rgba(237, 246, 255, 1);
+    }
+    .ant-table-tbody > tr {
+        // &:nth-child(even) when(@theme=default) {
+        // background: #f6f6f6;
+        // }
+        & > .ant-table-cell {
+            color: @text-color;
+        }
+        
+        &.ant-table-placeholder {
+            position: absolute;
+            top: 25%;
+            // top: auto;
+            right: 0;
+            // bottom: auto;
+            left: 0;
+            background-color: transparent;
+            border-top: none;
+            // height: 100%;
+            & > td.ant-table-cell {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                height: 100%;
+                // border-right: @border-width-base @border-style-base @table-border-color;
+                // border-left: @border-width-base @border-style-base @table-border-color;
+                border: none;
+            }
+        }
+    }
+    // fix: checkbox 选中时 固定列 最上面一层透明会 和下面重叠
+    // .ant-table-tbody > tr.ant-table-row-selected td {
+    //     background: transparent;
+    // }
+    &-alert {
+        margin-bottom: 8px;
+        &-message when(@theme=default) {
+            color: fade(@black, 65%);
+        }
+        &-message when(@theme=dark) {
+            color: @text-color;
+        }
+        &-info-content > strong {
+            margin: 0 4px;
+            color: #13c2c2;
+        }
+        &-info-option {
+            margin-left: 10px;
+        }
+    }
+    &-nodata {
+        .ant-table-scroll {
+            overflow-y: hidden;
+        }
+    }
+    &-toolbar {
+        display: table;
+        width: 100%;
+        margin: 16px 0;
+        color: @text-color;
+    }
+    &-toolbar-left,
+    &-toolbar-right {
+        display: inline-block;
+        display: table-cell;
+        vertical-align: middle;
+    }
+    &-toolbar-left {
+        color: @text-color;
+        font-size: 16px;
+    }
+    &-toolbar-right {
+        float: right;
+    }
+    // &-toolbar-line {
+    //     width: 1px;
+    //     height: 14px;
+    //     display: inline-block;
+    //     vertical-align: middle;
+    //     background: #e8e8e8;
+    //     margin: 0 -2px 0 12px;
+    // }
+    &-toolbar-setting-item {
+        display: inline-block;
+        margin-left: 16px;
+        color: @icon-color;
+        font-size: 16px;
+        vertical-align: middle;
+        cursor: pointer;
+        color: #707070;
+        &:hover {
+            color: @icon-color-hover;
+        }
+    }
+ 
+    &-space-item {
+        display: inline-block;
+        vertical-align: middle;
+    }
+    .react-resizable {
+        position: relative;
+        background-clip: padding-box;
+    }
+    .react-resizable-handle {
+        position: absolute;
+        right: -5px;
+        bottom: 0;
+        z-index: 1;
+        width: 10px;
+        height: 100%;
+        cursor: col-resize;
+    }
+
+    &-column-setting {
+        &-title {
+            height: 32px;
+            line-height: 32px;
+
+            a {
+                display: inline-block;
+                float: right;
+                vertical-align: middle;
+            }
+        }
+
+        &-checkbox-wrapper {
+            color: @text-color;
+            vertical-align: middle;
+        }
+
+        &-list {
+            &-list-item {
+                display: flex;
+
+                &-title {
+                    flex: 1;
+                }
+            }
+        }
+    }
+}