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 @@
@@ -46,6 +47,7 @@
v-model:value="record.field_numerical_type_id"
:options="fieldNumTypeSel"
placeholder="请选择"
+ allow-clear
style="width: 160px">
@@ -58,6 +60,7 @@
v-model:value="record.field_type_id"
:options="fieldTypeSel"
placeholder="请选择"
+ allow-clear
style="width: 160px"
>
@@ -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("保存成功");