@nokecy/qc-ui 1.0.4 → 1.0.6
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/README.md +23 -23
- package/dist/cjs/ConfirmPro/index.js +4 -4
- package/dist/cjs/ag-grid-plus/_utils/boolSelect.js +5 -5
- package/dist/cjs/ag-grid-plus/ag-grid-theme-builder.css +352 -352
- package/dist/cjs/ag-grid-plus/ag-gridPlus.js +2 -2
- package/dist/cjs/ag-grid-plus/index.less +14 -14
- package/dist/cjs/ag-grid-plus/interface.d.ts +5 -1
- package/dist/cjs/ag-grid-plus/queryForm/index.less +48 -48
- package/dist/cjs/ag-grid-plus/toolBar/index.js +4 -4
- package/dist/cjs/ag-grid-plus/utils.d.ts +2 -1
- package/dist/cjs/ag-grid-plus/utils.js +10 -7
- package/dist/cjs/dashboard/dashboard/components/toolbar/style/index.less +49 -49
- package/dist/cjs/dashboard/dashboard/index.less +173 -173
- package/dist/cjs/dashboard/dashboard/utils.js +4 -4
- package/dist/cjs/dashboard/utils.js +8 -8
- package/dist/cjs/dashboard/widget/index.less +7 -7
- package/dist/cjs/dashboard/widget/selector/index.less +172 -172
- package/dist/cjs/draggableModal/index.js +4 -4
- package/dist/cjs/draggableModal/style.less +16 -16
- package/dist/cjs/formDesigner/arrayTable/styles.less +2 -2
- package/dist/cjs/formDesigner/index.less +2 -2
- package/dist/cjs/fullScreenAlert/index.js +4 -4
- package/dist/cjs/fullScreenAlert/index.less +133 -133
- package/dist/cjs/importModal/index.js +4 -4
- package/dist/cjs/toolBar/index.less +25 -25
- package/dist/esm/ConfirmPro/index.js +4 -4
- package/dist/esm/ag-grid-plus/_utils/boolSelect.js +5 -5
- package/dist/esm/ag-grid-plus/ag-grid-theme-builder.css +352 -352
- package/dist/esm/ag-grid-plus/ag-gridPlus.js +2 -2
- package/dist/esm/ag-grid-plus/index.less +14 -14
- package/dist/esm/ag-grid-plus/interface.d.ts +5 -1
- package/dist/esm/ag-grid-plus/queryForm/index.less +48 -48
- package/dist/esm/ag-grid-plus/toolBar/index.js +4 -4
- package/dist/esm/ag-grid-plus/utils.d.ts +2 -1
- package/dist/esm/ag-grid-plus/utils.js +10 -7
- package/dist/esm/dashboard/dashboard/components/toolbar/style/index.less +49 -49
- package/dist/esm/dashboard/dashboard/index.less +173 -173
- package/dist/esm/dashboard/dashboard/utils.js +4 -4
- package/dist/esm/dashboard/utils.js +8 -8
- package/dist/esm/dashboard/widget/index.less +7 -7
- package/dist/esm/dashboard/widget/selector/index.less +172 -172
- package/dist/esm/draggableModal/index.js +4 -4
- package/dist/esm/draggableModal/style.less +16 -16
- package/dist/esm/formDesigner/arrayTable/styles.less +2 -2
- package/dist/esm/formDesigner/index.less +2 -2
- package/dist/esm/fullScreenAlert/index.js +4 -4
- package/dist/esm/fullScreenAlert/index.less +133 -133
- package/dist/esm/importModal/index.js +4 -4
- package/dist/esm/toolBar/index.less +25 -25
- package/dist/umd/qc-ui.min.js +1 -1
- package/package.json +70 -70
|
@@ -190,7 +190,7 @@ function AgGridPlus(props) {
|
|
|
190
190
|
}, [dataSource]);
|
|
191
191
|
var onRequest = function onRequest(queryFilter) {
|
|
192
192
|
setLoading(true);
|
|
193
|
-
var filter = (0, _utils.convertFilterModel)(queryFilter);
|
|
193
|
+
var filter = (0, _utils.convertFilterModel)(queryFilter, allColDefs);
|
|
194
194
|
var params = _objectSpread(_objectSpread({
|
|
195
195
|
filter: filter
|
|
196
196
|
}, gridParams), {}, {
|
|
@@ -211,7 +211,6 @@ function AgGridPlus(props) {
|
|
|
211
211
|
setLoading(false);
|
|
212
212
|
});
|
|
213
213
|
};
|
|
214
|
-
var actionDom = toolBarRender && toolBarRender(apiRef.current, (0, _utils.convertFilterModel)(queryFilter), queryFilter);
|
|
215
214
|
var sortChanged = function sortChanged(columnApi) {
|
|
216
215
|
var sortedColumn = columnApi.getColumnState().find(function (col) {
|
|
217
216
|
return Boolean(col.sort);
|
|
@@ -409,6 +408,7 @@ function AgGridPlus(props) {
|
|
|
409
408
|
var rowDataMemo = (0, _react.useMemo)(function () {
|
|
410
409
|
return props.treeData ? (0, _utils.flatten)((0, _utils.toTree)(rowData, treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id", treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId"), treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id") : rowData;
|
|
411
410
|
}, [rowData, props.treeData]);
|
|
411
|
+
var actionDom = toolBarRender && toolBarRender(apiRef.current, (0, _utils.convertFilterModel)(queryFilter, allColDefs), queryFilter);
|
|
412
412
|
return /*#__PURE__*/_react.default.createElement(_antd.Spin, {
|
|
413
413
|
spinning: loading,
|
|
414
414
|
wrapperClassName: "grid-spin"
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
.grid-spin {
|
|
2
|
-
height: 100%;
|
|
3
|
-
|
|
4
|
-
.ant-spin-container {
|
|
5
|
-
height: 100%;
|
|
6
|
-
}
|
|
7
|
-
}
|
|
8
|
-
|
|
9
|
-
.ag-icon-filter:before {
|
|
10
|
-
-webkit-mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
|
|
11
|
-
|
|
12
|
-
mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
|
|
13
|
-
|
|
14
|
-
color: #8a8a8a;
|
|
1
|
+
.grid-spin {
|
|
2
|
+
height: 100%;
|
|
3
|
+
|
|
4
|
+
.ant-spin-container {
|
|
5
|
+
height: 100%;
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
.ag-icon-filter:before {
|
|
10
|
+
-webkit-mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
|
|
11
|
+
|
|
12
|
+
mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
|
|
13
|
+
|
|
14
|
+
color: #8a8a8a;
|
|
15
15
|
}
|
|
@@ -29,6 +29,10 @@ interface GridProps extends AgGridReactProps {
|
|
|
29
29
|
gridRef?: React.Ref<GridRef | undefined>;
|
|
30
30
|
}
|
|
31
31
|
interface AgGridColumnPropsClone extends ColDef {
|
|
32
|
+
/**
|
|
33
|
+
* 是否精确查询
|
|
34
|
+
*/
|
|
35
|
+
exactQuery?: boolean;
|
|
32
36
|
hideInTable?: boolean;
|
|
33
37
|
hideInSearch?: boolean;
|
|
34
38
|
queryField?: string;
|
|
@@ -41,4 +45,4 @@ interface AgGridColumnPropsClone extends ColDef {
|
|
|
41
45
|
}[];
|
|
42
46
|
}
|
|
43
47
|
declare function AgGridColumn(props: AgGridColumnPropsClone | ColGroupDef): React.JSX.Element;
|
|
44
|
-
export { GridProps, AgGridColumn, GridRef };
|
|
48
|
+
export { GridProps, AgGridColumn, GridRef, AgGridColumnPropsClone };
|
|
@@ -1,48 +1,48 @@
|
|
|
1
|
-
|
|
2
|
-
@pro-table-search-prefix-cls: ~'ag-grid-table-search';
|
|
3
|
-
|
|
4
|
-
@pro-table-form-prefix-cls: ~'ag-grid-table-form';
|
|
5
|
-
|
|
6
|
-
.@{pro-table-search-prefix-cls} {
|
|
7
|
-
margin-bottom: 8px;
|
|
8
|
-
padding: 8px;
|
|
9
|
-
// padding-bottom: 0;
|
|
10
|
-
background-color: #fff;
|
|
11
|
-
|
|
12
|
-
&.@{pro-table-form-prefix-cls} {
|
|
13
|
-
margin: 0;
|
|
14
|
-
padding: 0 16px;
|
|
15
|
-
overflow: unset;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
&-light {
|
|
19
|
-
margin-bottom: 0;
|
|
20
|
-
padding: 16px 0;
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
&-form-option {
|
|
24
|
-
.ant-form-item {
|
|
25
|
-
margin: 0;
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
.ant-form-item-label {
|
|
29
|
-
opacity: 0;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
.ant-form-item-control-input {
|
|
33
|
-
justify-content: flex-start;
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
@media (max-width: 575px) {
|
|
39
|
-
.@{pro-table-search-prefix-cls} {
|
|
40
|
-
height: auto !important;
|
|
41
|
-
padding-bottom: 24px;
|
|
42
|
-
|
|
43
|
-
.ant-form-item-label {
|
|
44
|
-
min-width: 80px;
|
|
45
|
-
text-align: left;
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
}
|
|
1
|
+
|
|
2
|
+
@pro-table-search-prefix-cls: ~'ag-grid-table-search';
|
|
3
|
+
|
|
4
|
+
@pro-table-form-prefix-cls: ~'ag-grid-table-form';
|
|
5
|
+
|
|
6
|
+
.@{pro-table-search-prefix-cls} {
|
|
7
|
+
margin-bottom: 8px;
|
|
8
|
+
padding: 8px;
|
|
9
|
+
// padding-bottom: 0;
|
|
10
|
+
background-color: #fff;
|
|
11
|
+
|
|
12
|
+
&.@{pro-table-form-prefix-cls} {
|
|
13
|
+
margin: 0;
|
|
14
|
+
padding: 0 16px;
|
|
15
|
+
overflow: unset;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
&-light {
|
|
19
|
+
margin-bottom: 0;
|
|
20
|
+
padding: 16px 0;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
&-form-option {
|
|
24
|
+
.ant-form-item {
|
|
25
|
+
margin: 0;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
.ant-form-item-label {
|
|
29
|
+
opacity: 0;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
.ant-form-item-control-input {
|
|
33
|
+
justify-content: flex-start;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
@media (max-width: 575px) {
|
|
39
|
+
.@{pro-table-search-prefix-cls} {
|
|
40
|
+
height: auto !important;
|
|
41
|
+
padding-bottom: 24px;
|
|
42
|
+
|
|
43
|
+
.ant-form-item-label {
|
|
44
|
+
min-width: 80px;
|
|
45
|
+
text-align: left;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
@@ -19,10 +19,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
19
19
|
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; }
|
|
20
20
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
21
21
|
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); }
|
|
22
|
-
/**
|
|
23
|
-
* 获取配置区域 DOM Item
|
|
24
|
-
*
|
|
25
|
-
* @param setting 配置项
|
|
22
|
+
/**
|
|
23
|
+
* 获取配置区域 DOM Item
|
|
24
|
+
*
|
|
25
|
+
* @param setting 配置项
|
|
26
26
|
*/
|
|
27
27
|
function getSettingItem(setting) {
|
|
28
28
|
if ( /*#__PURE__*/_react.default.isValidElement(setting)) {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ValueFormatterParams } from 'ag-grid-community';
|
|
2
|
-
|
|
2
|
+
import { AgGridColumnPropsClone } from './interface';
|
|
3
|
+
declare const convertFilterModel: (filterModel: any, colDefs: AgGridColumnPropsClone[]) => string;
|
|
3
4
|
declare const convertSortModel: (sortModel: any[]) => string;
|
|
4
5
|
declare const dateValueFormatter: (params: ValueFormatterParams) => string;
|
|
5
6
|
declare const dateTimeValueFormatter: (params: ValueFormatterParams) => string;
|
|
@@ -22,9 +22,9 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
22
22
|
var esc = function esc(v) {
|
|
23
23
|
return v.replace(/([(),|,\\]|\/i)/g, '\\$1');
|
|
24
24
|
};
|
|
25
|
-
var getFilter = function getFilter(objectKey, value) {
|
|
25
|
+
var getFilter = function getFilter(objectKey, value, colDef) {
|
|
26
26
|
if (typeof value === 'string') {
|
|
27
|
-
return value && value != "" ? "".concat(objectKey, " =* ").concat(esc(value)) : "";
|
|
27
|
+
return value && value != "" ? "".concat(objectKey, " ").concat(colDef !== null && colDef !== void 0 && colDef.exactQuery ? '^' : "=*", " ").concat(esc(value)) : "";
|
|
28
28
|
}
|
|
29
29
|
if (typeof value === 'number') {
|
|
30
30
|
return "".concat(objectKey, " = ").concat(value);
|
|
@@ -36,12 +36,12 @@ var getFilter = function getFilter(objectKey, value) {
|
|
|
36
36
|
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"));
|
|
37
37
|
}
|
|
38
38
|
var items = [];
|
|
39
|
-
getObjectFilter(value, objectKey, items);
|
|
39
|
+
getObjectFilter(value, objectKey, items, colDef);
|
|
40
40
|
return items.filter(function (x) {
|
|
41
41
|
return !!x;
|
|
42
42
|
}).join(",");
|
|
43
43
|
};
|
|
44
|
-
var getObjectFilter = function getObjectFilter(obj, objKey, items) {
|
|
44
|
+
var getObjectFilter = function getObjectFilter(obj, objKey, items, colDef) {
|
|
45
45
|
Object.keys(obj).map(function (key) {
|
|
46
46
|
var value = obj[key];
|
|
47
47
|
var objectKey = "".concat(objKey, ".").concat(key);
|
|
@@ -49,7 +49,7 @@ var getObjectFilter = function getObjectFilter(obj, objKey, items) {
|
|
|
49
49
|
items.push("".concat(objectKey, " = ").concat(value));
|
|
50
50
|
}
|
|
51
51
|
if (typeof value === 'string') {
|
|
52
|
-
value && value != "" && items.push("".concat(objectKey, " =* ").concat(esc(value)));
|
|
52
|
+
value && value != "" && items.push("".concat(objectKey, " ").concat(colDef !== null && colDef !== void 0 && colDef.exactQuery ? '^' : "=*", " ").concat(esc(value)));
|
|
53
53
|
}
|
|
54
54
|
if (typeof value === 'boolean') {
|
|
55
55
|
items.push("".concat(objectKey, " = ").concat(value));
|
|
@@ -60,12 +60,15 @@ var getObjectFilter = function getObjectFilter(obj, objKey, items) {
|
|
|
60
60
|
if (value instanceof Object) items.push(getObjectFilter(value, "".concat(objKey, ".").concat(key), items));
|
|
61
61
|
});
|
|
62
62
|
};
|
|
63
|
-
var convertFilterModel = exports.convertFilterModel = function convertFilterModel(filterModel) {
|
|
63
|
+
var convertFilterModel = exports.convertFilterModel = function convertFilterModel(filterModel, colDefs) {
|
|
64
64
|
var items = [];
|
|
65
65
|
Object.keys(filterModel).map(function (key) {
|
|
66
66
|
var value = filterModel[key];
|
|
67
|
+
var colDef = colDefs.find(function (colDef) {
|
|
68
|
+
return colDef.field == key;
|
|
69
|
+
});
|
|
67
70
|
if (value !== undefined && value !== null && value !== "") {
|
|
68
|
-
var filter = getFilter(key, value);
|
|
71
|
+
var filter = getFilter(key, value, colDef);
|
|
69
72
|
if (filter && filter != "") {
|
|
70
73
|
items.push(filter);
|
|
71
74
|
}
|
|
@@ -1,49 +1,49 @@
|
|
|
1
|
-
.react-dashboard-toolbar {
|
|
2
|
-
display: flex;
|
|
3
|
-
align-items: center;
|
|
4
|
-
justify-content: space-between;
|
|
5
|
-
// width: 100%;
|
|
6
|
-
padding: 0 10px;
|
|
7
|
-
padding-bottom: 10px;
|
|
8
|
-
// background: var(--component-background);
|
|
9
|
-
|
|
10
|
-
&:after {
|
|
11
|
-
display: block;
|
|
12
|
-
clear: both;
|
|
13
|
-
content: '';
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
&-left {
|
|
17
|
-
float: left;
|
|
18
|
-
|
|
19
|
-
button {
|
|
20
|
-
margin-right: 10px;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
&-right {
|
|
25
|
-
float: right;
|
|
26
|
-
|
|
27
|
-
button {
|
|
28
|
-
margin-left: 10px;
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
&-space {
|
|
33
|
-
flex: auto;
|
|
34
|
-
height: 1px;
|
|
35
|
-
margin: 0 !important;
|
|
36
|
-
padding: 0 !important;
|
|
37
|
-
border: 0 !important;
|
|
38
|
-
-webkit-box-flex: 1;
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
&-fixed {
|
|
42
|
-
position: fixed;
|
|
43
|
-
right: 0;
|
|
44
|
-
bottom: 0;
|
|
45
|
-
z-index: 9;
|
|
46
|
-
border-top: 1px solid rgba(128, 128, 128, 0.1);
|
|
47
|
-
box-shadow: 0 -1px 2px rgba(128, 128, 128, 0.03);
|
|
48
|
-
}
|
|
49
|
-
}
|
|
1
|
+
.react-dashboard-toolbar {
|
|
2
|
+
display: flex;
|
|
3
|
+
align-items: center;
|
|
4
|
+
justify-content: space-between;
|
|
5
|
+
// width: 100%;
|
|
6
|
+
padding: 0 10px;
|
|
7
|
+
padding-bottom: 10px;
|
|
8
|
+
// background: var(--component-background);
|
|
9
|
+
|
|
10
|
+
&:after {
|
|
11
|
+
display: block;
|
|
12
|
+
clear: both;
|
|
13
|
+
content: '';
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
&-left {
|
|
17
|
+
float: left;
|
|
18
|
+
|
|
19
|
+
button {
|
|
20
|
+
margin-right: 10px;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
&-right {
|
|
25
|
+
float: right;
|
|
26
|
+
|
|
27
|
+
button {
|
|
28
|
+
margin-left: 10px;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
&-space {
|
|
33
|
+
flex: auto;
|
|
34
|
+
height: 1px;
|
|
35
|
+
margin: 0 !important;
|
|
36
|
+
padding: 0 !important;
|
|
37
|
+
border: 0 !important;
|
|
38
|
+
-webkit-box-flex: 1;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
&-fixed {
|
|
42
|
+
position: fixed;
|
|
43
|
+
right: 0;
|
|
44
|
+
bottom: 0;
|
|
45
|
+
z-index: 9;
|
|
46
|
+
border-top: 1px solid rgba(128, 128, 128, 0.1);
|
|
47
|
+
box-shadow: 0 -1px 2px rgba(128, 128, 128, 0.03);
|
|
48
|
+
}
|
|
49
|
+
}
|