From 137ebb8e9e1c59fc857c08e26c3e22cdfcb5a30f Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Sat, 11 May 2024 12:09:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E8=A1=A8=E5=8D=95=E5=85=A8?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/ops/db/DbTransferEdit.vue       |  1 +
 .../ops/db/component/table/ColumnFormItem.vue |  2 +-
 .../db/component/table/DbTableDataForm.vue    |  2 +-
 .../src/views/ops/redis/RedisEdit.vue         | 43 ++++++++-----------
 mayfly_go_web/src/views/ops/tag/TeamList.vue  | 12 +++++-
 .../src/views/system/config/ConfigEdit.vue    | 19 +++++++-
 .../views/system/resource/ResourceEdit.vue    | 22 ++++------
 .../src/views/system/role/RoleEdit.vue        | 26 ++++++++++-
 8 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/mayfly_go_web/src/views/ops/db/DbTransferEdit.vue b/mayfly_go_web/src/views/ops/db/DbTransferEdit.vue
index de5c2fc1..cc87ed13 100644
--- a/mayfly_go_web/src/views/ops/db/DbTransferEdit.vue
+++ b/mayfly_go_web/src/views/ops/db/DbTransferEdit.vue
@@ -259,6 +259,7 @@ const handleSrcTableCheckChange = (data: { id: string; name: string }, checked:
         }
     }
     if (data.id && (data.id + '').startsWith('list-item')) {
+        //
     }
 };
 
