From ccbdd0cf6d00da6686e3bbb127057dcb6140b776 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 10 Apr 2023 21:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/448=E3=80=91=E6=9A=97=E5=A4=9C?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8D=E5=AE=8C=E6=95=B4=EF=BC=8C=E6=9C=89?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/address/index.vue            |  8 ++++-
 .../depart/components/DepartFormTab.vue       |  8 +++++
 .../depart/components/DepartRuleTab.vue       |  7 ++++
 src/views/system/depart/index.vue             |  9 ++++-
 src/views/system/loginmini/OAuth2Login.vue    |  5 +--
 src/views/system/user/user.data.ts            |  7 +++-
 .../system/usersetting/AccountSetting.vue     | 22 +++++-------
 src/views/system/usersetting/BaseSetting.vue  | 25 +++++++++----
 .../system/usersetting/TenantSetting.vue      | 36 +++++++++++++------
 src/views/system/usersetting/UserSetting.vue  | 12 +++++--
 10 files changed, 101 insertions(+), 38 deletions(-)

diff --git a/src/views/system/address/index.vue b/src/views/system/address/index.vue
index 02e2bc6..bd5eac3 100644
--- a/src/views/system/address/index.vue
+++ b/src/views/system/address/index.vue
@@ -4,7 +4,7 @@
       <DepartLeftTree ref="leftTree" @select="onTreeSelect" />
     </a-col>
     <a-col :xl="18" :lg="24" :md="24" style="margin-bottom: 10px">
-      <div style="height: 100%; background-color: white">
+      <div style="height: 100%;" class="address-book">
         <!--引用表格-->
         <BasicTable @register="registerTable">
           <template #post="{ text }">
@@ -86,4 +86,10 @@
 
 <style lang="less" scoped>
   @import './index.less';
+
+  /*begin 兼容暗夜模式*/
+  .address-book{
+    background-color: @component-background !important;
+  }
+  /*end 兼容暗夜模式*/
 </style>
diff --git a/src/views/system/depart/components/DepartFormTab.vue b/src/views/system/depart/components/DepartFormTab.vue
index 83600c5..895428d 100644
--- a/src/views/system/depart/components/DepartFormTab.vue
+++ b/src/views/system/depart/components/DepartFormTab.vue
@@ -112,3 +112,11 @@
     }
   }
 </script>
+<style lang="less" scoped>
+   /*begin 兼容暗夜模式*/
+  .j-box-bottom-button-float{
+    background-color: @component-background;
+    border-top: 1px solid @border-color-base;
+  }
+   /*end 兼容暗夜模式*/
+</style>
diff --git a/src/views/system/depart/components/DepartRuleTab.vue b/src/views/system/depart/components/DepartRuleTab.vue
index f8025e9..a4e4390 100644
--- a/src/views/system/depart/components/DepartRuleTab.vue
+++ b/src/views/system/depart/components/DepartRuleTab.vue
@@ -166,4 +166,11 @@
   .depart-rule-tree :deep(.scrollbar__bar) {
     pointer-events: none;
   }
+
+   /*begin 兼容暗夜模式*/
+  .j-box-bottom-button-float{
+    background-color: @component-background;
+    border-top: 1px solid @border-color-base;
+  }
+  /*end 兼容暗夜模式*/
 </style>
diff --git a/src/views/system/depart/index.vue b/src/views/system/depart/index.vue
index 68ed965..80e3d1e 100644
--- a/src/views/system/depart/index.vue
+++ b/src/views/system/depart/index.vue
@@ -4,7 +4,7 @@
       <DepartLeftTree ref="leftTree" @select="onTreeSelect" @rootTreeData="onRootTreeData" />
     </a-col>
     <a-col :xl="12" :lg="24" :md="24" style="margin-bottom: 10px">
