zmdms-webui 0.0.6 → 0.0.8

package/dist/es/formitem/formItem.d.ts

@@ -1,7 +1,7 @@
 import React__default from 'react';
 import { FormItemProps, FormInstance } from 'antd/lib/form';
 
-type IWidth = "half" | "double" | "all" | "halfAll";
+type IWidth = "half" | "double" | "all" | "halfAll" | number;
 interface IFormItem extends FormItemProps {
     isDisplay?: boolean | string;
     isRequired?: boolean | string;

package/dist/es/formitem/formItem.js

@@ -100,9 +100,12 @@ var FormItem = function (props) {
 //   }
 // }
 function getWidthNum(width) {
+    if (typeof width === "number") {
+        return width;
+    }
     switch (width) {
         case "half":
-            return 12;
+            return 4;
         case "all":
             return 24;
         case "double":

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

@@ -4,6 +4,11 @@ import { Modal } from 'antd';
 
 interface IModalProps extends ModalProps {
     defaultOpen?: boolean;
+    defaultTitle?: string;
+    defaultConfirmMsg?: string;
+    defaultConfirmOkText?: string;
+    defaultType?: string;
+    confirmOnOk?: (type?: string) => Promise<any>;
 }
 interface IModalComponent extends React__default.ForwardRefExoticComponent<IModalProps & React__default.RefAttributes<unknown>> {
     info: typeof Modal.info;
@@ -11,6 +16,7 @@ interface IModalComponent extends React__default.ForwardRefExoticComponent<IModa
     error: typeof Modal.error;
     warning: typeof Modal.warning;
     confirm: typeof Modal.confirm;
+    destroyAll: typeof Modal.destroyAll;
 }
 
 export { IModalComponent, IModalProps };

package/dist/es/modal/modal.js

@@ -5,15 +5,33 @@ import { Modal as Modal$1 } from 'antd';
 import classNames from '../node_modules/classnames/index.js';
 
 var Modal = function (_a, ref) {
-    var className = _a.className, defaultOpen = _a.defaultOpen, resetProps = __rest(_a, ["className", "defaultOpen"]);
+    var className = _a.className, defaultOpen = _a.defaultOpen, defaultTitle = _a.defaultTitle, defaultConfirmMsg = _a.defaultConfirmMsg, defaultConfirmOkText = _a.defaultConfirmOkText, defaultType = _a.defaultType, confirmOnOk = _a.confirmOnOk, resetProps = __rest(_a, ["className", "defaultOpen", "defaultTitle", "defaultConfirmMsg", "defaultConfirmOkText", "defaultType", "confirmOnOk"]);
     var classes = classNames("ztxk-modal", className);
     var _b = useState(defaultOpen), open = _b[0], setOpen = _b[1];
+    var _c = useState(defaultTitle), title = _c[0], setTitle = _c[1];
+    var _d = useState(defaultConfirmMsg), confirmMsg = _d[0], setConfirmMsg = _d[1];
+    var _e = useState(defaultConfirmOkText), confirmOkText = _e[0], setConfirmOkText = _e[1];
+    var _f = useState(defaultType), type = _f[0], setType = _f[1];
     var close = useCallback(function () {
         setOpen(false);
     }, []);
     useImperativeHandle(ref, function () {
         return {
-            open: function () {
+            open: function (options) {
+                // 如果有默认参数 那么设置
+                // 一般用于 新增、修改用于同一个编辑框时使用
+                if (options === null || options === void 0 ? void 0 : options.title) {
+                    setTitle(options.title);
+                }
+                if (options === null || options === void 0 ? void 0 : options.confirmMsg) {
+                    setConfirmMsg(options.confirmMsg);
+                }
+                if (options === null || options === void 0 ? void 0 : options.confirmOkText) {
+                    setConfirmOkText(options.confirmOkText);
+                }
+                if (options === null || options === void 0 ? void 0 : options.type) {
+                    setType(options.type);
+                }
                 setOpen(true);
             },
             close: function () {
@@ -21,7 +39,22 @@ var Modal = function (_a, ref) {
             },
         };
     });
-    return (jsx(Modal$1, __assign({ open: open, onCancel: close, className: classes }, resetProps)));
+    var onOkHandle = useCallback(function () {
+        if (confirmMsg) {
+            Modal$1.confirm({
+                title: confirmMsg,
+                okText: confirmOkText ? confirmOkText : "确认保存",
+                onOk: confirmOnOk
+                    ? function () {
+                        return confirmOnOk(type).then(function () {
+                            setOpen(false);
+                        });
+                    }
+                    : undefined,
+            });
+        }
+    }, [confirmMsg, confirmOkText, confirmOnOk, type]);
+    return (jsx(Modal$1, __assign({ open: open, onCancel: close, className: classes, okText: "\u4FDD\u5B58", onOk: onOkHandle, width: "70%", title: title }, resetProps)));
 };
 var ModalComponent = forwardRef(Modal);
 ModalComponent.displayName = "ZTXK_WEBUI_ModalComponent";
@@ -29,6 +62,7 @@ ModalComponent.info = Modal$1.info;
 ModalComponent.success = Modal$1.success;
 ModalComponent.error = Modal$1.error;
 ModalComponent.warning = Modal$1.warning;
-ModalComponent.confirm = Modal$1.confirm;
+ModalComponent.confirm = Modal$1.confirm;
+ModalComponent.destroyAll = Modal$1.destroyAll;
 
 export { ModalComponent as default };

package/dist/es/table/hooks.js

@@ -137,6 +137,7 @@ function useAddAndDelChange(dataSourceRef, onTableChange, options) {
         rowKey,
         refreshScuCell,
         isAddAndDelAuto,
+        currentPage,
     ]);
     return onAddAndDel;
 }

package/dist/es/table/table.js

@@ -26,9 +26,11 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
 // TODO: 实现可拖拽行
 // TODO: 实现可编辑功能
 var Table = function (props) {
-    console.log("表格渲染");
+    // console.log("表格渲染");
     var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, _c = props.isDelAll, isDelAll = _c === void 0 ? true : _c, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _d = props.summaryFixed, summaryFixed = _d === void 0 ? true : _d, isInnerPagination = props.isInnerPagination, _e = props.innerPaginationPageSize, innerPaginationPageSize = _e === void 0 ? 30 : _e, _f = props.innerPaginationPosition, innerPaginationPosition = _f === void 0 ? INNER_TABLE_PAGINATION_POSITION : _f, _g = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _g === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _g, tableRefHandle = props.tableRefHandle, tableName = props.tableName, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "addMode", "addCallback", "isDel", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "tableRefHandle", "tableName"]);
-    var classes = classNames("ztxk-table", className);
+    var classes = classNames("ztxk-table", className, {
+        "ztxk-table--flex": isFlex,
+    });
     // 将表格数据 在 Ref中 存储一份
     var dataSourceRef = useRef();
     useEffect(function () {