@nokecy/qc-ui 1.0.47 → 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.
|
@@ -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
|
|
@@ -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
|