ztxkui 4.2.23-593 → 4.2.23-595

package/dist/UI/Table/EditTable.js

@@ -61,6 +61,7 @@ import i18next from 'ztxkutils/dist/i18next';
 import { useState, useEffect, useCallback, useRef } from 'react';
 import { data2, data3 } from './data';
 import ProEditTable from 'components/ProTable';
+import Table from 'components/Table';
 import { Button, message, EnhanceSelect, InputNumber, Modal, Input, DatePicker, } from '../../index.build';
 import { InputNumber as AntInputNumber } from 'antd';
 import { toThousand, exactRound } from 'ztxkutils/dist/tools';
@@ -84,8 +85,7 @@ function useColumns(tableHandleRef) {
             title: i18next.t('序号'),
             width: 62,
             fixed: 'left',
-            // key: 'index',
-            // render: (_text, _record, index) => `${index + 1}`,
+            key: 'index',
         },
         {
             title: i18next.t('测试列1'),
@@ -469,6 +469,100 @@ export default function EditTable() {
     var _e = useState(), iptNum = _e[0], setIptNum = _e[1];
     var _f = useState(false), open = _f[0], setOpen = _f[1];
     var _g = useState(3), num1 = _g[0], setNum1 = _g[1];
+    var lineColumns = [
+        {
+            title: i18next.t('线路编号'),
+            dataIndex: 'tlNo',
+            width: 150,
+        },
+        {
+            title: i18next.t('承运商'),
+            dataIndex: 'carryName',
+            width: 150,
+        },
+        {
+            title: i18next.t('运输方式'),
+            dataIndex: 'transportModeName',
+            width: 100,
+        },
+        {
+            title: i18next.t('发货仓库'),
+            dataIndex: 'shippingWarehouseName',
+            width: 150,
+        },
+        {
+            title: i18next.t('起运地'),
+            dataIndex: 'startArea',
+            width: 150,
+        },
+        {
+            title: i18next.t('详细发货地址'),
+            dataIndex: 'detailedShippingAddress',
+            width: 150,
+        },
+        {
+            title: i18next.t('收货仓库'),
+            dataIndex: 'receivingWarehouseName',
+            width: 150,
+        },
+        {
+            title: i18next.t('目的地'),
+            dataIndex: 'endArea',
+            width: 150,
+        },
+        {
+            title: i18next.t('详细收货地址'),
+            dataIndex: 'detailedReceivingAddress',
+            width: 200,
+        },
+        {
+            title: i18next.t('MMSI'),
+            dataIndex: 'mmsi',
+            width: 150,
+        },
+        {
+            title: i18next.t('采购合同号'),
+            dataIndex: 'pcNo',
+            width: 150,
+        },
+        {
+            title: i18next.t('销售合同号'),
+            dataIndex: 'scNo',
+            width: 150,
+        },
+    ];
+    var lineDataSource = [
+        {
+            id: '1',
+            tlNo: 'TL-2026-001',
+            carryName: '中远海运',
+            transportModeName: '海运',
+            shippingWarehouseName: '上海浦东仓库',
+            startArea: '上海',
+            detailedShippingAddress: '上海市浦东新区张江高科技园区',
+            receivingWarehouseName: '深圳南山仓库',
+            endArea: '深圳',
+            detailedReceivingAddress: '广东省深圳市南山区科技园',
+            mmsi: '412345678',
+            pcNo: 'PC-2026-0101',
+            scNo: 'SC-2026-0201',
+        },
+        {
+            id: '2',
+            tlNo: 'TL-2026-002',
+            carryName: '顺丰速运',
+            transportModeName: '公路',
+            shippingWarehouseName: '杭州余杭仓库',
+            startArea: '杭州',
+            detailedShippingAddress: '浙江省杭州市余杭区未来科技城',
+            receivingWarehouseName: '南京江宁仓库',
+            endArea: '南京',
+            detailedReceivingAddress: '江苏省南京市江宁区秣陵街道',
+            mmsi: '',
+            pcNo: 'PC-2026-0102',
+            scNo: 'SC-2026-0202',
+        },
+    ];
     return (React.createElement("div", null,
         React.createElement(Button, { onClick: function () {
                 console.log(data, selectedRowKeys);
@@ -503,6 +597,7 @@ export default function EditTable() {
                     }
                 });
             }); } }, i18next.t('触发验证')),
