diff --git a/backend/dvadmin/utils/filters.py b/backend/dvadmin/utils/filters.py index 88e3523..ad3d056 100644 --- a/backend/dvadmin/utils/filters.py +++ b/backend/dvadmin/utils/filters.py @@ -336,13 +336,16 @@ class CustomDjangoFilterBackend(DjangoFilterBackend): return queryset if filterset.__class__.__name__ == "AutoFilterSet": queryset = filterset.queryset + filter_fields = filterset.filters if self.filter_fields == "__all__" else self.filter_fields orm_lookup_dict = dict( zip( - [field for field in self.filter_fields], + [field for field in filter_fields], [filterset.filters[lookup].lookup_expr for lookup in filterset.filters.keys()], ) ) - orm_lookups = [self.construct_search(lookup, lookup_expr) for lookup, lookup_expr in orm_lookup_dict.items()] + orm_lookups = [ + self.construct_search(lookup, lookup_expr) for lookup, lookup_expr in orm_lookup_dict.items() + ] # print(orm_lookups) conditions = [] queries = [] diff --git a/web/src/components/tree-selector/lib/tree-selector.vue b/web/src/components/tree-selector/lib/tree-selector.vue index 8afb985..392f26f 100644 --- a/web/src/components/tree-selector/lib/tree-selector.vue +++ b/web/src/components/tree-selector/lib/tree-selector.vue @@ -306,7 +306,7 @@ export default { }, itemClosed (item) { const newNodes = lodash.without(this.selected, item) - console.log('new value', item, newNodes) + // console.log('new value', item, newNodes) this.$set(this, 'selected', newNodes) this.doValueInputChanged(newNodes) }, diff --git a/web/src/views/system/areas/crud.js b/web/src/views/system/areas/crud.js index 7f71b32..ce5addc 100644 --- a/web/src/views/system/areas/crud.js +++ b/web/src/views/system/areas/crud.js @@ -97,6 +97,11 @@ export const crudOptions = (vm) => { // label: 'name', // 数据字典中label字段的属性名 // children: 'children' // 数据字典中children字段的属性名 // }, + valueResolve (row, key) { + if (row.pcode === null) { + row.pcode = undefined + } + }, form: { component: { showAllLevels: false, // 仅显示最后一级