From 4a1a1ab297834241979b2c42e70baaf4dbc4f12f Mon Sep 17 00:00:00 2001 From: xingyuv Date: Tue, 14 Feb 2023 15:48:23 +0800 Subject: [PATCH 01/26] refactor: table-v2 --- src/types/auto-components.d.ts | 9 +- src/types/auto-imports.d.ts | 1 + src/views/system/notice/index.vue | 245 +++++++++++++---------------- src/views/system/notice/indexd.vue | 148 +++++++++++++++++ src/views/system/notice/indexh.vue | 103 ++++++++++++ 5 files changed, 363 insertions(+), 143 deletions(-) create mode 100644 src/views/system/notice/indexd.vue create mode 100644 src/views/system/notice/indexh.vue diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts index 990f55cc..f06196b1 100644 --- a/src/types/auto-components.d.ts +++ b/src/types/auto-components.d.ts @@ -21,6 +21,7 @@ declare module '@vue/runtime-core' { DictTag: typeof import('./../components/DictTag/src/DictTag.vue')['default'] Echart: typeof import('./../components/Echart/src/Echart.vue')['default'] Editor: typeof import('./../components/Editor/src/Editor.vue')['default'] + ElAutoResizer: typeof import('element-plus/es')['ElAutoResizer'] ElBadge: typeof import('element-plus/es')['ElBadge'] ElButton: typeof import('element-plus/es')['ElButton'] ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] @@ -51,14 +52,10 @@ declare module '@vue/runtime-core' { ElIcon: typeof import('element-plus/es')['ElIcon'] ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElLink: typeof import('element-plus/es')['ElLink'] ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] - ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] @@ -69,11 +66,7 @@ declare module '@vue/runtime-core' { ElTableV2: typeof import('element-plus/es')['ElTableV2'] ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabs: typeof import('element-plus/es')['ElTabs'] - ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTransfer: typeof import('element-plus/es')['ElTransfer'] - ElTree: typeof import('element-plus/es')['ElTree'] - ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] Error: typeof import('./../components/Error/src/Error.vue')['default'] FlowCondition: typeof import('./../components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue')['default'] diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index 714d6be2..d30eb960 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -3,6 +3,7 @@ export {} declare global { const DICT_TYPE: typeof import('@/utils/dict')['DICT_TYPE'] const EffectScope: typeof import('vue')['EffectScope'] + const ElButton: typeof import('element-plus/es')['ElButton'] const computed: typeof import('vue')['computed'] const createApp: typeof import('vue')['createApp'] const customRef: typeof import('vue')['customRef'] diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index aceadbba..d8824255 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -1,148 +1,123 @@ - diff --git a/src/views/system/notice/indexd.vue b/src/views/system/notice/indexd.vue new file mode 100644 index 00000000..aceadbba --- /dev/null +++ b/src/views/system/notice/indexd.vue @@ -0,0 +1,148 @@ + + diff --git a/src/views/system/notice/indexh.vue b/src/views/system/notice/indexh.vue new file mode 100644 index 00000000..2879a1c4 --- /dev/null +++ b/src/views/system/notice/indexh.vue @@ -0,0 +1,103 @@ + + From 2ebcb722152d4266f579b9b63e9614c17a120a4e Mon Sep 17 00:00:00 2001 From: xingyuv Date: Tue, 14 Feb 2023 16:02:01 +0800 Subject: [PATCH 02/26] feat: style --- src/views/system/notice/index.vue | 54 +++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index d8824255..82cbe47a 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -15,20 +15,22 @@ Query -
+
- +
+ +
@@ -37,6 +39,7 @@ import dayjs from 'dayjs' import { Column, ElPagination, ElTableV2, TableV2FixedDir } from 'element-plus' import * as NoticeApi from '@/api/system/notice' import { XTextButton } from '@/components/XButton' +import { DictTag } from '@/components/DictTag' const { t } = useI18n() // 国际化 const columns: Column[] = [ @@ -57,13 +60,19 @@ const columns: Column[] = [ key: 'type', dataKey: 'type', title: '公告类型', - width: 180 + width: 180, + cellRenderer: ({ cellData: type }) => ( + + ) }, { key: 'status', dataKey: 'status', title: t('common.status'), - width: 180 + width: 180, + cellRenderer: ({ cellData: status }) => ( + + ) }, { key: 'content', @@ -85,15 +94,22 @@ const columns: Column[] = [ key: 'actionbtns', dataKey: 'actionbtns', //需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填id title: '操作', //显示在单元格表头的文本 - width: 80, //当前列的宽度，必须设置 + width: 160, //当前列的宽度，必须设置 fixed: TableV2FixedDir.RIGHT, //是否固定列 align: 'center', cellRenderer: ({ cellData: id }) => ( - + <> + + + ) } ] @@ -115,6 +131,10 @@ const getList = async () => { tableTotal.value = res.total } +const handleUpdate = (id) => { + console.info(id) +} + const handleDelete = (id) => { console.info(id) } From 4d4f8841dcd1760a6d1c52ddb1f6efbf6e23ec16 Mon Sep 17 00:00:00 2001 From: xingyuv Date: Tue, 14 Feb 2023 16:13:59 +0800 Subject: [PATCH 03/26] fix: style --- src/views/system/notice/index.vue | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index 82cbe47a..9bc853e3 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -18,19 +18,25 @@
-
- -
+
+
+
@@ -122,7 +128,7 @@ const queryParms = reactive({ title: '', status: undefined, pageNo: 1, - pageSize: 10 + pageSize: 100 }) const getList = async () => { From 46b94aed33d1b4cefce75504624d9814dcf8a6fc Mon Sep 17 00:00:00 2001 From: xingyuv Date: Tue, 14 Feb 2023 16:40:15 +0800 Subject: [PATCH 04/26] feat: pagination --- src/views/system/notice/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index 9bc853e3..ab31b09b 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -32,7 +32,8 @@ Date: Sat, 18 Feb 2023 21:42:44 +0800 Subject: [PATCH 05/26] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/penal/task/task-components/ReceiveTask.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue index d8e1b4af..57c68b19 100644 --- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue +++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue @@ -11,10 +11,10 @@ > Date: Wed, 8 Mar 2023 08:15:49 +0800 Subject: [PATCH 06/26] =?UTF-8?q?vue3=20=E9=87=8D=E6=9E=84=EF=BC=9A?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20el=20=E5=8E=9F=E7=94=9F=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/infra/config/index.ts | 2 +- src/types/auto-components.d.ts | 10 +- src/types/auto-imports.d.ts | 1 - src/views/infra/config/config.data.ts | 90 ---------- src/views/infra/config/index.vue | 249 +++++++++++--------------- src/views/infra/config/index2.vue | 162 +++++++++++++++++ 6 files changed, 274 insertions(+), 240 deletions(-) delete mode 100644 src/views/infra/config/config.data.ts create mode 100644 src/views/infra/config/index2.vue diff --git a/src/api/infra/config/index.ts b/src/api/infra/config/index.ts index 5a9bee1b..84ded9aa 100644 --- a/src/api/infra/config/index.ts +++ b/src/api/infra/config/index.ts @@ -27,7 +27,7 @@ export interface ConfigExportReqVO { } // 查询参数列表 -export const getConfigPageApi = (params: ConfigPageReqVO) => { +export const getConfigPage = (params: ConfigPageReqVO) => { return request.get({ url: '/infra/config/page', params }) } diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts index fa82a4aa..96eed08d 100644 --- a/src/types/auto-components.d.ts +++ b/src/types/auto-components.d.ts @@ -23,8 +23,8 @@ declare module '@vue/runtime-core' { DictTag: typeof import('./../components/DictTag/src/DictTag.vue')['default'] Echart: typeof import('./../components/Echart/src/Echart.vue')['default'] Editor: typeof import('./../components/Editor/src/Editor.vue')['default'] - ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElAutoResizer: typeof import('element-plus/es')['ElAutoResizer'] + ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBadge: typeof import('element-plus/es')['ElBadge'] ElButton: typeof import('element-plus/es')['ElButton'] ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] @@ -35,6 +35,7 @@ declare module '@vue/runtime-core' { ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] + ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] ElDialog: typeof import('element-plus/es')['ElDialog'] @@ -56,10 +57,14 @@ declare module '@vue/runtime-core' { ElImage: typeof import('element-plus/es')['ElImage'] ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] + ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElLink: typeof import('element-plus/es')['ElLink'] ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] + ElRadio: typeof import('element-plus/es')['ElRadio'] + ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] @@ -74,6 +79,9 @@ declare module '@vue/runtime-core' { ElTimeline: typeof import('element-plus/es')['ElTimeline'] ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTransfer: typeof import('element-plus/es')['ElTransfer'] + ElTree: typeof import('element-plus/es')['ElTree'] + ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] Error: typeof import('./../components/Error/src/Error.vue')['default'] FlowCondition: typeof import('./../components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue')['default'] diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index a05a5b48..7c9f5ff1 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -6,7 +6,6 @@ export {} declare global { const DICT_TYPE: typeof import('@/utils/dict')['DICT_TYPE'] const EffectScope: typeof import('vue')['EffectScope'] - const ElButton: typeof import('element-plus/es')['ElButton'] const computed: typeof import('vue')['computed'] const createApp: typeof import('vue')['createApp'] const customRef: typeof import('vue')['customRef'] diff --git a/src/views/infra/config/config.data.ts b/src/views/infra/config/config.data.ts deleted file mode 100644 index 41acfa15..00000000 --- a/src/views/infra/config/config.data.ts +++ /dev/null @@ -1,90 +0,0 @@ -import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas' -const { t } = useI18n() // 国际化 - -// 表单校验 -export const rules = reactive({ - category: [required], - name: [required], - key: [required], - value: [required] -}) - -// CrudSchema -const crudSchemas = reactive({ - primaryKey: 'id', - primaryType: null, - action: true, - columns: [ - { - title: '参数分类', - field: 'category' - }, - { - title: '参数名称', - field: 'name', - isSearch: true - }, - { - title: '参数键名', - field: 'key', - isSearch: true - }, - { - title: '参数键值', - field: 'value' - }, - { - title: '系统内置', - field: 'type', - dictType: DICT_TYPE.INFRA_CONFIG_TYPE, - dictClass: 'number', - isSearch: true - }, - { - title: '是否可见', - field: 'visible', - table: { - slots: { - default: 'visible_default' - } - }, - form: { - component: 'RadioButton', - componentProps: { - options: [ - { label: '是', value: true }, - { label: '否', value: false } - ] - } - } - }, - { - title: t('form.remark'), - field: 'remark', - isTable: false, - form: { - component: 'Input', - componentProps: { - type: 'textarea', - rows: 4 - }, - colProps: { - span: 24 - } - } - }, - { - title: t('common.createTime'), - field: 'createTime', - formatter: 'formatDate', - isForm: false, - search: { - show: true, - itemRender: { - name: 'XDataTimePicker' - } - } - } - ] -}) -export const { allSchemas } = useVxeCrudSchemas(crudSchemas) diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index 73f0f8ad..14dd5ff7 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -1,162 +1,117 @@ diff --git a/src/views/infra/config/index2.vue b/src/views/infra/config/index2.vue new file mode 100644 index 00000000..ce52436f --- /dev/null +++ b/src/views/infra/config/index2.vue @@ -0,0 +1,162 @@ + + From 4c47ca9166cdce563666d07d10bd30590bc0bdfb Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 8 Mar 2023 09:49:14 +0800 Subject: [PATCH 07/26] =?UTF-8?q?vue3=20=E9=87=8D=E6=9E=84=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=A0=8F=E3=80=81=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Pagination/index.vue | 107 ++++++++++++++++++++++++++++ src/types/auto-components.d.ts | 1 + src/views/infra/config/index.vue | 70 +++++++++++++++++- 3 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 src/components/Pagination/index.vue diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue new file mode 100644 index 00000000..9e950b9d --- /dev/null +++ b/src/components/Pagination/index.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts index 96eed08d..7b10d679 100644 --- a/src/types/auto-components.d.ts +++ b/src/types/auto-components.d.ts @@ -93,6 +93,7 @@ declare module '@vue/runtime-core' { ImageViewer: typeof import('./../components/ImageViewer/src/ImageViewer.vue')['default'] Infotip: typeof import('./../components/Infotip/src/Infotip.vue')['default'] InputPassword: typeof import('./../components/InputPassword/src/InputPassword.vue')['default'] + Pagination: typeof import('./../components/Pagination/index.vue')['default'] ProcessDesigner: typeof import('./../components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue')['default'] ProcessPalette: typeof import('./../components/bpmnProcessDesigner/package/palette/ProcessPalette.vue')['default'] ProcessViewer: typeof import('./../components/bpmnProcessDesigner/package/designer/ProcessViewer.vue')['default'] diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index 14dd5ff7..f96da368 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -52,6 +52,37 @@ + + + + + + + 新增 + + + + + + 导出 + + + + + + @@ -59,18 +90,55 @@ + + + - diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index f96da368..3cde9385 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -26,12 +26,16 @@ @keyup.enter="handleQuery" /> - - - - - - + + + + + @@ -116,7 +119,7 @@ link type="primary" icon="el-icon-edit" - @click="handleUpdate(scope.row)" + @click="openModal('update', scope.row.id)" v-hasPermi="['infra:config:update']" > 修改 @@ -134,10 +137,15 @@ + + + + From 9ef85e144ca29ee7b1a3b92e06235c8714cc5ae5 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 8 Mar 2023 23:38:07 +0800 Subject: [PATCH 09/26] =?UTF-8?q?vue3=20=E9=87=8D=E6=9E=84=EF=BC=9A?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/infra/config/index.ts | 2 +- src/views/infra/config/form.vue | 66 ++++++++++++++++---------------- src/views/infra/config/index.vue | 8 ++-- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/api/infra/config/index.ts b/src/api/infra/config/index.ts index 84ded9aa..6924c251 100644 --- a/src/api/infra/config/index.ts +++ b/src/api/infra/config/index.ts @@ -32,7 +32,7 @@ export const getConfigPage = (params: ConfigPageReqVO) => { } // 查询参数详情 -export const getConfigApi = (id: number) => { +export const getConfig = (id: number) => { return request.get({ url: '/infra/config/get?id=' + id }) } diff --git a/src/views/infra/config/form.vue b/src/views/infra/config/form.vue index ad924825..e4481dce 100644 --- a/src/views/infra/config/form.vue +++ b/src/views/infra/config/form.vue @@ -1,50 +1,53 @@ diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index 3cde9385..e7f20a53 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -3,7 +3,7 @@ 新增 @@ -160,7 +160,7 @@ const queryParams = reactive({ type: undefined, createTime: [] }) -const queryForm = ref() // 搜索的表单 +const queryFormRef = ref() // 搜索的表单 /** 搜索按钮操作 */ const handleQuery = () => { @@ -182,7 +182,7 @@ const getList = async () => { /** 重置按钮操作 */ const resetQuery = () => { - queryForm.value.resetFields() + queryFormRef.value.resetFields() handleQuery() } From dcc796696acd3658ab4a2f44a28342a32316ada9 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 9 Mar 2023 00:06:53 +0800 Subject: [PATCH 10/26] =?UTF-8?q?vue3=20=E9=87=8D=E6=9E=84=EF=BC=9A?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=EF=BC=8C=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/infra/config/index.ts | 4 +-- src/config/axios/service.ts | 1 - src/views/infra/config/form.vue | 44 +++++++++++++++++---------------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/api/infra/config/index.ts b/src/api/infra/config/index.ts index 6924c251..5d13628c 100644 --- a/src/api/infra/config/index.ts +++ b/src/api/infra/config/index.ts @@ -42,12 +42,12 @@ export const getConfigKeyApi = (configKey: string) => { } // 新增参数 -export const createConfigApi = (data: ConfigVO) => { +export const createConfig = (data: ConfigVO) => { return request.post({ url: '/infra/config/create', data }) } // 修改参数 -export const updateConfigApi = (data: ConfigVO) => { +export const updateConfig = (data: ConfigVO) => { return request.put({ url: '/infra/config/update', data }) } diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts index fbafd3e8..7109615b 100644 --- a/src/config/axios/service.ts +++ b/src/config/axios/service.ts @@ -170,7 +170,6 @@ service.interceptors.response.use( return Promise.reject(new Error(msg)) } else if (code === 901) { ElMessage.error({ - duration: 5, offset: 300, dangerouslyUseHTMLString: true, message: diff --git a/src/views/infra/config/form.vue b/src/views/infra/config/form.vue index e4481dce..14a225a0 100644 --- a/src/views/infra/config/form.vue +++ b/src/views/infra/config/form.vue @@ -36,7 +36,6 @@ From 0ea6b1b7490925661ba9465dbaaa1059eb30e594 Mon Sep 17 00:00:00 2001 From: gexinzhineng/gxzn27 <1348660141@qq.com> Date: Thu, 9 Mar 2023 13:28:11 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E8=A7=A3=E5=86=B3TODO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/infra/config/form.vue | 27 ++++++++++++------ src/views/infra/config/index.vue | 48 +++++++++++++++++--------------- 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/src/views/infra/config/form.vue b/src/views/infra/config/form.vue index 14a225a0..b7c1ba83 100644 --- a/src/views/infra/config/form.vue +++ b/src/views/infra/config/form.vue @@ -1,7 +1,7 @@ - + From f474e06b0092397d0b32e005f8e8be353a52f887 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 9 Mar 2023 23:18:26 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20ConfigPageReqVO?= =?UTF-8?q?=EF=BC=8C=E7=AE=80=E5=8C=96=E7=90=86=E8=A7=A3=E6=88=90=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/infra/config/index.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/api/infra/config/index.ts b/src/api/infra/config/index.ts index 77a76261..3bb039c8 100644 --- a/src/api/infra/config/index.ts +++ b/src/api/infra/config/index.ts @@ -12,13 +12,6 @@ export interface ConfigVO { createTime: Date } -export interface ConfigPageReqVO extends PageParam { - name?: string - key?: string - type?: number - createTime?: Date[] -} - export interface ConfigExportReqVO { name?: string key?: string @@ -27,7 +20,7 @@ export interface ConfigExportReqVO { } // 查询参数列表 -export const getConfigPage = (params: ConfigPageReqVO) => { +export const getConfigPage = (params: PageParam) => { return request.get({ url: '/infra/config/page', params }) } From 5c675995cbb71999c6bd3e26f0089cac1f3a3720 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 10 Mar 2023 00:53:23 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/infra/config/index.vue | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index 132135c9..a67368ed 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -49,9 +49,10 @@ /> - - 搜索 - 重置 + + 搜索 + + 重置 @@ -63,23 +64,20 @@ - 新增 + 新增 - - 导出 + 导出 @@ -111,26 +109,24 @@ {{ dayjs(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }} - + From faaa47abdc1197e330019f66aea1136888aa0aeb Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 10 Mar 2023 08:04:14 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E7=9A=84=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/infra/config/index.ts | 4 ++-- src/views/infra/config/form.vue | 2 +- src/views/infra/config/index.vue | 29 ++++++++++++++++++++++++----- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/api/infra/config/index.ts b/src/api/infra/config/index.ts index 3bb039c8..c6d3772e 100644 --- a/src/api/infra/config/index.ts +++ b/src/api/infra/config/index.ts @@ -30,7 +30,7 @@ export const getConfig = (id: number) => { } // 根据参数键名查询参数值 -export const getConfigKeyApi = (configKey: string) => { +export const getConfigKey = (configKey: string) => { return request.get({ url: '/infra/config/get-value-by-key?key=' + configKey }) } @@ -45,7 +45,7 @@ export const updateConfig = (data: ConfigVO) => { } // 删除参数 -export const deleteConfigApi = (id: number) => { +export const deleteConfig = (id: number) => { return request.delete({ url: '/infra/config/delete?id=' + id }) } diff --git a/src/views/infra/config/form.vue b/src/views/infra/config/form.vue index 157917db..d9071e36 100644 --- a/src/views/infra/config/form.vue +++ b/src/views/infra/config/form.vue @@ -45,7 +45,7 @@ const message = useMessage() // 消息弹窗 const modelVisible = ref(false) // 弹窗的是否展示 const modelTitle = ref('') // 弹窗的标题 -const formLoading = ref(false) // 表单的 Loading 加载：1）修改时的数据加载；2）提交的按钮禁用 +const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formData = reactive({ id: undefined, diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index a67368ed..4e8b64b6 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -59,7 +59,6 @@ - 导出 + + + @@ -123,7 +126,7 @@ 删除 @@ -137,11 +140,13 @@ From ba563f76c62254546d4f18c42159a07d80d572db Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 10 Mar 2023 21:30:54 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E5=B0=86=20co?= =?UTF-8?q?nfig=20=E8=A1=A8=E5=8D=95=E7=9A=84=20visible=20=E6=94=B9?= =?UTF-8?q?=E6=88=90=E4=BB=8E=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E9=87=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/infra/config/form.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/infra/config/form.vue b/src/views/infra/config/form.vue index 5a45c83c..30e2f4d9 100644 --- a/src/views/infra/config/form.vue +++ b/src/views/infra/config/form.vue @@ -20,10 +20,14 @@ - - 是 - 否 + + {{ dict.label }} + @@ -39,6 +43,7 @@ diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index b3e627a1..e75b09da 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -36,7 +36,7 @@ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" - :default-time="[new Date(0, 0, 0, 0, 0, 0), new Date(0, 0, 0, 23, 59, 59)]" + :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" /> @@ -103,8 +103,8 @@ +