From da56c2438beb728d6d1a27bd14f6948015a2a2e2 Mon Sep 17 00:00:00 2001
From: sy2084 <yaoxiaoqiong@shiyue.com>
Date: Wed, 24 Jul 2024 17:55:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/y-chart.vue             |  9 -----
 src/components/common/y-table.vue             | 10 -----
 .../module-cfg/components/create-modal.vue    |  4 --
 .../module-cfg/components/field-modal.vue     | 38 ++++++++++++++-----
 4 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/components/common/y-chart.vue b/src/components/common/y-chart.vue
index 5d33496..154e32c 100644
--- a/src/components/common/y-chart.vue
+++ b/src/components/common/y-chart.vue
@@ -71,15 +71,6 @@ const currentChart = computed(() => {
   return props.chartCfg[chartType.value];
 })
 
-watch(
-  () => props.filterConfig,
-  (newVal) => {
-    // newVal.forEach((item) => {
-    //   filterData.value[item.name] = undefined;
-    // });
-  },
-);
-
 const toFilt = () => {
   const cloneFilter = _.cloneDeep(props.filterConfig);
   const filter = cloneFilter
diff --git a/src/components/common/y-table.vue b/src/components/common/y-table.vue
index 2298a50..73dd1c9 100644
--- a/src/components/common/y-table.vue
+++ b/src/components/common/y-table.vue
@@ -87,16 +87,6 @@ const pageState = reactive({
   perPage: 20,
 });
 
-watch(
-  () => props.filterConfig,
-  (newVal) => {
-
-    // newVal.forEach((item) => {
-    //   filterData.value[item.name] = undefined;
-    // });
-  }
-);
-
 const getData = () => {
   const cloneFilter = _.cloneDeep(props.filterConfig);
   const filter = cloneFilter
diff --git a/src/views/config-manage/module-cfg/components/create-modal.vue b/src/views/config-manage/module-cfg/components/create-modal.vue
index 4587eec..6c9c58b 100644
--- a/src/views/config-manage/module-cfg/components/create-modal.vue
+++ b/src/views/config-manage/module-cfg/components/create-modal.vue
@@ -126,10 +126,6 @@ watch(
   }
 );
 
-// onMounted(() => {
-//   toGetDbTable();
-// });
-
 const toGetDbTable = () => {
   getDbTableSelect({ projectId: formData.value.project_id }).then((res) => {
     tableTypes.value = res.data;
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 e6a9c86..ff16c9b 100644
--- a/src/views/config-manage/module-cfg/components/field-modal.vue
+++ b/src/views/config-manage/module-cfg/components/field-modal.vue
@@ -34,6 +34,7 @@
             <a-input
               v-if="editableData[record.field_id]"
               v-model:value="record[column.dataIndex]"
+              allow-clear
               placeholder="请输入"
             />
             <template v-else>
@@ -46,6 +47,7 @@
               v-model:value="record.field_numerical_type_id" 
               :options="fieldNumTypeSel" 
               placeholder="请选择"
+              allow-clear
               style="width: 160px">
             </a-select>
             <template v-else>
@@ -58,6 +60,7 @@
               v-model:value="record.field_type_id"
               :options="fieldTypeSel"
               placeholder="请选择"
+              allow-clear
               style="width: 160px"
             >
             </a-select>
@@ -223,22 +226,37 @@ const handleCancel = (record) => {
 
 const handleSave = (record) => {
   const params = {
-    field_id: record.field_id,
-    field_title: record.field_title,
-    field_name: record.field_name,
-    field_numerical_type_id: record.field_numerical_type_id,
     is_search: record.is_search,
     field_type_id: record.field_type_id,
-    belong_to_table: record.belong_to_table,
-    original_sql: record.original_sql,
     modular_id: props.modularId,
   };
-  if (typeof params.field_id === "string") {
-    // 新建
-    delete params.field_id;
-  } else {
+  // 检验必填参数
+  const validateFields = [
+    { field: 'field_title', msg: "请填写字段标题" },
+    { field: 'field_name', msg: "请填写字段名称" },
+    { field: 'field_numerical_type_id', msg: "请选择字段类型" },
+    { field: 'belong_to_table', msg: "请填写关联表" },
+    { field: 'original_sql', msg: "请填写sql数据源" },
+  ]
+  for(let i = 0; i < validateFields.length; i++) {
+    const curr = validateFields[i];
+    if (!record[curr.field]) {
+      message.error(curr.msg);
+      return;
+    } else {
+      params[curr.field] = record[curr.field];
+    }
+  }
+  if (record.is_search && !record.field_type_id) {
+    message.error("请选择搜索类型");
+    return;
+  }
+
+  // 如果是编辑操作
+  if (typeof record.field_id === "number") {
     params.field_id = record.field_id;
   }
+
   saveField(params).then(() => {
     delete editableData[record.field_id];
     message.success("保存成功");