center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #8137 from dataease/pr@dev-v2_dzz_mobile

Browse Source 
Pr@dev v2 dzz mobile
This commit is contained in:
dataeaseShu 2024-02-23 11:09:09 +08:00 committed by GitHub
commit a5328976c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/core-frontend/src/layout/index.vue
View File

@ -23,6 +23,7 @@ const toolboxMenu = computed(() => route.path.includes('toolbox'))
<Header v-else></Header> <Header v-else></Header>
<el-container class="layout-container"> <el-container class="layout-container">
<Sidebar v-if="systemMenu || settingMenu || toolboxMenu" class="layout-sidebar"> <Sidebar v-if="systemMenu || settingMenu || toolboxMenu" class="layout-sidebar">
<div v-if="systemMenu" class="org-config-center">组织管理中心</div>
<Menu style="height: 100%"></Menu> <Menu style="height: 100%"></Menu>
</Sidebar> </Sidebar>
<Main <Main
@ -48,6 +49,23 @@ const toolboxMenu = computed(() => route.path.includes('toolbox'))
height: calc(100vh - 56px); height: calc(100vh - 56px);
} }
.org-config-center {
height: 48px;
padding-left: 24px;
display: flex;
align-items: center;
font-size: 14px;
font-weight: 500;
line-height: 22px;
color: #8f959e;
border-bottom: 1px solid #1f232926;
position: sticky;
top: 0;
left: 0;
background: #fff;
z-index: 10;
}
.layout-main { .layout-main {
flex: 1; flex: 1;
background-color: var(--MainBG, #f5f6f7); background-color: var(--MainBG, #f5f6f7);

17
core/core-frontend/src/views/chart/components/editor/util/chart.ts
View File

@ -660,15 +660,16 @@ export const DEFAULT_SCROLL: ScrollCfg = {
} }
export const COLOR_PANEL = [ export const COLOR_PANEL = [
'#1E90FF', '#FF4500',
'#90EE90', '#FF8C00',
'#FFD700',
'#71AE46',
'#00CED1', '#00CED1',
'#E2BD84', '#1E90FF',
'#7A90E0', '#C71585',
'#3BA272', '#999999',
'#2BE7FF', '#000000',
'#0A8ADA', '#FFFFFF'
'#FFD700'
] ]
export const COLOR_CASES = [ export const COLOR_CASES = [

3
core/core-frontend/src/views/template-market/component/CategoryTemplateV2.vue
View File

@ -9,7 +9,7 @@
v-for="(templateItem, index) in fullTemplateShowList" v-for="(templateItem, index) in fullTemplateShowList"
v-show="showFlagCheck(templateItem)" v-show="showFlagCheck(templateItem)"
:key="templateItem.id + label" :key="templateItem.id + label"
style="float: left; padding: 24px 12px 0; text-align: center; flex: 0" style="float: left; padding: 8px 8px 0; text-align: center; flex: 0"
:style="{ width: templateSpan }" :style="{ width: templateSpan }"
> >
<template-market-v2-item <template-market-v2-item
@ -88,6 +88,7 @@ const props = defineProps({
height: 24px; height: 24px;
margin-top: 16px; margin-top: 16px;
display: inline; display: inline;
margin-bottom: 16px;
.custom-split-line { .custom-split-line {
margin: 4px 8px 0 12px; margin: 4px 8px 0 12px;
width: 2px; width: 2px;

7
core/core-frontend/src/views/template-market/index.vue
View File

@ -19,12 +19,17 @@
/></el-icon> /></el-icon>
<span>{{ state.curTemplate.title }}1 </span> <span>{{ state.curTemplate.title }}1 </span>
<el-row class="head-right"> <el-row class="head-right">
<el-button :disabled="state.curTemplateIndex === 0" style="float: right" @click="preOne" <el-button
secondary
:disabled="state.curTemplateIndex === 0"
style="float: right"
@click="preOne"
>上一个</el-button >上一个</el-button
> >
<el-button <el-button
:disabled="state.curTemplateIndex === state.curTemplateShowFilter.length - 1" :disabled="state.curTemplateIndex === state.curTemplateShowFilter.length - 1"
style="float: right" style="float: right"
secondary
@click="nextOne" @click="nextOne"
>下一个</el-button >下一个</el-button
> >