From 58db701b9e90f1af2f148e924f0656829164125c Mon Sep 17 00:00:00 2001 From: dengyu <3233891353@qq.com> Date: Mon, 18 Dec 2023 21:10:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(message):=20=E4=BF=AE=E5=A4=8D=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE=E6=9C=AA=E8=AE=BE?= =?UTF-8?q?=E7=BD=AErowkey=20Closes=20https://gitee.com/OS-Zero/deliver/is?= =?UTF-8?q?sues/I8PFZ4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deliver-front/vue/components.d.ts | 20 ------------------- .../vue/src/components/Drawer/index.vue | 4 ++-- deliver-front/vue/src/config/table.ts | 4 ++-- deliver-front/vue/vite.config.ts | 2 +- 4 files changed, 5 insertions(+), 25 deletions(-) diff --git a/deliver-front/vue/components.d.ts b/deliver-front/vue/components.d.ts index de413666..21a3877f 100644 --- a/deliver-front/vue/components.d.ts +++ b/deliver-front/vue/components.d.ts @@ -13,40 +13,20 @@ declare module 'vue' { ACard: typeof import('ant-design-vue/es')['Card'] ACardMeta: typeof import('ant-design-vue/es')['CardMeta'] ACol: typeof import('ant-design-vue/es')['Col'] - ADescriptions: typeof import('ant-design-vue/es')['Descriptions'] - ADescriptionsItem: typeof import('ant-design-vue/es')['DescriptionsItem'] - ADivider: typeof import('ant-design-vue/es')['Divider'] - ADrawer: typeof import('ant-design-vue/es')['Drawer'] - AForm: typeof import('ant-design-vue/es')['Form'] - AFormItem: typeof import('ant-design-vue/es')['FormItem'] - AInput: typeof import('ant-design-vue/es')['Input'] - AInputGroup: typeof import('ant-design-vue/es')['InputGroup'] - AInputNumber: typeof import('ant-design-vue/es')['InputNumber'] ALayout: typeof import('ant-design-vue/es')['Layout'] ALayoutContent: typeof import('ant-design-vue/es')['LayoutContent'] ALayoutFooter: typeof import('ant-design-vue/es')['LayoutFooter'] ALayoutHeader: typeof import('ant-design-vue/es')['LayoutHeader'] ALayoutSider: typeof import('ant-design-vue/es')['LayoutSider'] - AList: typeof import('ant-design-vue/es')['List'] - AListItem: typeof import('ant-design-vue/es')['ListItem'] AMenu: typeof import('ant-design-vue/es')['Menu'] AMenuItem: typeof import('ant-design-vue/es')['MenuItem'] AModal: typeof import('ant-design-vue/es')['Modal'] - APagination: typeof import('ant-design-vue/es')['Pagination'] - APopconfirm: typeof import('ant-design-vue/es')['Popconfirm'] ARadioButton: typeof import('ant-design-vue/es')['RadioButton'] ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup'] - ARangePicker: typeof import('ant-design-vue/es')['RangePicker'] ARow: typeof import('ant-design-vue/es')['Row'] - ASelect: typeof import('ant-design-vue/es')['Select'] - ASelectOption: typeof import('ant-design-vue/es')['SelectOption'] AStatistic: typeof import('ant-design-vue/es')['Statistic'] ASubMenu: typeof import('ant-design-vue/es')['SubMenu'] - ASwitch: typeof import('ant-design-vue/es')['Switch'] - ATable: typeof import('ant-design-vue/es')['Table'] - ATag: typeof import('ant-design-vue/es')['Tag'] ATooltip: typeof import('ant-design-vue/es')['Tooltip'] - AUploadDragger: typeof import('ant-design-vue/es')['UploadDragger'] Banner: typeof import('./src/components/Banner/index.vue')['default'] Code: typeof import('./src/components/Code/index.vue')['default'] Drawer: typeof import('./src/components/Drawer/index.vue')['default'] diff --git a/deliver-front/vue/src/components/Drawer/index.vue b/deliver-front/vue/src/components/Drawer/index.vue index 9841ca17..50192bbe 100644 --- a/deliver-front/vue/src/components/Drawer/index.vue +++ b/deliver-front/vue/src/components/Drawer/index.vue @@ -6,7 +6,7 @@ import JsonEditorVue from 'json-editor-vue3' interface Props { config: Form.Feedback model: Record - _options: Form.Options + _options: any } interface EmitEvent { (e: 'submit', params: any): void @@ -19,7 +19,7 @@ const cache = new Map() watch( () => props.model, () => { - drawerModel.value[props.model.key] = props.model[props.model.key] + drawerModel.value[props.model.rowKey] = props.model[props.model.rowKey] props.config.formData.forEach((item) => { if (item.type === 'cascader') { item.options.forEach((opt: any) => { diff --git a/deliver-front/vue/src/config/table.ts b/deliver-front/vue/src/config/table.ts index 5395d8b8..829a0913 100644 --- a/deliver-front/vue/src/config/table.ts +++ b/deliver-front/vue/src/config/table.ts @@ -314,7 +314,7 @@ export const tableColumns: Table.Columns[] = [ config: { ...editTemplateField, title: '修改模板' }, tip: '修改消息模版', icon: EditTwoTone, - options: { resetButtonText: '重置', submitButtonText: '确认修改' } + options: { rowKey: 'templateId', resetButtonText: '重置', submitButtonText: '确认修改' } }, { command: 'send', @@ -324,7 +324,7 @@ export const tableColumns: Table.Columns[] = [ config: sendTest, tip: '测试消息模板发送', icon: ApiTwoTone, - options: { resetButtonText: '清空', submitButtonText: '发送' } + options: { rowKey: 'templateId', resetButtonText: '清空', submitButtonText: '发送' } }, { command: 'delete', diff --git a/deliver-front/vue/vite.config.ts b/deliver-front/vue/vite.config.ts index de3fe16e..b53c461d 100644 --- a/deliver-front/vue/vite.config.ts +++ b/deliver-front/vue/vite.config.ts @@ -13,7 +13,7 @@ export default defineConfig({ proxy: { '/backend': { // 请求接口中要替换的标识 - target: 'http://localhost:6060', // 代理地址 + target: 'http://localhost:9090', // 代理地址 changeOrigin: true, // 是否允许跨域 secure: true } -- Gitee