fix(bug):修复了一些bug,顺便抽了根烟喝了杯茶
parent
09189e612a
commit
32f16e27a2
|
|
@ -15,9 +15,6 @@ VERSION = '2.0.0'
|
||||||
|
|
||||||
# load environment variables from .env file
|
# load environment variables from .env file
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
# print(os.getenv('MAXKB_CONFIG'))
|
# 直接从 /opt/maxkb/conf 目录加载配置
|
||||||
if os.getenv('MAXKB_CONFIG') is not None:
|
CONFIG = ConfigManager.load_user_config(root_path=os.path.abspath('/opt/maxkb/conf'))
|
||||||
CONFIG = ConfigManager.load_user_config(root_path=PROJECT_DIR)
|
|
||||||
else:
|
|
||||||
CONFIG = ConfigManager.load_user_config(root_path=os.path.abspath('/opt/maxkb/conf'))
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ from common.constants.cache_version import Cache_Version
|
||||||
from common.database_model_manage.database_model_manage import DatabaseModelManage
|
from common.database_model_manage.database_model_manage import DatabaseModelManage
|
||||||
from common.utils.rsa_util import get_key_pair_by_sql
|
from common.utils.rsa_util import get_key_pair_by_sql
|
||||||
from maxkb import settings
|
from maxkb import settings
|
||||||
|
from maxkb.const import CONFIG
|
||||||
from system_manage.models import SystemSetting
|
from system_manage.models import SystemSetting
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -48,5 +49,5 @@ class SystemConfigSerializer(serializers.Serializer):
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_config():
|
def get_config():
|
||||||
return {
|
return {
|
||||||
'mindmap_url': settings.config.get('MINDMAP_URL', '')
|
'mindmap_url': CONFIG.get('MINDMAP_URL', '')
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ const props = defineProps({
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
const isCollapse = ref(false)
|
const isCollapse = ref(true)
|
||||||
const leftWidth = ref(props.minLeftWidth)
|
const leftWidth = ref(props.minLeftWidth)
|
||||||
const isResizing = ref(false)
|
const isResizing = ref(false)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, ref } from 'vue'
|
import { computed, ref, onMounted } from 'vue'
|
||||||
import { useRoute } from 'vue-router'
|
import { useRoute } from 'vue-router'
|
||||||
import UserAvatar from '@/layout/layout-header/avatar/index.vue'
|
import UserAvatar from '@/layout/layout-header/avatar/index.vue'
|
||||||
|
|
||||||
|
|
@ -131,6 +131,12 @@ const activeSubMenu = computed(() => {
|
||||||
const path = route.path
|
const path = route.path
|
||||||
return path
|
return path
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// 确保组件挂载时下拉菜单保持折叠状态
|
||||||
|
onMounted(() => {
|
||||||
|
resourceAuthExpanded.value = false
|
||||||
|
systemSettingsExpanded.value = false
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue