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(); - 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 @@ - + 重置 保存 @@ -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(false); // 当前是否是更新模式 const isUpdate = ref(true); @@ -112,11 +114,15 @@ } } - 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 @@ - + @@ -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(false); const treeData = ref([]); @@ -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 兼容暗夜模式*/ 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 @@ - + @@ -61,10 +61,3 @@ -