diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj index 2b0f2f55..8445307e 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/frontend/admin/src/components/scTable/index.vue b/src/frontend/admin/src/components/scTable/index.vue index 93ba68ae..ffcae46f 100644 --- a/src/frontend/admin/src/components/scTable/index.vue +++ b/src/frontend/admin/src/components/scTable/index.vue @@ -177,6 +177,13 @@ + + { - const value = data.value?.split('\n') ?? [''] - this.vue.query.dynamicFilter.filters.push({ - field: data.field, - operator: data.operator, - value: value.length === 1 ? value[0] : value, - }) - if (this.onCommand) { - this.onCommand(this.vue.query.dynamicFilter.filters) - } + if (kv[1].indexOf('order-') === 0) { + this.vue.query.prop = kv[0] + this.vue.query.order = kv[1].substring(6) this.upData() - }) + } else { + this.$refs.fieldFilterDialog.open({ field: kv[0], operator: kv[1], value: kv[2] }, (data) => { + const value = data.value?.split('\n') ?? [''] + this.vue.query.dynamicFilter.filters.push({ + field: data.field, + operator: data.operator, + value: value.length === 1 ? value[0] : value, + }) + if (this.onCommand) { + this.onCommand(this.vue.query.dynamicFilter.filters) + } + this.upData() + }) + } }, contextMenuVisibleChange(visible) { if (!visible) { diff --git a/src/frontend/admin/src/locales/lang/en.js b/src/frontend/admin/src/locales/lang/en.js index 79394a4c..d854164e 100644 --- a/src/frontend/admin/src/locales/lang/en.js +++ b/src/frontend/admin/src/locales/lang/en.js @@ -624,4 +624,6 @@ export default { 链接: 'Link', 框架: 'IFrame', 按钮: 'Button', + 倒序排序:'Sort-Descending', + 顺序排序:'Sort-Ascending', } \ No newline at end of file diff --git a/src/frontend/admin/src/locales/lang/zh-cn.js b/src/frontend/admin/src/locales/lang/zh-cn.js index e45247a8..eafef7f2 100644 --- a/src/frontend/admin/src/locales/lang/zh-cn.js +++ b/src/frontend/admin/src/locales/lang/zh-cn.js @@ -622,4 +622,6 @@ export default { 链接: '链接', 框架: '框架', 按钮: '按钮', + 倒序排序:'倒序排序', + 顺序排序:'顺序排序', } \ No newline at end of file