ztxkui 4.2.23-567 → 4.2.23-569

package/dist/components/Table/table-menu.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="react" />
 import 'react-contexify/dist/ReactContexify.min.css';
-declare const TableMenu: ({ menuId, columns, originColumns, tableRef, virtualTableKey, onEditableSave, }: {
+declare const TableMenu: ({ menuId, columns, originColumns, tableRef, virtualTableKey, onEditableSave, isContextMenuFullscreen, }: {
     menuId: any;
     columns: any;
     originColumns: any;
     tableRef: any;
     virtualTableKey: any;
     onEditableSave: any;
+    isContextMenuFullscreen: any;
 }) => JSX.Element;
 export default TableMenu;

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

@@ -17,7 +17,7 @@ import screenfull from 'screenfull';
 import TableEnhanceCell from './table-enhance-cell';
 import { Modal, Descriptions, Button } from '../../index.build';
 var TableMenu = function (_a) {
-    var menuId = _a.menuId, columns = _a.columns, originColumns = _a.originColumns, tableRef = _a.tableRef, virtualTableKey = _a.virtualTableKey, onEditableSave = _a.onEditableSave;
+    var menuId = _a.menuId, columns = _a.columns, originColumns = _a.originColumns, tableRef = _a.tableRef, virtualTableKey = _a.virtualTableKey, onEditableSave = _a.onEditableSave, isContextMenuFullscreen = _a.isContextMenuFullscreen;
     var _b = useState(false), visible = _b[0], setVisible = _b[1];
     var _c = useState(undefined), record = _c[0], setRecord = _c[1];
     var _d = useState(-1), recordIndex = _d[0], setRecordIndex = _d[1];
@@ -29,12 +29,17 @@ var TableMenu = function (_a) {
     })
         .map(function (item) {
         var originItem = originColumns.find(function (originItem) { return originItem.key === item.key; });
+        console.log(originItem, item);
         return {
             key: item.key,
             label: (originItem === null || originItem === void 0 ? void 0 : originItem.title) || item.title,
             render: originItem === null || originItem === void 0 ? void 0 : originItem.render,
             onCell: item.onCell,
             editable: item.editable,
+            validate: (item === null || item === void 0 ? void 0 : item.validate) ||
+                (originItem === null || originItem === void 0 ? void 0 : originItem.validate) ||
+                (item === null || item === void 0 ? void 0 : item.required) ||
+                (originItem === null || originItem === void 0 ? void 0 : originItem.required),
         };
     });
     function onMenuItemClick(e) {
@@ -112,13 +117,15 @@ var TableMenu = function (_a) {
             }
             // 如果item.render 返回的不是ReactElement，那么就使用span来包裹
             // 做列合并时，render返回的是一个对象
-            return (React.createElement(Descriptions.Item, { key: item.key, label: item.label }, isValidElement(renderItem) ? (renderItem) : isValidElement(renderItem === null || renderItem === void 0 ? void 0 : renderItem.children) ? (renderItem === null || renderItem === void 0 ? void 0 : renderItem.children) : (React.createElement("span", { title: currentRecord[item.key] }, currentRecord[item.key]))));
+            return (React.createElement(Descriptions.Item, { key: item.key, label: React.createElement("span", { style: { display: 'flex', alignItems: 'center' } },
+                    React.createElement("span", { style: { color: 'red' } }, item.validate ? '*' : ''),
+                    item.label) }, isValidElement(renderItem) ? (renderItem) : isValidElement(renderItem === null || renderItem === void 0 ? void 0 : renderItem.children) ? (renderItem === null || renderItem === void 0 ? void 0 : renderItem.children) : (React.createElement("span", { title: currentRecord[item.key] }, currentRecord[item.key]))));
         });
     }
     return (React.createElement(React.Fragment, null,
         React.createElement(Menu, { id: menuId },
             React.createElement(Item, { data: "detail", onClick: onMenuItemClick }, i18next.t('查看明细')),
-            onEditableSave ? null : (React.createElement(Item, { data: "fullscreen", onClick: onMenuItemClick }, isFull ? i18next.t('退出全屏') : 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, footer: React.createElement("div", { style: { textAlign: 'right', paddingRight: '10px' } },
                 React.createElement(Button, { type: "primary", onClick: onCancel }, i18next.t('关闭'))), getContainer: false },
             React.createElement("div", { style: { maxHeight: '70vh', overflow: 'auto' } },

package/dist/components/Table/table.d.ts

@@ -110,6 +110,8 @@ export interface IProps<RecordType> extends Omit<TableProps<RecordType>, 'column
     defaultTableSummaryCollapseShow?: boolean;
     /** 是否默认显示操作按钮组更多 */
     defaultTableOperationBtnGroupShowMore?: boolean;
+    /** 右键是否显示全屏功能 */
+    isContextMenuFullscreen?: boolean;
 }
 /**
  * TodoList

package/dist/components/Table/table.js

@@ -134,8 +134,8 @@ export function usePrevious(value) {
 function Table(props) {
     var _this = this;
     var _a, _b, _c;
-    var className = props.className, scroll = props.scroll, _d = props.pagination, pagination = _d === void 0 ? false : _d, _e = props.bordered, bordered = _e === void 0 ? true : _e, _columns = props.columns, initColumns = props.initColumns, dataSource = props.dataSource, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, delIconText = props.delIconText, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, summaryConfig = props.summaryConfig, summaryFixed = props.summaryFixed, summary = props.summary, onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave, onDynamicChange = props.onDynamicChange, _f = props.isResizableColumn, isResizableColumn = _f === void 0 ? true : _f, configInfo = props.configInfo, tableHandleRef = props.tableHandleRef, tableName = props.tableName, isFlex = props.isFlex, onTableChange = props.onTableChange, rowSelection = props.rowSelection, showInnerPagination = props.showInnerPagination, defaultInnerPageSize = props.defaultInnerPageSize, virtualTableKey = props.virtualTableKey, _g = props.isSort, isSort = _g === void 0 ? true : _g, onSortChange = props.onSortChange, onFillDownChange = props.onFillDownChange, isInitSaveColumnDynamic = props.isInitSaveColumnDynamic, _h = props.isAutoClearSort, isAutoClearSort = _h === void 0 ? true : _h, isHeaderTitleWrap = props.isHeaderTitleWrap, isExternalSort = props.isExternalSort, onRow = props.onRow, isContextMenu = props.isContextMenu, diffData = props.diffData, _j = props.isDiffDataIncludeEmpty, isDiffDataIncludeEmpty = _j === void 0 ? true : _j, diffDataColor = props.diffDataColor, deptParams = props.deptParams, _k = props.isNumberInputThousandth, isNumberInputThousandth = _k === void 0 ? true : _k, _l = props.isNumberInputAlignRight, isNumberInputAlignRight = _l === void 0 ? true : _l, updateData = props.updateData, isRecordScrollPosition = props.isRecordScrollPosition, scrollPositionKey = props.scrollPositionKey, isTableSummaryCollapse = props.isTableSummaryCollapse, defaultTableSummaryCollapseShow = props.defaultTableSummaryCollapseShow, defaultTableOperationBtnGroupShowMore = props.defaultTableOperationBtnGroupShowMore, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "addIconText", "hideDelIcon", "showDelAllBtn", "delAllChange", "delIconText", "hiddenColumnDynamicIcon", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName", "isFlex", "onTableChange", "rowSelection", "showInnerPagination", "defaultInnerPageSize", "virtualTableKey", "isSort", "onSortChange", "onFillDownChange", "isInitSaveColumnDynamic", "isAutoClearSort", "isHeaderTitleWrap", "isExternalSort", "onRow", "isContextMenu", "diffData", "isDiffDataIncludeEmpty", "diffDataColor", "deptParams", "isNumberInputThousandth", "isNumberInputAlignRight", "updateData", "isRecordScrollPosition", "scrollPositionKey", "isTableSummaryCollapse", "defaultTableSummaryCollapseShow", "defaultTableOperationBtnGroupShowMore"]);
-    var _m = useBaseContext(), isEnableDecimalByDept = _m.isEnableDecimalByDept, contextIsTableSummaryCollapse = _m.isTableSummaryCollapse, isTableSummaryCollapseDefaultShow = _m.isTableSummaryCollapseDefaultShow, isOperationBtnGroupShowMoreDefault = _m.isOperationBtnGroupShowMoreDefault, isTableEditShowContextMenu = _m.isTableEditShowContextMenu;
+    var className = props.className, scroll = props.scroll, _d = props.pagination, pagination = _d === void 0 ? false : _d, _e = props.bordered, bordered = _e === void 0 ? true : _e, _columns = props.columns, initColumns = props.initColumns, dataSource = props.dataSource, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, delIconText = props.delIconText, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, summaryConfig = props.summaryConfig, summaryFixed = props.summaryFixed, summary = props.summary, onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave, onDynamicChange = props.onDynamicChange, _f = props.isResizableColumn, isResizableColumn = _f === void 0 ? true : _f, configInfo = props.configInfo, tableHandleRef = props.tableHandleRef, tableName = props.tableName, isFlex = props.isFlex, onTableChange = props.onTableChange, rowSelection = props.rowSelection, showInnerPagination = props.showInnerPagination, defaultInnerPageSize = props.defaultInnerPageSize, virtualTableKey = props.virtualTableKey, _g = props.isSort, isSort = _g === void 0 ? true : _g, onSortChange = props.onSortChange, onFillDownChange = props.onFillDownChange, isInitSaveColumnDynamic = props.isInitSaveColumnDynamic, _h = props.isAutoClearSort, isAutoClearSort = _h === void 0 ? true : _h, isHeaderTitleWrap = props.isHeaderTitleWrap, isExternalSort = props.isExternalSort, onRow = props.onRow, isContextMenu = props.isContextMenu, diffData = props.diffData, _j = props.isDiffDataIncludeEmpty, isDiffDataIncludeEmpty = _j === void 0 ? true : _j, diffDataColor = props.diffDataColor, deptParams = props.deptParams, _k = props.isNumberInputThousandth, isNumberInputThousandth = _k === void 0 ? true : _k, _l = props.isNumberInputAlignRight, isNumberInputAlignRight = _l === void 0 ? true : _l, updateData = props.updateData, isRecordScrollPosition = props.isRecordScrollPosition, scrollPositionKey = props.scrollPositionKey, isTableSummaryCollapse = props.isTableSummaryCollapse, defaultTableSummaryCollapseShow = props.defaultTableSummaryCollapseShow, defaultTableOperationBtnGroupShowMore = props.defaultTableOperationBtnGroupShowMore, _m = props.isContextMenuFullscreen, isContextMenuFullscreen = _m === void 0 ? true : _m, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "addIconText", "hideDelIcon", "showDelAllBtn", "delAllChange", "delIconText", "hiddenColumnDynamicIcon", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName", "isFlex", "onTableChange", "rowSelection", "showInnerPagination", "defaultInnerPageSize", "virtualTableKey", "isSort", "onSortChange", "onFillDownChange", "isInitSaveColumnDynamic", "isAutoClearSort", "isHeaderTitleWrap", "isExternalSort", "onRow", "isContextMenu", "diffData", "isDiffDataIncludeEmpty", "diffDataColor", "deptParams", "isNumberInputThousandth", "isNumberInputAlignRight", "updateData", "isRecordScrollPosition", "scrollPositionKey", "isTableSummaryCollapse", "defaultTableSummaryCollapseShow", "defaultTableOperationBtnGroupShowMore", "isContextMenuFullscreen"]);
+    var _o = useBaseContext(), isEnableDecimalByDept = _o.isEnableDecimalByDept, contextIsTableSummaryCollapse = _o.isTableSummaryCollapse, isTableSummaryCollapseDefaultShow = _o.isTableSummaryCollapseDefaultShow, isOperationBtnGroupShowMoreDefault = _o.isOperationBtnGroupShowMoreDefault, isTableEditShowContextMenu = _o.isTableEditShowContextMenu;
     // 如果开启了表格列过滤
     var isHasFilterRef = useRef(false);
     var deptParamsRef = useLastest(deptParams);
@@ -146,19 +146,19 @@ function Table(props) {
         'zt-table--flex': isFlex,
         'zt-table-header-title--wrap': isHeaderTitleWrap,
     });
-    var _o = useState(false), dynamicVisible = _o[0], setDynamicVisible = _o[1];
+    var _p = useState(false), dynamicVisible = _p[0], setDynamicVisible = _p[1];
     var showDynamicHandle = useCallback(function () { return setDynamicVisible(true); }, []);
     var hideDynamicHandle = useCallback(function () { return setDynamicVisible(false); }, []);
     var dataSourceRef = useRef();
     var preDataSource = usePrevious(dataSource);
-    var _p = useState(), sortDataSource = _p[0], setSortDataSource = _p[1];
+    var _q = useState(), sortDataSource = _q[0], setSortDataSource = _q[1];
     var isTableEditShowContextMenuBool = getFinalValue(isTableEditShowContextMenu, isContextMenu);
     // 非编辑表格默认加上全屏功能
     var menuId = useState(isTableEditShowContextMenuBool || !props.onEditableSave
         ? 'menuId-' + Math.floor(Math.random() * 100000000)
         : undefined)[0];
     // 内部分页相关配置
-    var _q = useInnerPagination(showInnerPagination, defaultInnerPageSize), paginationConfig = _q.paginationConfig, currentPage = _q.currentPage, setCurrent = _q.setCurrent, pageSize = _q.pageSize;
+    var _r = useInnerPagination(showInnerPagination, defaultInnerPageSize), paginationConfig = _r.paginationConfig, currentPage = _r.currentPage, setCurrent = _r.setCurrent, pageSize = _r.pageSize;
     var rowSelectionDataSource = useRef({});
     var myScroll = useMemo(function () {
         if (scroll) {
@@ -213,7 +213,7 @@ function Table(props) {
     // 表头放大镜的条件
     var filterSearchValuesRef = useRef({});
     // 2023-05-04 自定义表格排序方法
-    var _r = useState(), customOrder = _r[0], setCustomOrder = _r[1];
+    var _s = useState(), customOrder = _s[0], setCustomOrder = _s[1];
     var customSortHandle = useCallback(function (info, options) {
         if (Array.isArray(expandableDataSource) &&
             expandableDataSource.length > 1) {
@@ -399,12 +399,12 @@ function Table(props) {
     var menuShow = useContextMenu({
         id: menuId,
     }).show;
-    var _s = useScrollPosition({
+    var _t = useScrollPosition({
         tableRef: tableRef,
         isRecordScrollPosition: isRecordScrollPosition,
         virtualTableKey: virtualTableKey,
         storageKey: scrollPositionKey || virtualTableKey || showColumnDynamicKey,
-    }), removeScrollPosition = _s.removeScrollPosition, setTableScroll = _s.setTableScroll;
+    }), removeScrollPosition = _t.removeScrollPosition, setTableScroll = _t.setTableScroll;
     // 记录需要控制小数位数的字段(再小计的时候，需要控制小数位数)
     var decimalFieldsRef = useRef({});
     // 记录自动小数位（数据有几位小数就显示几位小数，影响小计）
@@ -415,7 +415,7 @@ function Table(props) {
      */
     var isTableOperationBtnGroupShowMore = getFinalValue(isOperationBtnGroupShowMoreDefault, defaultTableOperationBtnGroupShowMore);
     var onFillDownChangeRef = useLastest(onFillDownChange);
-    var _t = useColumns({
+    var _u = useColumns({
         columns: _columns,
         hiddenColumnDynamicIcon: hiddenColumnDynamicIcon,
         showColumnDynamic: showColumnDynamic,
@@ -454,7 +454,7 @@ function Table(props) {
         decimalFieldsRef: decimalFieldsRef,
         autoDecimalFieldsRef: autoDecimalFieldsRef,
         isTableOperationBtnGroupShowMore: isTableOperationBtnGroupShowMore,
-    }), newColumns = _t.newColumns, dynamicColumns = _t.dynamicColumns, refreshColumnsHandle = _t.refreshColumnsHandle;
+    }), newColumns = _u.newColumns, dynamicColumns = _u.dynamicColumns, refreshColumnsHandle = _u.refreshColumnsHandle;
     /**
      * 做一些监听
      */
@@ -723,7 +723,7 @@ function Table(props) {
     //   // eslint-disable-next-line react-hooks/exhaustive-deps
     // }, [sortDataSource, expandableDataSource]);
     // 为了兼容外部使用受控模式调用。
-    var _u = useState([]), innerRowSelection = _u[0], setInnerRowSelection = _u[1];
+    var _v = useState([]), innerRowSelection = _v[0], setInnerRowSelection = _v[1];
     // 如果传入了默认值，但是没有 传入受控值 需要设置下默认值
     var isFirstRowSelectionRef = useRef(false);
     useEffect(function () {
@@ -1126,7 +1126,7 @@ function Table(props) {
     // 表格合计
     var _isTableSummaryCollapse = getFinalValue(contextIsTableSummaryCollapse, isTableSummaryCollapse);
     var isTableSummaryCollapseDefault = getFinalValue(isTableSummaryCollapseDefaultShow, defaultTableSummaryCollapseShow);
-    var _v = useTableSummaryCollapse(tableRef, isTableSummaryCollapseDefault), showSummary = _v.showSummary, renderTableSummaryCollapse = _v.renderTableSummaryCollapse;
+    var _w = useTableSummaryCollapse(tableRef, isTableSummaryCollapseDefault), showSummary = _w.showSummary, renderTableSummaryCollapse = _w.renderTableSummaryCollapse;
     var onSummaryHandle = useCallback(function (pageData) {
         var _a;
         var _b = rowSelectionDataSource.current || {}, isChange = _b.isChange, selectedRowKeys = _b.selectedRowKeys, selectedRows = _b.selectedRows;
@@ -1260,7 +1260,7 @@ function Table(props) {
                     summary: summaryConfig ? onSummaryHandle : summary, rowSelection: rowSelection ? rowSelectionObj : rowSelection }, restProps)),
                 showColumnDynamic && dynamicVisible && (React.createElement(TableDynamic, { visible: dynamicVisible, onClose: hideDynamicHandle, onSave: saveDynamicHandle, onReset: resetDynamicHandle, columns: dynamicColumns, dynamicStorageKey: showColumnDynamicKey, innerDynamicList: initColumns || _columns || [], newColumns: newColumns }))),
             React.createElement("div", { ref: tipRef, className: "table-subtotal--tip" }),
-            menuId && (React.createElement(TableMenu, { menuId: menuId, columns: newColumns, originColumns: _columns, tableRef: tableRef, virtualTableKey: virtualTableKey, onEditableSave: props.onEditableSave })))));
+            menuId && (React.createElement(TableMenu, { menuId: menuId, columns: newColumns, originColumns: _columns, tableRef: tableRef, virtualTableKey: virtualTableKey, onEditableSave: props.onEditableSave, isContextMenuFullscreen: isContextMenuFullscreen })))));
 }
 // export default memo(Table, (prevProps, nextProps) => {
 //   return shallowEqual(prevProps, nextProps);

package/package.json

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