1、发起流程页面 流程分类无法显示

2、邮箱校验统一
3、角色管理页面角色编号换成id字段（之前是序号，vue2版本为id，测试说容易和显示顺序搞混）
4、bpmnjs流转条件无法自动保存回显问题

src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue

@@ -79,7 +79,7 @@ const resetFlowCondition = () => {
   if (
   if (
     bpmnElementSourceRef.value &&
     bpmnElementSourceRef.value &&
     bpmnElementSourceRef.value.default &&
     bpmnElementSourceRef.value.default &&
-    bpmnElementSourceRef.value.default.id === this.bpmnElement.id
+    bpmnElementSourceRef.value.default.id === bpmnElement.value.id
   ) {
   ) {
     // 默认
     // 默认
     flowConditionForm.value = { type: 'default' }
     flowConditionForm.value = { type: 'default' }
@@ -175,11 +175,13 @@ onBeforeUnmount(() => {
 watch(
 watch(
   () => props.businessObject,
   () => props.businessObject,
   (val) => {
   (val) => {
-    if (val) {
+    console.log(val, 'val')
     nextTick(() => {
     nextTick(() => {
       resetFlowCondition()
       resetFlowCondition()
     })
     })
-    }
+  },
+  {
+    immediate: true
   }
   }
 )
 )
 </script>
 </script>

src/views/bpm/processInstance/create.vue

@@ -3,6 +3,10 @@
     <!-- 第一步，通过流程定义的列表，选择对应的流程 -->
     <!-- 第一步，通过流程定义的列表，选择对应的流程 -->
     <div v-if="!selectProcessInstance">
     <div v-if="!selectProcessInstance">
       <XTable @register="registerTable">
       <XTable @register="registerTable">
+        <!-- 流程分类 -->
+        <template #category_default="{ row }">
+          <DictTag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="Number(row?.category)" />
+        </template>
         <template #version_default="{ row }">
         <template #version_default="{ row }">
           <el-tag v-if="row">v{{ row.version }}</el-tag>
           <el-tag v-if="row">v{{ row.version }}</el-tag>
         </template>
         </template>
@@ -56,6 +60,7 @@ import * as DefinitionApi from '@/api/bpm/definition'
 import * as ProcessInstanceApi from '@/api/bpm/processInstance'
 import * as ProcessInstanceApi from '@/api/bpm/processInstance'
 import { setConfAndFields2 } from '@/utils/formCreate'
 import { setConfAndFields2 } from '@/utils/formCreate'
 import { ApiAttrs } from '@form-create/element-ui/types/config'
 import { ApiAttrs } from '@form-create/element-ui/types/config'
+import { DICT_TYPE } from '@/utils/dict'
 
 
 const router = useRouter() // 路由
 const router = useRouter() // 路由
 const message = useMessage() // 消息
 const message = useMessage() // 消息

src/views/bpm/processInstance/process.create.ts

@@ -14,7 +14,12 @@ const crudSchemas = reactive<VxeCrudSchema>({
       title: '流程分类',
       title: '流程分类',
       field: 'category',
       field: 'category',
       dictType: DICT_TYPE.BPM_MODEL_CATEGORY,
       dictType: DICT_TYPE.BPM_MODEL_CATEGORY,
-      dictClass: 'number'
+      dictClass: 'number',
+      table: {
+        slots: {
+          default: 'category_default'
+        }
+      }
     },
     },
     {
     {
       title: '流程版本',
       title: '流程版本',

src/views/system/dept/dept.data.ts

@@ -6,7 +6,15 @@ const { t } = useI18n() // 国际化
 export const rules = reactive({
 export const rules = reactive({
   name: [required],
   name: [required],
   sort: [required],
   sort: [required],
-  email: [required],
+  // email: [required],
+  email: [
+    { required: true, message: t('profile.rules.mail'), trigger: 'blur' },
+    {
+      type: 'email',
+      message: t('profile.rules.truemail'),
+      trigger: ['blur', 'change']
+    }
+  ],
   phone: [
   phone: [
     {
     {
       len: 11,
       len: 11,

src/views/system/mail/account/account.data.ts

 import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
 import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
 
 
+const { t } = useI18n() // 国际化
+
 // 表单校验
 // 表单校验
 export const rules = reactive({
 export const rules = reactive({
-  mail: [required],
+  // mail: [required],
+  mail: [
+    { required: true, message: t('profile.rules.mail'), trigger: 'blur' },
+    {
+      type: 'email',
+      message: t('profile.rules.truemail'),
+      trigger: ['blur', 'change']
+    }
+  ],
   username: [required],
   username: [required],
   password: [required],
   password: [required],
   host: [required],
   host: [required],

src/views/system/role/role.data.ts

@@ -9,13 +9,20 @@ export const rules = reactive({
 })
 })
 // CrudSchema
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({
 const crudSchemas = reactive<VxeCrudSchema>({
-  primaryKey: 'id',
-  primaryTitle: '角色编号',
-  primaryType: 'seq',
+  // primaryKey: 'id',
+  // primaryTitle: '角色编号',
+  // primaryType: 'seq',
   action: true,
   action: true,
   actionWidth: '400px',
   actionWidth: '400px',
   columns: [
   columns: [
     {
     {
+      title: '角色编号',
+      field: 'id',
+      table: {
+        width: 200
+      }
+    },
+    {
       title: '角色名称',
       title: '角色名称',
       field: 'name',
       field: 'name',
       isSearch: true
       isSearch: true