es-grid-template 1.8.26 → 1.8.27
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.
|
@@ -15,5 +15,7 @@ interface UseColumnsConfig<RecordType> {
|
|
|
15
15
|
rowKey?: any;
|
|
16
16
|
onMouseHover?: any;
|
|
17
17
|
}
|
|
18
|
-
declare const useColumns: <RecordType extends AnyObject = AnyObject>(config: UseColumnsConfig<RecordType>) => readonly [
|
|
18
|
+
declare const useColumns: <RecordType extends AnyObject = AnyObject>(config: UseColumnsConfig<RecordType>) => readonly [
|
|
19
|
+
any
|
|
20
|
+
];
|
|
19
21
|
export default useColumns;
|
|
@@ -144,7 +144,10 @@ const TableHeadCell2 = props => {
|
|
|
144
144
|
destroyPopupOnHide: true,
|
|
145
145
|
dropdownRender: () => {
|
|
146
146
|
const type = getTypeFilter(originalColumn);
|
|
147
|
-
|
|
147
|
+
|
|
148
|
+
// const operatorValue = (column.getFilterOperator() ?? getDefaultOperator(originalColumn)) as string
|
|
149
|
+
|
|
150
|
+
const operatorValue = header.column.getFilterOperator() ?? getDefaultOperator(column.columnDef?.meta ?? {});
|
|
148
151
|
const operatorOptions = ['Checkbox', 'Dropdown', 'DropTree', 'CheckboxDropdown'].includes(type) ? booleanOperator : !type || type === 'Text' ? stringOperator : numberOperator;
|
|
149
152
|
return /*#__PURE__*/React.createElement("div", {
|
|
150
153
|
// className='ui-rc-table-filter-dropdown'
|
|
@@ -156,7 +159,7 @@ const TableHeadCell2 = props => {
|
|
|
156
159
|
minWidth: 275,
|
|
157
160
|
padding: '8px'
|
|
158
161
|
}
|
|
159
|
-
}, /*#__PURE__*/React.createElement("div", null), column.meta?.showOperator !== false && column.meta?.typeFilter !== 'DateRange' && column.meta?.typeFilter !== 'NumberRange' && /*#__PURE__*/React.createElement("div", {
|
|
162
|
+
}, /*#__PURE__*/React.createElement("div", null), column.columnDef.meta?.showOperator !== false && column.columnDef.meta?.typeFilter !== 'DateRange' && column.columnDef.meta?.typeFilter !== 'NumberRange' && /*#__PURE__*/React.createElement("div", {
|
|
160
163
|
className: 'mb-1'
|
|
161
164
|
}, /*#__PURE__*/React.createElement(Select, {
|
|
162
165
|
options: translateOption(operatorOptions, t),
|
|
@@ -15,5 +15,7 @@ interface UseColumnsConfig<RecordType> {
|
|
|
15
15
|
rowKey?: any;
|
|
16
16
|
onMouseHover?: any;
|
|
17
17
|
}
|
|
18
|
-
declare const useColumns: <RecordType extends AnyObject = AnyObject>(config: UseColumnsConfig<RecordType>) => readonly [
|
|
18
|
+
declare const useColumns: <RecordType extends AnyObject = AnyObject>(config: UseColumnsConfig<RecordType>) => readonly [
|
|
19
|
+
any
|
|
20
|
+
];
|
|
19
21
|
export default useColumns;
|
|
@@ -153,7 +153,10 @@ const TableHeadCell2 = props => {
|
|
|
153
153
|
destroyPopupOnHide: true,
|
|
154
154
|
dropdownRender: () => {
|
|
155
155
|
const type = (0, _utils.getTypeFilter)(originalColumn);
|
|
156
|
-
|
|
156
|
+
|
|
157
|
+
// const operatorValue = (column.getFilterOperator() ?? getDefaultOperator(originalColumn)) as string
|
|
158
|
+
|
|
159
|
+
const operatorValue = header.column.getFilterOperator() ?? (0, _utils.getDefaultOperator)(column.columnDef?.meta ?? {});
|
|
157
160
|
const operatorOptions = ['Checkbox', 'Dropdown', 'DropTree', 'CheckboxDropdown'].includes(type) ? _constant.booleanOperator : !type || type === 'Text' ? _constant.stringOperator : _constant.numberOperator;
|
|
158
161
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
159
162
|
// className='ui-rc-table-filter-dropdown'
|
|
@@ -165,7 +168,7 @@ const TableHeadCell2 = props => {
|
|
|
165
168
|
minWidth: 275,
|
|
166
169
|
padding: '8px'
|
|
167
170
|
}
|
|
168
|
-
}, /*#__PURE__*/_react.default.createElement("div", null), column.meta?.showOperator !== false && column.meta?.typeFilter !== 'DateRange' && column.meta?.typeFilter !== 'NumberRange' && /*#__PURE__*/_react.default.createElement("div", {
|
|
171
|
+
}, /*#__PURE__*/_react.default.createElement("div", null), column.columnDef.meta?.showOperator !== false && column.columnDef.meta?.typeFilter !== 'DateRange' && column.columnDef.meta?.typeFilter !== 'NumberRange' && /*#__PURE__*/_react.default.createElement("div", {
|
|
169
172
|
className: 'mb-1'
|
|
170
173
|
}, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Select, {
|
|
171
174
|
options: (0, _constant.translateOption)(operatorOptions, t),
|