-      <div style="height: 100%; background-color: white">
+      <div style="height: 100%;" class="depart-manage">
         <a-tabs v-show="departData != null" defaultActiveKey="base-info">
           <a-tab-pane tab="基本信息" key="base-info" forceRender style="position: relative">
             <div style="padding: 20px">
@@ -61,3 +61,10 @@
 <style lang="less">
   @import './index.less';
 </style>
+<style lang="less" scoped>
+  /*begin 兼容暗夜模式*/
+  .depart-manage{
+    background-color: @component-background;
+  }
+  /*end 兼容暗夜模式*/
+</style>
diff --git a/src/views/system/loginmini/OAuth2Login.vue b/src/views/system/loginmini/OAuth2Login.vue
index c03501c..0e6c74d 100644
--- a/src/views/system/loginmini/OAuth2Login.vue
+++ b/src/views/system/loginmini/OAuth2Login.vue
@@ -11,6 +11,7 @@
   import { useUserStore } from '/@/store/modules/user';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useI18n } from '/@/hooks/web/useI18n';
+  import {getTenantId} from "/@/utils/auth";
 
   const isOAuth = ref<boolean>(isOAuth2AppEnv());
   const env = ref<any>({ thirdApp: false, wxWork: false, dingtalk: false });
@@ -50,7 +51,7 @@
       if (route.query.oauth2LoginToken) {
         let token = route.query.oauth2LoginToken;
         //执行登录操作
-        thirdLogin({ token, thirdType: route.query.thirdType });
+        thirdLogin({ token, thirdType: route.query.thirdType,tenantId: getTenantId });
       } else if (env.value.wxWork) {
         sysOAuth2Login('wechat_enterprise');
       } else if (env.value.dingtalk) {
@@ -83,4 +84,4 @@
       }
     });
   }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts
