参数配置页面增加分组编码查询

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -509,7 +509,7 @@
         </member>
         <member name="P:Admin.NET.Core.SysConfig.GroupCode">
             <summary>
-            常量所属分类的编码
+            分组编码
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysConfig.Order">
@@ -4593,6 +4593,11 @@
             编码
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.Service.PageConfigInput.GroupCode">
+            <summary>
+            分组编码
+            </summary>
+        </member>
         <member name="T:Admin.NET.Core.Service.SysConfigService">
             <summary>
             系统参数配置服务

Admin.NET/Admin.NET.Core/Entity/SysConfig.cs

@@ -34,9 +34,9 @@ public class SysConfig : EntityBase
     public YesNoEnum SysFlag { get; set; }
 
     /// <summary>
-    /// 常量所属分类的编码
+    /// 分组编码
     /// </summary>
-    [SugarColumn(ColumnDescription = "常量所属分类的编码", Length = 64)]
+    [SugarColumn(ColumnDescription = "分组编码", Length = 64)]
     [MaxLength(64)]
     public string GroupCode { get; set; }
 

Admin.NET/Admin.NET.Core/Service/Config/Dto/ConfigInput.cs

@@ -15,6 +15,11 @@ public class PageConfigInput : BasePageInput
     /// 编码
     /// </summary>
     public string Code { get; set; }
+
+    /// <summary>
+    /// 分组编码
+    /// </summary>
+    public string GroupCode { get; set; }
 }
 
 [NotTable]

Web/src/api-services/apis/sys-config-api.ts