+        num1 > 4 && (React.createElement(Table, { columns: lineColumns, dataSource: lineDataSource, pagination: false, scroll: { x: 1000 }, rowKey: "id", style: { marginBottom: 16 } })),
         React.createElement(ProEditTable, { rowKey: "idaa", className: "diffTable", columns: columns, dataSource: data, 
             // 调用表格内部提供的方法
             tableHandleRef: tableHandleRef, 

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

@@ -279,6 +279,7 @@ export function setDynamicKey(dynamicStorageKey, value, options) {
     }
 }
 function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig) {
+    var _a, _b, _c, _d;
     var columns = basicConfig.columns, newColumnsRef = basicConfig.newColumnsRef, showColumnDynamic = basicConfig.showColumnDynamic, showColumnDynamicKey = basicConfig.showColumnDynamicKey, configInfo = basicConfig.configInfo, currentDataSource = basicConfig.currentDataSource, preDataSource = basicConfig.preDataSource, rowKey = basicConfig.rowKey, dataSourceRef = basicConfig.dataSourceRef, expandableChildrenColumnName = basicConfig.expandableChildrenColumnName, upDateColumnsRef = basicConfig.upDateColumnsRef, setUpDateColumnsRef = basicConfig.setUpDateColumnsRef, isUpDateColumnsRef = basicConfig.isUpDateColumnsRef, setIsUpDateColumnsRef = basicConfig.setIsUpDateColumnsRef, isHasFilterRef = basicConfig.isHasFilterRef, diffData = basicConfig.diffData, isDiffDataIncludeEmpty = basicConfig.isDiffDataIncludeEmpty, diffDataColor = basicConfig.diffDataColor;
     var onEditableSave = editableConfig.onEditableSave, onTableChange = editableConfig.onTableChange, currentPage = editableConfig.currentPage, onFillDownChangeRef = editableConfig.onFillDownChangeRef;
     var ColumnDynamicCom = dynamicConfig.ColumnDynamicCom, DelAllCom = dynamicConfig.DelAllCom, onAddAndDelHandleMemo = dynamicConfig.onAddAndDelHandleMemo, onAddAndDelHandle = dynamicConfig.onAddAndDelHandle, hideAddIcon = dynamicConfig.hideAddIcon, addIconText = dynamicConfig.addIconText, hideDelIcon = dynamicConfig.hideDelIcon, delIconText = dynamicConfig.delIconText;
@@ -671,8 +672,11 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
             };
         }
     });
-    // 编辑模式下，给序号列（第0列）注入编辑按钮
-    if (onEditableSave && !hideIndexColumnEditBtn && _newColumns.length > 0) {
+    // 编辑模式下，给序号列（第0列）注入编辑按钮（仅当第一列是序号列时）
+    var isFirstColumnIndex = _newColumns.length > 0 &&
+        typeof ((_a = _newColumns[0]) === null || _a === void 0 ? void 0 : _a.title) === 'string' &&
+        ((_d = (_c = (_b = _newColumns[0]) === null || _b === void 0 ? void 0 : _b.title) === null || _c === void 0 ? void 0 : _c.includes) === null || _d === void 0 ? void 0 : _d.call(_c, i18next.t('序号')));
+    if (onEditableSave && !hideIndexColumnEditBtn && isFirstColumnIndex) {
         var indexColumn = _newColumns[0];
         var originalRender_1 = indexColumn.render;
         indexColumn.render = function (text, record, index) {

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

@@ -46,12 +46,15 @@ var TableMenu = forwardRef(function (_a, ref) {
     }); });
     var items = columns
         .filter(function (item) {
-        return item.key && item.dataIndex && item.dataIndex !== 'index';
+        return (item.key || item.dataIndex) && item.dataIndex !== 'index';
     })
         .map(function (item) {
-        var originItem = originColumns.find(function (originItem) { return originItem.key === item.key; });
+        var fieldKey = item.key || item.dataIndex;
+        var originItem = originColumns.find(function (originItem) {
+            return originItem.key === fieldKey || originItem.dataIndex === fieldKey;
+        });
         return {
-            key: item.key,
+            key: fieldKey,
             label: (originItem === null || originItem === void 0 ? void 0 : originItem.title) || item.title,
             //
             render: (item === null || item === void 0 ? void 0 : item.render) || (originItem === null || originItem === void 0 ? void 0 : originItem.render),
@@ -291,7 +294,9 @@ var TableMenu = forwardRef(function (_a, ref) {
         React.createElement(Menu, { id: menuId },
             React.createElement(Item, { data: "detail", onClick: onMenuItemClick }, i18next.t('查看明细')),
             onEditableSave || !isContextMenuFullscreen ? null : (React.createElement(Item, { data: "fullscreen", onClick: onMenuItemClick }, isFull ? i18next.t('退出全屏') : i18next.t('全屏')))),
-        React.createElement(Modal, { width: '800px', title: i18next.t('详情'), visible: visible, onCancel: onCancel, stick: true, loading: false, className: className, footer: React.createElement(Button, { type: "primary", onClick: onCancel }, i18next.t('确定')), getContainer: false },
+        React.createElement(Modal, { width: "80%", title: i18next.t('详情'), visible: visible, onCancel: onCancel, 
+            // stick
+            mask: false, loading: false, className: className, footer: React.createElement(Button, { type: "primary", onClick: onCancel }, i18next.t('确定')), getContainer: false },
             React.createElement("div", { style: { maxHeight: '70vh', minWidth: '800px', overflow: 'auto' } },
                 React.createElement("div", { className: "zt-table-detail-grid" }, record && renderItem(items))))));
 });

package/dist/components/electron-signatures/interface.d.ts

@@ -468,10 +468,6 @@ export interface IElectronSignaturesItemPublic {
      * 盖户用电子章与契约锁脱离关系
      */
     isShowOpeningContractSealNotRelyQys?: boolean;
-    /**
-     * 允许下载盖章件的流程状态，逗号分隔，如 '50,60,70'，默认为 '50'
-     */
-    sealDownloadFlowStatus?: string;
 }
 export interface IElectronSignaturesProps extends IElectronSignaturesItem, IElectronSignaturesItemPublic {
     /**

package/package.json

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