mandarina-antd 1.6.0 → 1.6.1
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/build/List/ListFilter.js +6 -3
- package/build/List/ListFilter.js.map +1 -1
- package/build/List/ListFilters.js +15 -1
- package/build/List/ListFilters.js.map +1 -1
- package/build/List/SortableColumns.js +1 -1
- package/build/List/SortableColumns.js.map +1 -1
- package/package.json +1 -1
- package/src/List/ListFilter.tsx +6 -3
- package/src/List/ListFilters.tsx +20 -3
- package/src/List/SortableColumns.tsx +2 -1
package/build/List/ListFilter.js
CHANGED
|
@@ -49,7 +49,7 @@ exports.ListFilter = React.memo(function (_a) {
|
|
|
49
49
|
return FieldComponent && (React.createElement(AutoForm_1.default, { schema: bridge, autosave: true, autosaveDelay: 400, style: { width: 'calc(100% - 4px)' }, onSubmit: function (_a) {
|
|
50
50
|
var filter = _a.filter;
|
|
51
51
|
if (filter)
|
|
52
|
-
filter.internal = true; //this is for avoid rerender, if the filter does not have internal, is because is a external change as clear filters.
|
|
52
|
+
filter.internal = 'true'; //this is for avoid rerender, if the filter does not have internal, is because is a external change as clear filters.
|
|
53
53
|
onFilterChange(field, filter);
|
|
54
54
|
}, onValidate: function (model, error, callback) {
|
|
55
55
|
return callback(null);
|
|
@@ -57,8 +57,11 @@ exports.ListFilter = React.memo(function (_a) {
|
|
|
57
57
|
React.createElement(HiddenField_1.default, { name: 'internal' }),
|
|
58
58
|
React.createElement(FieldComponent, { name: 'filter', label: false, col: false, defaultValue: '' })));
|
|
59
59
|
}, function (prevProps, nextProps) {
|
|
60
|
-
|
|
61
|
-
|
|
60
|
+
var _a;
|
|
61
|
+
if (Object.keys(prevProps.filters).length === 0) {
|
|
62
|
+
return false;
|
|
63
|
+
}
|
|
64
|
+
return ((_a = nextProps.filter) === null || _a === void 0 ? void 0 : _a.internal) === 'true' && nextProps.field === prevProps.field && nextProps.schema === prevProps.schema;
|
|
62
65
|
});
|
|
63
66
|
exports.default = exports.ListFilter;
|
|
64
67
|
//# sourceMappingURL=ListFilter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ListFilter.js","sourceRoot":"","sources":["../../src/List/ListFilter.tsx"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA+B;AAC/B,oEAA8C;AAC9C,uCAAiC;AACjC,oCAAiC;AACjC,6CAAkD;AAElD,4DAA4D;AAC5D,0EAAoD;AAEvC,QAAA,IAAI,GAAG,cAAM,OAAA,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAA/D,CAA+D,CAAA;
|
|
1
|
+
{"version":3,"file":"ListFilter.js","sourceRoot":"","sources":["../../src/List/ListFilter.tsx"],"names":[],"mappings":"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"}
|
|
@@ -129,7 +129,8 @@ exports.getDefaultComponent = function (fieldDefinition) {
|
|
|
129
129
|
})));
|
|
130
130
|
var operator = (availableOperators.length > 1) ? (react_1.default.createElement(dropdown_1.default, { overlay: options },
|
|
131
131
|
react_1.default.createElement("a", { className: "ant-dropdown-link" }, exports.AllOperators[selected].symbol))) : undefined;
|
|
132
|
-
var type = fieldDefinition.type;
|
|
132
|
+
var type = fieldDefinition.type, validators = fieldDefinition.validators;
|
|
133
|
+
var hasOptions = utils_1.hasValidator(validators, 'isAllowed');
|
|
133
134
|
switch (true) {
|
|
134
135
|
case (type === mandarina_1.Integer):
|
|
135
136
|
return (react_1.default.createElement("span", { className: "ant-input-wrapper ant-input-group" },
|
|
@@ -164,6 +165,19 @@ exports.getDefaultComponent = function (fieldDefinition) {
|
|
|
164
165
|
} },
|
|
165
166
|
react_1.default.createElement(Option, { value: 'true' }, "Yes"),
|
|
166
167
|
react_1.default.createElement(Option, { value: 'false' }, "No")));
|
|
168
|
+
case (type === String && hasOptions):
|
|
169
|
+
var isAllowed = validators.find(function (validator) { return validator.validatorName === 'isAllowed'; });
|
|
170
|
+
if (!isAllowed) {
|
|
171
|
+
return null;
|
|
172
|
+
}
|
|
173
|
+
return (react_1.default.createElement(select_1.default, { value: value.filter, allowClear: true, style: { width: '100%' }, onChange: function (value) {
|
|
174
|
+
if (!value)
|
|
175
|
+
return onChange(null);
|
|
176
|
+
onChange({
|
|
177
|
+
operator: selected,
|
|
178
|
+
filter: value
|
|
179
|
+
});
|
|
180
|
+
} }, isAllowed.param.map(function (param) { return react_1.default.createElement(Option, { value: param }, param); })));
|
|
167
181
|
default:
|
|
168
182
|
return react_1.default.createElement(input_1.default, { addonBefore: operator, value: value.filter, style: { width: '100%' }, onChange: function (_a) {
|
|
169
183
|
var value = _a.target.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ListFilters.js","sourceRoot":"","sources":["../../src/List/ListFilters.tsx"],"names":[],"mappings":";;;;;;;;;;;;AAEA,iCAAgD;AAChD,uEAAgD;AAChD,qEAA8C;AAC9C,+DAAyC;AACzC,yDAAmC;AACnC,uEAAgD;AAChD,uDAAiC;AACjC,6CAAsC;AACtC,uCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"ListFilters.js","sourceRoot":"","sources":["../../src/List/ListFilters.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ exports.SortableColumn = react_sortable_hoc_1.SortableElement(function (_a) {
|
|
|
16
16
|
react_1.default.createElement("div", null,
|
|
17
17
|
title,
|
|
18
18
|
!noSort && react_1.default.createElement(SortButton_1.default, { onSortChange: onSortChange, field: field, sort: sort })),
|
|
19
|
-
filter && react_1.default.createElement(ListFilter_1.default, { onFilterChange: onFilterChange, field: field, filter: filters
|
|
19
|
+
filter && react_1.default.createElement(ListFilter_1.default, { onFilterChange: onFilterChange, field: field, filters: filters, filter: filters === null || filters === void 0 ? void 0 : filters[field], schema: schema }),
|
|
20
20
|
react_1.default.createElement(HideColumn_1.default, { onHide: function () { return onHideColumn(field, columnIndex); } })));
|
|
21
21
|
});
|
|
22
22
|
exports.SortableColumns = react_sortable_hoc_1.SortableContainer(function (_a) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SortableColumns.js","sourceRoot":"","sources":["../../src/List/SortableColumns.tsx"],"names":[],"mappings":";;;;;AAAA,gDAAyD;AACzD,4DAAsC;AACtC,4DAAsD;AACtD,4DAAwD;AACxD,yDAAsE;AAGtE,aAAa;AACb,mDAAiE;AAwBpD,QAAA,cAAc,GAAG,oCAAe,CAAC,UAAC,EAA8K;QAA7K,4BAAW,EAAE,cAA6C,EAApC,gBAAK,EAAE,gBAAK,EAAE,kBAAM,EAAE,kBAAM,EAAE,gBAAK,EAAG,cAAI,EAAE,oBAAO,EAAE,kBAAM,EAAE,8BAAY,EAAE,8BAAY,EAAE,kCAAc,EAAE,8BAAY,EAAE,kBAAM;IAC3L,OAAO,CACH,8BAAC,8BAAY,IACT,SAAS,EAAE,8EAA8E,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EACrH,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EACpB,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,UAAC,CAAiB,EAAE,IAAwB,IAAK,OAAA,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,EAAjD,CAAiD;QAChH;YACK,KAAK;YACL,CAAC,MAAM,IAAI,8BAAC,oBAAU,IAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAG,CAC7E;QAEL,MAAM,IAAI,8BAAC,oBAAU,IAAC,cAAc,EAAE,cAAc,EAC9B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"SortableColumns.js","sourceRoot":"","sources":["../../src/List/SortableColumns.tsx"],"names":[],"mappings":";;;;;AAAA,gDAAyD;AACzD,4DAAsC;AACtC,4DAAsD;AACtD,4DAAwD;AACxD,yDAAsE;AAGtE,aAAa;AACb,mDAAiE;AAwBpD,QAAA,cAAc,GAAG,oCAAe,CAAC,UAAC,EAA8K;QAA7K,4BAAW,EAAE,cAA6C,EAApC,gBAAK,EAAE,gBAAK,EAAE,kBAAM,EAAE,kBAAM,EAAE,gBAAK,EAAG,cAAI,EAAE,oBAAO,EAAE,kBAAM,EAAE,8BAAY,EAAE,8BAAY,EAAE,kCAAc,EAAE,8BAAY,EAAE,kBAAM;IAC3L,OAAO,CACH,8BAAC,8BAAY,IACT,SAAS,EAAE,8EAA8E,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EACrH,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EACpB,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,UAAC,CAAiB,EAAE,IAAwB,IAAK,OAAA,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,EAAjD,CAAiD;QAChH;YACK,KAAK;YACL,CAAC,MAAM,IAAI,8BAAC,oBAAU,IAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAG,CAC7E;QAEL,MAAM,IAAI,8BAAC,oBAAU,IAAC,cAAc,EAAE,cAAc,EAC9B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,KAAK,GACvB,MAAM,EAAE,MAAM,GAAG;QACvC,8BAAC,oBAAU,IAAC,MAAM,EAAE,cAAM,OAAA,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,EAAhC,CAAgC,GAAG,CAEnD,CAClB,CAAC;AACN,CAAC,CACJ,CAAA;AAEY,QAAA,eAAe,GAAG,sCAAiB,CAAC,UAAC,EAAmE;QAAlE,sBAAQ,EAAC,kBAAM,EAAC,gBAAK,EAAE,gBAAK,EAAC,cAAI;IAChF,OAAO,uCAAK,SAAS,EAAE,2BAA2B,EACtC,OAAO,EAAI,UAAC,CAAC;YACT,KAAK,CAAC,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,GAAG,CAAC,CAAC,MAAM,CAAA;YAC9D,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,EAAC,CAAC,CAAA;QAC3E,CAAC,EACD,KAAK,EAAE,EAAC,MAAM,QAAA,EAAC,IACtB,QAAQ,CACP,CAAA;AACV,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
package/src/List/ListFilter.tsx
CHANGED
|
@@ -20,6 +20,7 @@ interface ListFilterProps {
|
|
|
20
20
|
field: string,
|
|
21
21
|
schema: Schema
|
|
22
22
|
filter?: any
|
|
23
|
+
filters?: any
|
|
23
24
|
}
|
|
24
25
|
|
|
25
26
|
export const ListFilter = React.memo(({onFilterChange, field, filter, schema}: ListFilterProps) => {
|
|
@@ -48,7 +49,7 @@ export const ListFilter = React.memo(({onFilterChange, field, filter, schema}: L
|
|
|
48
49
|
<AutoForm schema={bridge} autosave autosaveDelay={400}
|
|
49
50
|
style={{width: 'calc(100% - 4px)'}}
|
|
50
51
|
onSubmit={({filter}: { filter: any }) => {
|
|
51
|
-
if (filter) filter.internal = true //this is for avoid rerender, if the filter does not have internal, is because is a external change as clear filters.
|
|
52
|
+
if (filter) filter.internal = 'true' //this is for avoid rerender, if the filter does not have internal, is because is a external change as clear filters.
|
|
52
53
|
onFilterChange(field, filter)
|
|
53
54
|
}}
|
|
54
55
|
onValidate={(model: any, error: any, callback: (error: any) => void) => {
|
|
@@ -62,8 +63,10 @@ export const ListFilter = React.memo(({onFilterChange, field, filter, schema}: L
|
|
|
62
63
|
)
|
|
63
64
|
},
|
|
64
65
|
(prevProps, nextProps) => {
|
|
65
|
-
|
|
66
|
-
|
|
66
|
+
if (Object.keys(prevProps.filters).length===0) {
|
|
67
|
+
return false
|
|
68
|
+
}
|
|
69
|
+
return nextProps.filter?.internal==='true' && nextProps.field === prevProps.field && nextProps.schema === prevProps.schema
|
|
67
70
|
}
|
|
68
71
|
)
|
|
69
72
|
|
package/src/List/ListFilters.tsx
CHANGED
|
@@ -9,8 +9,9 @@ import InputNumber from "antd/lib/input-number";
|
|
|
9
9
|
import Menu from "antd/lib/menu";
|
|
10
10
|
import React, {useState} from "react";
|
|
11
11
|
import {Integer, Schema} from "mandarina";
|
|
12
|
-
import {forceType} from "mandarina/build/Schema/utils";
|
|
12
|
+
import {forceType, hasValidator} from "mandarina/build/Schema/utils";
|
|
13
13
|
import Select from "antd/lib/select";
|
|
14
|
+
import {Validator} from "mandarina/build/Schema/ValidatorCreator";
|
|
14
15
|
const { Option } = Select;
|
|
15
16
|
|
|
16
17
|
export const AllOperators: { [subfix: string]: { description: string, symbol: string } } = {
|
|
@@ -128,9 +129,9 @@ export const getDefaultComponent = ( fieldDefinition: FieldDefinitionNative): Fi
|
|
|
128
129
|
</a>
|
|
129
130
|
</Dropdown>
|
|
130
131
|
) : undefined
|
|
131
|
-
let type = fieldDefinition
|
|
132
|
-
|
|
132
|
+
let {type, validators} = fieldDefinition
|
|
133
133
|
|
|
134
|
+
const hasOptions= hasValidator(validators,'isAllowed')
|
|
134
135
|
switch (true) {
|
|
135
136
|
|
|
136
137
|
case (type === Integer):
|
|
@@ -190,6 +191,22 @@ export const getDefaultComponent = ( fieldDefinition: FieldDefinitionNative): Fi
|
|
|
190
191
|
|
|
191
192
|
</Select>
|
|
192
193
|
)
|
|
194
|
+
case (type === String && hasOptions):
|
|
195
|
+
const isAllowed=validators.find((validator:Validator)=>validator.validatorName==='isAllowed')
|
|
196
|
+
if (!isAllowed){
|
|
197
|
+
return null
|
|
198
|
+
}
|
|
199
|
+
return (
|
|
200
|
+
<Select value={value.filter} allowClear style={{width: '100%'}} onChange={(value:any)=>{
|
|
201
|
+
if (!value) return onChange(null)
|
|
202
|
+
onChange({
|
|
203
|
+
operator: selected,
|
|
204
|
+
filter: value
|
|
205
|
+
})
|
|
206
|
+
}}>
|
|
207
|
+
{isAllowed.param.map((param: string)=><Option value={param}>{param}</Option>)}
|
|
208
|
+
</Select>
|
|
209
|
+
)
|
|
193
210
|
default:
|
|
194
211
|
return <Input addonBefore={operator} value={value.filter} style={{width: '100%'}}
|
|
195
212
|
onChange={({target: {value}}) => value ? onChange({
|
|
@@ -46,7 +46,8 @@ export const SortableColumn = SortableElement(({columnIndex, column: {title, fie
|
|
|
46
46
|
|
|
47
47
|
{filter && <ListFilter onFilterChange={onFilterChange}
|
|
48
48
|
field={field}
|
|
49
|
-
|
|
49
|
+
filters={filters}
|
|
50
|
+
filter={filters?.[field]}
|
|
50
51
|
schema={schema}/>}
|
|
51
52
|
{<HideColumn onHide={() => onHideColumn(field, columnIndex)}/>}
|
|
52
53
|
|