@vtx/components 4.0.0-beta.15 → 4.0.0-beta.16

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

@@ -15,7 +15,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import { useMergedState } from '@rc-component/util';
-import { request } from '@vtx/utils';
+import request from '@vtx/utils/lib/request';
 import getSignature from '@vtx/utils/lib/getSignature';
 import { createContext, useEffect, useMemo, useRef, useState } from 'react';
 import { useIntl } from "../../vtx-provider";

package/es/vtx-datagrid/index.js

@@ -116,9 +116,20 @@ function VtxTable(props) {
       var bodyDiv = Array.prototype.filter.call(divs, function (dom) {
         return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content');
       })[0];
+      var tablePlaceholder = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('tr'), function (dom) {
+        return dom.className.includes('ant-table-placeholder');
+      })[0];
       if (bodyDiv) {
         bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
       }
+      console.log('tablePlaceholder', tablePlaceholder);
+      if (tablePlaceholder) {
+        tablePlaceholder.style.height = "".concat(bodyHeight - (rest.scrollY || 0), "px");
+        var tableCell = Array.prototype.filter.call(tablePlaceholder.getElementsByTagName('td'), function (dom) {
+          return dom.className.includes('ant-table-cell');
+        })[0];
+        tableCell.style.height = "".concat(bodyHeight - (rest.scrollY || 0), "px");
+      }
       setState({
         scrollY: bodyHeight
       });
@@ -181,9 +192,6 @@ function VtxTable(props) {
       });
     };
     var _tableColumn = loopFilter(counter.tableColumn);
-    if (!columnsMap['_serialNum']) {
-      return [];
-    }
     return sortByKeyArrayExtract(_tableColumn, sortKeyColumns, columnsMap, 'key');
   }, [columnsMap, counter.tableColumn, sortKeyColumns]);
 

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

