From 7ec3550157849041718d2eb5125d1b97376f893f Mon Sep 17 00:00:00 2001
From: gexinzhineng/gxzn27 <1348660141@qq.com>
Date: Mon, 27 Feb 2023 16:14:02 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E6=96=B0=E5=BB=BA=E6=B5=81=E7=A8=8B=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=EF=BC=88vue2=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=EF=BC=89=202=E3=80=81=E6=B5=81=E7=A8=8B=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=20=E5=AD=97=E5=85=B8=E5=9B=9E=E6=98=BEbug=203?=
 =?UTF-8?q?=E3=80=81=E7=94=A8=E6=88=B7=E5=88=86=E7=BB=84=20=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=B6=E7=82=B9=E5=87=BB=E7=A9=BA=E7=99=BD=E5=A4=84?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=B6=88=E5=A4=B1=EF=BC=88vue2=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=EF=BC=8C=E4=B8=8D=E6=B6=88=E5=A4=B1=EF=BC=89=204?=
 =?UTF-8?q?=E3=80=81=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E8=A7=84=E8=8C=83=E6=A0=A1=E9=AA=8C=205?=
 =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E5=88=86=E9=85=8D=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=20=E6=8C=87=E5=AE=9A=E8=A7=92=E8=89=B2=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E5=AE=9A=E4=B8=BANumber?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/group/index.vue           | 2 +-
 src/views/bpm/model/index.vue           | 1 +
 src/views/bpm/processInstance/index.vue | 2 +-
 src/views/bpm/taskAssignRule/index.vue  | 4 ++--
 src/views/system/user/user.data.ts      | 9 ++++++++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/bpm/group/index.vue b/src/views/bpm/group/index.vue
index 7aa2ca4a..b0f08516 100644
--- a/src/views/bpm/group/index.vue
+++ b/src/views/bpm/group/index.vue
@@ -43,7 +43,7 @@
     </XTable>
   </ContentWrap>
 
-  <XModal v-model="dialogVisible" :title="dialogTitle">
+  <XModal v-model="dialogVisible" :title="dialogTitle" :mask-closable="false">
     <!-- 对话框(添加 / 修改) -->
     <Form
       v-if="['create', 'update'].includes(actionType)"
diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue
index 5fafb960..39f05d88 100644
--- a/src/views/bpm/model/index.vue
+++ b/src/views/bpm/model/index.vue
@@ -429,6 +429,7 @@ const handleUpdate = async (rowId: number) => {
   await setDialogTile('edit')
   // 设置数据
   saveForm.value = await ModelApi.getModelApi(rowId)
+  saveForm.value.category = Number(saveForm.value.category)
 }
 
 // 提交按钮
diff --git a/src/views/bpm/processInstance/index.vue b/src/views/bpm/processInstance/index.vue
index d2f81753..6cba9eaf 100644
--- a/src/views/bpm/processInstance/index.vue
+++ b/src/views/bpm/processInstance/index.vue
@@ -7,7 +7,7 @@
         <XButton
           type="primary"
           preIcon="ep:zoom-in"
-          title="新建流程"
+          title="发起流程"
           v-hasPermi="['bpm:process-instance:query']"
           @click="handleCreate"
         />
diff --git a/src/views/bpm/taskAssignRule/index.vue b/src/views/bpm/taskAssignRule/index.vue
index f93e4591..e6e4b88f 100644
--- a/src/views/bpm/taskAssignRule/index.vue
+++ b/src/views/bpm/taskAssignRule/index.vue
@@ -45,9 +45,9 @@
           <el-select v-model="formData.roleIds" multiple clearable style="width: 100%">
             <el-option
               v-for="item in roleOptions"
-              :key="parseInt(item.id)"
+              :key="item.id"
               :label="item.name"
-              :value="parseInt(item.id)"
+              :value="item.id"
             />
           </el-select>
         </el-form-item>
diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts
index c5b617c3..12c777fc 100644
--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
@@ -5,7 +5,14 @@ const { t } = useI18n()
 export const rules = reactive({
   username: [required],
   nickname: [required],
-  email: [required],
+  email: [
+    { required: true, message: t('profile.rules.mail'), trigger: 'blur' },
+    {
+      type: 'email',
+      message: t('profile.rules.truemail'),
+      trigger: ['blur', 'change']
+    }
+  ],
   status: [required],
   mobile: [
     {