eztech-core-components 1.0.68 → 1.0.69
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/package.json +1 -1
- package/utils/table-helper.js +14 -3
package/package.json
CHANGED
package/utils/table-helper.js
CHANGED
|
@@ -1551,8 +1551,18 @@ export const getAsyncData = async ({
|
|
|
1551
1551
|
}
|
|
1552
1552
|
}
|
|
1553
1553
|
if (col.columns && col.columns.length > 0 && !conf.tableHidden) {
|
|
1554
|
-
const searchStringTables = [
|
|
1555
|
-
|
|
1554
|
+
const searchStringTables = [
|
|
1555
|
+
'firearm_gun',
|
|
1556
|
+
'cstm_crime_places'
|
|
1557
|
+
]
|
|
1558
|
+
const searchStringFields = [
|
|
1559
|
+
'model_id',
|
|
1560
|
+
'calibre_id',
|
|
1561
|
+
'expert_id'
|
|
1562
|
+
]
|
|
1563
|
+
const searchAllStringFields = [
|
|
1564
|
+
'position_id'
|
|
1565
|
+
]
|
|
1556
1566
|
conf.columns = getColumns(col.columns, parentKeys.concat(col.col_field), parentFields[col.col_field] || {})
|
|
1557
1567
|
const showChildColumn = conf.columns?.filter(c => !c.tableHidden && !['color', 'is_ping', 'code'].includes(c.col_field))
|
|
1558
1568
|
conf.hasChildren = showChildColumn.length > 1
|
|
@@ -1577,11 +1587,12 @@ export const getAsyncData = async ({
|
|
|
1577
1587
|
conf.props.width = get(confChild, 'props.width')
|
|
1578
1588
|
conf.props['min-width'] = get(confChild, 'props.min-width')
|
|
1579
1589
|
}
|
|
1580
|
-
if (searchStringTables.includes(table?.name) && searchStringFields.includes(col.col_field)) {
|
|
1590
|
+
if ((searchStringTables.includes(table?.name) && searchStringFields.includes(col.col_field)) || searchAllStringFields.includes(col.col_field)) {
|
|
1581
1591
|
conf.search_type = confChild?.col_type
|
|
1582
1592
|
conf.search_key = confChild?.col_key
|
|
1583
1593
|
conf.search_op = 'start'
|
|
1584
1594
|
}
|
|
1595
|
+
|
|
1585
1596
|
// if (['created_by'].includes(conf.col_key)) {
|
|
1586
1597
|
// conf.child_key = `${conf.col_key}.full_name`
|
|
1587
1598
|
// conf.search_type = 'string'
|