@arim-aisdc/public-components 2.3.89 → 2.3.90
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/components/BaseInfo/BaseInfo.d.ts +1 -1
- package/dist/components/TableMax/TableMax.js +2 -2
- package/dist/components/TableMax/components/ColumnFilterV2/Filter.js +7 -6
- package/dist/components/TableMax/components/ColumnSort/customSortFns.d.ts +8 -8
- package/dist/components/TableMax/utils.d.ts +1 -1
- package/dist/components/TableMax/utils.js +117 -92
- package/package.json +1 -1
|
@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
|
|
|
17
17
|
value: any;
|
|
18
18
|
field: string;
|
|
19
19
|
label?: string;
|
|
20
|
-
text: string | Element |
|
|
20
|
+
text: string | JSX.Element | Element;
|
|
21
21
|
units?: string;
|
|
22
22
|
width?: string;
|
|
23
23
|
labelWidth?: string;
|
|
@@ -814,10 +814,10 @@ var TableMax = function TableMax(_ref) {
|
|
|
814
814
|
filteredRowModel: filteredRowModel,
|
|
815
815
|
filters: columnFilters,
|
|
816
816
|
formatFilters: getFormatFilters(columns, columnFilters),
|
|
817
|
-
formatFiltersV2: getFormatFiltersV2(columns, columnFilters) // 动态化查询格式：https://arim-jyzx.coding.net/p/infra/wiki/3252
|
|
817
|
+
formatFiltersV2: getFormatFiltersV2(columns, columnFilters, useTextFilter !== null && useTextFilter !== void 0 ? useTextFilter : tableMaxConfig === null || tableMaxConfig === void 0 ? void 0 : tableMaxConfig.useTextFilter) // 动态化查询格式：https://arim-jyzx.coding.net/p/infra/wiki/3252
|
|
818
818
|
});
|
|
819
819
|
}
|
|
820
|
-
}, [JSON.stringify(columnFilters), manualFiltering, tableId]);
|
|
820
|
+
}, [JSON.stringify(columnFilters), manualFiltering, tableId, useTextFilter, tableMaxConfig === null || tableMaxConfig === void 0 ? void 0 : tableMaxConfig.useTextFilter]);
|
|
821
821
|
|
|
822
822
|
// 排序回调
|
|
823
823
|
useEffect(function () {
|
|
@@ -47,6 +47,7 @@ var Filter = function Filter(_ref) {
|
|
|
47
47
|
_useState2 = _slicedToArray(_useState, 2),
|
|
48
48
|
columnFilterValue = _useState2[0],
|
|
49
49
|
setColumnFilterValue = _useState2[1];
|
|
50
|
+
console.log(columnFilterValue, 'columnFilterValue');
|
|
50
51
|
|
|
51
52
|
// 接口可选值
|
|
52
53
|
var _useState3 = useState([]),
|
|
@@ -248,7 +249,7 @@ var Filter = function Filter(_ref) {
|
|
|
248
249
|
}
|
|
249
250
|
}, []);
|
|
250
251
|
var filterComponent = function filterComponent(type) {
|
|
251
|
-
var _columnFilterValue$to, _columnFilterValue$to2, _columnFilterValue$to3, _columnDef$filterComP, _columnDef$filterComP2, _columnDef$filterComP3;
|
|
252
|
+
var _columnFilterValue$to, _columnFilterValue$to2, _columnFilterValue$to3, _columnDef$filterComP, _columnDef$filterComP2, _columnDef$filterComP3, _columnFilterValue$fi, _columnFilterValue$fi2;
|
|
252
253
|
var _useTranslation = useTranslation(),
|
|
253
254
|
_useTranslation2 = _slicedToArray(_useTranslation, 1),
|
|
254
255
|
t = _useTranslation2[0];
|
|
@@ -264,11 +265,11 @@ var Filter = function Filter(_ref) {
|
|
|
264
265
|
},
|
|
265
266
|
children: "\u7A7A\u503C(NULL)"
|
|
266
267
|
}), /*#__PURE__*/_jsx("p", {
|
|
267
|
-
className: "quickly-input-item ".concat(typeof columnFilterValue === 'string' && ((columnFilterValue === null || columnFilterValue === void 0 || (_columnFilterValue$to2 = columnFilterValue.toUpperCase()) === null || _columnFilterValue$to2 === void 0 ? void 0 : _columnFilterValue$to2.trim()) === '
|
|
268
|
+
className: "quickly-input-item ".concat(typeof columnFilterValue === 'string' && ((columnFilterValue === null || columnFilterValue === void 0 || (_columnFilterValue$to2 = columnFilterValue.toUpperCase()) === null || _columnFilterValue$to2 === void 0 ? void 0 : _columnFilterValue$to2.trim()) === 'NOTNULL' || (columnFilterValue === null || columnFilterValue === void 0 || (_columnFilterValue$to3 = columnFilterValue.toUpperCase()) === null || _columnFilterValue$to3 === void 0 ? void 0 : _columnFilterValue$to3.trim()) === 'NOTNULL') ? 'quickly-input-item-selected' : null),
|
|
268
269
|
onClick: function onClick() {
|
|
269
|
-
handleChangeFilterValueWithDebounce('
|
|
270
|
+
handleChangeFilterValueWithDebounce('NOTNULL');
|
|
270
271
|
},
|
|
271
|
-
children: "\u975E\u7A7A\u503C(
|
|
272
|
+
children: "\u975E\u7A7A\u503C(NOTNULL)"
|
|
272
273
|
})]
|
|
273
274
|
});
|
|
274
275
|
switch (type) {
|
|
@@ -351,7 +352,7 @@ var Filter = function Filter(_ref) {
|
|
|
351
352
|
width: 188
|
|
352
353
|
},
|
|
353
354
|
allowClear: true,
|
|
354
|
-
value: columnFilterValue
|
|
355
|
+
value: _typeof(columnFilterValue) === 'object' ? Array.isArray(columnFilterValue === null || columnFilterValue === void 0 ? void 0 : columnFilterValue.filterValue) ? columnFilterValue === null || columnFilterValue === void 0 || (_columnFilterValue$fi = columnFilterValue.filterValue) === null || _columnFilterValue$fi === void 0 ? void 0 : _columnFilterValue$fi.join(' ') : columnFilterValue === null || columnFilterValue === void 0 ? void 0 : columnFilterValue.filterValue : columnFilterValue
|
|
355
356
|
}), quickInput]
|
|
356
357
|
})
|
|
357
358
|
});
|
|
@@ -371,7 +372,7 @@ var Filter = function Filter(_ref) {
|
|
|
371
372
|
width: 188
|
|
372
373
|
},
|
|
373
374
|
allowClear: true,
|
|
374
|
-
value: columnFilterValue,
|
|
375
|
+
value: _typeof(columnFilterValue) === 'object' ? Array.isArray(columnFilterValue === null || columnFilterValue === void 0 ? void 0 : columnFilterValue.filterValue) ? columnFilterValue === null || columnFilterValue === void 0 || (_columnFilterValue$fi2 = columnFilterValue.filterValue) === null || _columnFilterValue$fi2 === void 0 ? void 0 : _columnFilterValue$fi2.join(' ') : columnFilterValue === null || columnFilterValue === void 0 ? void 0 : columnFilterValue.filterValue : columnFilterValue,
|
|
375
376
|
placeholder: t('global.placeholder.input')
|
|
376
377
|
}), quickInput]
|
|
377
378
|
})
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { TableMaxColumnType } from "../../type";
|
|
2
|
-
export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) =>
|
|
3
|
-
export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) =>
|
|
4
|
-
export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) =>
|
|
5
|
-
export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) =>
|
|
2
|
+
export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
|
|
3
|
+
export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
|
|
4
|
+
export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
|
|
5
|
+
export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
|
|
6
6
|
declare const customSortFns: {
|
|
7
|
-
numberSortFn: (rowA: any, rowB: any, columnId: string) =>
|
|
8
|
-
stringSortFn: (rowA: any, rowB: any, columnId: string) =>
|
|
9
|
-
timeSortFn: (rowA: any, rowB: any, columnId: string) =>
|
|
10
|
-
numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) =>
|
|
7
|
+
numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
|
|
8
|
+
stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
|
|
9
|
+
timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
|
|
10
|
+
numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
|
|
11
11
|
};
|
|
12
12
|
export default customSortFns;
|
|
13
13
|
export type SortFnType = keyof typeof customSortFns | undefined;
|
|
@@ -29,7 +29,7 @@ export declare const getFormatFilters: (columns: TableMaxColumnType[], originFil
|
|
|
29
29
|
* 3. Input/AutoComplete：Contains
|
|
30
30
|
* 4. SingleDate/SingleNumber/SingleSelect：Eq
|
|
31
31
|
*/
|
|
32
|
-
export declare const getFormatFiltersV2: (columns: TableMaxColumnType[], originFilters: ColumnFiltersState) => FormatFilterType[];
|
|
32
|
+
export declare const getFormatFiltersV2: (columns: TableMaxColumnType[], originFilters: ColumnFiltersState, useTextFilter: boolean) => FormatFilterType[];
|
|
33
33
|
export declare const getFormatSorting: (columns: TableMaxColumnType[], originSorting: SortingState) => {
|
|
34
34
|
id: string;
|
|
35
35
|
desc: boolean;
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
1
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
2
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
3
|
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
4
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
6
5
|
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); }
|
|
6
|
+
function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
|
|
7
|
+
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); }
|
|
8
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
9
|
+
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
7
10
|
import dayjs from 'dayjs';
|
|
8
11
|
import { cloneDeep } from 'lodash';
|
|
9
12
|
// import request from '../../utils/request';
|
|
@@ -132,6 +135,10 @@ export var getFormatFilters = function getFormatFilters(columns, originFilters)
|
|
|
132
135
|
// 单选组件
|
|
133
136
|
formatFilters[formatKey] = value.filterValue;
|
|
134
137
|
// formatFilters[formatKey] = value;
|
|
138
|
+
} else if (filterType === FilterType.Input || filterType === FilterType.AutoComplete) {
|
|
139
|
+
var _value$filterValue$, _value$filterValue, _value$filterValue2;
|
|
140
|
+
formatFilters[formatKey] = _typeof(value) === 'object' ? typeof (value === null || value === void 0 ? void 0 : value.filterValue) === 'string' ? value === null || value === void 0 ? void 0 : value.filterValue : Array.isArray(value === null || value === void 0 ? void 0 : value.filterValue) ? (_value$filterValue$ = value === null || value === void 0 || (_value$filterValue = value.filterValue) === null || _value$filterValue === void 0 ? void 0 : _value$filterValue[0]) !== null && _value$filterValue$ !== void 0 ? _value$filterValue$ : value === null || value === void 0 || (_value$filterValue2 = value.filterValue) === null || _value$filterValue2 === void 0 ? void 0 : _value$filterValue2[1] : undefined : value;
|
|
141
|
+
// formatFilters[formatKey] = value;
|
|
135
142
|
} else {
|
|
136
143
|
// 其他
|
|
137
144
|
formatFilters[formatKey] = value;
|
|
@@ -151,93 +158,111 @@ export var getFormatFilters = function getFormatFilters(columns, originFilters)
|
|
|
151
158
|
* 3. Input/AutoComplete：Contains
|
|
152
159
|
* 4. SingleDate/SingleNumber/SingleSelect：Eq
|
|
153
160
|
*/
|
|
154
|
-
export var getFormatFiltersV2 = function getFormatFiltersV2(columns, originFilters) {
|
|
161
|
+
export var getFormatFiltersV2 = function getFormatFiltersV2(columns, originFilters, useTextFilter) {
|
|
155
162
|
console.log('getFormatFilters :>> ', columns, originFilters);
|
|
156
163
|
var formatFilters = [];
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
var
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
} else if (
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
'NOT NULL': FilterOperator.IsNotNull,
|
|
221
|
-
NOTNULL: FilterOperator.IsNotNull
|
|
222
|
-
};
|
|
164
|
+
var _iterator = _createForOfIteratorHelper(originFilters),
|
|
165
|
+
_step;
|
|
166
|
+
try {
|
|
167
|
+
var _loop = function _loop() {
|
|
168
|
+
var filter = _step.value;
|
|
169
|
+
var _ref6 = filter || {},
|
|
170
|
+
id = _ref6.id,
|
|
171
|
+
value = _ref6.value;
|
|
172
|
+
var curColumn = columns.find(function (item) {
|
|
173
|
+
return item.id === id;
|
|
174
|
+
});
|
|
175
|
+
var _ref7 = curColumn || {},
|
|
176
|
+
filterType = _ref7.filterType,
|
|
177
|
+
filterKey = _ref7.filterKey;
|
|
178
|
+
// const { format = defaultDateFormat } = curColumn?.filterComProps || {};
|
|
179
|
+
// 优先取formattedFilterKey作为key
|
|
180
|
+
var formatKey = filterKey || id;
|
|
181
|
+
var res = {
|
|
182
|
+
field: formatKey,
|
|
183
|
+
operator: FilterOperator.Contains,
|
|
184
|
+
value: null
|
|
185
|
+
};
|
|
186
|
+
if (filterType === FilterType.Date || filterType === FilterType.DateRange) {
|
|
187
|
+
// 时间范围
|
|
188
|
+
if (value !== null && value !== void 0 && value.startDate && !(value !== null && value !== void 0 && value.endDate)) {
|
|
189
|
+
res.operator = FilterOperator.Ge;
|
|
190
|
+
res.value = value.startDate;
|
|
191
|
+
} else if (!(value !== null && value !== void 0 && value.startDate) && value !== null && value !== void 0 && value.endDate) {
|
|
192
|
+
res.operator = FilterOperator.Le;
|
|
193
|
+
res.value = value.endDate;
|
|
194
|
+
} else if (value !== null && value !== void 0 && value.startDate && value !== null && value !== void 0 && value.endDate) {
|
|
195
|
+
res.operator = FilterOperator.Between;
|
|
196
|
+
res.value = [value.startDate, value.endDate];
|
|
197
|
+
}
|
|
198
|
+
} else if (filterType === FilterType.Integer || filterType === FilterType.NumberRange) {
|
|
199
|
+
// 数字范围
|
|
200
|
+
if (!noValue(value === null || value === void 0 ? void 0 : value[0]) && noValue(value === null || value === void 0 ? void 0 : value[1])) {
|
|
201
|
+
res.operator = FilterOperator.Ge;
|
|
202
|
+
res.value = value[0];
|
|
203
|
+
} else if (noValue(value === null || value === void 0 ? void 0 : value[0]) && !noValue(value === null || value === void 0 ? void 0 : value[1])) {
|
|
204
|
+
res.operator = FilterOperator.Le;
|
|
205
|
+
res.value = value[1];
|
|
206
|
+
} else if (!noValue(value === null || value === void 0 ? void 0 : value[0]) && !noValue(value === null || value === void 0 ? void 0 : value[1])) {
|
|
207
|
+
res.operator = FilterOperator.Between;
|
|
208
|
+
res.value = value;
|
|
209
|
+
}
|
|
210
|
+
} else if (filterType === FilterType.MultiSelect || !filterType) {
|
|
211
|
+
// 多选组件
|
|
212
|
+
res.value = value.filterValue;
|
|
213
|
+
res.operator = JSON.stringify(res.value) === '["NULL"]' ? FilterOperator.IsNull : FilterOperator.In;
|
|
214
|
+
} else if (filterType === FilterType.Input || filterType === FilterType.AutoComplete) {
|
|
215
|
+
// Input组件
|
|
216
|
+
if (typeof value === 'string') {
|
|
217
|
+
var _value$toUpperCase;
|
|
218
|
+
var upperValue = value === null || value === void 0 || (_value$toUpperCase = value.toUpperCase()) === null || _value$toUpperCase === void 0 ? void 0 : _value$toUpperCase.trim();
|
|
219
|
+
res.value = splitString(value + '');
|
|
220
|
+
res.operator = upperValue === 'NULL' ? FilterOperator.IsNull : upperValue === 'NOT NULL' || upperValue === 'NOTNULL' ? FilterOperator.IsNotNull : typeof res.value === 'string' ? FilterOperator.Contains : FilterOperator.In;
|
|
221
|
+
} else {
|
|
222
|
+
// 1. 简化变量处理：合并空值判断 + 类型转换
|
|
223
|
+
var _ref8 = value || {},
|
|
224
|
+
filterValue = _ref8.filterValue,
|
|
225
|
+
operator = _ref8.operator;
|
|
226
|
+
var _upperValue = (filterValue === null || filterValue === void 0 ? void 0 : filterValue.toString().toUpperCase().trim()) || '';
|
|
223
227
|
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
228
|
+
// 2. 拆分 operator 逻辑：用对象映射替代多层三元，更易维护
|
|
229
|
+
var operatorMap = {
|
|
230
|
+
NULL: FilterOperator.IsNull,
|
|
231
|
+
'NOT NULL': FilterOperator.IsNotNull,
|
|
232
|
+
NOTNULL: FilterOperator.IsNotNull
|
|
233
|
+
};
|
|
234
|
+
if (!useTextFilter && Array.isArray(filterValue)) {
|
|
235
|
+
res.value = filterValue;
|
|
236
|
+
res.operator = FilterOperator.In;
|
|
237
|
+
} else {
|
|
238
|
+
var _operatorMap$_upperVa;
|
|
239
|
+
// 3. 核心逻辑简化：先匹配特殊值 → 再处理默认逻辑
|
|
240
|
+
res.value = typeof filterValue === 'string' ? splitString((filterValue !== null && filterValue !== void 0 ? filterValue : '') + '') : filterValue; // 空值合并替代 +'' 更严谨
|
|
241
|
+
res.operator = (_operatorMap$_upperVa = operatorMap[_upperValue]) !== null && _operatorMap$_upperVa !== void 0 ? _operatorMap$_upperVa : operator === FilterOperator.Contains ? typeof res.value === 'string' ? FilterOperator.Contains : FilterOperator.In : operator;
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
} else if (filterType === FilterType.SingleSelect) {
|
|
245
|
+
var _res$value;
|
|
246
|
+
// 单选组件
|
|
247
|
+
res.value = value.filterValue;
|
|
248
|
+
var _upperValue2 = typeof res.value === 'string' ? (_res$value = res.value) === null || _res$value === void 0 ? void 0 : _res$value.toUpperCase() : res.value;
|
|
249
|
+
res.operator = _upperValue2 === 'NULL' ? FilterOperator.IsNull : _upperValue2 === 'NOT NULL' ? FilterOperator.IsNotNull : FilterOperator.Eq;
|
|
250
|
+
} else {
|
|
251
|
+
// 其他组件: SingleDate/SingleNumber
|
|
252
|
+
res.operator = FilterOperator.Eq;
|
|
253
|
+
res.value = value;
|
|
227
254
|
}
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
var _upperValue2 = typeof res.value === 'string' ? (_res$value = res.value) === null || _res$value === void 0 ? void 0 : _res$value.toUpperCase() : res.value;
|
|
233
|
-
res.operator = _upperValue2 === 'NULL' ? FilterOperator.IsNull : _upperValue2 === 'NOT NULL' ? FilterOperator.IsNotNull : FilterOperator.Eq;
|
|
234
|
-
} else {
|
|
235
|
-
// 其他组件: SingleDate/SingleNumber
|
|
236
|
-
res.operator = FilterOperator.Eq;
|
|
237
|
-
res.value = value;
|
|
255
|
+
formatFilters.push(res);
|
|
256
|
+
};
|
|
257
|
+
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
258
|
+
_loop();
|
|
238
259
|
}
|
|
239
|
-
|
|
240
|
-
|
|
260
|
+
} catch (err) {
|
|
261
|
+
_iterator.e(err);
|
|
262
|
+
} finally {
|
|
263
|
+
_iterator.f();
|
|
264
|
+
}
|
|
265
|
+
;
|
|
241
266
|
return formatFilters;
|
|
242
267
|
};
|
|
243
268
|
export var getFormatSorting = function getFormatSorting(columns, originSorting) {
|
|
@@ -245,8 +270,8 @@ export var getFormatSorting = function getFormatSorting(columns, originSorting)
|
|
|
245
270
|
var curColumn = columns.find(function (item) {
|
|
246
271
|
return item.id === sort.id;
|
|
247
272
|
});
|
|
248
|
-
var
|
|
249
|
-
sortingKey =
|
|
273
|
+
var _ref9 = curColumn || {},
|
|
274
|
+
sortingKey = _ref9.sortingKey;
|
|
250
275
|
// 优先取formattedFilterKey作为key
|
|
251
276
|
var formatKey = sortingKey || sort.id;
|
|
252
277
|
return _objectSpread(_objectSpread({}, sort), {}, {
|
|
@@ -271,13 +296,13 @@ export var operationColumnNoTooltips = function operationColumnNoTooltips(column
|
|
|
271
296
|
};
|
|
272
297
|
|
|
273
298
|
//下载
|
|
274
|
-
export var downloadExcel = function downloadExcel(
|
|
275
|
-
var url =
|
|
276
|
-
data =
|
|
277
|
-
title =
|
|
278
|
-
setDownLoading =
|
|
279
|
-
method =
|
|
280
|
-
request =
|
|
299
|
+
export var downloadExcel = function downloadExcel(_ref10) {
|
|
300
|
+
var url = _ref10.url,
|
|
301
|
+
data = _ref10.data,
|
|
302
|
+
title = _ref10.title,
|
|
303
|
+
setDownLoading = _ref10.setDownLoading,
|
|
304
|
+
method = _ref10.method,
|
|
305
|
+
request = _ref10.request;
|
|
281
306
|
setDownLoading(true);
|
|
282
307
|
request(url, {
|
|
283
308
|
method: method || 'post',
|