zmdms-webui 2.6.1 → 2.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -102,10 +102,6 @@ interface IModalProps extends Omit<ModalProps, "onOk"> {
102
102
  * 最大高度
103
103
  */
104
104
  maxHeight?: number;
105
- /**
106
- * 默认宽度
107
- */
108
- defaultWidth?: string | number;
109
105
  /**
110
106
  * 默认高度
111
107
  */
@@ -9,18 +9,18 @@ import useResizable from './useResizable.js';
9
9
  import myMessage from '../message/index.js';
10
10
 
11
11
  var Modal = function (_a, ref) {
12
- var className = _a.className, defaultOpen = _a.defaultOpen, defaultTitle = _a.defaultTitle, defaultConfirmMsg = _a.defaultConfirmMsg, defaultConfirmOkText = _a.defaultConfirmOkText, defaultType = _a.defaultType, confirmPreHandle = _a.confirmPreHandle, confirmOnOk = _a.confirmOnOk, onOk = _a.onOk, footer = _a.footer, onOkValidate = _a.onOkValidate, _b = _a.isDrag, isDrag = _b === void 0 ? true : _b, _c = _a.isResize, isResize = _c === void 0 ? false : _c, minWidth = _a.minWidth, minHeight = _a.minHeight, maxWidth = _a.maxWidth, maxHeight = _a.maxHeight, defaultWidth = _a.defaultWidth, _d = _a.defaultHeight, defaultHeight = _d === void 0 ? 500 : _d, modalTitle = _a.title, modalRender = _a.modalRender, resetProps = __rest(_a, ["className", "defaultOpen", "defaultTitle", "defaultConfirmMsg", "defaultConfirmOkText", "defaultType", "confirmPreHandle", "confirmOnOk", "onOk", "footer", "onOkValidate", "isDrag", "isResize", "minWidth", "minHeight", "maxWidth", "maxHeight", "defaultWidth", "defaultHeight", "title", "modalRender"]);
12
+ var className = _a.className, defaultOpen = _a.defaultOpen, defaultTitle = _a.defaultTitle, defaultConfirmMsg = _a.defaultConfirmMsg, defaultConfirmOkText = _a.defaultConfirmOkText, defaultType = _a.defaultType, confirmPreHandle = _a.confirmPreHandle, confirmOnOk = _a.confirmOnOk, onOk = _a.onOk, footer = _a.footer, onOkValidate = _a.onOkValidate, _b = _a.isDrag, isDrag = _b === void 0 ? true : _b, _c = _a.isResize, isResize = _c === void 0 ? false : _c, minWidth = _a.minWidth, minHeight = _a.minHeight, maxWidth = _a.maxWidth, maxHeight = _a.maxHeight, defaultHeight = _a.defaultHeight, modalTitle = _a.title, modalRender = _a.modalRender, resetProps = __rest(_a, ["className", "defaultOpen", "defaultTitle", "defaultConfirmMsg", "defaultConfirmOkText", "defaultType", "confirmPreHandle", "confirmOnOk", "onOk", "footer", "onOkValidate", "isDrag", "isResize", "minWidth", "minHeight", "maxWidth", "maxHeight", "defaultHeight", "title", "modalRender"]);
13
13
  var classes = classNames("ztxk-modal", isResize && "ztxk-modal-resize", className);
14
14
  // 模态框基本属性
15
- var _e = useState(defaultOpen), open = _e[0], setOpen = _e[1];
16
- var _f = useState(defaultTitle), title = _f[0], setTitle = _f[1];
17
- var _g = useState(), loading = _g[0], setLoading = _g[1];
15
+ var _d = useState(defaultOpen), open = _d[0], setOpen = _d[1];
16
+ var _e = useState(defaultTitle), title = _e[0], setTitle = _e[1];
17
+ var _f = useState(), loading = _f[0], setLoading = _f[1];
18
18
  // 二次确认框相关配置
19
- var _h = useState(confirmOnOk ? true : false), isConfirm = _h[0], setIsConfirm = _h[1];
20
- var _j = useState(defaultConfirmMsg), confirmMsg = _j[0], setConfirmMsg = _j[1];
21
- var _k = useState(defaultConfirmOkText), confirmOkText = _k[0], setConfirmOkText = _k[1];
19
+ var _g = useState(confirmOnOk ? true : false), isConfirm = _g[0], setIsConfirm = _g[1];
20
+ var _h = useState(defaultConfirmMsg), confirmMsg = _h[0], setConfirmMsg = _h[1];
21
+ var _j = useState(defaultConfirmOkText), confirmOkText = _j[0], setConfirmOkText = _j[1];
22
22
  // 模态框类型
23
- var _l = useState(defaultType), type = _l[0], setType = _l[1];
23
+ var _k = useState(defaultType), type = _k[0], setType = _k[1];
24
24
  var close = useCallback(function () {
25
25
  setOpen(false);
26
26
  }, []);
@@ -142,21 +142,21 @@ var Modal = function (_a, ref) {
142
142
  setConfirmMsg: setConfirmOkText,
143
143
  };
144
144
  });
