ztxkui 4.2.23-591 → 4.2.23-592

package/dist/UI/Table/EditTable.js

@@ -81,8 +81,8 @@ function useColumns(tableHandleRef) {
             title: i18next.t('序号'),
             width: 62,
             fixed: 'left',
-            key: 'index',
-            render: function (_text, _record, index) { return "" + (index + 1); },
+            // key: 'index',
+            // render: (_text, _record, index) => `${index + 1}`,
         },
         {
             title: i18next.t('测试列1'),
@@ -130,7 +130,7 @@ function useColumns(tableHandleRef) {
         },
         {
             title: i18next.t('测试列2'),
-            // width: 100,
+            width: 100,
             dataIndex: 'test2',
             key: 'test2',
             showCopy: true,
@@ -140,7 +140,7 @@ function useColumns(tableHandleRef) {
         },
         {
             title: i18next.t('测试列31112'),
-            // width: 100,
+            width: 100,
             dataIndex: 'test3',
             key: 'test3',
             showCopy: true,
@@ -156,7 +156,7 @@ function useColumns(tableHandleRef) {
         },
         {
             title: i18next.t('测试列4'),
-            // width: 100,
+            width: 100,
             dataIndex: 'test4',
             key: 'test4',
             showCopy: true,
@@ -191,7 +191,7 @@ function useColumns(tableHandleRef) {
         },
         {
             title: i18next.t('测试列41'),
-            // width: 100,
+            width: 100,
             dataIndex: 'test41',
             key: 'test41',
             showCopy: true,
@@ -204,7 +204,7 @@ function useColumns(tableHandleRef) {
         },
         {
             title: i18next.t('测试列41123'),
-            // width: 100,
+            width: 100,
             dataIndex: 'test41123',
             key: 'test41123',
             showCopy: true,
@@ -217,7 +217,7 @@ function useColumns(tableHandleRef) {
         },
         {
             title: i18next.t('测试列42'),
-            // width: 100,
+            width: 100,
             dataIndex: 'test42',
             key: 'test42',
             showCopy: true,
@@ -233,7 +233,7 @@ function useColumns(tableHandleRef) {
         },
         {
             title: i18next.t('测试列142'),
-            // width: 100,
+            width: 100,
             dataIndex: 'test142',
             key: 'test142',
             showCopy: true,
@@ -250,7 +250,7 @@ function useColumns(tableHandleRef) {
         },
         {
             title: i18next.t('测试列43'),
-            // width: 100,
+            width: 100,
             dataIndex: 'test43',
             key: 'test43',
             showCopy: true,
@@ -265,7 +265,7 @@ function useColumns(tableHandleRef) {
         },
         {
             title: i18next.t('测试列5'),
-            // width: 100,
+            width: 100,
             dataIndex: 'test5',
             key: 'test5',
             showCopy: true,

package/dist/components/Table/hooks/useColumns.js

@@ -679,6 +679,12 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
             var originalContent = originalRender_1
                 ? originalRender_1(text, record, index)
                 : text;
+            // 如果结果是普通对象（如 record、列合并对象），不渲染
+            if (originalContent != null &&
+                typeof originalContent === 'object' &&
+                !React.isValidElement(originalContent)) {
+                originalContent = null;
+            }
             return (React.createElement("div", { style: {
                     display: 'flex',
                     alignItems: 'center',

package/dist/components/Table/table-menu.js

@@ -238,7 +238,9 @@ var TableMenu = forwardRef(function (_a, ref) {
             var currentRecord = recordItem || record;
             var renderItem = null;
             var isDisabled = false;
-            if (item.editable && onEditableSave && typeof item.onCell === 'function') {
+            if (item.editable &&
+                onEditableSave &&
+                typeof item.onCell === 'function') {
                 var onCellItem = item.onCell(currentRecord, recordIndex);
                 renderItem = React.createElement(TableEnhanceCell, __assign({}, onCellItem, { noTdWrap: true }));
                 // 与 TableEnhanceCell 保持一致的禁用判断逻辑

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.23-591",
+  "version": "4.2.23-592",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",