zmdms-webui 1.0.0 → 1.0.2

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -25,6 +25,7 @@ var DynamicDrawer = function (props, ref) {
         return {
             setVisible: setVisible,
             onSure: onSure,
+            onReset: onReset,
         };
     });
     // 根据item的checkod 获取当前选中项

package/dist/es/dynamicsetting/dynamicSetting.js

@@ -33,6 +33,11 @@ var DynamicSetting = function (props, ref) {
                 var _a;
                 (_a = drawerRef.current) === null || _a === void 0 ? void 0 : _a.onSure(list);
             },
+            // 重置数据
+            resetList: function () {
+                var _a;
+                (_a = drawerRef.current) === null || _a === void 0 ? void 0 : _a.onReset();
+            },
         };
     });
     return Array.isArray(list) && list.length > 0 ? (jsxs("div", __assign({ className: "ztxk-dynamic-setting" }, { children: [hiddenOperationIcon ? null : (jsx("div", __assign({ onClick: function () { var _a; return (_a = drawerRef.current) === null || _a === void 0 ? void 0 : _a.setVisible(true); } }, { children: children ? (children) : (jsx(SettingOutlined, { style: { fontSize: 18, color: "#768696" } })) }))), jsx(DynamicDrawer, { list: list, dynamicKey: dynamicKey, parentDynamicKey: parentDynamicKey, ref: drawerRef, title: title, onCurrentListChange: onCurrentListChange, isFixed: isFixed, isMore: isMore })] }))) : null;

package/dist/es/dynamicsetting/interface.d.ts

@@ -22,6 +22,7 @@ interface IRef {
     setList: React.Dispatch<React.SetStateAction<IDynamicItem[]>>;
     setVisible: (v: boolean) => void;
     updateList: (list: any) => void;
+    resetList: () => void;
 }
 
 export { IDynamicItem, IDynamicSettingProps, IRef };

package/dist/es/table/interface.d.ts

@@ -171,6 +171,10 @@ interface ITableRefHandel {
         y: number;
         vid: string;
     }) => void;
+    /**
+     * 重置
+     */
+    onResetDynamicList?: () => void;
 }
 interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"> {
     /**

package/dist/es/table/table.js

@@ -235,6 +235,16 @@ var Table = function (props) {
             scrollTo: function (obj) {
                 scrollTo(obj);
             },
+            /** 动态列配置重置 */
+            onResetDynamicList: function () {
+                var _a, _b;
+                (_b = (_a = dynamicSettingRef.current) === null || _a === void 0 ? void 0 : _a.resetList) === null || _b === void 0 ? void 0 : _b.call(_a);
+            },
+            /** 动态列配置设置 */
+            onSetDynamicList: function (list) {
+                var _a, _b;
+                (_b = (_a = dynamicSettingRef.current) === null || _a === void 0 ? void 0 : _a.updateList) === null || _b === void 0 ? void 0 : _b.call(_a, list);
+            },
         };
     });
     // 表格

package/dist/es/table/useInnerPagination.js

@@ -40,7 +40,13 @@ function useInnerPagination(isInnerPagination, innerPaginationPageSize, options)
             if (currentPageNum && currentPageNum > 1 && currentPageSizeNum) {
                 var prePageTotalNum = (currentPageNum - 1) * currentPageSizeNum;
                 if (prePageTotalNum >= currentDataNum) {
-                    setCurrent(function (preCurrent) { return preCurrent - 1; });
+                    setCurrent(function (preCurrent) {
+                        // 及时更新当前的值 因为可能会在render中使用
+                        if (currentPage.current) {
+                            currentPage.current.page = preCurrent - 1;
+                        }
+                        return preCurrent - 1;
+                    });
                 }
             }
         }
@@ -52,6 +58,11 @@ function useInnerPagination(isInnerPagination, innerPaginationPageSize, options)
             if (isInnerPagination) {
                 setCurrent(page);
                 setPageSize(pageSize);
+                // 及时更新当前的值 因为可能会在render中使用
+                currentPage.current = {
+                    page: page,
+                    pageSize: Number(pageSize),
+                };
             }
         },
         hideOnSinglePage: true,

package/dist/es/watermark/watermark-shadow.js

@@ -4,7 +4,9 @@ import { createWatermark } from './utils.js';
 import { useMemoizedFn, useMount } from 'ahooks';
 
 var WatermarkShadow = function (props, ref) {
-    var zIndex = props.zIndex, isMutationObserver = props.isMutationObserver, content = props.content, font = props.font, rotate = props.rotate, width = props.width, height = props.height, containerDomRef = props.containerDomRef;
+    var 
+    // zIndex,
+    isMutationObserver = props.isMutationObserver, content = props.content, font = props.font, rotate = props.rotate, width = props.width, height = props.height, containerDomRef = props.containerDomRef;
     var waterDomRef = useRef(null);
     var shadowRootRef = useRef();
     var createWaterMemo = useMemoizedFn(function () {
@@ -100,7 +102,8 @@ var WatermarkShadow = function (props, ref) {
         };
     });
     return (jsx("div", { ref: waterDomRef, className: "ztxk-watermark--div", style: {
-            zIndex: zIndex,
+            // 将这个层级设置为最高
+            zIndex: 9999,
             position: "absolute",
             visibility: "visible",
             overflow: "hidden",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",