@vtx/components 4.0.0-beta.87 → 4.0.0-beta.88

package/es/vtx-datagrid/Store/Provide.js

@@ -15,16 +15,16 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { useMergedState } from '@rc-component/util';
-import request from '@vtx/utils/lib/request';
 import getSignature from '@vtx/utils/lib/getSignature';
+import request from '@vtx/utils/lib/request';
 import VtxEllipsisText from "../../vtx-ellipsis-text";
-import { createContext, useEffect, useMemo, useRef, useState, useCallback } from 'react';
-import { useIntl } from "../../vtx-provider";
-import { message } from 'antd';
-import { genColumnKey, isFunction, useDeepCompareEffectDebounce } from "../../utils";
-import renderColumnButtons from "../renderColumnButtons";
 import { getVtxToken } from '@vtx/utils';
+import { message } from 'antd';
+import { createContext, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { isFunction, useDeepCompareEffectDebounce } from "../../utils";
+import { useIntl } from "../../vtx-provider";
 import { buildColumnKeyMap, buildSortKeyColumns, getVisibleColumnKeysFromMap } from "../columnState";
+import renderColumnButtons from "../renderColumnButtons";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var indexColumnKey = '_serialNum';
 function useMergedState1(defaultValue, option) {
@@ -152,7 +152,7 @@ function useContainer() {
     tableConfig = _useState10[0],
     setTableConfig = _useState10[1];
   var _useMergedState = useMergedState(function () {
-      return props.size || props.defaultSize || 'middle';
+      return props.size || props.defaultSize || 'small';
     }, {
       value: props.size,
       onChange: props.onSizeChange

package/es/vtx-datagrid/index.js

@@ -18,15 +18,15 @@ import { ConfigProvider, Empty, Table } from 'antd';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { useContext, useEffect, useLayoutEffect, useMemo, useRef } from 'react';
+import { useAntdColumnResize } from 'react-antd-column-resize';
 import { ErrorBoundary, genColumnKey, sortByKeyArrayExtract } from "../utils";
 import useSet from "../utils/useSet";
+import { useIntl } from "../vtx-provider";
 import Alert from "./Alert";
-import ToolBar from "./ToolBar";
 import { Container, TableContext } from "./Store/Provide";
+import ToolBar from "./ToolBar";
 import { mergeComponentsForResize } from "./mergeComponents";
 import { useStyle } from "./style/index";
-import { useAntdColumnResize } from 'react-antd-column-resize';
-import { useIntl } from "../vtx-provider";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var isMac = navigator.userAgent.indexOf('Mac OS') !== -1;
@@ -210,7 +210,8 @@ function VtxTable(props) {
       showQuickJumper: true,
       showTotal: function showTotal(total) {
         return "".concat(TextEnum.paginationTotalText, " ").concat(total, " ").concat(TextEnum.paginationItemText);
-      }
+      },
+      size: 'medium'
     }, pagination);
   };
   // 先排序，排序的结果给列设置作用

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

@@ -23,7 +23,7 @@ var genVtxFormLayoutStyle = function genVtxFormLayoutStyle(token) {
       }
     },
     '.ant-form-item-control': {
-      'img': {
+      img: {
         borderRadius: token.borderRadius
       },
       '.ant-select,.ant-input-number': {
@@ -129,10 +129,12 @@ var genVtxFormLayoutStyle = function genVtxFormLayoutStyle(token) {
       cursor: 'pointer'
     },
     '.ant-card-body': {
-      padding: 0
+      padding: '0 10px'
     },
     '.ant-card-head': {
-      height: '44px'
+      height: '44px',
+      background: '#F5F7FA',
+      padding: '0 20px'
     },
     '.ant-card-head-wrapper, .ant-card-head-title': {
       fontWeight: '600',
@@ -145,7 +147,7 @@ var genVtxFormLayoutStyle = function genVtxFormLayoutStyle(token) {
       color: token.colorTextSecondary
     },
     '.ant-card-head-title': {
-      paddingLeft: '10px !important',
+      paddingLeft: '12px !important',
       display: 'flex',
       alignItems: 'center'
     },

package/lib/vtx-datagrid/Store/Provide.js

@@ -6,16 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.indexColumnKey = exports.TableContext = exports.Container = void 0;
 var _util = require("@rc-component/util");
-var _request = _interopRequireDefault(require("@vtx/utils/lib/request"));
 var _getSignature = _interopRequireDefault(require("@vtx/utils/lib/getSignature"));
+var _request = _interopRequireDefault(require("@vtx/utils/lib/request"));
 var _vtxEllipsisText = _interopRequireDefault(require("../../vtx-ellipsis-text"));
+var _utils = require("@vtx/utils");
+var _antd = require("antd");
 var _react = require("react");
+var _utils2 = require("../../utils");
 var _vtxProvider = require("../../vtx-provider");
-var _antd = require("antd");
-var _utils = require("../../utils");
-var _renderColumnButtons = _interopRequireDefault(require("../renderColumnButtons"));
-var _utils2 = require("@vtx/utils");
 var _columnState = require("../columnState");
+var _renderColumnButtons = _interopRequireDefault(require("../renderColumnButtons"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -82,7 +82,7 @@ function useMergedState1(defaultValue, option) {
 }
 function useContainer() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var _ref2 = (0, _utils2.getVtxToken)() || {},
+  var _ref2 = (0, _utils.getVtxToken)() || {},
     _ref2$userId = _ref2.userId,
     userId = _ref2$userId === void 0 ? '' : _ref2$userId,
     _ref2$tenantId = _ref2.tenantId,
@@ -159,7 +159,7 @@ function useContainer() {
     tableConfig = _useState10[0],
     setTableConfig = _useState10[1];
   var _useMergedState = (0, _util.useMergedState)(function () {
-      return props.size || props.defaultSize || 'middle';
+      return props.size || props.defaultSize || 'small';
     }, {
       value: props.size,
       onChange: props.onSizeChange
@@ -224,7 +224,7 @@ function useContainer() {
       return _objectSpread(_objectSpread({}, newColumn), {}, {
         key: newColumn.key || newColumn.dataIndex,
         disable: disabledColumnKeys === null || disabledColumnKeys === void 0 ? void 0 : disabledColumnKeys.includes(column.dataIndex || column.key),
-        render: (0, _utils.isFunction)(column.renderButtons) ? function (text, record, index) {
+        render: (0, _utils2.isFunction)(column.renderButtons) ? function (text, record, index) {
           return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             style: {
               whiteSpace: 'nowrap'
@@ -263,7 +263,7 @@ function useContainer() {
   }, [tableColumn, props.defaultVisibleColumnKeys, tableConfig, uniqueKey]);
 
   // 深度比较 + 防抖 + 忽略这render函数引用变化
-  (0, _utils.useDeepCompareEffectDebounce)(function () {
+  (0, _utils2.useDeepCompareEffectDebounce)(function () {
     var columnKeyMap = (0, _columnState.buildColumnKeyMap)(tableColumn, {
       visibleColumnKeys: visibleColumnKeys,
       defaultVisibleColumnKeys: props.defaultVisibleColumnKeys,
@@ -276,7 +276,7 @@ function useContainer() {
       isFirst.current = false;
     }
   }, [visibleColumnKeys, props.defaultVisibleColumnKeys, tableColumn], ['render'], 100);
-  (0, _utils.useDeepCompareEffectDebounce)(function () {
+  (0, _utils2.useDeepCompareEffectDebounce)(function () {
     var _props$onVisibleColum;
     (_props$onVisibleColum = props.onVisibleColumnsChange) === null || _props$onVisibleColum === void 0 || _props$onVisibleColum.call(props, (0, _columnState.getVisibleColumnKeysFromMap)(columnsMap, sortKeyColumns.current));
   }, [JSON.stringify(columnsMap), sortKeyColumns.current], ['render'], 200);

package/lib/vtx-datagrid/index.js

@@ -12,15 +12,15 @@ var _antd = require("antd");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
+var _reactAntdColumnResize = require("react-antd-column-resize");
 var _utils = require("../utils");
 var _useSet3 = _interopRequireDefault(require("../utils/useSet"));
+var _vtxProvider = require("../vtx-provider");
 var _Alert = _interopRequireDefault(require("./Alert"));
-var _ToolBar = _interopRequireDefault(require("./ToolBar"));
 var _Provide = require("./Store/Provide");
+var _ToolBar = _interopRequireDefault(require("./ToolBar"));
 var _mergeComponents = require("./mergeComponents");
 var _index = require("./style/index");
-var _reactAntdColumnResize = require("react-antd-column-resize");
-var _vtxProvider = require("../vtx-provider");
 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); }
@@ -220,7 +220,8 @@ function VtxTable(props) {
       showQuickJumper: true,
       showTotal: function showTotal(total) {
         return "".concat(TextEnum.paginationTotalText, " ").concat(total, " ").concat(TextEnum.paginationItemText);
-      }
+      },
+      size: 'medium'
     }, pagination);
   };
   // 先排序，排序的结果给列设置作用

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

@@ -29,7 +29,7 @@ var genVtxFormLayoutStyle = function genVtxFormLayoutStyle(token) {
       }
     },
     '.ant-form-item-control': {
-      'img': {
+      img: {
         borderRadius: token.borderRadius
       },
       '.ant-select,.ant-input-number': {
@@ -135,10 +135,12 @@ var genVtxFormLayoutStyle = function genVtxFormLayoutStyle(token) {
       cursor: 'pointer'
     },
     '.ant-card-body': {
-      padding: 0
+      padding: '0 10px'
     },
     '.ant-card-head': {
-      height: '44px'
+      height: '44px',
+      background: '#F5F7FA',
+      padding: '0 20px'
     },
     '.ant-card-head-wrapper, .ant-card-head-title': {
       fontWeight: '600',
@@ -151,7 +153,7 @@ var genVtxFormLayoutStyle = function genVtxFormLayoutStyle(token) {
       color: token.colorTextSecondary
     },
     '.ant-card-head-title': {
-      paddingLeft: '10px !important',
+      paddingLeft: '12px !important',
       display: 'flex',
       alignItems: 'center'
     },

package/package.json

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