From 7cbc15ea85b3e5af2d300bd106000fe10e800a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= Date: Tue, 26 Sep 2023 18:01:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90webfirst=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=A8=E7=AE=A1=E7=90=86=E5=89=8D=E7=AB=AF=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebFirstManager/Impl/FieldService.cs | 32 +- .../Yi.Framework.Module.xml | 6 + Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs | 1 + Yi.RuoYi.Vue3/src/api/webfirst/fieldApi.js | 54 ++ Yi.RuoYi.Vue3/src/api/webfirst/tableApi.js | 44 ++ .../webfirst/table/components/FieldList.vue | 511 ++++++++++-------- .../webfirst/table/components/TableList.vue | 52 +- .../views/webfirst/table/hooks/useField.js | 9 - .../views/webfirst/table/hooks/useTable.js | 10 +- .../src/views/webfirst/table/index.vue | 13 +- 10 files changed, 471 insertions(+), 261 deletions(-) create mode 100644 Yi.RuoYi.Vue3/src/api/webfirst/fieldApi.js create mode 100644 Yi.RuoYi.Vue3/src/api/webfirst/tableApi.js delete mode 100644 Yi.RuoYi.Vue3/src/views/webfirst/table/hooks/useField.js diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/FieldService.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/FieldService.cs index 4117aef1..934902fe 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/FieldService.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/FieldService.cs @@ -1,14 +1,20 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Reflection; using System.Text; using System.Threading.Tasks; +using EasyTool; using Furion.DependencyInjection; using Furion.DynamicApiController; using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using Yi.Framework.Infrastructure.Ddd.Dtos; using Yi.Framework.Infrastructure.Ddd.Services; +using Yi.Framework.Module.DictionaryManager.Dtos.DictionaryType; using Yi.Framework.Module.WebFirstManager.Dtos.Field; using Yi.Framework.Module.WebFirstManager.Entities; +using Yi.Framework.Module.WebFirstManager.Enums; namespace Yi.Framework.Module.WebFirstManager.Impl { @@ -16,7 +22,31 @@ namespace Yi.Framework.Module.WebFirstManager.Impl /// 字段管理 /// [ApiDescriptionSettings("WebFirstManager")] - public class FieldService:CrudAppService ,IFieldService,ITransient,IDynamicApiController + public class FieldService : CrudAppService, IFieldService, ITransient, IDynamicApiController { + public async override Task> GetListAsync([FromQuery] FieldGetListInput input) + { + RefAsync total = 0; + var entities = await _DbQueryable.WhereIF(input.TableId is not null, x => x.TableId.Equals(input.TableId!)) + .WhereIF(input.Name is not null, x => x.Name!.Contains(input.Name!)) + + .ToPageListAsync(input.PageNum, input.PageSize, total); + + return new PagedResultDto + { + Total = total, + Items = await MapToGetListOutputDtosAsync(entities) + }; + } + + /// + /// 获取类型枚举 + /// + /// + [Route("type")] + public object GetFieldTypeEnum() + { + return typeof(FieldTypeEnum).GetFields(BindingFlags.Static | BindingFlags.Public).Select(x => new { lable = x.Name, value = (int)EnumUtil.GetValueByName(x.Name) }).ToList(); + } } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml b/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml index 07e69b23..e11adb10 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml +++ b/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml @@ -523,6 +523,12 @@ 字段管理 + + + 获取类型枚举 + + + Web To Code diff --git a/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs b/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs index e8427f72..95a4913a 100644 --- a/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs +++ b/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs @@ -38,6 +38,7 @@ public class Startup : AppStartup { // 注册作业，并配置作业触发器 //options.AddJob(Triggers.Period(10000)); + //options.AddJob(Triggers.Period(10000)); options.AddJob(Triggers.Cron("0 0 0,12 ? * ?", CronStringFormat.WithSeconds)); // 表示每天凌晨与12点 }); services.AddFileLogging("log/application-{0:yyyy}-{0:MM}-{0:dd}.log", options => diff --git a/Yi.RuoYi.Vue3/src/api/webfirst/fieldApi.js b/Yi.RuoYi.Vue3/src/api/webfirst/fieldApi.js new file mode 100644 index 00000000..95fe66fa --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/webfirst/fieldApi.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +// 分页查询 +export function listData(query) { + return request({ + url: '/field', + method: 'get', + params: query + }) +} + +// type查询 +export function getType(query) { + return request({ + url: '/field/type', + method: 'get', + params: query + }) +} + + +// id查询 +export function getData(id) { + return request({ + url: `/field/${id}`, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/field', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(data) { + return request({ + url: `/field/${data.id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(ids) { + return request({ + url: `/field/${ids}`, + method: 'delete', + }) +} diff --git a/Yi.RuoYi.Vue3/src/api/webfirst/tableApi.js b/Yi.RuoYi.Vue3/src/api/webfirst/tableApi.js new file mode 100644 index 00000000..888a5c0b --- /dev/null +++ b/Yi.RuoYi.Vue3/src/api/webfirst/tableApi.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 分页查询 +export function listData(query) { + return request({ + url: '/table', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(id) { + return request({ + url: `/table/${id}`, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/table', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(data) { + return request({ + url: `/table/${data.id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(ids) { + return request({ + url: `/table/${ids}`, + method: 'delete', + }) +} diff --git a/Yi.RuoYi.Vue3/src/views/webfirst/table/components/FieldList.vue b/Yi.RuoYi.Vue3/src/views/webfirst/table/components/FieldList.vue index b5beeb95..c217a354 100644 --- a/Yi.RuoYi.Vue3/src/views/webfirst/table/components/FieldList.vue +++ b/Yi.RuoYi.Vue3/src/views/webfirst/table/components/FieldList.vue @@ -1,190 +1,234 @@ - - diff --git a/Yi.RuoYi.Vue3/src/views/webfirst/table/components/TableList.vue b/Yi.RuoYi.Vue3/src/views/webfirst/table/components/TableList.vue index 2080acac..808d1c02 100644 --- a/Yi.RuoYi.Vue3/src/views/webfirst/table/components/TableList.vue +++ b/Yi.RuoYi.Vue3/src/views/webfirst/table/components/TableList.vue @@ -1,46 +1,32 @@ + \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/webfirst/table/hooks/useField.js b/Yi.RuoYi.Vue3/src/views/webfirst/table/hooks/useField.js deleted file mode 100644 index e70579af..00000000 --- a/Yi.RuoYi.Vue3/src/views/webfirst/table/hooks/useField.js +++ /dev/null @@ -1,9 +0,0 @@ - -const useField=()=>{ - const field=ref("zd") - onMounted(() => { - console.log(`the component is now mounted. field`) - }); -return {field}; -} -export default useField; \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/webfirst/table/hooks/useTable.js b/Yi.RuoYi.Vue3/src/views/webfirst/table/hooks/useTable.js index 657093ba..e1a07005 100644 --- a/Yi.RuoYi.Vue3/src/views/webfirst/table/hooks/useTable.js +++ b/Yi.RuoYi.Vue3/src/views/webfirst/table/hooks/useTable.js @@ -1,9 +1,11 @@ +import {listData} from "@/api/webfirst/tableApi.js" const useTable=()=>{ - const table=ref("数据表选择") - onMounted(() => { - console.log(`the component is now mounted. table`) + const dataList=ref([]); + onMounted( async() => { + const response= await listData(); + dataList.value=response.data.items; }); - return {table}; + return {dataList}; } export default useTable; \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/webfirst/table/index.vue b/Yi.RuoYi.Vue3/src/views/webfirst/table/index.vue index aff18445..ce7a921f 100644 --- a/Yi.RuoYi.Vue3/src/views/webfirst/table/index.vue +++ b/Yi.RuoYi.Vue3/src/views/webfirst/table/index.vue @@ -1,12 +1,21 @@