Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

package.json

@@ -10,13 +10,13 @@
     "dev-server": "vite --mode dev",
     "dev-server": "vite --mode dev",
     "ts:check": "vue-tsc --noEmit",
     "ts:check": "vue-tsc --noEmit",
     "build:local": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build",
     "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: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: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",
     "build:prod": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode prod",
     "serve:dev": "vite preview --mode dev",
     "serve:dev": "vite preview --mode dev",
     "serve:prod": "vite preview --mode prod",
     "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": "npx rimraf node_modules",
     "clean:cache": "npx rimraf node_modules/.cache",
     "clean:cache": "npx rimraf node_modules/.cache",
     "lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
     "lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",

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

@@ -79,13 +79,13 @@ const resetFlowCondition = () => {
   bpmnElement.value = bpmnInstances().bpmnElement
   bpmnElement.value = bpmnInstances().bpmnElement
   bpmnElementSource.value = bpmnElement.value.source
   bpmnElementSource.value = bpmnElement.value.source
   bpmnElementSourceRef.value = bpmnElement.value.businessObject.sourceRef
   bpmnElementSourceRef.value = bpmnElement.value.businessObject.sourceRef
+  // 初始化默认type为default
+  flowConditionForm.value = { type: 'default' }
   if (
   if (
     bpmnElementSourceRef.value &&
     bpmnElementSourceRef.value &&
     bpmnElementSourceRef.value.default &&
     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' }
     flowConditionForm.value = { type: 'default' }
   } else if (!bpmnElement.value.businessObject.conditionExpression) {
   } else if (!bpmnElement.value.businessObject.conditionExpression) {
     // 普通
     // 普通

src/views/Login/SocialLogin.vue

@@ -64,7 +64,7 @@
                   </el-form-item>
                   </el-form-item>
                 </el-col>
                 </el-col>
                 <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
                 <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
-                  <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
+                  <el-form-item v-if="loginData.tenantEnable" prop="tenantName">
                     <el-input
                     <el-input
                       v-model="loginData.loginForm.tenantName"
                       v-model="loginData.loginForm.tenantName"
                       :placeholder="t('login.tenantNamePlaceholder')"
                       :placeholder="t('login.tenantNamePlaceholder')"
@@ -207,7 +207,7 @@ const loginData = reactive({
 // 获取验证码
 // 获取验证码
 const getCode = async () => {
 const getCode = async () => {
   // 情况一，未开启：则直接登录
   // 情况一，未开启：则直接登录
-  if (loginData.captchaEnable) {
+  if (!loginData.captchaEnable) {
     await handleLogin({})
     await handleLogin({})
   } else {
   } else {
     // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
     // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录

src/views/bpm/oa/leave/index.vue

@@ -83,7 +83,7 @@
       <el-table-column align="center" label="申请编号" prop="id" />
       <el-table-column align="center" label="申请编号" prop="id" />
       <el-table-column align="center" label="状态" prop="result">
       <el-table-column align="center" label="状态" prop="result">
         <template #default="scope">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.result" />
+          <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.status" />
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column
       <el-table-column

src/views/system/dept/index.vue

@@ -8,7 +8,7 @@
       :inline="true"
       :inline="true"
       label-width="68px"
       label-width="68px"
     >
     >
-      <el-form-item label="部门名称" prop="title">
+      <el-form-item label="部门名称" prop="name">
         <el-input
         <el-input
           v-model="queryParams.name"
           v-model="queryParams.name"
           placeholder="请输入部门名称"
           placeholder="请输入部门名称"