Merge branch 'main' of http://123.132.248.154:10000/gitY/LinYeFangHuo

src/views/chart/ContentHeader/headerLeftBtn/index.vue

@@ -74,6 +74,8 @@
   import { HistoryStackEnum } from '@/store/modules/chartHistoryStore/chartHistoryStore.d';
   import { useChartLayoutStore } from '@/store/modules/chartLayoutStore/chartLayoutStore';
   import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d';
+  import { router } from '@/router';
+  import { PageEnum } from '@/enums/pageEnum';
 
   const { LayersIcon, BarChartIcon, PrismIcon, HomeIcon, ArrowBackIcon, ArrowForwardIcon } =
     icon.ionicons5;
@@ -163,7 +165,8 @@
       message: '确定已保存了数据（Ctrl / ⌘ + S），并返回到首页吗？',
       isMaskClosable: true,
       onPositiveCallback: () => {
-        goHome();
+        router.replace(PageEnum.BASE_HOME);
+        // goHome();
         useRemoveKeyboard();
       },
     });

src/views/project/items/components/ProjectItemsList/index.vue

@@ -6,6 +6,22 @@
         <a-radio-button value="1">已发布</a-radio-button>
         <a-radio-button value="-1">未发布</a-radio-button>
       </a-radio-group>
+      <div class="layout-button">
+        <div @click="clickHandle">
+          <n-button ghost type="primary">
+            <template #icon>
+              <n-icon>
+                <DuplicateOutlineIcon v-show="designStore.getDarkTheme"></DuplicateOutlineIcon>
+                <DuplicateIcon v-show="!designStore.getDarkTheme"></DuplicateIcon>
+              </n-icon>
+            </template>
+            <span>
+              {{ $t('project.create_btn') }}
+            </span>
+          </n-button>
+        </div>
+      </div>
+      <CreateModal :show="createModalShow" @close="closeHandle"></CreateModal>
     </div>
     <!-- 加载 -->
     <div v-show="loading">
@@ -57,12 +73,46 @@
   import { icon } from '@/plugins';
   import { useModalDataInit } from './hooks/useModal.hook';
   import { useDataListInit } from './hooks/useData.hook';
+  import { router } from '@/router';
+  import { PageEnum } from '@/enums/pageEnum';
+  import { ref } from 'vue'
+  import { useDesignStore } from '@/store/modules/designStore/designStore';
+  import { CreateModal } from '@/views/project/layout/components/ProjectLayoutCreate/components/CreateModal/index';
+  const { DuplicateIcon, DuplicateOutlineIcon } = icon.ionicons5;
 
-  const { CopyIcon, EllipsisHorizontalCircleSharpIcon } = icon.ionicons5;
   const { modalData, modalShow, closeModal, previewHandle, resizeHandle, editHandle } =
     useModalDataInit();
   const { loading, paginat, list, state, changeSize, changePage, releaseHandle, deleteHandle, changeState } =
     useDataListInit();
+
+  const designStore = useDesignStore();
+  const createModalShow = ref(false)
+  const goHomeHandle = () => {
+    router.replace(PageEnum.BASE_HOME);
+  };
+  const clickHandle = async() => {
+    // 新增项目
+    // const res = await createProjectApi({
+    //   // 项目名称
+    //   projectName: getUUID(),
+    //   // remarks
+    //   remarks: null,
+    //   // 图片地址
+    //   indexImage: null,
+    // });
+    // if (res) {
+    //   console.log(res);
+    //   const { id } = res;
+    //   window['$message'].success('新建成功');
+    //   const path = fetchPathByName(ChartEnum.CHART_HOME_NAME, 'href');
+    //   routerTurnByPath(path, [id], undefined, true);
+    //   closeHandle();
+    // }
+    createModalShow.value = true;
+  };
+  const closeHandle = () => {
+    createModalShow.value = false;
+  };
 </script>
 
 <style lang="scss" scoped>
@@ -85,6 +135,9 @@
       display: flex;
       justify-content: start;
       margin-bottom: 10px;
+      .layout-button{
+        margin-left: 30px;
+      }
     }
   }
 </style>