From ccd56f2ddaac7993f5429b0feed600e4083cf9bc Mon Sep 17 00:00:00 2001 From: DevDengChao <2325690622@qq.com> Date: Tue, 7 May 2024 15:31:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=B1=E4=BA=8E?= =?UTF-8?q?=20.env.local-dev=20=E9=87=8D=E5=91=BD=E5=90=8D=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E6=9E=84=E5=BB=BA=E6=8C=87=E4=BB=A4=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b450bf69..1fa88646 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,13 @@ "dev-server": "vite --mode dev", "ts:check": "vue-tsc --noEmit", "build:local": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build", - "build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev", + "build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode dev", "build:test": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode test", "build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage", "build:prod": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode prod", "serve:dev": "vite preview --mode dev", "serve:prod": "vite preview --mode prod", - "preview": "pnpm build:local-dev && vite preview", + "preview": "pnpm build:local && vite preview", "clean": "npx rimraf node_modules", "clean:cache": "npx rimraf node_modules/.cache", "lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src", From eeae01e661833b57d74128d0c74448f1ad991fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E7=97=95?= <614891294@qq.com> Date: Tue, 7 May 2024 09:08:28 +0000 Subject: [PATCH 2/6] =?UTF-8?q?update=20src/views/Login/SocialLogin.vue.?= =?UTF-8?q?=20=E8=BF=99=E9=87=8C=E5=B7=B2=E7=BB=8F=E6=98=AF=E5=B8=83?= =?UTF-8?q?=E5=B0=94=E5=80=BC=E4=BA=86=EF=BC=8C=E4=B8=8D=E7=94=A8=E5=9C=A8?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=B8=BA=E5=B8=83=E5=B0=94=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 天痕 <614891294@qq.com> --- src/views/Login/SocialLogin.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Login/SocialLogin.vue b/src/views/Login/SocialLogin.vue index 1eb9293c..5d0db475 100644 --- a/src/views/Login/SocialLogin.vue +++ b/src/views/Login/SocialLogin.vue @@ -64,7 +64,7 @@ - + Date: Tue, 7 May 2024 09:10:43 +0000 Subject: [PATCH 3/6] =?UTF-8?q?update=20src/views/Login/SocialLogin.vue.?= =?UTF-8?q?=20=E8=BF=99=E9=87=8C=E5=BA=94=E8=AF=A5=E5=8F=96=E5=8F=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 天痕 <614891294@qq.com> --- src/views/Login/SocialLogin.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Login/SocialLogin.vue b/src/views/Login/SocialLogin.vue index 1eb9293c..af77d889 100644 --- a/src/views/Login/SocialLogin.vue +++ b/src/views/Login/SocialLogin.vue @@ -207,7 +207,7 @@ const loginData = reactive({ // 获取验证码 const getCode = async () => { // 情况一，未开启：则直接登录 - if (loginData.captchaEnable) { + if (!loginData.captchaEnable) { await handleLogin({}) } else { // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录 From 657ad506a41dd83f06954261e05461d79bc4640b Mon Sep 17 00:00:00 2001 From: syubun Date: Wed, 8 May 2024 09:44:47 +0800 Subject: [PATCH 4/6] =?UTF-8?q?oa=E8=AF=B7=E5=81=87=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/oa/leave/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/bpm/oa/leave/index.vue b/src/views/bpm/oa/leave/index.vue index bd41104a..2cb53247 100644 --- a/src/views/bpm/oa/leave/index.vue +++ b/src/views/bpm/oa/leave/index.vue @@ -83,7 +83,7 @@ Date: Wed, 8 May 2024 06:14:01 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E4=B8=AD=EF=BC=8C=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E4=B8=AD=E7=9A=84prop?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=80=BC=E5=86=99=E9=94=99=E4=BA=86=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=EF=BC=8C=E5=B7=B2=E5=81=9A=E7=9B=B8?= =?UTF-8?q?=E5=BA=94=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘岩Tony <345006662@qq.com> --- src/views/system/dept/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index e99d7f8a..4757e5c0 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -8,7 +8,7 @@ :inline="true" label-width="68px" > - + Date: Wed, 8 May 2024 15:13:51 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=B5=81=E8=BD=AC=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/penal/flow-condition/FlowCondition.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue b/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue index 345670ae..1715d73b 100644 --- a/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue +++ b/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue @@ -79,13 +79,13 @@ const resetFlowCondition = () => { bpmnElement.value = bpmnInstances().bpmnElement bpmnElementSource.value = bpmnElement.value.source bpmnElementSourceRef.value = bpmnElement.value.businessObject.sourceRef + // 初始化默认type为default + flowConditionForm.value = { type: 'default' } if ( bpmnElementSourceRef.value && bpmnElementSourceRef.value.default && - bpmnElementSourceRef.value.default.id === bpmnElement.value.id && - flowConditionForm.value.type == 'default' + bpmnElementSourceRef.value.default.id === bpmnElement.value.id ) { - // 默认 flowConditionForm.value = { type: 'default' } } else if (!bpmnElement.value.businessObject.conditionExpression) { // 普通