@nokecy/qc-ui 1.0.28 → 1.0.30
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/queryForm/index.js +1 -1
- package/dist/cjs/ag-grid-plus/setting/index.js +1 -1
- package/dist/cjs/ag-grid-plus/utils.js +5 -3
- package/dist/esm/ag-grid-plus/queryForm/index.js +1 -1
- package/dist/esm/ag-grid-plus/setting/index.js +1 -1
- package/dist/esm/ag-grid-plus/utils.js +5 -3
- package/dist/umd/qc-ui.min.js +1 -1
- package/package.json +1 -1
|
@@ -175,7 +175,7 @@ var FormRender = function FormRender(props) {
|
|
|
175
175
|
(0, _react2.useEffect)(function () {
|
|
176
176
|
var new_schema = getSchema(onReset);
|
|
177
177
|
setSchema(new_schema);
|
|
178
|
-
}, [JSON.stringify(columnStates)]);
|
|
178
|
+
}, [JSON.stringify(columnStates), JSON.stringify(colDefs)]);
|
|
179
179
|
return /*#__PURE__*/_react2.default.createElement("div", {
|
|
180
180
|
className: (0, _classnames.default)(className, "ag-grid-table-search ag-grid-table-search-query-filter")
|
|
181
181
|
}, /*#__PURE__*/_react2.default.createElement(_antdV.Form, {
|
|
@@ -65,7 +65,7 @@ var Setting = function Setting(props) {
|
|
|
65
65
|
hide: columnState.hide,
|
|
66
66
|
cellClass: colDef.cellClass,
|
|
67
67
|
// 添加 cellClass
|
|
68
|
-
suppressHeaderFilterButton: colDef.suppressHeaderFilterButton
|
|
68
|
+
suppressHeaderFilterButton: !colDef.suppressHeaderFilterButton
|
|
69
69
|
}, columnState));
|
|
70
70
|
});
|
|
71
71
|
return columnRowData;
|
|
@@ -34,9 +34,11 @@ var getFilter = function getFilter(objectKey, value, colDef) {
|
|
|
34
34
|
}
|
|
35
35
|
if (value instanceof Array) {
|
|
36
36
|
// 处理时间数组
|
|
37
|
-
if (value.length === 2 && value.every(function (v) {
|
|
38
|
-
return (0, _dayjs.default)(v).isValid();
|
|
39
|
-
})) {
|
|
37
|
+
if (value.length === 2 && (value.every(function (v) {
|
|
38
|
+
return (0, _dayjs.default)(v, 'YYYY-MM-DD').isValid();
|
|
39
|
+
}) || value.every(function (v) {
|
|
40
|
+
return (0, _dayjs.default)(v, 'YYYY-MM-DD HH:mm:ss').isValid();
|
|
41
|
+
}))) {
|
|
40
42
|
return "".concat(objectKey, " >= ").concat((0, _dayjs.default)(value[0]).format("YYYY-MM-DD"), " ,") + "".concat(objectKey, " <= ").concat((0, _dayjs.default)(value[1]).add(1, 'days').format("YYYY-MM-DD"));
|
|
41
43
|
}
|
|
42
44
|
|
|
@@ -167,7 +167,7 @@ var FormRender = function FormRender(props) {
|
|
|
167
167
|
useEffect(function () {
|
|
168
168
|
var new_schema = getSchema(onReset);
|
|
169
169
|
setSchema(new_schema);
|
|
170
|
-
}, [JSON.stringify(columnStates)]);
|
|
170
|
+
}, [JSON.stringify(columnStates), JSON.stringify(colDefs)]);
|
|
171
171
|
return /*#__PURE__*/React.createElement("div", {
|
|
172
172
|
className: classNames(className, "ag-grid-table-search ag-grid-table-search-query-filter")
|
|
173
173
|
}, /*#__PURE__*/React.createElement(Form, {
|
|
@@ -56,7 +56,7 @@ var Setting = function Setting(props) {
|
|
|
56
56
|
hide: columnState.hide,
|
|
57
57
|
cellClass: colDef.cellClass,
|
|
58
58
|
// 添加 cellClass
|
|
59
|
-
suppressHeaderFilterButton: colDef.suppressHeaderFilterButton
|
|
59
|
+
suppressHeaderFilterButton: !colDef.suppressHeaderFilterButton
|
|
60
60
|
}, columnState));
|
|
61
61
|
});
|
|
62
62
|
return columnRowData;
|
|
@@ -27,9 +27,11 @@ var getFilter = function getFilter(objectKey, value, colDef) {
|
|
|
27
27
|
}
|
|
28
28
|
if (value instanceof Array) {
|
|
29
29
|
// 处理时间数组
|
|
30
|
-
if (value.length === 2 && value.every(function (v) {
|
|
31
|
-
return dayjs(v).isValid();
|
|
32
|
-
})) {
|
|
30
|
+
if (value.length === 2 && (value.every(function (v) {
|
|
31
|
+
return dayjs(v, 'YYYY-MM-DD').isValid();
|
|
32
|
+
}) || value.every(function (v) {
|
|
33
|
+
return dayjs(v, 'YYYY-MM-DD HH:mm:ss').isValid();
|
|
34
|
+
}))) {
|
|
33
35
|
return "".concat(objectKey, " >= ").concat(dayjs(value[0]).format("YYYY-MM-DD"), " ,") + "".concat(objectKey, " <= ").concat(dayjs(value[1]).add(1, 'days').format("YYYY-MM-DD"));
|
|
34
36
|
}
|
|
35
37
|
|