diff --git a/mayfly_go_web/src/views/ops/db/component/table/ColumnFormItem.vue b/mayfly_go_web/src/views/ops/db/component/table/ColumnFormItem.vue
index 146182c8..a582a94a 100644
--- a/mayfly_go_web/src/views/ops/db/component/table/ColumnFormItem.vue
+++ b/mayfly_go_web/src/views/ops/db/component/table/ColumnFormItem.vue
@@ -117,7 +117,7 @@ const handleBlur = () => {
     if (editorOpening.value) {
         return;
     }
-    if (props.dataType == DataType.Number && !/^-?\d*\.?\d+$/.test(itemValue.value)) {
+    if (props.dataType == DataType.Number && itemValue.value && !/^-?\d*\.?\d+$/.test(itemValue.value)) {
         ElMessage.error('输入内容与类型不匹配');
         return;
     }
diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTableDataForm.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTableDataForm.vue
index 30d196d9..d161457e 100644
--- a/mayfly_go_web/src/views/ops/db/component/table/DbTableDataForm.vue
+++ b/mayfly_go_web/src/views/ops/db/component/table/DbTableDataForm.vue
@@ -6,7 +6,7 @@
                 :key="column.columnName"
                 class="w100 mb5"
                 :prop="column.columnName"
-                :required="column.nullable != 'YES' && !column.isPrimaryKey && !column.isIdentity"
+                :required="!column.nullable && !column.isPrimaryKey && !column.isIdentity"
             >
                 <template #label>
                     <span class="pointer" :title="`${column.columnType} | ${column.columnComment}`">
diff --git a/mayfly_go_web/src/views/ops/redis/RedisEdit.vue b/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
index c5f1c949..072df23d 100644
--- a/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
+++ b/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
@@ -58,13 +58,6 @@
                                 placeholder="请输入密码, 修改操作可不填"
                                 autocomplete="new-password"
                             >
-                                <!-- <template v-if="form.id && form.id != 0" #suffix>
-                                    <el-popover @hide="pwd = ''" placement="right" title="原密码" :width="200" trigger="click" :content="pwd">
-                                        <template #reference>
-                                            <el-link @click="getPwd" :underline="false" type="primary" class="mr5">原密码</el-link>
-                                        </template>
-                                    </el-popover>
-                                </template> -->
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="db" label="库号" required>
@@ -106,7 +99,7 @@
 </template>
 
 <script lang="ts" setup>
-import { toRefs, reactive, ref, watchEffect } from 'vue';
+import { toRefs, reactive, ref, watch } from 'vue';
 import { redisApi } from './api';
 import { ElMessage } from 'element-plus';
 import TagTreeSelect from '../component/TagTreeSelect.vue';
@@ -207,23 +200,25 @@ const { dialogVisible, tabActiveName, form, submitForm, dbList } = toRefs(state)
 const { isFetching: testConnBtnLoading, execute: testConnExec } = redisApi.testConn.useApi(submitForm);
 const { isFetching: saveBtnLoading, execute: saveRedisExec } = redisApi.saveRedis.useApi(submitForm);
 
-watchEffect(() => {
-    state.dialogVisible = props.visible;
-    if (!state.dialogVisible) {
-        return;
+watch(
+    () => props.visible,
+    () => {
+        state.dialogVisible = props.visible;
+        if (!state.dialogVisible) {
+            return;
+        }
+        state.tabActiveName = 'basic';
+        const redis: any = props.redis;
+        if (redis) {
+            state.form = { ...redis };
+            state.form.tagCodePaths = redis.tags.map((t: any) => t.codePath);
+            convertDb(state.form.db);
+        } else {
+            state.form = { db: '0', tagCodePaths: [] } as any;
+            state.dbList = [0];
+        }
     }
-    state.tabActiveName = 'basic';
-    const redis: any = props.redis;
-    if (redis) {
-        state.form = { ...redis };
-        state.form.tagCodePaths = redis.tags.map((t: any) => t.codePath);
-        convertDb(state.form.db);
-    } else {
-        state.form = { db: '0', tagCodePaths: [] } as any;
-
-        state.dbList = [0];
-    }
-});
+);
 
 const convertDb = (db: string) => {
     state.dbList = db.split(',').map((x) => Number.parseInt(x));
diff --git a/mayfly_go_web/src/views/ops/tag/TeamList.vue b/mayfly_go_web/src/views/ops/tag/TeamList.vue
index 6de6d61b..0eca6eb6 100755
--- a/mayfly_go_web/src/views/ops/tag/TeamList.vue
+++ b/mayfly_go_web/src/views/ops/tag/TeamList.vue
@@ -36,7 +36,7 @@
                 <DrawerHeader :header="addTeamDialog.form.id ? '编辑团队' : '添加团队'" :back="cancelSaveTeam" />
             </template>
 
-            <el-form ref="teamForm" :model="addTeamDialog.form" label-width="auto">
+            <el-form ref="teamForm" :model="addTeamDialog.form" :rules="teamFormRules" label-width="auto">
                 <el-form-item prop="name" label="团队名" required>
                     <el-input :disabled="addTeamDialog.form.id" v-model="addTeamDialog.form.name" auto-complete="off"></el-input>
                 </el-form-item>
@@ -106,6 +106,16 @@ const teamForm: any = ref(null);
 const pageTableRef: Ref<any> = ref(null);
 const showMemPageTableRef: Ref<any> = ref(null);
 
+const teamFormRules = {
+    name: [
+        {
+            required: true,
+            message: '请输入团队名',
+            trigger: ['change', 'blur'],
+        },
+    ],
+};
+
 const searchItems = [SearchItem.input('name', '团队名称')];
 const columns = [
     TableColumn.new('name', '团队名称'),
diff --git a/mayfly_go_web/src/views/system/config/ConfigEdit.vue b/mayfly_go_web/src/views/system/config/ConfigEdit.vue
index d01f12d1..2e062ff1 100755
--- a/mayfly_go_web/src/views/system/config/ConfigEdit.vue
+++ b/mayfly_go_web/src/views/system/config/ConfigEdit.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-dialog :title="title" v-model="dvisible" :show-close="false" :before-close="cancel" width="900px" :destroy-on-close="true">
-            <el-form ref="configForm" :model="form" label-width="auto">
+            <el-form ref="configForm" :model="form" :rules="rules" label-width="auto">
                 <el-form-item prop="name" label="配置项" required>
                     <el-input v-model="form.name"></el-input>
                 </el-form-item>
@@ -46,6 +46,23 @@ import { configApi, accountApi } from '../api';
 import { DynamicFormEdit } from '@/components/dynamic-form';
 import { ElMessage } from 'element-plus';
 
+const rules = {
+    name: [
+        {
+            required: true,
+            message: '请输入配置项',
+            trigger: ['change', 'blur'],
+        },
+    ],
+    key: [
+        {
+            required: true,
+            message: '请输入配置key',
+            trigger: ['change', 'blur'],
+        },
+    ],
+};
+
 const props = defineProps({
     visible: {
         type: Boolean,
diff --git a/mayfly_go_web/src/views/system/resource/ResourceEdit.vue b/mayfly_go_web/src/views/system/resource/ResourceEdit.vue
index f1408dda..471c3205 100644
--- a/mayfly_go_web/src/views/system/resource/ResourceEdit.vue
+++ b/mayfly_go_web/src/views/system/resource/ResourceEdit.vue
@@ -255,6 +255,13 @@ const changeLinkType = () => {
 };
 
 const btnOk = async () => {
+    try {
+        await menuForm.value.validate();
+    } catch (e: any) {
+        ElMessage.error('请正确填写信息');
+        return false;
+    }
+
     const submitForm = { ...state.form };
     if (submitForm.type == 1) {
         // 如果是菜单，则解析meta，如果值为false或者''则去除该值
@@ -263,13 +270,6 @@ const btnOk = async () => {
         submitForm.meta = null as any;
     }
 
-    try {
-        await menuForm.value.validate();
-    } catch (e: any) {
-        ElMessage.error('请正确填写信息');
-        return false;
-    }
-
     state.submitForm = submitForm;
     await saveResouceExec();
 
@@ -317,10 +317,4 @@ const cancel = () => {
     emit('cancel');
 };
 </script>
-<style lang="scss">
-// 	.m-dialog {
-// 		.el-cascader {
-// 			width: 100%;
-// 		}
-// 	}
-</style>
+<style lang="scss"></style>
diff --git a/mayfly_go_web/src/views/system/role/RoleEdit.vue b/mayfly_go_web/src/views/system/role/RoleEdit.vue
index 413c9114..24507dc8 100755
--- a/mayfly_go_web/src/views/system/role/RoleEdit.vue
+++ b/mayfly_go_web/src/views/system/role/RoleEdit.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="role-dialog">
         <el-dialog :title="title" v-model="dvisible" :show-close="false" :before-close="cancel" width="500px" :destroy-on-close="true">
-            <el-form ref="roleForm" :model="form" label-width="auto">
+            <el-form ref="roleForm" :model="form" :rules="rules" label-width="auto">
                 <el-form-item prop="name" label="角色名称" required>
                     <el-input v-model="form.name" auto-complete="off"></el-input>
                 </el-form-item>
@@ -32,6 +32,30 @@ import { ref, toRefs, reactive, watchEffect } from 'vue';
 import { roleApi } from '../api';
 import { RoleStatusEnum } from '../enums';
 
+const rules = {
+    name: [
+        {
+            required: true,
+            message: '请输入角色名称',
+            trigger: ['change', 'blur'],
+        },
+    ],
+    code: [
+        {
+            required: true,
+            message: '请输入角色编号',
+            trigger: ['change', 'blur'],
+        },
+    ],
+    status: [
+        {
+            required: true,
+            message: '请选择状态',
+            trigger: ['change', 'blur'],
+        },
+    ],
+};
+
 const props = defineProps({
     visible: {
         type: Boolean,