From e070ca1eaa7d0a37aa7d09ca4cb9aaa6903d674a Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Wed, 14 Aug 2024 14:13:25 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E6=9A=82=E6=97=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89fast-crud=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SeedData/SysMenuSeedData.cs | 1 - Web/package.json | 5 - Web/src/main.ts | 88 --------- Web/src/views/system/fastCrud/crud.tsx | 180 ------------------ Web/src/views/system/fastCrud/index.vue | 66 ------- 5 files changed, 340 deletions(-) delete mode 100644 Web/src/views/system/fastCrud/crud.tsx delete mode 100644 Web/src/views/system/fastCrud/index.vue diff --git a/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs b/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs index 9e9facc2..70234de2 100644 --- a/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs +++ b/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs @@ -196,7 +196,6 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData new SysMenu{ Id=1310000000621, Pid=1310000000601, Title="代码生成", Path="/develop/codeGen", Name="sysCodeGen", Component="/system/codeGen/index", Icon="ele-Crop", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 }, new SysMenu{ Id=1310000000631, Pid=1310000000601, Title="表单设计", Path="/develop/formDes", Name="sysFormDes", Component="/system/formDes/index", Icon="ele-Edit", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 }, new SysMenu{ Id=1310000000641, Pid=1310000000601, Title="系统接口", Path="/develop/api", Name="sysApi", Component="layout/routerView/iframe", IsIframe=true, OutLink="http://localhost:5005", Icon="ele-Help", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 }, - new SysMenu{ Id=1310000000681, Pid=1310000000601, Title="FastCrud", Path="/develop/fastCrud", Name="sysFastCrud", Component="/system/fastCrud/index", Icon="ele-CoffeeCup", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=150}, new SysMenu{ Id=1310000000701, Pid=0, Title="帮助文档", Path="/doc", Name="doc", Component="Layout", Icon="ele-Notebook", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=14000 }, new SysMenu{ Id=1310000000711, Pid=1310000000701, Title="框架教程", Path="/doc/admin", Name="sysAdmin", Component="layout/routerView/link", IsIframe=false, IsKeepAlive=false, OutLink="http://101.43.53.74:5050/", Icon="ele-Sunny", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, diff --git a/Web/package.json b/Web/package.json index e8f5d233..3df32822 100644 --- a/Web/package.json +++ b/Web/package.json @@ -15,11 +15,6 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.3.1", - "@fast-crud/fast-crud": "^1.21.2", - "@fast-crud/fast-extends": "^1.21.2", - "@fast-crud/ui-element": "^1.21.2", - "@fast-crud/ui-interface": "^1.21.2", - "@iconify/vue": "^4.1.2", "@logicflow/core": "^1.2.28", "@logicflow/extension": "^1.2.28", "@microsoft/signalr": "^8.0.7", diff --git a/Web/src/main.ts b/Web/src/main.ts index 601b6e32..e9631a6b 100644 --- a/Web/src/main.ts +++ b/Web/src/main.ts @@ -30,92 +30,4 @@ const app = createApp(App); directive(app); other.elSvg(app); -// #region FastCrud配置 -import { FastCrud } from '@fast-crud/fast-crud'; -import '@fast-crud/fast-crud/dist/style.css'; -import ui from '@fast-crud/ui-element'; -import { FsExtendsUploader, FsExtendsEditor } from '@fast-crud/fast-extends'; -import '@fast-crud/fast-extends/dist/style.css'; -app.use(ui); -app.use(FastCrud, { - i18n, - commonOptions() { - return { - request: { - transformQuery: ({ page, form, sort }) => { - const order = sort == null ? {} : { orderProp: sort.prop, orderAsc: sort.asc }; - return { page: page?.currentPage, pageSize: page?.pageSize, ...form, ...order }; - }, - // page请求结果转换 - transformRes: ({ res }) => { - const records = res.data.result.items; - const total = res.data.result.total; - const currentPage = res.data.result.page; - const pageSize = res.data.result.pageSize; - return { - currentPage: currentPage, - pageSize: pageSize, - total: total, - records, - }; - }, - form: { - display: 'flex', // 表单布局 - labelWidth: '120px', // 表单label宽度 - }, - }, - }; - }, -}); - -const baseURL = import.meta.env.VITE_API_URL; -import request from '/@/utils/request'; -import { getToken } from '/@/utils/axios-utils'; -// 文件上传 -app.use(FsExtendsUploader, { - defaultType: 'form', - form: { - action: baseURL + '/api/sysFile/uploadFile', - name: 'file', - withCredentials: false, - uploadRequest: async (props) => { - const { action, file, onProgress } = props; - const data = new FormData(); - data.append('file', file); - const token = getToken(); - const Authorization = token ? `Bearer ${token}` : null; - const result = await request({ - url: action, - method: 'post', - data, - headers: { - 'Content-Type': 'multipart/form-data', - Authorization: Authorization, - }, - timeout: 60000, - onUploadProgress(progress) { - onProgress({ percent: Math.round((progress.loaded / progress.total!) * 100) }); - }, - }); - if (result) { - return result.data; - } else { - throw new Error(result.message); - } - }, - async successHandle(ret: any) { - return { - url: baseURL + '/' + ret.result.filePath + '/' + ret.result.id + ret.result.suffix, - key: ret.result.fileName, - }; - }, - }, -}); - -// 富文本编辑器 -app.use(FsExtendsEditor, { - wangEditor: {}, -}); -// #endregion - app.use(pinia).use(router).use(ElementPlus).use(setupVXETable).use(i18n).use(VueGridLayout).use(VForm3).use(VueSignaturePad).use(vue3TreeOrg).mount('#app'); diff --git a/Web/src/views/system/fastCrud/crud.tsx b/Web/src/views/system/fastCrud/crud.tsx deleted file mode 100644 index de60b457..00000000 --- a/Web/src/views/system/fastCrud/crud.tsx +++ /dev/null @@ -1,180 +0,0 @@ -import { ref } from 'vue'; -import { ElMessage } from 'element-plus'; -import { dict, compute, EditReq, DelReq, AddReq } from '@fast-crud/fast-crud'; - -import { getAPI } from '/@/utils/axios-utils'; -import { SysNoticeApi } from '/@/api-services/api'; -import { PageFileInput } from '/@/api-services/models'; - -export default function ({ expose }) { - // 分页查询 - const pageRequest = async (query: any) => { - const params = { - page: query.currentPage, - pageSize: query.pageSize, - field: query.field, - order: query.order, - descStr: 'desc', - } as PageFileInput; - const result = await getAPI(SysNoticeApi).apiSysNoticePagePost(params); - return result; - }; - // 编辑 - const editRequest = async ({ form, row }: EditReq) => { - if (form.id == null) { - form.id = row.id; - } - return await getAPI(SysNoticeApi) - .apiSysNoticeUpdatePost(form) - .then((rsp: any) => { - if (rsp.data.code == 200) { - ElMessage.success('修改成功！'); - } else { - ElMessage.error('修改失败：' + rsp.data.message); - } - }); - }; - // 删除 - const delRequest = async ({ row }: DelReq) => { - return await getAPI(SysNoticeApi).apiSysNoticeDeletePost(row); - }; - // 增加 - const addRequest = async ({ form }: AddReq) => { - return await getAPI(SysNoticeApi).apiSysNoticeAddPost(form); - }; - // 选择 - const selectedIds = ref([]); - const onSelectionChange = (changed: any) => { - selectedIds.value = changed; - }; - return { - selectedIds, - crudOptions: { - container: { - is: 'fs-layout-card', - }, - form: { - wrapper: { - // is: 'el-drawer', - // width: '80%', - draggable: false, - closeOnEsc: false, - maskClosable: false, - }, - }, - search: { - show: true, - }, - actionbar: {}, - toolbar: { - show: true, - buttons: { - search: { show: true }, - refresh: { show: true }, - compact: { show: true }, - export: { show: true }, - columns: { show: true }, - }, - }, - table: { - scrollX: 725, - bordered: false, - rowKey: (row: any) => row.id, - checkedRowKeys: selectedIds, - 'onUpdate:checkedRowKeys': onSelectionChange, - }, - pagination: { - show: true, - }, - request: { - pageRequest, - addRequest, - editRequest, - delRequest, - }, - rowHandle: { - fixed: 'right', - align: 'center', - width: 200, - buttons: { - view: { show: true }, - edit: { show: true }, - }, - }, - columns: { - _checked: { - title: '选择', - form: { show: false }, - column: { - type: 'selection', - align: 'center', - width: '55px', - columnSetDisabled: true, - disabled(row: any) { - return row.account === 'gvanet'; - }, - }, - }, - type: { - title: '类型', - type: 'dict-select', - search: { show: true, col: { span: 6 } }, - column: { - align: 'center', - width: '120px', - }, - dict: dict({ - value: 'id', - label: 'text', - data: [ - { id: '1', text: '通知' }, - { id: '2', text: '公告' }, - ], - }), - form: { - col: { span: 24 }, - rule: [{ required: true, message: '请输入类型' }], - }, - }, - title: { - title: '标题', - type: 'text', - search: { show: true, col: { span: 6 } }, - column: { - align: 'center', - width: 'auto', - }, - form: { - col: { span: 24 }, - rule: [{ required: true, message: '请输入标题' }], - }, - }, - content: { - title: '内容', - type: 'editor-wang5', - search: { show: false, col: { span: 6 } }, - column: { - show: false, - }, - form: { - col: { span: 24 }, - rule: [{ required: true, message: '请输入内容' }], - component: { - disabled: compute(({ form }) => { - return form.disabled; - }), - id: '1', // 当同一个页面有多个editor时，需要配置不同的id - config: {}, - uploader: { - type: 'form', - buildUrl(res: any) { - return res.url; - }, - }, - }, - }, - }, - }, - }, - }; -} diff --git a/Web/src/views/system/fastCrud/index.vue b/Web/src/views/system/fastCrud/index.vue deleted file mode 100644 index 01f9042a..00000000 --- a/Web/src/views/system/fastCrud/index.vue +++ /dev/null @@ -1,66 +0,0 @@ - - -