From 2d3227c5bcbe8e48b3ee7c093dd661c5205c7cd5 Mon Sep 17 00:00:00 2001 From: gexinzhineng/gxzn27 <1348660141@qq.com> Date: Wed, 1 Mar 2023 14:51:26 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E6=B5=81=E7=A8=8B=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=202=E3=80=81=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=E6=A0=A1=E9=AA=8C=E7=BB=9F=E4=B8=80=203=E3=80=81?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=BC=96=E5=8F=B7=E6=8D=A2=E6=88=90id=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=88=E4=B9=8B=E5=89=8D=E6=98=AF=E5=BA=8F=E5=8F=B7?= =?UTF-8?q?=EF=BC=8Cvue2=E7=89=88=E6=9C=AC=E4=B8=BAid=EF=BC=8C=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=AF=B4=E5=AE=B9=E6=98=93=E5=92=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=90=9E=E6=B7=B7=EF=BC=89=204=E3=80=81bpmnj?= =?UTF-8?q?s=E6=B5=81=E8=BD=AC=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BF=9D=E5=AD=98=E5=9B=9E=E6=98=BE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/penal/flow-condition/FlowCondition.vue | 14 ++++++++------ src/views/bpm/processInstance/create.vue | 5 +++++ src/views/bpm/processInstance/process.create.ts | 7 ++++++- src/views/system/dept/dept.data.ts | 10 +++++++++- src/views/system/mail/account/account.data.ts | 12 +++++++++++- src/views/system/role/role.data.ts | 13 ++++++++++--- 6 files changed, 49 insertions(+), 12 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue b/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue index ee4512e7..ae1d1567 100644 --- a/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue +++ b/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue @@ -79,7 +79,7 @@ const resetFlowCondition = () => { if ( bpmnElementSourceRef.value && bpmnElementSourceRef.value.default && - bpmnElementSourceRef.value.default.id === this.bpmnElement.id + bpmnElementSourceRef.value.default.id === bpmnElement.value.id ) { // 默认 flowConditionForm.value = { type: 'default' } @@ -175,11 +175,13 @@ onBeforeUnmount(() => { watch( () => props.businessObject, (val) => { - if (val) { - nextTick(() => { - resetFlowCondition() - }) - } + console.log(val, 'val') + nextTick(() => { + resetFlowCondition() + }) + }, + { + immediate: true } ) diff --git a/src/views/bpm/processInstance/create.vue b/src/views/bpm/processInstance/create.vue index c0542b22..084c085c 100644 --- a/src/views/bpm/processInstance/create.vue +++ b/src/views/bpm/processInstance/create.vue @@ -3,6 +3,10 @@
+ + @@ -56,6 +60,7 @@ import * as DefinitionApi from '@/api/bpm/definition' import * as ProcessInstanceApi from '@/api/bpm/processInstance' import { setConfAndFields2 } from '@/utils/formCreate' import { ApiAttrs } from '@form-create/element-ui/types/config' +import { DICT_TYPE } from '@/utils/dict' const router = useRouter() // 路由 const message = useMessage() // 消息 diff --git a/src/views/bpm/processInstance/process.create.ts b/src/views/bpm/processInstance/process.create.ts index b2282406..7516c0b4 100644 --- a/src/views/bpm/processInstance/process.create.ts +++ b/src/views/bpm/processInstance/process.create.ts @@ -14,7 +14,12 @@ const crudSchemas = reactive({ title: '流程分类', field: 'category', dictType: DICT_TYPE.BPM_MODEL_CATEGORY, - dictClass: 'number' + dictClass: 'number', + table: { + slots: { + default: 'category_default' + } + } }, { title: '流程版本', diff --git a/src/views/system/dept/dept.data.ts b/src/views/system/dept/dept.data.ts index 5e3d0761..c6945841 100644 --- a/src/views/system/dept/dept.data.ts +++ b/src/views/system/dept/dept.data.ts @@ -6,7 +6,15 @@ const { t } = useI18n() // 国际化 export const rules = reactive({ name: [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: [ { len: 11, diff --git a/src/views/system/mail/account/account.data.ts b/src/views/system/mail/account/account.data.ts index a2e29f85..bd05ce4f 100644 --- a/src/views/system/mail/account/account.data.ts +++ b/src/views/system/mail/account/account.data.ts @@ -1,8 +1,18 @@ import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas' +const { t } = useI18n() // 国际化 + // 表单校验 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], password: [required], host: [required], diff --git a/src/views/system/role/role.data.ts b/src/views/system/role/role.data.ts index fef2ec47..d55b5e21 100644 --- a/src/views/system/role/role.data.ts +++ b/src/views/system/role/role.data.ts @@ -9,12 +9,19 @@ export const rules = reactive({ }) // CrudSchema const crudSchemas = reactive({ - primaryKey: 'id', - primaryTitle: '角色编号', - primaryType: 'seq', + // primaryKey: 'id', + // primaryTitle: '角色编号', + // primaryType: 'seq', action: true, actionWidth: '400px', columns: [ + { + title: '角色编号', + field: 'id', + table: { + width: 200 + } + }, { title: '角色名称', field: 'name',