diff --git a/Dockerfile b/Dockerfile index f7fb4ad1..3ed09ead 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0.0-preview.5 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0.0-preview.6 AS base WORKDIR /app EXPOSE 8080 RUN apt update diff --git a/scripts/switcher.freesql.json b/scripts/switcher.freesql.json index 57304cfb..eabab32a 100644 --- a/scripts/switcher.freesql.json +++ b/scripts/switcher.freesql.json @@ -10,11 +10,11 @@ "packages": [ { "packageName": "FreeSql.NS", - "version": "3.2.821-ns1" + "version": "3.2.833-preview20260627-ns1" }, { "packageName": "FreeSql.DbContext.NS", - "version": "3.2.821-ns1" + "version": "3.2.833-preview20260627-ns1" } ] } diff --git a/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj b/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj index 3908de65..164b150a 100644 --- a/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj +++ b/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj @@ -10,10 +10,10 @@ - + - + \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj index 91d5392e..5a816980 100644 --- a/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj +++ b/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj @@ -6,15 +6,15 @@ - - + + - + diff --git a/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj b/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj index 11dde67b..2e0a96f1 100644 --- a/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj +++ b/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj @@ -4,7 +4,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/frontend/admin/src/components/scTableSelect/index.vue b/src/frontend/admin/src/components/scTableSelect/index.vue index a3a10b6c..a1774739 100644 --- a/src/frontend/admin/src/components/scTableSelect/index.vue +++ b/src/frontend/admin/src/components/scTableSelect/index.vue @@ -65,7 +65,7 @@ import config from '@/config/tableSelect' export default { props: { modelValue: null, - apiObj: { + queryApi: { type: Object, default: () => {}, }, @@ -143,7 +143,7 @@ export default { [this.defaultProps.keyword]: this.keyword, } Object.assign(reqData, this.params, this.formData) - const res = await this.apiObj.post(reqData) + const res = await this.queryApi.post(reqData) const parseData = config.parseData(res) this.tableData = parseData.rows ?? [] this.total = parseData.total diff --git a/src/frontend/admin/src/views/sys/config/index.vue b/src/frontend/admin/src/views/sys/config/index.vue index 565a4fd6..32132c04 100644 --- a/src/frontend/admin/src/views/sys/config/index.vue +++ b/src/frontend/admin/src/views/sys/config/index.vue @@ -19,12 +19,7 @@
- +
@@ -122,6 +117,11 @@ export default { if (this.keywords) { this.query.keywords = this.keywords } + this.query.dynamicFilter.filters.push({ + field: 'enabled', + operator: 'eq', + value: true, + }) }, data() { return { @@ -189,6 +189,12 @@ export default { } this.$refs.table.refresh() }, + //重置 + onReset() { + Object.entries(this.$refs.selectFilter.selected).forEach(([key, _]) => (this.$refs.selectFilter.selected[key] = [''])) + this.$refs.selectFilter.selected['enabled'] = [true] + }, + //搜索 onSearch(form) { if (Array.isArray(form.dy.createdTime)) { this.query.dynamicFilter.filters.push({ @@ -218,6 +224,12 @@ export default { type: 'root', }) } + this.$refs.search.keeps.push({ + field: 'enabled', + value: true, + type: 'dy', + }) + this.onReset() }, props: ['keywords'], watch: {}, diff --git a/src/frontend/admin/src/views/sys/dept/index.vue b/src/frontend/admin/src/views/sys/dept/index.vue index 214e0dc2..26b258f3 100644 --- a/src/frontend/admin/src/views/sys/dept/index.vue +++ b/src/frontend/admin/src/views/sys/dept/index.vue @@ -29,7 +29,7 @@ }, ]" :vue="this" - @reset="Object.entries(this.$refs.selectFilter.selected).forEach(([key, _]) => (this.$refs.selectFilter.selected[key] = ['']))" + @reset="onReset" @search="onSearch" ref="search" />
@@ -128,6 +128,11 @@ export default { if (this.keywords) { this.query.keywords = this.keywords } + this.query.dynamicFilter.filters.push({ + field: 'enabled', + operator: 'eq', + value: true, + }) }, data() { return { @@ -195,6 +200,12 @@ export default { } this.$refs.table.refresh() }, + //重置 + onReset() { + Object.entries(this.$refs.selectFilter.selected).forEach(([key, _]) => (this.$refs.selectFilter.selected[key] = [''])) + this.$refs.selectFilter.selected['enabled'] = [true] + }, + //搜索 onSearch(form) { if (Array.isArray(form.dy.createdTime)) { this.query.dynamicFilter.filters.push({ @@ -224,6 +235,12 @@ export default { type: 'root', }) } + this.$refs.search.keeps.push({ + field: 'enabled', + value: true, + type: 'dy', + }) + this.onReset() }, props: ['keywords'], watch: {}, diff --git a/src/frontend/admin/src/views/sys/job/all/index.vue b/src/frontend/admin/src/views/sys/job/all/index.vue index ba6454ae..fbb12087 100644 --- a/src/frontend/admin/src/views/sys/job/all/index.vue +++ b/src/frontend/admin/src/views/sys/job/all/index.vue @@ -48,7 +48,7 @@ }, ]" :vue="this" - @reset="Object.entries(this.$refs.selectFilter.selected).forEach(([key, _]) => (this.$refs.selectFilter.selected[key] = ['']))" + @reset="onReset" @search="onSearch" ref="search" /> @@ -228,6 +228,11 @@ export default { if (this.keywords || this.$route.query.keywords) { this.query.keywords = this.keywords || this.$route.query.keywords } + this.query.dynamicFilter.filters.push({ + field: 'enabled', + operator: 'eq', + value: true, + }) }, data() { return { @@ -319,6 +324,12 @@ export default { } this.$refs.table.refresh() }, + //重置 + onReset() { + Object.entries(this.$refs.selectFilter.selected).forEach(([key, _]) => (this.$refs.selectFilter.selected[key] = [''])) + this.$refs.selectFilter.selected['enabled'] = [true] + }, + //搜索 onSearch(form) { if (Array.isArray(form.dy.createdTime)) { this.query.dynamicFilter.filters.push({ @@ -363,6 +374,12 @@ export default { type: 'root', }) } + this.$refs.search.keeps.push({ + field: 'enabled', + value: true, + type: 'dy', + }) + this.onReset() }, props: ['keywords'], watch: {}, diff --git a/src/frontend/admin/src/views/sys/role/index.vue b/src/frontend/admin/src/views/sys/role/index.vue index 55cd12fc..c32df270 100644 --- a/src/frontend/admin/src/views/sys/role/index.vue +++ b/src/frontend/admin/src/views/sys/role/index.vue @@ -47,7 +47,7 @@ }, ]" :vue="this" - @reset="Object.entries(this.$refs.selectFilter.selected).forEach(([key, _]) => (this.$refs.selectFilter.selected[key] = ['']))" + @reset="onReset" @search="onSearch" ref="search" /> @@ -174,6 +174,11 @@ export default { if (this.keywords) { this.query.keywords = this.keywords } + this.query.dynamicFilter.filters.push({ + field: 'enabled', + operator: 'eq', + value: true, + }) }, data() { return { @@ -265,6 +270,12 @@ export default { } this.$refs.table.refresh() }, + //重置 + onReset() { + Object.entries(this.$refs.selectFilter.selected).forEach(([key, _]) => (this.$refs.selectFilter.selected[key] = [''])) + this.$refs.selectFilter.selected['enabled'] = [true] + }, + //搜索 onSearch(form) { if (Array.isArray(form.dy.createdTime)) { this.query.dynamicFilter.filters.push({ @@ -309,6 +320,12 @@ export default { type: 'root', }) } + this.$refs.search.keeps.push({ + field: 'enabled', + value: true, + type: 'dy', + }) + this.onReset() }, props: ['keywords'], watch: {}, diff --git a/src/frontend/admin/src/views/sys/user/index.vue b/src/frontend/admin/src/views/sys/user/index.vue index ed78d29c..2e58f15b 100644 --- a/src/frontend/admin/src/views/sys/user/index.vue +++ b/src/frontend/admin/src/views/sys/user/index.vue @@ -45,7 +45,7 @@ }, ]" :vue="this" - @reset="Object.entries(this.$refs.selectFilter.selected).forEach(([key, _]) => (this.$refs.selectFilter.selected[key] = ['']))" + @reset="onReset" @search="onSearch" ref="search" /> @@ -158,6 +158,11 @@ export default { if (this.deptId) { this.query.filter.deptId = this.deptId } + this.query.dynamicFilter.filters.push({ + field: 'enabled', + operator: 'eq', + value: true, + }) }, data() { return { @@ -216,6 +221,12 @@ export default { }) this.$refs.search.search() }, + //重置 + onReset() { + Object.entries(this.$refs.selectFilter.selected).forEach(([key, _]) => (this.$refs.selectFilter.selected[key] = [''])) + this.$refs.selectFilter.selected['enabled'] = [true] + }, + //搜索 onSearch(form) { if (Array.isArray(form.dy.createdTime)) { this.query.dynamicFilter.filters.push({ @@ -245,6 +256,12 @@ export default { type: 'root', }) } + this.$refs.search.keeps.push({ + field: 'enabled', + value: true, + type: 'dy', + }) + this.onReset() }, props: ['keywords', 'roleId', 'deptId'], watch: {},