From bdc815a39ddbdd023fdff91d32dac5003f341d2e Mon Sep 17 00:00:00 2001
From: aeizzz <aeizzz@foxmail.com>
Date: Thu, 9 Mar 2023 08:55:23 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=09=E5=8F=82=E6=95=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=B9=82=E7=AD=89=E6=80=A7=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin/param.ts          | 41 +++++++++++++++++++++++++++-
 src/views/admin/param/form.vue  | 47 +++++++++++++++++++++------------
 src/views/admin/param/index.vue |  6 +++++
 3 files changed, 76 insertions(+), 18 deletions(-)

diff --git a/src/api/admin/param.ts b/src/api/admin/param.ts
index 150e261f..c39c07d9 100644
--- a/src/api/admin/param.ts
+++ b/src/api/admin/param.ts
@@ -1,4 +1,5 @@
 import request from '/@/utils/request';
+import { getObjDetails } from '/@/api/admin/tenant';
 
 export function fetchList(query?: Object) {
 	return request({
@@ -18,7 +19,7 @@ export function addObj(obj?: Object) {
 
 export function getObj(id?: string) {
 	return request({
-		url: '/admin/param/' + id,
+		url: '/admin/param/details/' + id,
 		method: 'get',
 	});
 }
@@ -45,3 +46,41 @@ export function refreshCache() {
 		method: 'put',
 	});
 }
+
+export function getObjDetails(obj?: object) {
+	return request({
+		url: '/admin/param/details',
+		method: 'get',
+		params: obj,
+	});
+}
+
+export function validateParamsCode(rule: any, value: any, callback: any, isEdit: boolean) {
+	if (isEdit) {
+		return callback();
+	}
+
+	getObjDetails({ publicKey: value }).then((response) => {
+		const result = response.data;
+		if (result !== null) {
+			callback(new Error('参数编码已经存在'));
+		} else {
+			callback();
+		}
+	});
+}
+
+export function validateParamsName(rule: any, value: any, callback: any, isEdit: boolean) {
+	if (isEdit) {
+		return callback();
+	}
+
+	getObjDetails({ publicName: value }).then((response) => {
+		const result = response.data;
+		if (result !== null) {
+			callback(new Error('参数名称已经存在'));
+		} else {
+			callback();
+		}
+	});
+}
diff --git a/src/views/admin/param/form.vue b/src/views/admin/param/form.vue
index 0495f8b6..9bb6cc3a 100644
--- a/src/views/admin/param/form.vue
+++ b/src/views/admin/param/form.vue
@@ -2,39 +2,39 @@
 	<el-dialog :close-on-click-modal="false" :title="form.publicId ? $t('common.editBtn') : $t('common.addBtn')" draggable v-model="visible">
 		<el-form :model="form" :rules="dataRules" formDialogRef label-width="90px" ref="dataFormRef">
 			<el-row :gutter="20">
-				<el-col :span="24" class="mb20">
+				<el-col :span="12" class="mb20">
 					<el-form-item :label="t('param.publicName')" prop="publicName">
 						<el-input :placeholder="t('param.inputpublicNameTip')" v-model="form.publicName" />
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="24" class="mb20">
+				<el-col :span="12" class="mb20">
 					<el-form-item :label="t('param.publicKey')" prop="publicKey">
 						<el-input :placeholder="t('param.inputpublicKeyTip')" v-model="form.publicKey" />
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="24" class="mb20">
+				<el-col :span="12" class="mb20">
 					<el-form-item :label="t('param.publicValue')" prop="publicValue">
 						<el-input :placeholder="t('param.inputpublicValueTip')" v-model="form.publicValue" />
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="24" class="mb20">
+				<el-col :span="12" class="mb20">
 					<el-form-item :label="t('param.status')" prop="status">
-						<el-select :placeholder="t('param.inputstatusTip')" v-model="form.status">
-							<el-option :key="index" :label="item.label" :value="item.value" v-for="(item, index) in status_type"></el-option>
-						</el-select>
+						<el-radio-group v-model="form.status">
+							<el-radio :label="item.value" border v-for="(item, index) in status_type" :key="index">{{ item.label }}</el-radio>
+						</el-radio-group>
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="24" class="mb20">
+				<el-col :span="12" class="mb20">
 					<el-form-item :label="t('param.validateCode')" prop="validateCode">
 						<el-input :placeholder="t('param.inputvalidateCodeTip')" v-model="form.validateCode" />
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="24" class="mb20">
+				<el-col :span="12" class="mb20">
 					<el-form-item :label="t('param.publicType')" prop="publicType">
 						<el-select :placeholder="t('param.inputpublicTypeTip')" v-model="form.publicType">
 							<el-option :key="index" :label="item.label" :value="item.value" v-for="(item, index) in param_type"></el-option>
@@ -42,11 +42,11 @@
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="24" class="mb20">
+				<el-col :span="12" class="mb20">
 					<el-form-item :label="t('param.systemFlag')" prop="systemFlag">
-						<el-select :placeholder="t('param.inputsystemFlagTip')" v-model="form.systemFlag">
-							<el-option :key="index" :label="item.label" :value="item.value" v-for="(item, index) in dict_type"></el-option>
-						</el-select>
+						<el-radio-group v-model="form.systemFlag">
+							<el-radio :label="item.value" border v-for="(item, index) in dict_type" :key="index">{{ item.label }}</el-radio>
+						</el-radio-group>
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -64,7 +64,7 @@
 // 定义子组件向父组件传值/事件
 import { useDict } from '/@/hooks/dict';
 import { useMessage } from '/@/hooks/message';
-import { addObj, getObj, putObj } from '/@/api/admin/param';
+import { addObj, getObj, putObj, validateParamsCode, validateParamsName } from '/@/api/admin/param';
 import { useI18n } from 'vue-i18n';
 import { rule } from '/@/utils/validate';
 
@@ -86,20 +86,33 @@ const form = reactive({
 	publicValue: '',
 	status: '0',
 	validateCode: '',
-	publicType: '',
+	publicType: '0',
 	systemFlag: '0',
 });
 
 // 定义校验规则
 const dataRules = reactive({
-	publicName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+	publicName: [
+		{ required: true, message: '名称不能为空', trigger: 'blur' },
+		{
+			validator: (rule: any, value: any, callback: any) => {
+				validateParamsName(rule, value, callback, form.publicId !== '');
+			},
+			trigger: 'blur',
+		},
+	],
 	publicKey: [
 		{ required: true, message: '参数键不能为空', trigger: 'blur' },
 		{ validator: rule.validatorLowercase, trigger: 'blur' },
+		{
+			validator: (rule: any, value: any, callback: any) => {
+				validateParamsCode(rule, value, callback, form.publicId !== '');
+			},
+			trigger: 'blur',
+		},
 	],
 	publicValue: [{ required: true, message: '参数值不能为空', trigger: 'blur' }],
 	status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
-	validateCode: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
 	publicType: [{ required: true, message: '类型不能为空', trigger: 'blur' }],
 	systemFlag: [{ required: true, message: '类型不能为空', trigger: 'blur' }],
 });
diff --git a/src/views/admin/param/index.vue b/src/views/admin/param/index.vue
index faec9dbc..dab90fa7 100644
--- a/src/views/admin/param/index.vue
+++ b/src/views/admin/param/index.vue
@@ -3,6 +3,12 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row class="mb8" v-show="showSearch">
 				<el-form :inline="true" :model="state.queryForm" ref="queryRef">
+					<el-form-item :label="$t('param.publicName')" prop="publicName">
+						<el-input :placeholder="$t('param.inputpublicNameTip')" style="max-width: 180px" v-model="state.queryForm.publicName" />
+					</el-form-item>
+					<el-form-item :label="$t('param.publicKey')" prop="publicKey">
+						<el-input :placeholder="$t('param.inputpublicKeyTip')" style="max-width: 180px" v-model="state.queryForm.publicKey" />
+					</el-form-item>
 					<el-form-item :label="t('param.systemFlag')" class="ml2" prop="systemFlag">
 						<el-select :placeholder="t('param.inputsystemFlagTip')" v-model="state.queryForm.systemFlag">
 							<el-option :key="index" :label="item.label" :value="item.value" v-for="(item, index) in dict_type"></el-option>