From 5c277f9748367fb2d95da7a8bf42573cf0e496e9 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 26 Jun 2023 23:25:12 +0800
Subject: [PATCH] =?UTF-8?q?[issues/563]=E6=9A=97=E8=89=B2=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E9=83=A8=E5=88=86=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/address/index.less           |  5 ++++-
 src/views/system/address/index.vue            |  8 +-------
 .../depart/components/DepartFormTab.vue       | 20 ++++++++++++-------
 .../depart/components/DepartRuleTab.vue       | 12 +++--------
 src/views/system/depart/index.less            |  4 ++++
 src/views/system/depart/index.vue             |  9 +--------
 6 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/views/system/address/index.less b/src/views/system/address/index.less
index e1f751a..61b73d4 100644
--- a/src/views/system/address/index.less
+++ b/src/views/system/address/index.less
@@ -1,7 +1,10 @@
 //noinspection LessUnresolvedVariable
-@prefix-cls: ~'@{namespace}-depart-manage';
+@prefix-cls: ~'@{namespace}-address-list';
 
 .@{prefix-cls} {
+  // update-begin-author:liusq date:20230625 for: [issues/563]暗色主题部分失效
+  background-color: @component-background;
+  // update-end-author:liusq date:20230625 for: [issues/563]暗色主题部分失效
   &--box {
     .ant-tabs-nav {
       padding: 0 20px;
diff --git a/src/views/system/address/index.vue b/src/views/system/address/index.vue
index bd5eac3..302f969 100644
--- a/src/views/system/address/index.vue
+++ b/src/views/system/address/index.vue
@@ -84,12 +84,6 @@
   queryPositionInfo();
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
   @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 895428d..23cc921 100644
--- a/src/views/system/depart/components/DepartFormTab.vue
+++ b/src/views/system/depart/components/DepartFormTab.vue
@@ -2,7 +2,7 @@
   <a-spin :spinning="loading">
     <BasicForm @register="registerForm" />
     <div class="j-box-bottom-button offset-20" style="margin-top: 30px">
-      <div class="j-box-bottom-button-float">
+      <div class="j-box-bottom-button-float" :class="[`${prefixCls}`]">
         <a-button preIcon="ant-design:sync-outlined" @click="onReset">重置</a-button>
         <a-button type="primary" preIcon="ant-design:save-filled" @click="onSubmit">保存</a-button>
       </div>
@@ -15,13 +15,15 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { saveOrUpdateDepart } from '../depart.api';
   import { useBasicFormSchema, orgCategoryOptions } from '../depart.data';
+  import { useDesign } from '/@/hooks/web/useDesign';
+
+  const { prefixCls } = useDesign('j-depart-form-content');
 
   const emit = defineEmits(['success']);
   const props = defineProps({
     data: { type: Object, default: () => ({}) },
     rootTreeData: { type: Array, default: () => [] },
   });
-  const prefixCls = inject('prefixCls');
   const loading = ref<boolean>(false);
   // 当前是否是更新模式
   const isUpdate = ref<boolean>(true);
@@ -112,11 +114,15 @@
     }
   }
 </script>
-<style lang="less" scoped>
-   /*begin 兼容暗夜模式*/
-  .j-box-bottom-button-float{
-    background-color: @component-background;
+<style lang="less">
+  // update-begin-author:liusq date:20230625 for: [issues/563]暗色主题部分失效
+
+  @prefix-cls: ~'@{namespace}-j-depart-form-content';
+  /*begin 兼容暗夜模式*/
+  .@{prefix-cls} {
+    background: @component-background;
     border-top: 1px solid @border-color-base;
   }
-   /*end 兼容暗夜模式*/
+  /*end 兼容暗夜模式*/
+  // update-end-author:liusq date:20230625 for: [issues/563]暗色主题部分失效
 </style>
diff --git a/src/views/system/depart/components/DepartRuleTab.vue b/src/views/system/depart/components/DepartRuleTab.vue
index a4e4390..b87222f 100644
--- a/src/views/system/depart/components/DepartRuleTab.vue
+++ b/src/views/system/depart/components/DepartRuleTab.vue
@@ -24,7 +24,7 @@
     <a-empty v-else description="无可配置部门权限" />
 
     <div class="j-box-bottom-button offset-20" style="margin-top: 30px">
-      <div class="j-box-bottom-button-float">
+      <div class="j-box-bottom-button-float" :class="[`${prefixCls}`]">
         <a-dropdown :trigger="['click']" placement="top">
           <template #overlay>
             <a-menu>
@@ -52,14 +52,15 @@
   import { BasicTree } from '/@/components/Tree/index';
   import DepartDataRuleDrawer from './DepartDataRuleDrawer.vue';
   import { queryRoleTreeList, queryDepartPermission, saveDepartPermission } from '../depart.api';
+  import { useDesign } from '/@/hooks/web/useDesign';
 
+  const { prefixCls } = useDesign('j-depart-form-content');
   const props = defineProps({
     data: { type: Object, default: () => ({}) },
   });
   // 当前选中的部门ID，可能会为空，代表未选择部门
   const departId = computed(() => props.data?.id);
 
-  const prefixCls = inject('prefixCls');
   const basicTree = ref();
   const loading = ref<boolean>(false);
   const treeData = ref<any[]>([]);
@@ -166,11 +167,4 @@
   .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.less b/src/views/system/depart/index.less
index e1f751a..67e0e08 100644
--- a/src/views/system/depart/index.less
+++ b/src/views/system/depart/index.less
@@ -2,6 +2,10 @@
 @prefix-cls: ~'@{namespace}-depart-manage';
 
 .@{prefix-cls} {
+  // update-begin-author:liusq date:20230625 for: [issues/563]暗色主题部分失效
+  background: @component-background;
+  // update-end-author:liusq date:20230625 for: [issues/563]暗色主题部分失效
+
   &--box {
     .ant-tabs-nav {
       padding: 0 20px;
diff --git a/src/views/system/depart/index.vue b/src/views/system/depart/index.vue
index 80e3d1e..406347f 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%;" class="depart-manage">
+      <div style="height: 100%;" :class="[`${prefixCls}`]">
         <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,10 +61,3 @@
 <style lang="less">
   @import './index.less';
 </style>
-<style lang="less" scoped>
-  /*begin 兼容暗夜模式*/
-  .depart-manage{
-    background-color: @component-background;
-  }
-  /*end 兼容暗夜模式*/
-</style>