ls-pro-common 1.0.35 → 1.0.38
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/common.js +1 -1
- package/dist/common.min.js +1 -1
- package/es/components/InputMultiLine.d.ts +2 -2
- package/es/components/InputMultiLine.js +4 -4
- package/es/utils/index.d.ts +50 -1
- package/es/utils/index.js +109 -2
- package/lib/components/InputMultiLine.d.ts +2 -2
- package/lib/components/InputMultiLine.js +4 -4
- package/lib/utils/index.d.ts +50 -1
- package/lib/utils/index.js +131 -6
- package/package.json +2 -2
|
@@ -5,7 +5,7 @@ export declare type InputMultiLineProps = ProFormItemProps<InputProps> & {
|
|
|
5
5
|
/**@name 表单项name, 跟 form.item 的 name一致 */
|
|
6
6
|
name: string;
|
|
7
7
|
/**@name 表单值*/
|
|
8
|
-
|
|
8
|
+
defaultValue?: string;
|
|
9
9
|
/**@name 弹框宽度,默认为400 */
|
|
10
10
|
popWidth?: string;
|
|
11
11
|
/**@name 弹框位置,默认为bottom */
|
|
@@ -28,7 +28,7 @@ declare const InputMultiLine: React.ForwardRefExoticComponent<{
|
|
|
28
28
|
/**@name 表单项name, 跟 form.item 的 name一致 */
|
|
29
29
|
name: string;
|
|
30
30
|
/**@name 表单值*/
|
|
31
|
-
|
|
31
|
+
defaultValue?: string | undefined;
|
|
32
32
|
/**@name 弹框宽度,默认为400 */
|
|
33
33
|
popWidth?: string | undefined;
|
|
34
34
|
/**@name 弹框位置,默认为bottom */
|
|
@@ -6,7 +6,7 @@ import _Input from "antd/es/input";
|
|
|
6
6
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
7
7
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
8
8
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
9
|
-
var _excluded = ["name", "rows", "maxRows", "placement", "popWidth", "fieldProps", "
|
|
9
|
+
var _excluded = ["name", "rows", "maxRows", "placement", "popWidth", "fieldProps", "defaultValue", "allowClear"];
|
|
10
10
|
import React, { useRef, useState, useEffect, useContext, useMemo, useImperativeHandle } from 'react';
|
|
11
11
|
import { ProFormText, ProFormContext } from 'ls-pro-form';
|
|
12
12
|
import { UnorderedListOutlined } from '@ant-design/icons';
|
|
@@ -45,15 +45,15 @@ var InputMultiLine = /*#__PURE__*/React.forwardRef(function (prop, ref) {
|
|
|
45
45
|
_prop$popWidth = prop.popWidth,
|
|
46
46
|
popWidth = _prop$popWidth === void 0 ? '400px' : _prop$popWidth,
|
|
47
47
|
fieldProps = prop.fieldProps,
|
|
48
|
-
|
|
48
|
+
defaultValue = prop.defaultValue,
|
|
49
49
|
_prop$allowClear = prop.allowClear,
|
|
50
50
|
allowClear = _prop$allowClear === void 0 ? true : _prop$allowClear,
|
|
51
51
|
rest = _objectWithoutProperties(prop, _excluded); // 设置初始值
|
|
52
52
|
|
|
53
53
|
|
|
54
54
|
useEffect(function () {
|
|
55
|
-
if (
|
|
56
|
-
setText(
|
|
55
|
+
if (defaultValue) {
|
|
56
|
+
setText(defaultValue);
|
|
57
57
|
} else if (name) {
|
|
58
58
|
var _formRef$current;
|
|
59
59
|
|
package/es/utils/index.d.ts
CHANGED
|
@@ -1,10 +1,59 @@
|
|
|
1
|
-
export { getUrlQuery, setUrlQuery,
|
|
1
|
+
export { getUrlQuery, setUrlQuery, toGatewayUrl, dateFormat, getResourceProps } from 'ls-pro-table/lib/utils';
|
|
2
2
|
/**
|
|
3
3
|
* 设置文档title
|
|
4
4
|
* @param {*} title
|
|
5
5
|
* @returns
|
|
6
6
|
*/
|
|
7
7
|
export declare const setTitle: (title: string) => void;
|
|
8
|
+
/**
|
|
9
|
+
* 日期格式化
|
|
10
|
+
* @param dt 日期
|
|
11
|
+
* @param showTime 是否显示时间 默认true
|
|
12
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
13
|
+
*/
|
|
14
|
+
export declare const formatDate: (dt: Date | null | undefined, showTime?: boolean | undefined) => string;
|
|
15
|
+
/**
|
|
16
|
+
* 返回当前日期
|
|
17
|
+
* @returns YYYY-MM-DD
|
|
18
|
+
*/
|
|
19
|
+
export declare const today: () => string;
|
|
20
|
+
/**
|
|
21
|
+
* 返回当前日期时间
|
|
22
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
23
|
+
*/
|
|
24
|
+
export declare const now: () => string;
|
|
25
|
+
/**
|
|
26
|
+
* 当前日期加减
|
|
27
|
+
* @param addDay 添加添数,可为负数
|
|
28
|
+
* @param addMonth 添加月数,可为负数
|
|
29
|
+
* @param addYear 添加年数,可以负责
|
|
30
|
+
* @returns YYYY-MM-DD
|
|
31
|
+
*/
|
|
32
|
+
export declare const todayAdd: (addDay: number, addMonth?: number, addYear?: number) => string;
|
|
33
|
+
/**
|
|
34
|
+
* 当前时间加减
|
|
35
|
+
* @param addDay 添加添数,可为负数
|
|
36
|
+
* @param addMonth 添加月数,可为负数
|
|
37
|
+
* @param addYear 添加年数,可以负责
|
|
38
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
39
|
+
*/
|
|
40
|
+
export declare const nowAdd: (addDay: number, addMonth?: number, addYear?: number) => string;
|
|
41
|
+
/**
|
|
42
|
+
* 时间加减
|
|
43
|
+
* @param dt 原始时间,传 null 为当前时间
|
|
44
|
+
* @param addDay 添加添数,可为负数
|
|
45
|
+
* @param addMonth 添加月数,可为负数
|
|
46
|
+
* @param addYear 添加年数,可以负责
|
|
47
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
48
|
+
*/
|
|
49
|
+
export declare const dateAdd: (dt: Date | null, addDay: number, addMonth?: number, addYear?: number) => string;
|
|
50
|
+
/**
|
|
51
|
+
* 千位符格式化数值
|
|
52
|
+
* @param num 数值
|
|
53
|
+
* @param dec 小数位数,默认为2位小数
|
|
54
|
+
* @returns xx,xxx.xx
|
|
55
|
+
*/
|
|
56
|
+
export declare const formatMoney: (num: number | string, dec?: number) => string;
|
|
8
57
|
/**
|
|
9
58
|
* 获取Cookie
|
|
10
59
|
* @param {String} name cookie名
|
package/es/utils/index.js
CHANGED
|
@@ -6,7 +6,8 @@ import _message from "antd/es/message";
|
|
|
6
6
|
import _typeof from "@babel/runtime/helpers/esm/typeof";
|
|
7
7
|
import React from "react";
|
|
8
8
|
import { QuestionCircleOutlined } from '@ant-design/icons';
|
|
9
|
-
|
|
9
|
+
import { dateFormat } from "ls-pro-table/es/utils";
|
|
10
|
+
export { getUrlQuery, setUrlQuery, toGatewayUrl, dateFormat, getResourceProps } from "ls-pro-table/es/utils";
|
|
10
11
|
/**
|
|
11
12
|
* 设置文档title
|
|
12
13
|
* @param {*} title
|
|
@@ -15,9 +16,115 @@ export { getUrlQuery, setUrlQuery, dateFormat, toGatewayUrl, getResourceProps }
|
|
|
15
16
|
|
|
16
17
|
export var setTitle = function setTitle(title) {
|
|
17
18
|
if (!title) return;
|
|
18
|
-
title = title.length > 10 ? title.substring(0, 10) + '...' : title;
|
|
19
19
|
document.title = title;
|
|
20
20
|
};
|
|
21
|
+
/**
|
|
22
|
+
* 日期格式化
|
|
23
|
+
* @param dt 日期
|
|
24
|
+
* @param showTime 是否显示时间 默认true
|
|
25
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
26
|
+
*/
|
|
27
|
+
|
|
28
|
+
export var formatDate = dateFormat;
|
|
29
|
+
/**
|
|
30
|
+
* 返回当前日期
|
|
31
|
+
* @returns YYYY-MM-DD
|
|
32
|
+
*/
|
|
33
|
+
|
|
34
|
+
export var today = function today() {
|
|
35
|
+
return dateFormat(null, false);
|
|
36
|
+
};
|
|
37
|
+
/**
|
|
38
|
+
* 返回当前日期时间
|
|
39
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
40
|
+
*/
|
|
41
|
+
|
|
42
|
+
export var now = function now() {
|
|
43
|
+
return dateFormat(null, true);
|
|
44
|
+
};
|
|
45
|
+
/**
|
|
46
|
+
* 当前日期加减
|
|
47
|
+
* @param addDay 添加添数,可为负数
|
|
48
|
+
* @param addMonth 添加月数,可为负数
|
|
49
|
+
* @param addYear 添加年数,可以负责
|
|
50
|
+
* @returns YYYY-MM-DD
|
|
51
|
+
*/
|
|
52
|
+
|
|
53
|
+
export var todayAdd = function todayAdd(addDay) {
|
|
54
|
+
var addMonth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
|
|
55
|
+
var addYear = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
56
|
+
return nowAdd(addDay, addMonth, addYear).split(' ')[0];
|
|
57
|
+
};
|
|
58
|
+
/**
|
|
59
|
+
* 当前时间加减
|
|
60
|
+
* @param addDay 添加添数,可为负数
|
|
61
|
+
* @param addMonth 添加月数,可为负数
|
|
62
|
+
* @param addYear 添加年数,可以负责
|
|
63
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
64
|
+
*/
|
|
65
|
+
|
|
66
|
+
export var nowAdd = function nowAdd(addDay) {
|
|
67
|
+
var addMonth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
|
|
68
|
+
var addYear = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
69
|
+
return dateAdd(null, addDay, addMonth, addYear);
|
|
70
|
+
};
|
|
71
|
+
/**
|
|
72
|
+
* 时间加减
|
|
73
|
+
* @param dt 原始时间,传 null 为当前时间
|
|
74
|
+
* @param addDay 添加添数,可为负数
|
|
75
|
+
* @param addMonth 添加月数,可为负数
|
|
76
|
+
* @param addYear 添加年数,可以负责
|
|
77
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
78
|
+
*/
|
|
79
|
+
|
|
80
|
+
export var dateAdd = function dateAdd(dt, addDay) {
|
|
81
|
+
var addMonth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
82
|
+
var addYear = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
|
|
83
|
+
|
|
84
|
+
if (!dt) {
|
|
85
|
+
dt = new Date();
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
if (addDay) {
|
|
89
|
+
dt.setDate(dt.getDate() + addDay);
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
if (addMonth) {
|
|
93
|
+
dt.setMonth(dt.getMonth() + addMonth);
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
if (addYear) {
|
|
97
|
+
dt.setFullYear(dt.getFullYear() + addYear);
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
return dateFormat(dt, true);
|
|
101
|
+
};
|
|
102
|
+
/**
|
|
103
|
+
* 千位符格式化数值
|
|
104
|
+
* @param num 数值
|
|
105
|
+
* @param dec 小数位数,默认为2位小数
|
|
106
|
+
* @returns xx,xxx.xx
|
|
107
|
+
*/
|
|
108
|
+
|
|
109
|
+
export var formatMoney = function formatMoney(num) {
|
|
110
|
+
var dec = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
|
|
111
|
+
|
|
112
|
+
if (typeof num === 'string') {
|
|
113
|
+
try {
|
|
114
|
+
num = Number(num);
|
|
115
|
+
} catch (e) {
|
|
116
|
+
num = 0;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
var str = num.toFixed(dec);
|
|
121
|
+
|
|
122
|
+
if (str.indexOf('.') === -1) {
|
|
123
|
+
str += '.';
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
return str.replace(/(\d)(?=(\d{3})+\.)/g, '$1,').replace(/\.$/, '');
|
|
127
|
+
};
|
|
21
128
|
/**
|
|
22
129
|
* 获取Cookie
|
|
23
130
|
* @param {String} name cookie名
|
|
@@ -5,7 +5,7 @@ export declare type InputMultiLineProps = ProFormItemProps<InputProps> & {
|
|
|
5
5
|
/**@name 表单项name, 跟 form.item 的 name一致 */
|
|
6
6
|
name: string;
|
|
7
7
|
/**@name 表单值*/
|
|
8
|
-
|
|
8
|
+
defaultValue?: string;
|
|
9
9
|
/**@name 弹框宽度,默认为400 */
|
|
10
10
|
popWidth?: string;
|
|
11
11
|
/**@name 弹框位置,默认为bottom */
|
|
@@ -28,7 +28,7 @@ declare const InputMultiLine: React.ForwardRefExoticComponent<{
|
|
|
28
28
|
/**@name 表单项name, 跟 form.item 的 name一致 */
|
|
29
29
|
name: string;
|
|
30
30
|
/**@name 表单值*/
|
|
31
|
-
|
|
31
|
+
defaultValue?: string | undefined;
|
|
32
32
|
/**@name 弹框宽度,默认为400 */
|
|
33
33
|
popWidth?: string | undefined;
|
|
34
34
|
/**@name 弹框位置,默认为bottom */
|
|
@@ -31,7 +31,7 @@ var _lsProForm = require("ls-pro-form");
|
|
|
31
31
|
|
|
32
32
|
var _icons = require("@ant-design/icons");
|
|
33
33
|
|
|
34
|
-
var _excluded = ["name", "rows", "maxRows", "placement", "popWidth", "fieldProps", "
|
|
34
|
+
var _excluded = ["name", "rows", "maxRows", "placement", "popWidth", "fieldProps", "defaultValue", "allowClear"];
|
|
35
35
|
|
|
36
36
|
var InputMultiLine = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
|
|
37
37
|
//@ts-ignore
|
|
@@ -67,14 +67,14 @@ var InputMultiLine = /*#__PURE__*/_react.default.forwardRef(function (prop, ref)
|
|
|
67
67
|
_prop$popWidth = prop.popWidth,
|
|
68
68
|
popWidth = _prop$popWidth === void 0 ? '400px' : _prop$popWidth,
|
|
69
69
|
fieldProps = prop.fieldProps,
|
|
70
|
-
|
|
70
|
+
defaultValue = prop.defaultValue,
|
|
71
71
|
_prop$allowClear = prop.allowClear,
|
|
72
72
|
allowClear = _prop$allowClear === void 0 ? true : _prop$allowClear,
|
|
73
73
|
rest = (0, _objectWithoutProperties2.default)(prop, _excluded); // 设置初始值
|
|
74
74
|
|
|
75
75
|
(0, _react.useEffect)(function () {
|
|
76
|
-
if (
|
|
77
|
-
setText(
|
|
76
|
+
if (defaultValue) {
|
|
77
|
+
setText(defaultValue);
|
|
78
78
|
} else if (name) {
|
|
79
79
|
var _formRef$current;
|
|
80
80
|
|
package/lib/utils/index.d.ts
CHANGED
|
@@ -1,10 +1,59 @@
|
|
|
1
|
-
export { getUrlQuery, setUrlQuery,
|
|
1
|
+
export { getUrlQuery, setUrlQuery, toGatewayUrl, dateFormat, getResourceProps } from 'ls-pro-table/lib/utils';
|
|
2
2
|
/**
|
|
3
3
|
* 设置文档title
|
|
4
4
|
* @param {*} title
|
|
5
5
|
* @returns
|
|
6
6
|
*/
|
|
7
7
|
export declare const setTitle: (title: string) => void;
|
|
8
|
+
/**
|
|
9
|
+
* 日期格式化
|
|
10
|
+
* @param dt 日期
|
|
11
|
+
* @param showTime 是否显示时间 默认true
|
|
12
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
13
|
+
*/
|
|
14
|
+
export declare const formatDate: (dt: Date | null | undefined, showTime?: boolean | undefined) => string;
|
|
15
|
+
/**
|
|
16
|
+
* 返回当前日期
|
|
17
|
+
* @returns YYYY-MM-DD
|
|
18
|
+
*/
|
|
19
|
+
export declare const today: () => string;
|
|
20
|
+
/**
|
|
21
|
+
* 返回当前日期时间
|
|
22
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
23
|
+
*/
|
|
24
|
+
export declare const now: () => string;
|
|
25
|
+
/**
|
|
26
|
+
* 当前日期加减
|
|
27
|
+
* @param addDay 添加添数,可为负数
|
|
28
|
+
* @param addMonth 添加月数,可为负数
|
|
29
|
+
* @param addYear 添加年数,可以负责
|
|
30
|
+
* @returns YYYY-MM-DD
|
|
31
|
+
*/
|
|
32
|
+
export declare const todayAdd: (addDay: number, addMonth?: number, addYear?: number) => string;
|
|
33
|
+
/**
|
|
34
|
+
* 当前时间加减
|
|
35
|
+
* @param addDay 添加添数,可为负数
|
|
36
|
+
* @param addMonth 添加月数,可为负数
|
|
37
|
+
* @param addYear 添加年数,可以负责
|
|
38
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
39
|
+
*/
|
|
40
|
+
export declare const nowAdd: (addDay: number, addMonth?: number, addYear?: number) => string;
|
|
41
|
+
/**
|
|
42
|
+
* 时间加减
|
|
43
|
+
* @param dt 原始时间,传 null 为当前时间
|
|
44
|
+
* @param addDay 添加添数,可为负数
|
|
45
|
+
* @param addMonth 添加月数,可为负数
|
|
46
|
+
* @param addYear 添加年数,可以负责
|
|
47
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
48
|
+
*/
|
|
49
|
+
export declare const dateAdd: (dt: Date | null, addDay: number, addMonth?: number, addYear?: number) => string;
|
|
50
|
+
/**
|
|
51
|
+
* 千位符格式化数值
|
|
52
|
+
* @param num 数值
|
|
53
|
+
* @param dec 小数位数,默认为2位小数
|
|
54
|
+
* @returns xx,xxx.xx
|
|
55
|
+
*/
|
|
56
|
+
export declare const formatMoney: (num: number | string, dec?: number) => string;
|
|
8
57
|
/**
|
|
9
58
|
* 获取Cookie
|
|
10
59
|
* @param {String} name cookie名
|
package/lib/utils/index.js
CHANGED
|
@@ -5,14 +5,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports.appPath = void 0;
|
|
8
|
+
exports.dateAdd = exports.appPath = void 0;
|
|
9
9
|
Object.defineProperty(exports, "dateFormat", {
|
|
10
10
|
enumerable: true,
|
|
11
11
|
get: function get() {
|
|
12
12
|
return _utils.dateFormat;
|
|
13
13
|
}
|
|
14
14
|
});
|
|
15
|
-
exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = void 0;
|
|
15
|
+
exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.formatMoney = exports.formatDate = void 0;
|
|
16
16
|
Object.defineProperty(exports, "getResourceProps", {
|
|
17
17
|
enumerable: true,
|
|
18
18
|
get: function get() {
|
|
@@ -25,7 +25,7 @@ Object.defineProperty(exports, "getUrlQuery", {
|
|
|
25
25
|
return _utils.getUrlQuery;
|
|
26
26
|
}
|
|
27
27
|
});
|
|
28
|
-
exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.isDev = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
|
|
28
|
+
exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
|
|
29
29
|
Object.defineProperty(exports, "setUrlQuery", {
|
|
30
30
|
enumerable: true,
|
|
31
31
|
get: function get() {
|
|
@@ -39,7 +39,7 @@ Object.defineProperty(exports, "toGatewayUrl", {
|
|
|
39
39
|
return _utils.toGatewayUrl;
|
|
40
40
|
}
|
|
41
41
|
});
|
|
42
|
-
exports.yesnoList = exports.treeFind = exports.treeEach = void 0;
|
|
42
|
+
exports.yesnoList = exports.treeFind = exports.treeEach = exports.todayAdd = exports.today = void 0;
|
|
43
43
|
|
|
44
44
|
var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
|
|
45
45
|
|
|
@@ -66,9 +66,134 @@ var _utils = require("ls-pro-table/lib/utils");
|
|
|
66
66
|
*/
|
|
67
67
|
var setTitle = function setTitle(title) {
|
|
68
68
|
if (!title) return;
|
|
69
|
-
title = title.length > 10 ? title.substring(0, 10) + '...' : title;
|
|
70
69
|
document.title = title;
|
|
71
70
|
};
|
|
71
|
+
/**
|
|
72
|
+
* 日期格式化
|
|
73
|
+
* @param dt 日期
|
|
74
|
+
* @param showTime 是否显示时间 默认true
|
|
75
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
76
|
+
*/
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
exports.setTitle = setTitle;
|
|
80
|
+
var formatDate = _utils.dateFormat;
|
|
81
|
+
/**
|
|
82
|
+
* 返回当前日期
|
|
83
|
+
* @returns YYYY-MM-DD
|
|
84
|
+
*/
|
|
85
|
+
|
|
86
|
+
exports.formatDate = formatDate;
|
|
87
|
+
|
|
88
|
+
var today = function today() {
|
|
89
|
+
return (0, _utils.dateFormat)(null, false);
|
|
90
|
+
};
|
|
91
|
+
/**
|
|
92
|
+
* 返回当前日期时间
|
|
93
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
94
|
+
*/
|
|
95
|
+
|
|
96
|
+
|
|
97
|
+
exports.today = today;
|
|
98
|
+
|
|
99
|
+
var now = function now() {
|
|
100
|
+
return (0, _utils.dateFormat)(null, true);
|
|
101
|
+
};
|
|
102
|
+
/**
|
|
103
|
+
* 当前日期加减
|
|
104
|
+
* @param addDay 添加添数,可为负数
|
|
105
|
+
* @param addMonth 添加月数,可为负数
|
|
106
|
+
* @param addYear 添加年数,可以负责
|
|
107
|
+
* @returns YYYY-MM-DD
|
|
108
|
+
*/
|
|
109
|
+
|
|
110
|
+
|
|
111
|
+
exports.now = now;
|
|
112
|
+
|
|
113
|
+
var todayAdd = function todayAdd(addDay) {
|
|
114
|
+
var addMonth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
|
|
115
|
+
var addYear = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
116
|
+
return nowAdd(addDay, addMonth, addYear).split(' ')[0];
|
|
117
|
+
};
|
|
118
|
+
/**
|
|
119
|
+
* 当前时间加减
|
|
120
|
+
* @param addDay 添加添数,可为负数
|
|
121
|
+
* @param addMonth 添加月数,可为负数
|
|
122
|
+
* @param addYear 添加年数,可以负责
|
|
123
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
124
|
+
*/
|
|
125
|
+
|
|
126
|
+
|
|
127
|
+
exports.todayAdd = todayAdd;
|
|
128
|
+
|
|
129
|
+
var nowAdd = function nowAdd(addDay) {
|
|
130
|
+
var addMonth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
|
|
131
|
+
var addYear = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
132
|
+
return dateAdd(null, addDay, addMonth, addYear);
|
|
133
|
+
};
|
|
134
|
+
/**
|
|
135
|
+
* 时间加减
|
|
136
|
+
* @param dt 原始时间,传 null 为当前时间
|
|
137
|
+
* @param addDay 添加添数,可为负数
|
|
138
|
+
* @param addMonth 添加月数,可为负数
|
|
139
|
+
* @param addYear 添加年数,可以负责
|
|
140
|
+
* @returns YYYY-MM-DD hh:mm:ss
|
|
141
|
+
*/
|
|
142
|
+
|
|
143
|
+
|
|
144
|
+
exports.nowAdd = nowAdd;
|
|
145
|
+
|
|
146
|
+
var dateAdd = function dateAdd(dt, addDay) {
|
|
147
|
+
var addMonth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
148
|
+
var addYear = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
|
|
149
|
+
|
|
150
|
+
if (!dt) {
|
|
151
|
+
dt = new Date();
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
if (addDay) {
|
|
155
|
+
dt.setDate(dt.getDate() + addDay);
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
if (addMonth) {
|
|
159
|
+
dt.setMonth(dt.getMonth() + addMonth);
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
if (addYear) {
|
|
163
|
+
dt.setFullYear(dt.getFullYear() + addYear);
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
return (0, _utils.dateFormat)(dt, true);
|
|
167
|
+
};
|
|
168
|
+
/**
|
|
169
|
+
* 千位符格式化数值
|
|
170
|
+
* @param num 数值
|
|
171
|
+
* @param dec 小数位数,默认为2位小数
|
|
172
|
+
* @returns xx,xxx.xx
|
|
173
|
+
*/
|
|
174
|
+
|
|
175
|
+
|
|
176
|
+
exports.dateAdd = dateAdd;
|
|
177
|
+
|
|
178
|
+
var formatMoney = function formatMoney(num) {
|
|
179
|
+
var dec = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
|
|
180
|
+
|
|
181
|
+
if (typeof num === 'string') {
|
|
182
|
+
try {
|
|
183
|
+
num = Number(num);
|
|
184
|
+
} catch (e) {
|
|
185
|
+
num = 0;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
var str = num.toFixed(dec);
|
|
190
|
+
|
|
191
|
+
if (str.indexOf('.') === -1) {
|
|
192
|
+
str += '.';
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
return str.replace(/(\d)(?=(\d{3})+\.)/g, '$1,').replace(/\.$/, '');
|
|
196
|
+
};
|
|
72
197
|
/**
|
|
73
198
|
* 获取Cookie
|
|
74
199
|
* @param {String} name cookie名
|
|
@@ -76,7 +201,7 @@ var setTitle = function setTitle(title) {
|
|
|
76
201
|
*/
|
|
77
202
|
|
|
78
203
|
|
|
79
|
-
exports.
|
|
204
|
+
exports.formatMoney = formatMoney;
|
|
80
205
|
|
|
81
206
|
var getCookie = function getCookie(name) {
|
|
82
207
|
var arr,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ls-pro-common",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.38",
|
|
4
4
|
"description": "ls-pro-common",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"antd",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@ant-design/icons": "^4.3.0",
|
|
31
|
-
"ls-pro-table": "2.62.
|
|
31
|
+
"ls-pro-table": "2.62.30",
|
|
32
32
|
"ls-pro-form": "1.52.25",
|
|
33
33
|
"@babel/runtime": "^7.16.3",
|
|
34
34
|
"classnames": "^2.2.6",
|