index cf4fadb..5d7efd9 100644
--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
@@ -284,7 +284,12 @@ export const formSchema: FormSchema[] = [
     label: '邮箱',
     field: 'email',
     component: 'Input',
-    rules: rules.rule('email', false),
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { ...rules.duplicateCheckRule('sys_user', 'email', model, schema, true)[0] },
+        { ...rules.rule('email', false)[0] },
+      ];
+    },
   },
   {
     label: '手机号码',
diff --git a/src/views/system/usersetting/AccountSetting.vue b/src/views/system/usersetting/AccountSetting.vue
index 19a40ee..e027f21 100644
--- a/src/views/system/usersetting/AccountSetting.vue
+++ b/src/views/system/usersetting/AccountSetting.vue
@@ -22,16 +22,6 @@
       <span class="pointer blue-e5" style="margin-left: 10px" @click="updatePassWord">修改</span>
     </div>
 
-    <div class="account-row-item">
-      <div class="account-label gray-75">账号绑定</div>
-      <span>
-        <WechatFilled :style="!wechatData.bindWechat ? { color: '#9e9e9e' } : { color: '#1ec563' }" />
-        <span class="gray-75" style="margin-left: 12px">微信</span>
-        <span class="gray-75" style="margin-left: 8px" v-if="wechatData.bindWechat">{{ '已绑定：' + wechatData.name }}</span>
-        <span class="blue-e5 pointer" style="margin-left: 24px" @click="wechatBind">{{ !wechatData.bindWechat ? '绑定' : '解绑' }}</span>
-      </span>
-    </div>
-
     <div class="account-row-item clearfix">
       <div class="account-label gray-75">账户注销</div>
       <span style="color: red" class="pointer" @click="cancellation">注销</span>
@@ -145,7 +135,9 @@ onMounted(() => {
 <style lang="less" scoped>
 .account-row-item {
   align-items: center;
-  border-bottom: 1px solid #eaeaea;
+  /*begin 兼容暗夜模式*/
+  border-bottom: 1px solid @border-color-base;
+  /*end 兼容暗夜模式*/
   box-sizing: border-box;
   display: flex;
   height: 71px;
@@ -158,7 +150,9 @@ onMounted(() => {
 }
 
 .gray-75 {
-  color: #757575 !important;
+  /*begin 兼容暗夜模式*/
+  color: @text-color !important;
+  /*end 兼容暗夜模式*/
 }
 
 .pointer {
@@ -188,7 +182,9 @@ onMounted(() => {
 .my-account{
   font-size: 17px;
   font-weight: 700!important;
-  color: #333!important;
+  /*begin 兼容暗夜模式*/
+  color: @text-color;
+  /*end 兼容暗夜模式*/
   margin-bottom: 20px;
 }
 </style>
diff --git a/src/views/system/usersetting/BaseSetting.vue b/src/views/system/usersetting/BaseSetting.vue
index e315452..1de3a6a 100644
--- a/src/views/system/usersetting/BaseSetting.vue
+++ b/src/views/system/usersetting/BaseSetting.vue
@@ -30,7 +30,7 @@
     <div class="account-data">
       <!-- 详细资料 -->
       <div class="account-detail">
-        <div class="font-size-15 font-bold" style="color: #333!important;margin-bottom: 16px">详细资料</div>
+        <div class="font-size-15 font-bold font-color-gray" style="margin-bottom: 16px">详细资料</div>
         <div class="margin-bottom-10 font-size-13">
           <span class="gray-75 item-label">生日</span>
           <span class="gray-3">{{ userInfo.birthday }}</span>
@@ -50,7 +50,7 @@
       </div>
       <!-- 联系信息 -->
       <div class="account-info">
-        <div class="font-size-15 font-bold" style="color: #333!important;margin-bottom: 16px">联系信息</div>
+        <div class="font-size-15 font-bold font-color-gray" style="margin-bottom: 16px">联系信息</div>
         <div class="margin-bottom-10 font-size-13">
           <span class="gray-75 item-label">邮箱</span>
           <span class="gray-3">{{ userInfo.email ? userInfo.email : "未填写" }}</span>
@@ -219,7 +219,7 @@ onMounted(async () => {
 .user-setting-top {
   padding-top: 40px;
   width: 100%;
-  border-bottom: 1px solid #eaeaea;
+  border-bottom: 1px solid @border-color-base;
   display: flex;
   padding-bottom: 40px;
 }
@@ -261,7 +261,9 @@ onMounted(async () => {
   width: 200px;
   text-overflow: ellipsis;
   line-height: 32px!important;
-  color: #333;
+  /*begin 兼容暗夜模式*/
+  color: @text-color;
+  /*end 兼容暗夜模式*/
   font-weight: 500;
 }
 
@@ -300,13 +302,15 @@ onMounted(async () => {
   margin-bottom: 10px;
 }
 
+/*begin 兼容暗夜模式*/
 .gray-75 {
-  color: #757575 !important;
+  color: @text-color !important;
 }
 
 .gray-3 {
-  color: #333333;
+  color: @text-color;
 }
+/*end 兼容暗夜模式*/
 
 .account-info {
   width: 60%;
@@ -335,7 +339,9 @@ onMounted(async () => {
 }
 
 .use-day{
-  color: #333;
+  /*begin 兼容暗夜模式*/
+  color: @text-color;
+  /*end 兼容暗夜模式*/
   margin-top: 10px;
   font-size: 13px;
   span{
@@ -346,4 +352,9 @@ onMounted(async () => {
 .font-size-13{
   font-size: 13px;
 }
+/*begin 兼容暗夜模式*/
+.font-color-gray{
+  color: @text-color;
+}
+/*end 兼容暗夜模式*/
 </style>
diff --git a/src/views/system/usersetting/TenantSetting.vue b/src/views/system/usersetting/TenantSetting.vue
index 97505b3..1111d09 100644
--- a/src/views/system/usersetting/TenantSetting.vue
+++ b/src/views/system/usersetting/TenantSetting.vue
@@ -420,7 +420,9 @@ onMounted(() => {
 .my-tenant{
   font-size: 17px;
   font-weight: 700!important;
-  color: #333!important;
+  /*begin 兼容暗夜模式*/
+  color: @text-color;
+  /*end 兼容暗夜模式*/
   margin-bottom: 20px;
 }
 .tenant-list{
@@ -430,7 +432,9 @@ onMounted(() => {
   overflow-x: hidden;
 }
 .tenant-list-item{
-  border: 1px solid #eaeaea;
+  /*begin 兼容暗夜模式*/
+  border: 1px solid @border-color-base;
+  /*end 兼容暗夜模式*/
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
@@ -446,7 +450,9 @@ onMounted(() => {
     padding: 14px 0;
     cursor: pointer;
     font-size:17px;
-    color: #333!important;
+    /*begin 兼容暗夜模式*/
+    color: @text-color;
+    /*end 兼容暗夜模式*/
     font-weight: 700!important;
   }
 }
@@ -472,14 +478,18 @@ onMounted(() => {
   transition: ease-in 2s;
 
   .content-box {
-    border-top: 1px solid #eaeaea;
+    /*begin 兼容暗夜模式*/
+    border-top: 1px solid @border-color-base;
+    /*end 兼容暗夜模式*/
     box-sizing: border-box;
     display: flex;
     padding: 24px 0;
   }
 
   .content-name {
-    color: #757575;
+    /*begin 兼容暗夜模式*/
+    color: @text-color;
+    /*end 兼容暗夜模式*/
     text-align: center;
     width: 100px;
     font-size: 13px;
@@ -491,7 +501,9 @@ onMounted(() => {
   }
 
   .content-des-text {
-    color: #757575;
+    /*begin 兼容暗夜模式*/
+    color: @text-color;
+    /*end 兼容暗夜模式*/
     text-align: left;
     width: 76px;
     font-size: 13px;
@@ -504,7 +516,9 @@ onMounted(() => {
 }
 
 .footer-box {
-  border-top: 1px solid #eaeaea;
+  /*begin 兼容暗夜模式*/
+  border-top: 1px solid @border-color-base;
+  /*end 兼容暗夜模式*/
   box-sizing: border-box;
   display: flex;
   padding: 24px 0;
@@ -515,18 +529,20 @@ onMounted(() => {
   margin-right: 40px;
 }
 
+/*begin 兼容暗夜模式*/
 .font-color333 {
-  color: #333333;
+  color: @text-color;
   font-weight: normal;
 }
 
 .font-color9e {
-  color: #9e9e9e;
+  color: @text-color;
 }
 
 .font-color75 {
-  color: #757575;
+  color: @text-color;
 }
+/*end 兼容暗夜模式*/
 
 .font-size13 {
   font-size: 13px;
diff --git a/src/views/system/usersetting/UserSetting.vue b/src/views/system/usersetting/UserSetting.vue
index ff56d55..c53bb96 100644
--- a/src/views/system/usersetting/UserSetting.vue
+++ b/src/views/system/usersetting/UserSetting.vue
@@ -74,14 +74,18 @@ export default defineComponent({
   }
   //tabs弹窗左边样式
   :deep(.ant-tabs-nav){
-    background-color: #FFFFFF;
+    /*begin 兼容暗夜模式*/
+    background-color: @component-background;
+    /*end 兼容暗夜模式*/
     height: 260px;
   }
   //tabs弹窗右边边样式
   :deep(.ant-tabs-content-holder){
     position: relative;
     left: 12px;
-    background: #FFFFFF;
+    /*begin 兼容暗夜模式*/
+    background: @component-background;
+    /*end 兼容暗夜模式*/
     height: auto !important;
   }
 }
@@ -105,6 +109,8 @@ export default defineComponent({
   padding-right:14px;
 }
 .icon-font-color{
-  color: #9e9e9e;
+  /*begin 兼容暗夜模式*/
+  color: @text-color;
+  /*end 兼容暗夜模式*/
 }
 </style>