145
- var _m = useResizable({
145
+ var _l = useResizable({
146
146
  isResize: isResize,
147
147
  minWidth: minWidth,
148
148
  minHeight: minHeight,
149
149
  maxWidth: maxWidth,
150
150
  maxHeight: maxHeight,
151
- defaultWidth: defaultWidth,
151
+ defaultWidth: resetProps.width,
152
152
  defaultHeight: defaultHeight,
153
153
  modalRender: modalRender,
154
- }), resizableWidth = _m.width, resizableModalRender = _m.resizableModalRender;
155
- var _o = useDraggable({
154
+ }), resizableWidth = _l.width, resizableModalRender = _l.resizableModalRender;
155
+ var _m = useDraggable({
156
156
  isDrag: isDrag,
157
157
  title: modalTitle || title,
158
158
  modalRender: modalRender,
159
- }), dragTitle = _o.dragTitle, dragModalRender = _o.dragModalRender;
159
+ }), dragTitle = _m.dragTitle, dragModalRender = _m.dragModalRender;
160
160
  var finalWidth = isResize ? resizableWidth : resetProps.width || "70%";
161
161
  return (jsx(Modal$1, __assign({ open: open, onCancel: close, className: classes, okText: "\u4FDD\u5B58", onOk: footer ? undefined : onOkHandle, title: dragTitle, keyboard: false, maskClosable: false, confirmLoading: loading, cancelButtonProps: { loading: loading }, footer: footer, modalRender: function (modal) {
162
162
  var resized = resizableModalRender(modal);
@@ -3,7 +3,7 @@ import { jsxs, jsx } from 'react/jsx-runtime';
3
3
  import React__default, { useState, useRef, useCallback } from 'react';
4
4
 
5
5
  var useResizable = function (options) {
6
- var isResize = options.isResize, _a = options.minWidth, minWidth = _a === void 0 ? 400 : _a, _b = options.minHeight, minHeight = _b === void 0 ? 300 : _b, maxWidth = options.maxWidth, maxHeight = options.maxHeight, _c = options.defaultWidth, defaultWidth = _c === void 0 ? "70%" : _c, _d = options.defaultHeight, defaultHeight = _d === void 0 ? "auto" : _d;
6
+ var isResize = options.isResize, _a = options.minWidth, minWidth = _a === void 0 ? 100 : _a, _b = options.minHeight, minHeight = _b === void 0 ? 100 : _b, maxWidth = options.maxWidth, maxHeight = options.maxHeight, _c = options.defaultWidth, defaultWidth = _c === void 0 ? "70%" : _c, _d = options.defaultHeight, defaultHeight = _d === void 0 ? "auto" : _d;
7
7
  var _e = useState({
8
8
  width: defaultWidth,
9
9
  height: defaultHeight,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zmdms-webui",
3
- "version": "2.6.1",
3
+ "version": "2.6.2",
4
4
  "private": false,
5
5
  "main": "dist/index.es.js",
6
6
  "module": "dist/index.es.js",