From 6898913d45971d9ea6a75a2afaf5308b48d5a837 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Mon, 30 Jan 2023 10:47:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=9A=E7=9F=A5=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/notice/Template/Debug/index.vue | 35 ++++++++++++-----------
 src/views/notice/Template/index.vue       |  8 +++---
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/views/notice/Template/Debug/index.vue b/src/views/notice/Template/Debug/index.vue
index 4da9e494..b4c265ca 100644
--- a/src/views/notice/Template/Debug/index.vue
+++ b/src/views/notice/Template/Debug/index.vue
@@ -9,14 +9,13 @@
         :confirmLoading="btnLoading"
     >
         <a-form layout="vertical">
-            <a-form-item label="通知模版" v-bind="validateInfos.templateId">
+            <a-form-item label="通知配置" v-bind="validateInfos.configId">
                 <a-select
-                    v-model:value="formData.templateId"
-                    placeholder="请选择通知模版"
-                    @change="getTemplateDetail"
+                    v-model:value="formData.configId"
+                    placeholder="请选择通知配置"
                 >
                     <a-select-option
-                        v-for="(item, index) in templateList"
+                        v-for="(item, index) in configList"
                         :key="index"
                         :value="item.id"
                     >
@@ -63,10 +62,11 @@
 <script setup lang="ts">
 import { Form } from 'ant-design-vue';
 import { PropType } from 'vue';
-import ConfigApi from '@/api/notice/config';
+import TemplateApi from '@/api/notice/template';
 import {
     TemplateFormData,
     IVariableDefinitions,
+    BindConfig,
 } from '@/views/notice/Template/types';
 import { message } from 'ant-design-vue';
 
@@ -93,22 +93,25 @@ const _vis = computed({
 /**
  * 获取通知模板
  */
-const templateList = ref<TemplateFormData[]>([]);
-const getTemplateList = async () => {
+const configList = ref<BindConfig[]>([]);
+const getConfigList = async () => {
     const params = {
         terms: [
             { column: 'type', value: props.data.type },
             { column: 'provider', value: props.data.provider },
         ],
     };
-    const { result } = await ConfigApi.getTemplate(params, props.data.id);
-    templateList.value = result;
+    const { result } = await TemplateApi.getConfig(params);
+    configList.value = result;
 };
 
 watch(
     () => _vis.value,
     (val) => {
-        if (val) getTemplateList();
+        if (val) {
+            getConfigList();
+            getTemplateDetail();
+        }
     },
 );
 
@@ -117,9 +120,7 @@ watch(
  */
 const templateDetailTable = ref<IVariableDefinitions[]>();
 const getTemplateDetail = async () => {
-    const { result } = await ConfigApi.getTemplateDetail(
-        formData.value.templateId,
-    );
+    const { result } = await TemplateApi.getTemplateDetail(props.data.id);
     templateDetailTable.value = result.variableDefinitions.map((m: any) => ({
         ...m,
         value: undefined,
@@ -147,13 +148,13 @@ const columns = [
 
 // 表单数据
 const formData = ref({
-    templateId: '',
+    configId: '',
     variableDefinitions: '',
 });
 
 // 验证规则
 const formRules = ref({
-    templateId: [{ required: true, message: '请选择通知模板' }],
+    configId: [{ required: true, message: '请选择通知模板' }],
     variableDefinitions: [{ required: false, message: '该字段是必填字段' }],
 });
 
@@ -175,7 +176,7 @@ const handleOk = () => {
             });
             // console.log('params: ', params);
             btnLoading.value = true;
-            ConfigApi.debug(params, props.data.id, formData.value.templateId)
+            TemplateApi.debug(params, formData.value.configId, props.data.id)
                 .then((res) => {
                     if (res.success) {
                         message.success('操作成功');
diff --git a/src/views/notice/Template/index.vue b/src/views/notice/Template/index.vue
index 77e22ff3..c71f1130 100644
--- a/src/views/notice/Template/index.vue
+++ b/src/views/notice/Template/index.vue
@@ -8,7 +8,7 @@
         <JTable
             ref="configRef"
             :columns="columns"
-            :request="ConfigApi.list"
+            :request="TemplateApi.list"
             :defaultParams="{
                 sorts: [{ name: 'createTime', order: 'desc' }],
             }"
@@ -155,7 +155,7 @@
 </template>
 
 <script setup lang="ts">
-import ConfigApi from '@/api/notice/config';
+import TemplateApi from '@/api/notice/template';
 import type { ActionsType } from '@/components/Table/index.vue';
 import { getImage, LocalStore } from '@/utils/comm';
 import { message } from 'ant-design-vue';
@@ -275,7 +275,7 @@ const beforeUpload = (file: any) => {
         }
         try {
             const data = JSON.parse(text || '{}');
-            const { success } = await ConfigApi.update(data);
+            const { success } = await TemplateApi.update(data);
             if (success) {
                 message.success('操作成功');
                 configRef.value.reload();
@@ -367,7 +367,7 @@ const getActions = (
             popConfirm: {
                 title: '确认删除?',
                 onConfirm: async () => {
-                    const resp = await ConfigApi.del(data.id);
+                    const resp = await TemplateApi.del(data.id);
                     if (resp.status === 200) {
                         message.success('操作成功！');
                         configRef.value?.reload();