@@ -20,18 +20,29 @@ var genVtxStyle = function genVtxStyle(token) {
   }), '.ant-table-body', _defineProperty({}, '.ant-table-tbody', {
     '>tr.ant-table-placeholder': {
       position: 'absolute',
-      top: '25%',
+      bottom: 0,
       right: 0,
       left: 0,
       backgroundColor: 'transparent',
       borderTop: 'none',
+      height: '100%',
+      borderInlineEnd: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
+      borderBottom: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
       '>td.ant-table-cell': {
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'center',
+        padding: 0,
         width: '100%',
         height: '100%',
-        border: 'none'
+        border: 'none',
+        '.ant-table-expanded-row-fixed': {
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          height: '100%',
+          width: '100%',
+          '&:after': {
+            borderInlineEnd: 'none'
+          }
+        }
       }
     }
   }))), '.ant-pagination', _defineProperty({}, '.ant-pagination-item', {
@@ -47,6 +58,10 @@ var genVtxStyle = function genVtxStyle(token) {
   }), '.ant-table-body', {
     '>table >tbody>tr>td': {
       borderInlineColor: 'transparent !important'
+    },
+    '>table >tbody>tr.ant-table-placeholder': {
+      borderInlineColor: 'transparent !important',
+      borderBottomColor: 'transparent !important'
     }
   }))))), "&.vtx-datagrid-striped", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty({}, '.ant-table-body', {
     '>table >tbody>tr:nth-child(odd)>td': {

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

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.indexColumnKey = exports.TableContext = exports.Container = void 0;
 var _util = require("@rc-component/util");
-var _utils = require("@vtx/utils");
+var _request = _interopRequireDefault(require("@vtx/utils/lib/request"));
 var _getSignature = _interopRequireDefault(require("@vtx/utils/lib/getSignature"));
 var _react = require("react");
 var _vtxProvider = require("../../vtx-provider");
 var _antd = require("antd");
-var _utils2 = require("../../utils");
+var _utils = require("../../utils");
 var _renderColumnButtons = _interopRequireDefault(require("../renderColumnButtons"));
+var _utils2 = require("@vtx/utils");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
@@ -33,7 +34,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 var indexColumnKey = exports.indexColumnKey = '_serialNum';
 function useContainer() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var _ref = (0, _utils.getVtxToken)() || {},
+  var _ref = (0, _utils2.getVtxToken)() || {},
     _ref$userId = _ref.userId,
     userId = _ref$userId === void 0 ? '' : _ref$userId,
     _ref$tenantId = _ref.tenantId,
@@ -175,7 +176,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, _utils2.isFunction)(column.renderButtons) ? function (text, record, index) {
+        render: (0, _utils.isFunction)(column.renderButtons) ? function (text, record, index) {
           return (0, _renderColumnButtons.default)({
             renderButtons: column.renderButtons,
             visible: column.renderButtonsVisibleNum,
@@ -207,7 +208,7 @@ function useContainer() {
           fixed = _ref2.fixed,
           disable = _ref2.disable,
           width = _ref2.width;
-        var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+        var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
           show: indexColumn && indexColumnKey == columnKey ? true : (_ref3 = _toConsumableArray(props.defaultVisibleColumnKeys)) === null || _ref3 === void 0 ? void 0 : _ref3.includes(columnKey),
           fixed: fixed,
@@ -222,7 +223,7 @@ function useContainer() {
           fixed = _ref4.fixed,
           disable = _ref4.disable,
           width = _ref4.width;
-        var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+        var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
           show: true,
           fixed: fixed,
@@ -235,7 +236,7 @@ function useContainer() {
   }, [tableColumn, props.defaultVisibleColumnKeys, tableConfig, uniqueKey]);
 
   // 深度比较 + 防抖 + 忽略这render函数引用变化
-  (0, _utils2.useDeepCompareEffectDebounce)(function () {
+  (0, _utils.useDeepCompareEffectDebounce)(function () {
     var columnKeyMap = {};
     if (Array.isArray(visibleColumnKeys)) {
       tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref5, index) {
@@ -245,7 +246,7 @@ function useContainer() {
           fixed = _ref5.fixed,
           disable = _ref5.disable,
           width = _ref5.width;
-        var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+        var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
           show: isFirst.current && indexColumn && indexColumnKey == columnKey ? true : (_ref6 = _toConsumableArray(visibleColumnKeys)) === null || _ref6 === void 0 ? void 0 : _ref6.includes(columnKey),
           fixed: fixed,
@@ -261,7 +262,7 @@ function useContainer() {
           fixed = _ref7.fixed,
           disable = _ref7.disable,
           width = _ref7.width;
-        var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+        var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
           show: isFirst.current && indexColumn && indexColumnKey == columnKey ? true : (_ref8 = _toConsumableArray(props.defaultVisibleColumnKeys)) === null || _ref8 === void 0 ? void 0 : _ref8.includes(columnKey),
           fixed: fixed,
@@ -276,7 +277,7 @@ function useContainer() {
           fixed = _ref9.fixed,
           disable = _ref9.disable,
           width = _ref9.width;
-        var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+        var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
           show: true,
           fixed: fixed,
@@ -292,14 +293,14 @@ function useContainer() {
       return key;
     });
     if ((sortKeys === null || sortKeys === void 0 ? void 0 : sortKeys.length) > 0) {
-      sortKeyColumns.current = (0, _utils2.sortByGivenOrder)(sortKeyColumns.current, sortKeys);
+      sortKeyColumns.current = (0, _utils.sortByGivenOrder)(sortKeyColumns.current, sortKeys);
     }
     setColumnsMap(columnKeyMap);
     if (isFirst.current) {
       isFirst.current = false;
     }
   }, [visibleColumnKeys], ['render'], 100);
-  (0, _utils2.useDeepCompareEffectDebounce)(function () {
+  (0, _utils.useDeepCompareEffectDebounce)(function () {
     var _sortKeyColumns$curre, _props$onVisibleColum;
     var visibleColumnKeys = [];
     (_sortKeyColumns$curre = sortKeyColumns.current) === null || _sortKeyColumns$curre === void 0 || _sortKeyColumns$curre.map(function (columnKey) {
@@ -319,7 +320,7 @@ function useContainer() {
     var params = {
       tableCode: uniqueKey
     };
-    _utils.request.get("".concat(location.origin, "/cloud/management/api/v101/user/config/table/page"), {
+    _request.default.get("".concat(location.origin, "/cloud/management/api/v101/user/config/table/page"), {
       body: params
     }).then(function (res) {
       var _res$data;
@@ -346,7 +347,7 @@ function useContainer() {
   var getUniqueKey = function getUniqueKey() {
     var route = location.href.match(/#\/(\S*)\?/);
     if (route) {
-      _utils.request.get("".concat(location.pathname, "resources/json/menu.json"), {
+      _request.default.get("".concat(location.pathname, "resources/json/menu.json"), {
         headers: _objectSpread({}, (0, _getSignature.default)({}))
       }).then(function (res) {
         var _res$data2;
@@ -358,7 +359,7 @@ function useContainer() {
     // setUniqueKey('test_demo_7')
   };
   var saveColumns = function saveColumns() {
-    _utils.request.post("/cloud/management/api/v101/user/config/table/save", {
+    _request.default.post("/cloud/management/api/v101/user/config/table/save", {
       body: JSON.stringify({
         showColumns: "".concat(sortKeyColumns.current.join(','), ";").concat(JSON.stringify(columnsMap)),
         tableCode: uniqueKey,

package/lib/vtx-datagrid/index.js

@@ -126,9 +126,20 @@ function VtxTable(props) {
       var bodyDiv = Array.prototype.filter.call(divs, function (dom) {
         return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content');
       })[0];
+      var tablePlaceholder = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('tr'), function (dom) {
+        return dom.className.includes('ant-table-placeholder');
+      })[0];
       if (bodyDiv) {
         bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
       }
+      console.log('tablePlaceholder', tablePlaceholder);
+      if (tablePlaceholder) {
+        tablePlaceholder.style.height = "".concat(bodyHeight - (rest.scrollY || 0), "px");
+        var tableCell = Array.prototype.filter.call(tablePlaceholder.getElementsByTagName('td'), function (dom) {
+          return dom.className.includes('ant-table-cell');
+        })[0];
+        tableCell.style.height = "".concat(bodyHeight - (rest.scrollY || 0), "px");
+      }
       setState({
         scrollY: bodyHeight
       });
@@ -191,9 +202,6 @@ function VtxTable(props) {
       });
     };
     var _tableColumn = loopFilter(counter.tableColumn);
-    if (!columnsMap['_serialNum']) {
-      return [];
-    }
     return (0, _utils.sortByKeyArrayExtract)(_tableColumn, sortKeyColumns, columnsMap, 'key');
   }, [columnsMap, counter.tableColumn, sortKeyColumns]);
 

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

@@ -26,18 +26,29 @@ var genVtxStyle = function genVtxStyle(token) {
   }), '.ant-table-body', _defineProperty({}, '.ant-table-tbody', {
     '>tr.ant-table-placeholder': {
       position: 'absolute',
-      top: '25%',
+      bottom: 0,
       right: 0,
       left: 0,
       backgroundColor: 'transparent',
       borderTop: 'none',
+      height: '100%',
+      borderInlineEnd: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
+      borderBottom: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
       '>td.ant-table-cell': {
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'center',
+        padding: 0,
         width: '100%',
         height: '100%',
-        border: 'none'
+        border: 'none',
+        '.ant-table-expanded-row-fixed': {
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          height: '100%',
+          width: '100%',
+          '&:after': {
+            borderInlineEnd: 'none'
+          }
+        }
       }
     }
   }))), '.ant-pagination', _defineProperty({}, '.ant-pagination-item', {
@@ -53,6 +64,10 @@ var genVtxStyle = function genVtxStyle(token) {
   }), '.ant-table-body', {
     '>table >tbody>tr>td': {
       borderInlineColor: 'transparent !important'
+    },
+    '>table >tbody>tr.ant-table-placeholder': {
+      borderInlineColor: 'transparent !important',
+      borderBottomColor: 'transparent !important'
     }
   }))))), "&.vtx-datagrid-striped", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty({}, '.ant-table-body', {
     '>table >tbody>tr:nth-child(odd)>td': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/components",
-  "version": "4.0.0-beta.15",
+  "version": "4.0.0-beta.16",
   "description": "React components for Vortex",
   "keywords": [
     "react",
@@ -87,7 +87,6 @@
     "@emotion/serialize": "^1.3.3",
     "@rc-component/util": "1.3.0",
     "@types/react": "^18.0.0",
-    "@vtx/utils": "^1.0.20",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-react": "^1.0.6",
     "@wangeditor/plugin-upload-attachment": "^1.1.0",
@@ -216,7 +215,8 @@
     "write-pkg": "^4.0.0",
     "xhr-mock": "^2.5.1",
     "yorkie": "^2.0.0",
-    "zustand": "^4.5.7"
+    "zustand": "^4.5.7",
+    "@vtx/utils": "^1.0.20"
   },
   "peerDependencies": {
     "@ant-design/icons": "^6.0.0",
@@ -224,9 +224,10 @@
     "lodash-es": "^4.17.21",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
-    "dayjs": "^1.11.18"
+    "dayjs": "^1.11.18",
+    "@vtx/utils": "^1.0.20"
   },
-  "peerDependenciesName":"声明宿主依赖",
+  "peerDependenciesName": "声明宿主依赖",
   "packageManager": "pnpm@9.6.0",
   "publishConfig": {
     "access": "public"