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

Pr@dev v2 dzz mobile

core/core-frontend/src/layout/index.vue

@@ -23,6 +23,7 @@ const toolboxMenu = computed(() => route.path.includes('toolbox'))
     <Header v-else></Header>
     <el-container class="layout-container">
       <Sidebar v-if="systemMenu || settingMenu || toolboxMenu" class="layout-sidebar">
+        <div v-if="systemMenu" class="org-config-center">组织管理中心</div>
         <Menu style="height: 100%"></Menu>
       </Sidebar>
       <Main
@@ -48,6 +49,23 @@ const toolboxMenu = computed(() => route.path.includes('toolbox'))
       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 {
       flex: 1;
       background-color: var(--MainBG, #f5f6f7);

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

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

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

@@ -9,7 +9,7 @@
     v-for="(templateItem, index) in fullTemplateShowList"
     v-show="showFlagCheck(templateItem)"
     :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 }"
   >
     <template-market-v2-item
@@ -88,6 +88,7 @@ const props = defineProps({
   height: 24px;
   margin-top: 16px;
   display: inline;
+  margin-bottom: 16px;
   .custom-split-line {
     margin: 4px 8px 0 12px;
     width: 2px;

core/core-frontend/src/views/template-market/index.vue

@@ -19,12 +19,17 @@
         /></el-icon>
         <span>{{ state.curTemplate.title }}1 </span>
         <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
             :disabled="state.curTemplateIndex === state.curTemplateShowFilter.length - 1"
             style="float: right"
+            secondary
             @click="nextOne"
             >下一个</el-button
           >