From 6bfce93f3fc1459e92f35c5122f566fd5b882354 Mon Sep 17 00:00:00 2001 From: sy2084 Date: Tue, 29 Oct 2024 13:41:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=A4=8D=E5=8E=9F=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- components.d.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index 38669de..e112d1d 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ VITE_NODE_ENV = prod VITE_OA_BASEURL = https://oa.shiyuegame.com -# VITE_YCODE_BASEURL = https://custom-chart-api.shiyuegame.com -VITE_YCODE_BASEURL = https://custom-chart-api.shiyuegame.com:19998 +VITE_YCODE_BASEURL = https://custom-chart-api.shiyuegame.com +# VITE_YCODE_BASEURL = https://custom-chart-api.shiyuegame.com:19998 VITE_YCODE_BASEURL_FRONT = https://custom-chart.shiyuegame.com diff --git a/components.d.ts b/components.d.ts index 8bc14c1..d55d6f3 100644 --- a/components.d.ts +++ b/components.d.ts @@ -18,6 +18,7 @@ declare module 'vue' { AFloatButton: typeof import('ant-design-vue/es')['FloatButton'] AForm: typeof import('ant-design-vue/es')['Form'] AFormItem: typeof import('ant-design-vue/es')['FormItem'] + AImage: typeof import('ant-design-vue/es')['Image'] AInput: typeof import('ant-design-vue/es')['Input'] AInputNumber: typeof import('ant-design-vue/es')['InputNumber'] AInputPassword: typeof import('ant-design-vue/es')['InputPassword'] From f890f7ff97b45adb8b382cfefdce3e5139c3592f Mon Sep 17 00:00:00 2001 From: sy2084 Date: Tue, 29 Oct 2024 15:00:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E6=9C=8D=E7=AB=AF=E5=8F=A3=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/config-manage/project-cfg/service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/config-manage/project-cfg/service.js b/src/views/config-manage/project-cfg/service.js index f8d2342..55b1495 100644 --- a/src/views/config-manage/project-cfg/service.js +++ b/src/views/config-manage/project-cfg/service.js @@ -3,7 +3,7 @@ import { get, post } from "@/utils/request"; // 获取项目列表 export function getProjectList({ page, perPage, projectName }) { return get({ - url: `/api/v1/project/list`, + url: `https://custom-chart-api.shiyuegame.com:19998/api/v1/project/list`, params: { page, per_page: perPage, From 030c84dc653fe21904093a3665eafe76dd9c365a Mon Sep 17 00:00:00 2001 From: sy2084 Date: Tue, 29 Oct 2024 17:24:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=A4=8D=E5=8E=9F=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/config-manage/project-cfg/service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/config-manage/project-cfg/service.js b/src/views/config-manage/project-cfg/service.js index 55b1495..f8d2342 100644 --- a/src/views/config-manage/project-cfg/service.js +++ b/src/views/config-manage/project-cfg/service.js @@ -3,7 +3,7 @@ import { get, post } from "@/utils/request"; // 获取项目列表 export function getProjectList({ page, perPage, projectName }) { return get({ - url: `https://custom-chart-api.shiyuegame.com:19998/api/v1/project/list`, + url: `/api/v1/project/list`, params: { page, per_page: perPage, From 01023fc14beb0a8698075fde2633b15799c9dd86 Mon Sep 17 00:00:00 2001 From: sy2084 Date: Wed, 30 Oct 2024 10:54:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module-cfg/components/field-modal.vue | 25 ++++++++++++++++--- src/views/config-manage/module-cfg/config.ts | 2 +- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/views/config-manage/module-cfg/components/field-modal.vue b/src/views/config-manage/module-cfg/components/field-modal.vue index 3642ea1..0b6effd 100644 --- a/src/views/config-manage/module-cfg/components/field-modal.vue +++ b/src/views/config-manage/module-cfg/components/field-modal.vue @@ -127,9 +127,13 @@ >取消 - 修改 +
+ 修改 + + 删除 + +
+ @@ -177,7 +181,7 @@ import { getFieldTypeSelect, getFieldNumSelect, getFieldList, - // deleteField, + deleteField, saveField, // getFieldDetail, } from "@/views/config-manage/module-cfg/service"; @@ -298,6 +302,15 @@ const handleEdit = (record) => { }; }; +const handleDelete = (record) => { + deleteField({ + field_id: record.field_id, + }).then(() => { + message.success('删除成功') + toGetList(); + }) +} + const handleCancel = (record) => { if (typeof record.field_id === "string") { dataList.value.shift(); @@ -382,4 +395,8 @@ const handleSave = (record) => { .pagination-box { text-align: center; } + +:deep(.@{ant-prefix}-btn) { + padding: 4px 8px; +} diff --git a/src/views/config-manage/module-cfg/config.ts b/src/views/config-manage/module-cfg/config.ts index 74b84cb..6a299d5 100644 --- a/src/views/config-manage/module-cfg/config.ts +++ b/src/views/config-manage/module-cfg/config.ts @@ -20,7 +20,7 @@ export const viewCfgCols = [ { dataIndex: 'is_other_database', title: '数据库特配', align: 'center'}, { dataIndex: 'original_type', title: '数据源类型', align: 'center'}, { dataIndex: 'original_sql', title: '数据源', align: 'center', width: 400}, - { dataIndex: 'action', title: '操作', align: 'center'}, + { dataIndex: 'action', title: '操作', align: 'center', width: 120}, ]; export const originalTypes = [