feat: 合并dev

src/views/chart/ContentEdit/components/EditRange/index.vue

@@ -55,7 +55,10 @@ const rangeModelStyle = computed(() => {
   position: relative;
   transform-origin: left top;
   background-size: cover;
+<<<<<<< HEAD
   border-radius: 10px;
+=======
+>>>>>>> dev
   overflow: hidden;
   @include fetch-border-color('hover-border-color');
   @include fetch-bg-color('background-color2');

src/views/chart/ContentEdit/components/EditSelect/index.vue

@@ -93,21 +93,33 @@ watch(
     position: absolute;
     width: 100%;
     height: 100%;
+<<<<<<< HEAD
     border-radius: 5px;
+=======
+>>>>>>> dev
     overflow: hidden;
   }
   .select-border {
     left: 0;
     top: 0;
+<<<<<<< HEAD
     opacity: 0.5;
     border-width: 2px;
+=======
+    opacity: 1;
+    border-width: 1px;
+>>>>>>> dev
     border-style: solid;
     border-color: v-bind('themeColor');
   }
   .select-background {
     top: 2px;
     left: 2px;
+<<<<<<< HEAD
     opacity: 0.2;
+=======
+    opacity: 0.08;
+>>>>>>> dev
     background-color: v-bind('themeColor');
   }
 }

src/views/chart/ContentEdit/components/EditShapeBox/index.vue

@@ -139,7 +139,11 @@ const hide = computed(() => {
       position: absolute;
       width: 100%;
       height: 100%;
+<<<<<<< HEAD
       border-radius: 10px;
+=======
+      border-radius: 4px;
+>>>>>>> dev
     }
 
     .shape-modal-select {

src/views/chart/ContentEdit/components/EditTools/index.vue

@@ -182,13 +182,21 @@ const btnList: BtnListType[] = [
     key: 'import',
     type: TypeEnum.IMPORTUPLOAD,
     name: '导入',
+<<<<<<< HEAD
     icon: ShareIcon
+=======
+    icon: DownloadIcon
+>>>>>>> dev
   },
   {
     key: 'export',
     type: TypeEnum.BUTTON,
     name: '导出',
+<<<<<<< HEAD
     icon: DownloadIcon,
+=======
+    icon: ShareIcon,
+>>>>>>> dev
     handle: exportHandle
   },
   {
@@ -231,6 +239,11 @@ $asideBottom: 70px;
   border: 1px solid;
   @include fetch-border-color('hover-border-color-shallow');
   &.aside {
+<<<<<<< HEAD
+=======
+    display: flex;
+    justify-content: center;
+>>>>>>> dev
     flex-direction: column-reverse;
     height: auto;
     right: 20px;

src/views/chart/ContentEdit/index.vue

@@ -193,7 +193,10 @@ onMounted(() => {
   @include background-image('background-point');
 
   @include goId('chart-edit-content') {
+<<<<<<< HEAD
     border-radius: 10px;
+=======
+>>>>>>> dev
     overflow: hidden;
     @extend .go-transition;
     @include fetch-theme('box-shadow');

src/views/project/templateMarket/index.vue

@@ -1,9 +1,21 @@
 <template>
   <div class="go-project-template-market">
+<<<<<<< HEAD
     <n-space vertical>
       <n-image object-fit="contain" height="300" preview-disabled :src="requireErrorImg()"></n-image>
       <n-h3>暂时还没有东西呢</n-h3>
     </n-space>
+=======
+    <div class="content-box">
+      <n-space vertical>
+        <img src="https://goviewpro.goviewlink.com/charts-img-db/charts-img-db_id_5pimyysnnh8000.png" style="width: 100%" />
+        <img src="https://goviewpro.goviewlink.com/charts-img-db/charts-img-db_id_izetnl0654w00.png" style="height: 400px" />
+        <n-button text tag="a" href="https://ai.goviewlink.com/?channel=mayun" target="_blank" type="primary">
+          前往 GoViewPro 查看 👆
+        </n-button>
+      </n-space>
+    </div>
+>>>>>>> dev
   </div>
 </template>
 
@@ -12,8 +24,33 @@ import { requireErrorImg } from '@/utils'
 </script>
 
 <style lang="scss" scoped>
+<<<<<<< HEAD
 @include go("project-template-market") {
   margin-top: 100px;
   @extend .go-flex-center;
+=======
+@include go('project-template-market') {
+  box-sizing: border-box;
+  height: calc(100vh - 62px);
+  padding-top: 3vh;
+  .content-box {
+    width: 700px;
+    margin: 0 auto 0;
+    padding: 20px;
+    border-radius: 10px;
+    background: linear-gradient(120deg, rgba(255, 255, 255, 0.15) 0%, rgba(29, 83, 163, 0.3) 99.09%);
+    box-shadow: 0px 0px 6px 6px rgba(0, 0, 0, 0.04);
+    @extend .go-flex-center;
+    img {
+      border-radius: 6px;
+    }
+  }
+>>>>>>> dev
+}
+
+@include dark() {
+  @include go('project-template-market') {
+    background-color: #18181c;
+  }
 }
 </style>