zmdms-webui 0.0.10 → 0.0.12
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.
- package/dist/es/modal/interface.d.ts +8 -0
- package/dist/es/modal/modal.js +26 -8
- package/dist/es/operationbtn/interface.d.ts +1 -1
- package/dist/es/table/interface.d.ts +2 -1
- package/dist/es/table/useColumns.js +6 -2
- package/dist/index.build.d.ts +5 -4
- package/dist/index.dark.css +1 -1
- package/dist/index.default.css +1 -1
- package/dist/index.umd.js +2 -2
- package/package.json +1 -1
|
@@ -4,6 +4,7 @@ import { Modal } from 'antd';
|
|
|
4
4
|
|
|
5
5
|
interface IModalOpenOptions {
|
|
6
6
|
title?: string;
|
|
7
|
+
isConfirm?: boolean;
|
|
7
8
|
confirmMsg?: string;
|
|
8
9
|
confirmOkText?: string;
|
|
9
10
|
type?: string;
|
|
@@ -12,6 +13,12 @@ interface IModalOpenOptions {
|
|
|
12
13
|
interface IModalRef {
|
|
13
14
|
open?: (options?: IModalOpenOptions) => void;
|
|
14
15
|
close?: () => void;
|
|
16
|
+
getType?: () => string | undefined;
|
|
17
|
+
setConfirmMsg?: (confirmMsg: string) => void;
|
|
18
|
+
}
|
|
19
|
+
interface IConfirmPreResult {
|
|
20
|
+
confirmMsg?: string;
|
|
21
|
+
confirmOkText?: string;
|
|
15
22
|
}
|
|
16
23
|
interface IModalProps extends ModalProps {
|
|
17
24
|
defaultOpen?: boolean;
|
|
@@ -19,6 +26,7 @@ interface IModalProps extends ModalProps {
|
|
|
19
26
|
defaultConfirmMsg?: string;
|
|
20
27
|
defaultConfirmOkText?: string;
|
|
21
28
|
defaultType?: string;
|
|
29
|
+
confirmPreHandle?: (type?: string) => IConfirmPreResult;
|
|
22
30
|
confirmOnOk?: (type?: string) => Promise<any>;
|
|
23
31
|
}
|
|
24
32
|
interface IModalComponent extends React__default.ForwardRefExoticComponent<IModalProps & React__default.RefAttributes<unknown>> {
|
package/dist/es/modal/modal.js
CHANGED
|
@@ -5,13 +5,14 @@ import { Modal as Modal$1 } from 'antd';
|
|
|
5
5
|
import classNames from '../node_modules/classnames/index.js';
|
|
6
6
|
|
|
7
7
|
var Modal = function (_a, ref) {
|
|
8
|
-
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"]);
|
|
8
|
+
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, resetProps = __rest(_a, ["className", "defaultOpen", "defaultTitle", "defaultConfirmMsg", "defaultConfirmOkText", "defaultType", "confirmPreHandle", "confirmOnOk"]);
|
|
9
9
|
var classes = classNames("ztxk-modal", className);
|
|
10
10
|
var _b = useState(defaultOpen), open = _b[0], setOpen = _b[1];
|
|
11
11
|
var _c = useState(defaultTitle), title = _c[0], setTitle = _c[1];
|
|
12
|
-
var _d = useState(
|
|
13
|
-
var _e = useState(
|
|
14
|
-
var _f = useState(
|
|
12
|
+
var _d = useState(false), isConfirm = _d[0], setIsConfirm = _d[1];
|
|
13
|
+
var _e = useState(defaultConfirmMsg), confirmMsg = _e[0], setConfirmMsg = _e[1];
|
|
14
|
+
var _f = useState(defaultConfirmOkText), confirmOkText = _f[0], setConfirmOkText = _f[1];
|
|
15
|
+
var _g = useState(defaultType), type = _g[0], setType = _g[1];
|
|
15
16
|
var close = useCallback(function () {
|
|
16
17
|
setOpen(false);
|
|
17
18
|
}, []);
|
|
@@ -32,18 +33,28 @@ var Modal = function (_a, ref) {
|
|
|
32
33
|
if (options === null || options === void 0 ? void 0 : options.type) {
|
|
33
34
|
setType(options.type);
|
|
34
35
|
}
|
|
36
|
+
if (typeof (options === null || options === void 0 ? void 0 : options.isConfirm) === "boolean") {
|
|
37
|
+
setIsConfirm(options.isConfirm);
|
|
38
|
+
}
|
|
35
39
|
setOpen(true);
|
|
36
40
|
},
|
|
37
41
|
close: function () {
|
|
38
42
|
setOpen(false);
|
|
39
43
|
},
|
|
44
|
+
getType: function () { return type; },
|
|
45
|
+
setConfirmMsg: setConfirmOkText,
|
|
40
46
|
};
|
|
41
47
|
});
|
|
42
48
|
var onOkHandle = useCallback(function () {
|
|
43
|
-
if (
|
|
49
|
+
if (isConfirm) {
|
|
50
|
+
var options = confirmPreHandle && confirmPreHandle(type);
|
|
44
51
|
Modal$1.confirm({
|
|
45
|
-
title: confirmMsg,
|
|
46
|
-
okText:
|
|
52
|
+
title: (options === null || options === void 0 ? void 0 : options.confirmMsg) ? options.confirmMsg : confirmMsg,
|
|
53
|
+
okText: (options === null || options === void 0 ? void 0 : options.confirmOkText)
|
|
54
|
+
? options.confirmOkText
|
|
55
|
+
: confirmOkText
|
|
56
|
+
? confirmOkText
|
|
57
|
+
: "确认保存",
|
|
47
58
|
onOk: confirmOnOk
|
|
48
59
|
? function () {
|
|
49
60
|
return confirmOnOk(type).then(function () {
|
|
@@ -53,7 +64,14 @@ var Modal = function (_a, ref) {
|
|
|
53
64
|
: undefined,
|
|
54
65
|
});
|
|
55
66
|
}
|
|
56
|
-
}, [
|
|
67
|
+
}, [
|
|
68
|
+
isConfirm,
|
|
69
|
+
confirmPreHandle,
|
|
70
|
+
confirmMsg,
|
|
71
|
+
confirmOkText,
|
|
72
|
+
confirmOnOk,
|
|
73
|
+
type,
|
|
74
|
+
]);
|
|
57
75
|
return (jsx(Modal$1, __assign({ open: open, onCancel: close, className: classes, okText: "\u4FDD\u5B58", onOk: onOkHandle, width: "70%", title: title }, resetProps)));
|
|
58
76
|
};
|
|
59
77
|
var ModalComponent = forwardRef(Modal);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Table } from 'antd';
|
|
2
|
-
import {
|
|
2
|
+
import { TableProps, TablePaginationConfig, ColumnType } from 'antd/lib/table';
|
|
3
3
|
import { IInputProps } from '../input/input.js';
|
|
4
4
|
import { IInputNumberProps } from '../inputnumber/inputNumber.js';
|
|
5
5
|
|
|
@@ -11,6 +11,7 @@ interface IEditableConfig extends Partial<IEditableConfigOtherProps> {
|
|
|
11
11
|
interface IColumnType<RecordType> extends ColumnType<RecordType> {
|
|
12
12
|
dynamicDisabled?: boolean;
|
|
13
13
|
isCopy?: boolean | string | string[];
|
|
14
|
+
isRequire?: boolean;
|
|
14
15
|
editable?: boolean;
|
|
15
16
|
editableConfig?: IEditableConfig;
|
|
16
17
|
validate?: {
|
|
@@ -18,11 +18,15 @@ function useColumns(columns, options) {
|
|
|
18
18
|
if (Array.isArray(newColumns)) {
|
|
19
19
|
newColumns.forEach(function (column) {
|
|
20
20
|
var _column = __assign({}, column);
|
|
21
|
-
var isCopy = _column.isCopy, editable = _column.editable, editableConfig = _column.editableConfig, title = _column.title, key = _column.key, validate = _column.validate;
|
|
21
|
+
var isCopy = _column.isCopy, editable = _column.editable, editableConfig = _column.editableConfig, title = _column.title, key = _column.key, validate = _column.validate, isRequire = _column.isRequire;
|
|
22
22
|
var _key = key ? key : _column === null || _column === void 0 ? void 0 : _column.dataIndex;
|
|
23
23
|
// 列头增加复制按钮
|
|
24
24
|
if (isCopy) {
|
|
25
|
-
_column.title = (jsxs(Fragment, { children: [title, jsx(CopyIcon, { copyKey: isCopy === true ?
|
|
25
|
+
_column.title = (jsxs(Fragment, { children: [title, jsx(CopyIcon, { copyKey: isCopy === true ? _key : isCopy, dataSourceRef: dataSourceRef })] }));
|
|
26
|
+
}
|
|
27
|
+
// 列头增加必填标识
|
|
28
|
+
if (isRequire) {
|
|
29
|
+
_column.title = (jsxs(Fragment, { children: [jsx("i", __assign({ className: "ztxk-column--required" }, { children: "*" })), _column.title] }));
|
|
26
30
|
}
|
|
27
31
|
// 如果列添加可编辑配置
|
|
28
32
|
if (editable && isEdit) {
|
package/dist/index.build.d.ts
CHANGED
|
@@ -24,7 +24,8 @@ export { default as AppLayoutHeader } from './es/applayoutheader/appLayoutHeader
|
|
|
24
24
|
export { default as AppLayoutSider } from './es/applayoutsider/appLayoutSider.js';
|
|
25
25
|
export { default as OperationBtn } from './es/operationbtn/operationBtn.js';
|
|
26
26
|
export { Affix, Alert, Anchor, AutoComplete, Avatar, BackTop, Badge, Breadcrumb, Card, Carousel, Cascader, Checkbox, Col, Collapse, Comment, ConfigProvider, Descriptions, Divider, Drawer, Dropdown, Empty, Grid, Image, Layout, List, Mentions, Menu, PageHeader, Popconfirm, Popover, Progress, Radio, Rate, Result, Row, Segmented, Select, Skeleton, Slider, Space, Spin, Statistic, Steps, Switch, Tag, Timeline, Tooltip, Transfer, Tree, TreeSelect, Typography, Upload, message, notification } from 'antd';
|
|
27
|
-
export { IModalOpenOptions, IModalRef } from './es/modal/interface.js';
|
|
28
|
-
export { IFooterDom } from './es/footer/interface.js';
|
|
29
|
-
export { IColumnsType } from './es/table/interface.js';
|
|
30
|
-
export { IFormItemProps } from './es/form/interface.js';
|
|
27
|
+
export { IModalOpenOptions, IModalProps, IModalRef } from './es/modal/interface.js';
|
|
28
|
+
export { IFooterDom, IFooterProps } from './es/footer/interface.js';
|
|
29
|
+
export { IColumnsType, ITableProps } from './es/table/interface.js';
|
|
30
|
+
export { IFormItemProps, IProFormProps } from './es/form/interface.js';
|
|
31
|
+
export { IOperationBtn } from './es/operationbtn/interface.js';
|