@nokecy/qc-ui 1.0.46 → 1.0.48
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/cjs/ag-grid-plus/_utils/customGroupCellRenderer.js +10 -2
- package/dist/cjs/ag-grid-plus/ag-gridPlus.js +6 -5
- package/dist/cjs/ag-grid-plus/utils.js +3 -2
- package/dist/cjs/array-table/index.js +3 -2
- package/dist/esm/ag-grid-plus/_utils/customGroupCellRenderer.js +10 -2
- package/dist/esm/ag-grid-plus/ag-gridPlus.js +6 -5
- package/dist/esm/ag-grid-plus/utils.js +3 -2
- package/dist/esm/array-table/index.js +3 -2
- package/dist/umd/qc-ui.min.js +1 -1
- package/package.json +1 -1
|
@@ -16,8 +16,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
16
16
|
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
17
17
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
18
18
|
var CustomGroupCellRenderer = function CustomGroupCellRenderer(props) {
|
|
19
|
+
//@ts-ignore
|
|
19
20
|
var node = props.node,
|
|
20
|
-
value = props.value
|
|
21
|
+
value = props.value,
|
|
22
|
+
innerRenderer = props.innerRenderer;
|
|
21
23
|
var _useState = (0, _react.useState)(node.expanded),
|
|
22
24
|
_useState2 = _slicedToArray(_useState, 2),
|
|
23
25
|
expanded = _useState2[0],
|
|
@@ -70,6 +72,12 @@ var CustomGroupCellRenderer = function CustomGroupCellRenderer(props) {
|
|
|
70
72
|
fontSize: '10px',
|
|
71
73
|
color: '#00b96b'
|
|
72
74
|
}
|
|
73
|
-
}))), "\xA0",
|
|
75
|
+
}))), "\xA0", /*#__PURE__*/_react.default.createElement("span", {
|
|
76
|
+
style: {
|
|
77
|
+
display: 'inline-block',
|
|
78
|
+
height: 2,
|
|
79
|
+
width: "".concat(node.level * 14, "px")
|
|
80
|
+
}
|
|
81
|
+
}), innerRenderer ? innerRenderer(props) : value);
|
|
74
82
|
};
|
|
75
83
|
var _default = exports.default = CustomGroupCellRenderer;
|
|
@@ -336,13 +336,13 @@ function AgGridPlus(props) {
|
|
|
336
336
|
if (!i.cellRenderer) {
|
|
337
337
|
switch (i.calculateType) {
|
|
338
338
|
case "sum":
|
|
339
|
-
calculateData[i.field] = i.formatWithCommas ? handelNumber(sumFun(i.field, displayedData).toFixed(i.transactionAmount)) : sumFun(i.field, displayedData).toFixed(i.transactionAmount);
|
|
339
|
+
calculateData[i.field] = i.formatWithCommas ? handelNumber(sumFun(i.field, displayedData).toFixed(i.transactionAmount)) : Number(sumFun(i.field, displayedData).toFixed(i.transactionAmount));
|
|
340
340
|
break;
|
|
341
341
|
case "avg":
|
|
342
|
-
calculateData[i.field] = avgFun(i.field, displayedData).toFixed(i.transactionAmount);
|
|
342
|
+
calculateData[i.field] = Number(avgFun(i.field, displayedData).toFixed(i.transactionAmount));
|
|
343
343
|
break;
|
|
344
344
|
case "standardDeviation":
|
|
345
|
-
calculateData[i.field] = standardDeviationFun(i.field, displayedData).toFixed(i.transactionAmount);
|
|
345
|
+
calculateData[i.field] = Number(standardDeviationFun(i.field, displayedData).toFixed(i.transactionAmount));
|
|
346
346
|
break;
|
|
347
347
|
default:
|
|
348
348
|
break;
|
|
@@ -541,10 +541,11 @@ function AgGridPlus(props) {
|
|
|
541
541
|
maxResultCount: pagination.pageSize
|
|
542
542
|
});
|
|
543
543
|
var autoGroupColumnDef = (0, _react.useMemo)(function () {
|
|
544
|
-
|
|
544
|
+
var _props$autoGroupColum;
|
|
545
|
+
return _objectSpread(_objectSpread({}, props.autoGroupColumnDef), (_props$autoGroupColum = props.autoGroupColumnDef) !== null && _props$autoGroupColum !== void 0 && _props$autoGroupColum.cellRenderer ? {} : {
|
|
545
546
|
cellRenderer: _customGroupCellRenderer.default
|
|
546
547
|
});
|
|
547
|
-
}, []);
|
|
548
|
+
}, [props.autoGroupColumnDef]);
|
|
548
549
|
return /*#__PURE__*/_react.default.createElement(_antd.Spin, {
|
|
549
550
|
spinning: loading,
|
|
550
551
|
wrapperClassName: "grid-spin"
|
|
@@ -33,15 +33,16 @@ var getFilter = function getFilter(objectKey, value, colDef) {
|
|
|
33
33
|
return "".concat(objectKey, " = ").concat(value);
|
|
34
34
|
}
|
|
35
35
|
if (value instanceof Array) {
|
|
36
|
-
var _colDef$searchCompone;
|
|
36
|
+
var _colDef$searchCompone, _colDef$searchCompone2;
|
|
37
37
|
var format = (colDef === null || colDef === void 0 || (_colDef$searchCompone = colDef.searchComponentProps) === null || _colDef$searchCompone === void 0 ? void 0 : _colDef$searchCompone.format) || 'YYYY-MM-DD';
|
|
38
|
+
var showTime = colDef === null || colDef === void 0 || (_colDef$searchCompone2 = colDef.searchComponentProps) === null || _colDef$searchCompone2 === void 0 ? void 0 : _colDef$searchCompone2.showTime;
|
|
38
39
|
// 处理时间数组
|
|
39
40
|
if (value.length === 2 && (value.every(function (v) {
|
|
40
41
|
return (0, _dayjs.default)(v, 'YYYY-MM-DD').isValid();
|
|
41
42
|
}) || value.every(function (v) {
|
|
42
43
|
return (0, _dayjs.default)(v, 'YYYY-MM-DD HH:mm:ss').isValid();
|
|
43
44
|
}))) {
|
|
44
|
-
return "".concat(objectKey, " >= ").concat((0, _dayjs.default)(value[0]).format(format), " ,") + "".concat(objectKey, " <= ").concat((0, _dayjs.default)(value[1]).add(1, 'days').format(format));
|
|
45
|
+
return "".concat(objectKey, " >= ").concat((0, _dayjs.default)(value[0]).format(format), " ,") + "".concat(objectKey, " <= ").concat(showTime ? (0, _dayjs.default)(value[1]).format(format) : (0, _dayjs.default)(value[1]).add(1, 'days').format(format));
|
|
45
46
|
}
|
|
46
47
|
|
|
47
48
|
// 处理非时间数组(如数字数组),转为 "asnStatus=10|asnStatus=20"
|
|
@@ -24,6 +24,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
24
24
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
25
25
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
26
26
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
27
|
+
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
27
28
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
28
29
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
29
30
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
@@ -167,7 +168,7 @@ var ArrayTable = (0, _react2.observer)(function (props) {
|
|
|
167
168
|
style: {
|
|
168
169
|
marginBottom: 5
|
|
169
170
|
}
|
|
170
|
-
}, addition ? /*#__PURE__*/_react.default.createElement(_arrayAddBtn.default, {
|
|
171
|
+
}, addition ? /*#__PURE__*/_react.default.createElement(_arrayAddBtn.default, _extends({
|
|
171
172
|
arrayField: field,
|
|
172
173
|
schema: schema,
|
|
173
174
|
defaultValue: {
|
|
@@ -178,7 +179,7 @@ var ArrayTable = (0, _react2.observer)(function (props) {
|
|
|
178
179
|
onAdd: function onAdd() {
|
|
179
180
|
setIsAdd(true);
|
|
180
181
|
}
|
|
181
|
-
}) : null), /*#__PURE__*/_react.default.createElement("div", {
|
|
182
|
+
}, addition.props)) : null), /*#__PURE__*/_react.default.createElement("div", {
|
|
182
183
|
ref: ref,
|
|
183
184
|
style: {
|
|
184
185
|
height: height ? height : 400
|
|
@@ -7,8 +7,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
7
7
|
import React, { useCallback, useEffect, useState } from 'react';
|
|
8
8
|
import { MinusOutlined, PlusOutlined } from '@ant-design/icons';
|
|
9
9
|
var CustomGroupCellRenderer = function CustomGroupCellRenderer(props) {
|
|
10
|
+
//@ts-ignore
|
|
10
11
|
var node = props.node,
|
|
11
|
-
value = props.value
|
|
12
|
+
value = props.value,
|
|
13
|
+
innerRenderer = props.innerRenderer;
|
|
12
14
|
var _useState = useState(node.expanded),
|
|
13
15
|
_useState2 = _slicedToArray(_useState, 2),
|
|
14
16
|
expanded = _useState2[0],
|
|
@@ -61,6 +63,12 @@ var CustomGroupCellRenderer = function CustomGroupCellRenderer(props) {
|
|
|
61
63
|
fontSize: '10px',
|
|
62
64
|
color: '#00b96b'
|
|
63
65
|
}
|
|
64
|
-
}))), "\xA0",
|
|
66
|
+
}))), "\xA0", /*#__PURE__*/React.createElement("span", {
|
|
67
|
+
style: {
|
|
68
|
+
display: 'inline-block',
|
|
69
|
+
height: 2,
|
|
70
|
+
width: "".concat(node.level * 14, "px")
|
|
71
|
+
}
|
|
72
|
+
}), innerRenderer ? innerRenderer(props) : value);
|
|
65
73
|
};
|
|
66
74
|
export default CustomGroupCellRenderer;
|
|
@@ -327,13 +327,13 @@ function AgGridPlus(props) {
|
|
|
327
327
|
if (!i.cellRenderer) {
|
|
328
328
|
switch (i.calculateType) {
|
|
329
329
|
case "sum":
|
|
330
|
-
calculateData[i.field] = i.formatWithCommas ? handelNumber(sumFun(i.field, displayedData).toFixed(i.transactionAmount)) : sumFun(i.field, displayedData).toFixed(i.transactionAmount);
|
|
330
|
+
calculateData[i.field] = i.formatWithCommas ? handelNumber(sumFun(i.field, displayedData).toFixed(i.transactionAmount)) : Number(sumFun(i.field, displayedData).toFixed(i.transactionAmount));
|
|
331
331
|
break;
|
|
332
332
|
case "avg":
|
|
333
|
-
calculateData[i.field] = avgFun(i.field, displayedData).toFixed(i.transactionAmount);
|
|
333
|
+
calculateData[i.field] = Number(avgFun(i.field, displayedData).toFixed(i.transactionAmount));
|
|
334
334
|
break;
|
|
335
335
|
case "standardDeviation":
|
|
336
|
-
calculateData[i.field] = standardDeviationFun(i.field, displayedData).toFixed(i.transactionAmount);
|
|
336
|
+
calculateData[i.field] = Number(standardDeviationFun(i.field, displayedData).toFixed(i.transactionAmount));
|
|
337
337
|
break;
|
|
338
338
|
default:
|
|
339
339
|
break;
|
|
@@ -532,10 +532,11 @@ function AgGridPlus(props) {
|
|
|
532
532
|
maxResultCount: pagination.pageSize
|
|
533
533
|
});
|
|
534
534
|
var autoGroupColumnDef = useMemo(function () {
|
|
535
|
-
|
|
535
|
+
var _props$autoGroupColum;
|
|
536
|
+
return _objectSpread(_objectSpread({}, props.autoGroupColumnDef), (_props$autoGroupColum = props.autoGroupColumnDef) !== null && _props$autoGroupColum !== void 0 && _props$autoGroupColum.cellRenderer ? {} : {
|
|
536
537
|
cellRenderer: CustomGroupCellRenderer
|
|
537
538
|
});
|
|
538
|
-
}, []);
|
|
539
|
+
}, [props.autoGroupColumnDef]);
|
|
539
540
|
return /*#__PURE__*/React.createElement(Spin, {
|
|
540
541
|
spinning: loading,
|
|
541
542
|
wrapperClassName: "grid-spin"
|
|
@@ -26,15 +26,16 @@ var getFilter = function getFilter(objectKey, value, colDef) {
|
|
|
26
26
|
return "".concat(objectKey, " = ").concat(value);
|
|
27
27
|
}
|
|
28
28
|
if (value instanceof Array) {
|
|
29
|
-
var _colDef$searchCompone;
|
|
29
|
+
var _colDef$searchCompone, _colDef$searchCompone2;
|
|
30
30
|
var format = (colDef === null || colDef === void 0 || (_colDef$searchCompone = colDef.searchComponentProps) === null || _colDef$searchCompone === void 0 ? void 0 : _colDef$searchCompone.format) || 'YYYY-MM-DD';
|
|
31
|
+
var showTime = colDef === null || colDef === void 0 || (_colDef$searchCompone2 = colDef.searchComponentProps) === null || _colDef$searchCompone2 === void 0 ? void 0 : _colDef$searchCompone2.showTime;
|
|
31
32
|
// 处理时间数组
|
|
32
33
|
if (value.length === 2 && (value.every(function (v) {
|
|
33
34
|
return dayjs(v, 'YYYY-MM-DD').isValid();
|
|
34
35
|
}) || value.every(function (v) {
|
|
35
36
|
return dayjs(v, 'YYYY-MM-DD HH:mm:ss').isValid();
|
|
36
37
|
}))) {
|
|
37
|
-
return "".concat(objectKey, " >= ").concat(dayjs(value[0]).format(format), " ,") + "".concat(objectKey, " <= ").concat(dayjs(value[1]).add(1, 'days').format(format));
|
|
38
|
+
return "".concat(objectKey, " >= ").concat(dayjs(value[0]).format(format), " ,") + "".concat(objectKey, " <= ").concat(showTime ? dayjs(value[1]).format(format) : dayjs(value[1]).add(1, 'days').format(format));
|
|
38
39
|
}
|
|
39
40
|
|
|
40
41
|
// 处理非时间数组(如数字数组),转为 "asnStatus=10|asnStatus=20"
|
|
@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
4
4
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
5
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
6
6
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
7
|
+
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
7
8
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
8
9
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
9
10
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
@@ -161,7 +162,7 @@ var ArrayTable = observer(function (props) {
|
|
|
161
162
|
style: {
|
|
162
163
|
marginBottom: 5
|
|
163
164
|
}
|
|
164
|
-
}, addition ? /*#__PURE__*/React.createElement(ArrayAddBtn, {
|
|
165
|
+
}, addition ? /*#__PURE__*/React.createElement(ArrayAddBtn, _extends({
|
|
165
166
|
arrayField: field,
|
|
166
167
|
schema: schema,
|
|
167
168
|
defaultValue: {
|
|
@@ -172,7 +173,7 @@ var ArrayTable = observer(function (props) {
|
|
|
172
173
|
onAdd: function onAdd() {
|
|
173
174
|
setIsAdd(true);
|
|
174
175
|
}
|
|
175
|
-
}) : null), /*#__PURE__*/React.createElement("div", {
|
|
176
|
+
}, addition.props)) : null), /*#__PURE__*/React.createElement("div", {
|
|
176
177
|
ref: ref,
|
|
177
178
|
style: {
|
|
178
179
|
height: height ? height : 400
|