@ahoo-wang/fetcher-viewer 3.16.6 → 3.16.9
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/filter/FallbackFilter.d.ts.map +1 -1
- package/dist/filter/panel/FilterPanel.d.ts +2 -1
- package/dist/filter/panel/FilterPanel.d.ts.map +1 -1
- package/dist/filter/types.d.ts +6 -1
- package/dist/filter/types.d.ts.map +1 -1
- package/dist/filter/useFilterState.d.ts.map +1 -1
- package/dist/index.es.js +41 -19
- package/dist/index.es.js.map +1 -1
- package/dist/index.umd.js +1 -1
- package/dist/index.umd.js.map +1 -1
- package/dist/view/View.d.ts +2 -1
- package/dist/view/View.d.ts.map +1 -1
- package/dist/view/hooks/useViewState.d.ts +3 -2
- package/dist/view/hooks/useViewState.d.ts.map +1 -1
- package/dist/viewer/hooks/useViewerState.d.ts +2 -1
- package/dist/viewer/hooks/useViewerState.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FallbackFilter.d.ts","sourceRoot":"","sources":["../../src/filter/FallbackFilter.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"FallbackFilter.d.ts","sourceRoot":"","sources":["../../src/filter/FallbackFilter.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAItD,wBAAgB,cAAc,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,gBAAgB,2CAsB7D;yBAtBe,cAAc"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Key, RefAttributes, default as React } from 'react';
|
|
2
2
|
import { TypedFilterProps } from '../TypedFilter';
|
|
3
3
|
import { Condition } from '@ahoo-wang/fetcher-wow';
|
|
4
|
+
import { FilterState } from '../types';
|
|
4
5
|
import { ColProps, ButtonProps } from 'antd';
|
|
5
6
|
import { RowProps } from 'antd/es/grid/row';
|
|
6
7
|
export interface ActiveFilter extends Omit<TypedFilterProps, 'onChange' | 'ref'> {
|
|
@@ -34,7 +35,7 @@ export interface FilterPanelProps extends RefAttributes<FilterPanelRef> {
|
|
|
34
35
|
actionsCol?: ColProps;
|
|
35
36
|
filters: ActiveFilter[];
|
|
36
37
|
actions?: React.ReactNode;
|
|
37
|
-
onSearch?: (finalCondition: Condition, activeFilterValues: Map<Key, Condition>) => void;
|
|
38
|
+
onSearch?: (finalCondition: Condition, activeFilterValues: Map<Key, Condition>, filterStates: Map<Key, FilterState>) => void;
|
|
38
39
|
resetButton?: boolean | Omit<ButtonProps, 'onClick'>;
|
|
39
40
|
searchButton?: Omit<ButtonProps, 'onClick'>;
|
|
40
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterPanel.d.ts","sourceRoot":"","sources":["../../../src/filter/panel/FilterPanel.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAChD,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"FilterPanel.d.ts","sourceRoot":"","sources":["../../../src/filter/panel/FilterPanel.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAChD,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAKlD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGjD,MAAM,WAAW,YAAa,SAAQ,IAAI,CACxC,gBAAgB,EAChB,UAAU,GAAG,KAAK,CACnB;IACC,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,8BAA8B;IAC7C;;;;;OAKG;IACH,YAAY,IAAI,SAAS,GAAG,SAAS,CAAC;CACvC;AAED,MAAM,WAAW,cAAe,SAAQ,8BAA8B;IACpE;;;OAGG;IACH,MAAM,IAAI,IAAI,CAAC;IAEf;;;OAGG;IACH,KAAK,IAAI,IAAI,CAAC;CACf;AAED,MAAM,WAAW,gBAAiB,SAAQ,aAAa,CAAC,cAAc,CAAC;IACrE,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,QAAQ,CAAC,EAAE,CACT,cAAc,EAAE,SAAS,EACzB,kBAAkB,EAAE,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,EACvC,YAAY,EAAE,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,KAChC,IAAI,CAAC;IACV,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACrD,YAAY,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;CAC7C;AAkBD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,2CAmHlD"}
|
package/dist/filter/types.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { AttributesCapable, NamedCapable } from '@ahoo-wang/fetcher';
|
|
|
2
2
|
import { ConditionCapable, ConditionOptions } from '@ahoo-wang/fetcher-wow';
|
|
3
3
|
import { SelectProps } from 'antd/es/select';
|
|
4
4
|
import { RefAttributes, default as React } from 'react';
|
|
5
|
-
import { StyleCapable } from '../types';
|
|
5
|
+
import { Optional, StyleCapable } from '../types';
|
|
6
6
|
import { SelectOperator, SelectOperatorLocale } from './operator';
|
|
7
7
|
/**
|
|
8
8
|
* @see {@link Schema}
|
|
@@ -14,8 +14,13 @@ export interface FilterField extends NamedCapable {
|
|
|
14
14
|
}
|
|
15
15
|
export interface FilterRef {
|
|
16
16
|
getValue(): FilterValue | undefined;
|
|
17
|
+
getState(): FilterState;
|
|
17
18
|
reset(): void;
|
|
18
19
|
}
|
|
20
|
+
export interface FilterState {
|
|
21
|
+
operator: SelectOperator;
|
|
22
|
+
value: Optional;
|
|
23
|
+
}
|
|
19
24
|
export interface FilterLabelProps extends StyleCapable {
|
|
20
25
|
}
|
|
21
26
|
export interface FilterOperatorProps extends Omit<SelectProps<SelectOperator>, 'value' | 'options' | 'mode'> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/filter/types.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/filter/types.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,YAAY;IAC/C,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,IAAI,WAAW,GAAG,SAAS,CAAC;IAEpC,QAAQ,IAAI,WAAW,CAAC;IAExB,KAAK,IAAI,IAAI,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,QAAQ,CAAC;CACjB;AAED,MAAM,WAAW,gBAAiB,SAAQ,YAAY;CAAG;AAEzD,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAC/C,WAAW,CAAC,cAAc,CAAC,EAC3B,OAAO,GAAG,SAAS,GAAG,MAAM,CAC7B;IACC,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,kBAAkB,CAAC,EAAE,cAAc,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,WAAY,SAAQ,gBAAgB;CAAG;AAExD,MAAM,WAAW,WAAW,CAC1B,cAAc,SAAS,gBAAgB,GAAG,gBAAgB,CAE1D,SAAQ,iBAAiB,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE,YAAY;IACjE,KAAK,EAAE,WAAW,CAAC;IACnB,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,QAAQ,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACtC,KAAK,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC;IACzC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFilterState.d.ts","sourceRoot":"","sources":["../../src/filter/useFilterState.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAa,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAyB,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE3C,OAAO,KAAK,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"useFilterState.d.ts","sourceRoot":"","sources":["../../src/filter/useFilterState.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAa,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAyB,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE3C,OAAO,KAAK,EAAE,SAAS,EAAe,WAAW,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAIjD,MAAM,MAAM,8BAA8B,GAAG,CAC3C,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,cAAc,EAC7B,KAAK,EAAE,QAAQ,KACZ,QAAQ,CAAC;AACd,MAAM,MAAM,QAAQ,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;AAClE,MAAM,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC;AAC7E,MAAM,MAAM,oBAAoB,GAAG,CACjC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,QAAQ,KACZ,QAAQ,CAAC;AACd,MAAM,MAAM,oBAAoB,GAAG,CACjC,WAAW,EAAE,WAAW,KACrB,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC3B,eAAO,MAAM,iBAAiB,EAAE,aAE/B,CAAC;AAEF,MAAM,WAAW,qBAAsB,SAAQ,aAAa,CAAC,SAAS,CAAC;IACrE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,QAAQ,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,8BAA8B,CAAC,EAAE,8BAA8B,CAAC;IAChE,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,QAAQ,CAAC;IAChB,WAAW,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,CAAC;IAChD,QAAQ,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC;IACpC,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAyCD,wBAAgB,cAAc,CAC5B,OAAO,EAAE,qBAAqB,GAC7B,oBAAoB,CAoEtB"}
|
package/dist/index.es.js
CHANGED
|
@@ -748,6 +748,12 @@ function useFilterState(n) {
|
|
|
748
748
|
getValue() {
|
|
749
749
|
return g(i, o);
|
|
750
750
|
},
|
|
751
|
+
getState() {
|
|
752
|
+
return {
|
|
753
|
+
operator: i,
|
|
754
|
+
value: o
|
|
755
|
+
};
|
|
756
|
+
},
|
|
751
757
|
reset: b
|
|
752
758
|
}), r[19] = i, r[20] = b, r[21] = g, r[22] = o, r[23] = t4) : t4 = r[23], re(n.ref, t4);
|
|
753
759
|
let x;
|
|
@@ -1487,6 +1493,12 @@ function FallbackFilter(r) {
|
|
|
1487
1493
|
function _temp$10() {
|
|
1488
1494
|
return {
|
|
1489
1495
|
getValue() {},
|
|
1496
|
+
getState() {
|
|
1497
|
+
return {
|
|
1498
|
+
operator: Xt.UNDEFINED,
|
|
1499
|
+
value: void 0
|
|
1500
|
+
};
|
|
1501
|
+
},
|
|
1490
1502
|
reset() {}
|
|
1491
1503
|
};
|
|
1492
1504
|
}
|
|
@@ -1611,21 +1623,24 @@ var _n = {
|
|
|
1611
1623
|
function FilterPanel(n) {
|
|
1612
1624
|
let r = e(48), { ref: i, row: o, col: c, actionsCol: u, filters: f, onSearch: p, actions: g, resetButton: _, searchButton: v } = n, b = o === void 0 ? _n : o, x = c === void 0 ? vn : c, C = u === void 0 ? yn : u, w = fe(), { locale: T } = useLocale(), t3;
|
|
1613
1625
|
r[0] === w ? t3 = r[1] : (t3 = () => {
|
|
1614
|
-
let e = [], n = /* @__PURE__ */ new Map();
|
|
1615
|
-
for (let
|
|
1616
|
-
let
|
|
1617
|
-
|
|
1626
|
+
let e = [], n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map();
|
|
1627
|
+
for (let i of w.entries()) {
|
|
1628
|
+
let a = i[0], o = i[1].getState();
|
|
1629
|
+
n.set(a, o);
|
|
1630
|
+
let s = i[1].getValue()?.condition;
|
|
1631
|
+
s && (e.push(s), r.set(a, s));
|
|
1618
1632
|
}
|
|
1619
1633
|
return {
|
|
1620
1634
|
finalCondition: qe(...e),
|
|
1621
|
-
activeFilterValues:
|
|
1635
|
+
activeFilterValues: r,
|
|
1636
|
+
filterStates: n
|
|
1622
1637
|
};
|
|
1623
1638
|
}, r[0] = w, r[1] = t3);
|
|
1624
1639
|
let E = t3, t4;
|
|
1625
1640
|
r[2] !== E || r[3] !== p ? (t4 = () => {
|
|
1626
1641
|
if (!p) return;
|
|
1627
|
-
let { finalCondition: e, activeFilterValues: n } = E();
|
|
1628
|
-
p(e, n);
|
|
1642
|
+
let { finalCondition: e, activeFilterValues: n, filterStates: r } = E();
|
|
1643
|
+
p(e, n, r);
|
|
1629
1644
|
}, r[2] = E, r[3] = p, r[4] = t4) : t4 = r[4];
|
|
1630
1645
|
let k = t4, t5;
|
|
1631
1646
|
r[5] === w ? t5 = r[6] : (t5 = () => {
|
|
@@ -3188,8 +3203,8 @@ function View(n) {
|
|
|
3188
3203
|
let r = e(77), i, a, o, s, c, u, f, p, g, _, v, b, x, C;
|
|
3189
3204
|
r[0] === n ? (i = r[1], a = r[2], o = r[3], s = r[4], c = r[5], u = r[6], f = r[7], p = r[8], g = r[9], _ = r[10], v = r[11], b = r[12], x = r[13], C = r[14]) : ({ref: v, fields: c, availableFilters: a, dataSource: o, actionColumn: i, showFilter: b, filterMode: u, pagination: _, enableRowSelection: s, viewTableSetting: C, onClickPrimaryKey: p, onSelectedDataChange: g, loading: f, ...x} = n, r[0] = n, r[1] = i, r[2] = a, r[3] = o, r[4] = s, r[5] = c, r[6] = u, r[7] = f, r[8] = p, r[9] = g, r[10] = _, r[11] = v, r[12] = b, r[13] = x, r[14] = C);
|
|
3190
3205
|
let { page: w, setPage: T, activeFilters: k, setActiveFilters: A, columns: j, setColumns: N, pageSize: P, setPageSize: I, tableSize: L, setTableSize: R, setCondition: z, setSorter: B, selectedCount: V, updateSelectedCount: H } = useViewState(x), { locale: U } = useLocale(), t1;
|
|
3191
|
-
r[15] === z ? t1 = r[16] : (t1 = (e, n) => {
|
|
3192
|
-
z(e, n);
|
|
3206
|
+
r[15] === z ? t1 = r[16] : (t1 = (e, n, r) => {
|
|
3207
|
+
z(e, n, r);
|
|
3193
3208
|
}, r[15] = z, r[16] = t1);
|
|
3194
3209
|
let K = t1, t2;
|
|
3195
3210
|
r[17] !== w || r[18] !== P || r[19] !== T || r[20] !== I ? (t2 = (e, n) => {
|
|
@@ -3359,8 +3374,8 @@ function useViewState(n) {
|
|
|
3359
3374
|
fe(e), L?.(X, e, Y, Z);
|
|
3360
3375
|
}, r[21] = X, r[22] = L, r[23] = Y, r[24] = fe, r[25] = Z, r[26] = t7) : t7 = r[26];
|
|
3361
3376
|
let Se = t7, t8;
|
|
3362
|
-
r[27] !== L || r[28] !== Y || r[29] !== me || r[30] !== fe || r[31] !== Z ? (t8 = (e, n) => {
|
|
3363
|
-
me(e, n), fe(1), L?.(e, 1, Y, Z);
|
|
3377
|
+
r[27] !== L || r[28] !== Y || r[29] !== me || r[30] !== fe || r[31] !== Z ? (t8 = (e, n, r) => {
|
|
3378
|
+
me(e, n, r), fe(1), L?.(e, 1, Y, Z);
|
|
3364
3379
|
}, r[27] = L, r[28] = Y, r[29] = me, r[30] = fe, r[31] = Z, r[32] = t8) : t8 = r[32];
|
|
3365
3380
|
let Ce = t8, t9;
|
|
3366
3381
|
r[33] !== X || r[34] !== L || r[35] !== Y || r[36] !== fe || r[37] !== he ? (t9 = (e) => {
|
|
@@ -4118,23 +4133,30 @@ function useViewerState(n) {
|
|
|
4118
4133
|
});
|
|
4119
4134
|
}, r[39] = v, r[40] = z, r[41] = t13) : t13 = r[41];
|
|
4120
4135
|
let J = t13, t14;
|
|
4121
|
-
r[42] !== I || r[43] !== v || r[44] !== L || r[45] !== V ? (t14 = (e, n) => {
|
|
4136
|
+
r[42] !== I || r[43] !== v || r[44] !== L || r[45] !== V ? (t14 = (e, n, r) => {
|
|
4122
4137
|
V(e);
|
|
4123
|
-
let
|
|
4124
|
-
let
|
|
4125
|
-
return
|
|
4138
|
+
let i = I.map((e) => {
|
|
4139
|
+
let i = n.get(e.key), a = r.get(e.key);
|
|
4140
|
+
return i ? {
|
|
4141
|
+
...e,
|
|
4142
|
+
value: { defaultValue: i.value },
|
|
4143
|
+
operator: { defaultValue: i.operator }
|
|
4144
|
+
} : a?.operator ? {
|
|
4126
4145
|
...e,
|
|
4127
|
-
|
|
4128
|
-
|
|
4146
|
+
operator: {
|
|
4147
|
+
...e.operator,
|
|
4148
|
+
defaultValue: a.operator
|
|
4149
|
+
},
|
|
4150
|
+
value: null
|
|
4129
4151
|
} : {
|
|
4130
4152
|
...e,
|
|
4131
4153
|
value: null
|
|
4132
4154
|
};
|
|
4133
4155
|
});
|
|
4134
|
-
L(
|
|
4156
|
+
L(i), b({
|
|
4135
4157
|
...v,
|
|
4136
4158
|
condition: e,
|
|
4137
|
-
filters:
|
|
4159
|
+
filters: i
|
|
4138
4160
|
});
|
|
4139
4161
|
}, r[42] = I, r[43] = v, r[44] = L, r[45] = V, r[46] = t14) : t14 = r[46];
|
|
4140
4162
|
let ce = t14, t15;
|