ztxkui 4.2.23-565 → 4.2.23-566

package/dist/components/EnhanceSelect/index.js

@@ -1266,7 +1266,9 @@ function EnhanceSelect(_a) {
     }, [selectList, newValue, dataKey, titleKey]);
     return (React.createElement(Select, __assign({ defaultValue: showAll ? '' : undefined, allowClear: true, showSearch: true, autoClearSearchValue: !!remoteSearch, filterOption: remoteSearch ? false : filterOptionHandle, 
         // searchValue={searchValue}
-        onSearch: remoteSearch ? onSearchHandle : onSearchHandleInnerDebounce, onChange: onChangeHandle, optionLabelProp: "title", loading: loading, onFocus: onFocusHandle, onBlur: onBlurHandle, onClear: onClearHandle, onSelect: onSelectHandle, onClick: onClickHandle, onMouseDown: onMouseDownHandle, getPopupContainer: getPopupContainer, open: isOpen, onDropdownVisibleChange: function (visible) { return setIsOpen(visible); }, onPopupScroll: onPopupScrollHandle, dropdownRender: url && !remoteSearch && isCatch
+        onSearch: remoteSearch ? onSearchHandle : onSearchHandleInnerDebounce, onChange: onChangeHandle, optionLabelProp: "title", loading: loading, onFocus: onFocusHandle, onBlur: onBlurHandle, onClear: onClearHandle, onSelect: onSelectHandle, onClick: onClickHandle, onMouseDown: onMouseDownHandle, 
+        // getPopupContainer={(trigger) => trigger || document.body}
+        getPopupContainer: getPopupContainer, open: isOpen, onDropdownVisibleChange: function (visible) { return setIsOpen(visible); }, onPopupScroll: onPopupScrollHandle, dropdownRender: url && !remoteSearch && isCatch
             ? function (menu) { return (React.createElement(React.Fragment, null,
                 menu,
                 React.createElement(Divider, { style: { marginTop: 0, marginBottom: '4px' } }),

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

@@ -12,9 +12,14 @@ export declare function useTableContext(): TableContextProps;
  * 否则采用传入的getContainer方法
  * 其次全局的getPopupContainer方法
  * 最后默认的document.body
+ * 这个方案彻底放弃了 不可行
+ * 之前想的是 表格全屏的时候 把弹出层容器挂载到表格容器上（因为全屏的容器层级是系统层级的，如果挂载到body上或者其他容器上下拉框、日期框会选择不了）
+ * 但是这样会产生一个问题。当表格退出全屏的时候，如果表格容器高度不够，那么弹出层会显示不全，因为表格已经overflow: hidden了
+ * 就算把表格的overflow：hidden去掉，也会产生别的问题。比如外部使用的时候，表格容器被嵌套在了一个overflow：hidden的容器里面
+ * 所以这里不处理了，直接禁用掉编辑表格的全屏功能
  * @param options
  * @returns
  */
 export declare function usePopupContainer(options?: {
     getPopupContainer?: any;
-}): (target?: HTMLElement) => any;
+}): any;

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

@@ -15,28 +15,37 @@ export function useTableContext() {
  * 否则采用传入的getContainer方法
  * 其次全局的getPopupContainer方法
  * 最后默认的document.body
+ * 这个方案彻底放弃了 不可行
+ * 之前想的是 表格全屏的时候 把弹出层容器挂载到表格容器上（因为全屏的容器层级是系统层级的，如果挂载到body上或者其他容器上下拉框、日期框会选择不了）
+ * 但是这样会产生一个问题。当表格退出全屏的时候，如果表格容器高度不够，那么弹出层会显示不全，因为表格已经overflow: hidden了
+ * 就算把表格的overflow：hidden去掉，也会产生别的问题。比如外部使用的时候，表格容器被嵌套在了一个overflow：hidden的容器里面
+ * 所以这里不处理了，直接禁用掉编辑表格的全屏功能
  * @param options
  * @returns
  */
 export function usePopupContainer(options) {
     var comGetPopupContainer = (options || {}).getPopupContainer;
-    var _a = useTableContext(), inTable = _a.inTable, tableContainerRef = _a.tableContainerRef;
+    // const { inTable, tableContainerRef } = useTableContext();
     var antdConfig = useAntdContext();
     var getPopupContainer = useMemoizedFn(function (target) {
-        var _a, _b;
+        var _a;
         var targetElement = target || document.body;
-        if (inTable) {
-            return ((tableContainerRef === null || tableContainerRef === void 0 ? void 0 : tableContainerRef.current) ||
-                ((_a = antdConfig === null || antdConfig === void 0 ? void 0 : antdConfig.getPopupContainer) === null || _a === void 0 ? void 0 : _a.call(antdConfig, targetElement)) ||
-                document.body);
-        }
-        if (typeof comGetPopupContainer === 'function') {
-            return comGetPopupContainer === null || comGetPopupContainer === void 0 ? void 0 : comGetPopupContainer(targetElement);
-        }
-        if (typeof comGetPopupContainer !== 'undefined') {
-            return comGetPopupContainer;
-        }
-        return ((_b = antdConfig === null || antdConfig === void 0 ? void 0 : antdConfig.getPopupContainer) === null || _b === void 0 ? void 0 : _b.call(antdConfig, targetElement)) || document.body;
+        // if (inTable) {
+        //   return (
+        //     tableContainerRef?.current ||
+        //     antdConfig?.getPopupContainer?.(targetElement) ||
+        //     document.body
+        //   );
+        // }
+        // if (typeof comGetPopupContainer === 'function') {
+        //   return comGetPopupContainer?.(targetElement);
+        // }
+        // if (typeof comGetPopupContainer !== 'undefined') {
+        //   return comGetPopupContainer;
+        // }
+        return ((_a = antdConfig === null || antdConfig === void 0 ? void 0 : antdConfig.getPopupContainer) === null || _a === void 0 ? void 0 : _a.call(antdConfig, targetElement)) || document.body;
     });
-    return getPopupContainer;
+    return typeof comGetPopupContainer !== 'undefined'
+        ? comGetPopupContainer
+        : getPopupContainer;
 }

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

@@ -1,12 +1,11 @@
 /// <reference types="react" />
 import 'react-contexify/dist/ReactContexify.min.css';
-declare const TableMenu: ({ menuId, columns, originColumns, tableRef, virtualTableKey, onEditableSave, isFlex, }: {
+declare const TableMenu: ({ menuId, columns, originColumns, tableRef, virtualTableKey, onEditableSave, }: {
     menuId: any;
     columns: any;
     originColumns: any;
     tableRef: any;
     virtualTableKey: any;
     onEditableSave: any;
-    isFlex: 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, isFlex = _a.isFlex;
+    var menuId = _a.menuId, columns = _a.columns, originColumns = _a.originColumns, tableRef = _a.tableRef, virtualTableKey = _a.virtualTableKey, onEditableSave = _a.onEditableSave;
     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];
@@ -94,17 +94,6 @@ var TableMenu = function (_a) {
     function onCancel() {
         setVisible(false);
     }
-    useEffect(function () {
-        if (!onEditableSave || isFlex) {
-            return;
-        }
-        if (visible) {
-            tableRef.current.classList.add('zt-table--menu-modal');
-        }
-        else {
-            tableRef.current.classList.remove('zt-table--menu-modal');
-        }
-    }, [visible, onEditableSave]);
     function renderItem(items) {
         return items.map(function (item) {
             var _a, _b;
@@ -129,7 +118,7 @@ var TableMenu = function (_a) {
     return (React.createElement(React.Fragment, null,
         React.createElement(Menu, { id: menuId },
             React.createElement(Item, { data: "detail", onClick: onMenuItemClick }, i18next.t('查看明细')),
-            React.createElement(Item, { data: "fullscreen", onClick: onMenuItemClick }, isFull ? i18next.t('退出全屏') : i18next.t('全屏'))),
+            onEditableSave ? 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.js

@@ -1247,9 +1247,7 @@ function Table(props) {
     return (React.createElement(TableContextProvider, { value: { inTable: true, tableContainerRef: tableRef } },
         React.createElement("div", { className: isFlex ? 'zt-table-flex' : 'zt-table--wrap-container', style: isFlex
                 ? { position: 'relative', overflow: 'hidden', flex: 1 }
-                : // : { position: 'relative', overflow: 'hidden' }
-                    // 这里不能设置overflow:hidden，否则右键全屏之后，会导致表格中的弹出组件出现问题
-                    { position: 'relative' }, ref: tableRef },
+                : { position: 'relative', overflow: 'hidden' }, ref: tableRef },
             React.createElement(DndProvider, { backend: HTML5Backend, context: window },
                 React.createElement(AntTable, __assign({ className: classes, bordered: bordered, pagination: showInnerPagination
                         ? pagination
@@ -1262,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, isFlex: isFlex })))));
+            menuId && (React.createElement(TableMenu, { menuId: menuId, columns: newColumns, originColumns: _columns, tableRef: tableRef, virtualTableKey: virtualTableKey, onEditableSave: props.onEditableSave })))));
 }
 // export default memo(Table, (prevProps, nextProps) => {
 //   return shallowEqual(prevProps, nextProps);

package/package.json

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