@@ -196,6 +196,7 @@ export const SysConfigApiAxiosParamCreator = function (configuration?: Configura
          * @summary 获取参数配置分页列表
          * @param {string} [name] 名称
          * @param {string} [code] 编码
+         * @param {string} [groupCode] 分组编码
          * @param {number} [page] 当前页码
          * @param {number} [pageSize] 页码容量
          * @param {string} [field] 排序字段
@@ -204,7 +205,7 @@ export const SysConfigApiAxiosParamCreator = function (configuration?: Configura
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        sysConfigPageGet: async (name?: string, code?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysConfigPageGet: async (name?: string, code?: string, groupCode?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/sysConfig/page`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -226,6 +227,10 @@ export const SysConfigApiAxiosParamCreator = function (configuration?: Configura
                 localVarQueryParameter['Code'] = code;
             }
 
+            if (groupCode !== undefined) {
+                localVarQueryParameter['GroupCode'] = groupCode;
+            }
+
             if (page !== undefined) {
                 localVarQueryParameter['Page'] = page;
             }
@@ -372,6 +377,7 @@ export const SysConfigApiFp = function(configuration?: Configuration) {
          * @summary 获取参数配置分页列表
          * @param {string} [name] 名称
          * @param {string} [code] 编码
+         * @param {string} [groupCode] 分组编码
          * @param {number} [page] 当前页码
          * @param {number} [pageSize] 页码容量
          * @param {string} [field] 排序字段
@@ -380,8 +386,8 @@ export const SysConfigApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysConfigPageGet(name?: string, code?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSqlSugarPagedListSysConfig>>> {
-            const localVarAxiosArgs = await SysConfigApiAxiosParamCreator(configuration).sysConfigPageGet(name, code, page, pageSize, field, order, descStr, options);
+        async sysConfigPageGet(name?: string, code?: string, groupCode?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSqlSugarPagedListSysConfig>>> {
+            const localVarAxiosArgs = await SysConfigApiAxiosParamCreator(configuration).sysConfigPageGet(name, code, groupCode, page, pageSize, field, order, descStr, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -454,6 +460,7 @@ export const SysConfigApiFactory = function (configuration?: Configuration, base
          * @summary 获取参数配置分页列表
          * @param {string} [name] 名称
          * @param {string} [code] 编码
+         * @param {string} [groupCode] 分组编码
          * @param {number} [page] 当前页码
          * @param {number} [pageSize] 页码容量
          * @param {string} [field] 排序字段
@@ -462,8 +469,8 @@ export const SysConfigApiFactory = function (configuration?: Configuration, base
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysConfigPageGet(name?: string, code?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSqlSugarPagedListSysConfig>> {
-            return SysConfigApiFp(configuration).sysConfigPageGet(name, code, page, pageSize, field, order, descStr, options).then((request) => request(axios, basePath));
+        async sysConfigPageGet(name?: string, code?: string, groupCode?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSqlSugarPagedListSysConfig>> {
+            return SysConfigApiFp(configuration).sysConfigPageGet(name, code, groupCode, page, pageSize, field, order, descStr, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -533,6 +540,7 @@ export class SysConfigApi extends BaseAPI {
      * @summary 获取参数配置分页列表
      * @param {string} [name] 名称
      * @param {string} [code] 编码
+     * @param {string} [groupCode] 分组编码
      * @param {number} [page] 当前页码
      * @param {number} [pageSize] 页码容量
      * @param {string} [field] 排序字段
@@ -542,8 +550,8 @@ export class SysConfigApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysConfigApi
      */
-    public async sysConfigPageGet(name?: string, code?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSqlSugarPagedListSysConfig>> {
-        return SysConfigApiFp(this.configuration).sysConfigPageGet(name, code, page, pageSize, field, order, descStr, options).then((request) => request(this.axios, this.basePath));
+    public async sysConfigPageGet(name?: string, code?: string, groupCode?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSqlSugarPagedListSysConfig>> {
+        return SysConfigApiFp(this.configuration).sysConfigPageGet(name, code, groupCode, page, pageSize, field, order, descStr, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 

Web/src/api-services/models/add-config-input.ts

@@ -79,7 +79,7 @@ export interface AddConfigInput {
      */
     sysFlag?: YesNoEnum;
     /**
-     * 常量所属分类的编码
+     * 分组编码
      * @type {string}
      * @memberof AddConfigInput
      */

Web/src/api-services/models/sys-config.ts

@@ -79,7 +79,7 @@ export interface SysConfig {
      */
     sysFlag?: YesNoEnum;
     /**
-     * 常量所属分类的编码
+     * 分组编码
      * @type {string}
      * @memberof SysConfig
      */

Web/src/api-services/models/update-config-input.ts

@@ -79,7 +79,7 @@ export interface UpdateConfigInput {
      */
     sysFlag?: YesNoEnum;
     /**
-     * 常量所属分类的编码
+     * 分组编码
      * @type {string}
      * @memberof UpdateConfigInput
      */

Web/src/views/system/config/component/editConfig.vue

@@ -36,8 +36,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="所属分类" prop="groupCode">
-							<el-input v-model="ruleForm.groupCode" placeholder="所属分类" clearable :disabled="ruleForm.sysFlag == 1" />
+						<el-form-item label="分组编码" prop="groupCode">
+							<el-input v-model="ruleForm.groupCode" placeholder="分组编码" clearable :disabled="ruleForm.sysFlag == 1" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">

Web/src/views/system/config/index.vue

@@ -8,6 +8,9 @@
 				<el-form-item label="配置编码" prop="code">
 					<el-input placeholder="配置编码" clearable @keyup.enter="handleQuery" v-model="queryParams.code" />
 				</el-form-item>
+				<el-form-item label="分组编码" prop="groupCode">
+					<el-input placeholder="分组编码" clearable @keyup.enter="handleQuery" v-model="queryParams.code" />
+				</el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysConfig:page'"> 查询 </el-button>
@@ -28,7 +31,7 @@
 						<el-tag type="danger" v-else> 否 </el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="groupCode" label="所属分类" show-overflow-tooltip />
+				<el-table-column prop="groupCode" label="分组编码" show-overflow-tooltip />
 				<el-table-column prop="order" label="排序" width="70" align="center" show-overflow-tooltip />
 				<el-table-column prop="createTime" label="修改时间" align="center" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
@@ -76,6 +79,7 @@ export default defineComponent({
 			queryParams: {
 				name: undefined,
 				code: undefined,
+				groupCode: undefined,
 			},
 			tableParams: {
 				page: 1,
@@ -97,7 +101,7 @@ export default defineComponent({
 		// 查询操作
 		const handleQuery = async () => {
 			state.loading = true;
-			var res = await getAPI(SysConfigApi).sysConfigPageGet(state.queryParams.name, state.queryParams.code, state.tableParams.page, state.tableParams.pageSize);
+			var res = await getAPI(SysConfigApi).sysConfigPageGet(state.queryParams.name, state.queryParams.code, state.queryParams.groupCode, state.tableParams.page, state.tableParams.pageSize);
 			state.configData = res.data.result?.items ?? [];
 			state.tableParams.total = res.data.result?.total;
 			state.loading = false;