From 3f4b3c67f261f21121c8e9f7c14d926f152a5836 Mon Sep 17 00:00:00 2001
From: Sun <95302870@qq.com>
Date: Sat, 6 Jan 2024 11:46:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90=E4=BA=86?=
 =?UTF-8?q?=E5=A2=9E=E6=94=B9=E6=9F=A5=E5=8C=85=E6=8B=AC=E7=A3=81=E7=9B=98?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppIconSystemMonitor/Disk.vue             |  1 -
 .../SystemMonitor/Edit/DiskEditor/index.vue   | 57 ++++++++++++-------
 .../Edit/GenericProgressStyleEditor/index.vue | 21 +++++--
 .../deskModule/SystemMonitor/Edit/index.vue   | 20 ++++---
 .../deskModule/SystemMonitor/index.vue        | 11 +++-
 src/utils/defaultData/index.ts                | 10 ++++
 6 files changed, 81 insertions(+), 39 deletions(-)
 create mode 100644 src/utils/defaultData/index.ts

diff --git a/src/components/deskModule/SystemMonitor/AppIconSystemMonitor/Disk.vue b/src/components/deskModule/SystemMonitor/AppIconSystemMonitor/Disk.vue
index 9443215..41898d2 100644
--- a/src/components/deskModule/SystemMonitor/AppIconSystemMonitor/Disk.vue
+++ b/src/components/deskModule/SystemMonitor/AppIconSystemMonitor/Disk.vue
@@ -31,7 +31,6 @@ function formatdiskToByte(v: number): number {
 }
 
 async function getData() {
-  console.log(props.path)
   try {
     const { data, code } = await getDiskStateByPath<SystemMonitor.DiskInfo>(props.path)
     if (code === 0)
diff --git a/src/components/deskModule/SystemMonitor/Edit/DiskEditor/index.vue b/src/components/deskModule/SystemMonitor/Edit/DiskEditor/index.vue
index 77606be..db2e1ff 100644
--- a/src/components/deskModule/SystemMonitor/Edit/DiskEditor/index.vue
+++ b/src/components/deskModule/SystemMonitor/Edit/DiskEditor/index.vue
@@ -6,6 +6,7 @@ import GenericMonitorCard from '../../components/GenericMonitorCard/index.vue'
 import GenericProgress from '../../components/GenericProgress/index.vue'
 import { PanelPanelConfigStyleEnum } from '@/enums'
 import { getDiskMountpoints } from '@/api/system/systemMonitor'
+import { defautSwatchesBackground } from '@/utils/defaultData'
 
 interface Emit {
   (e: 'update:diskExtendParam', visible: DiskExtendParam): void
@@ -21,7 +22,7 @@ const mountPointList = ref<{
   value: string
 }[]>([])
 
-const data = computed({
+const extendParam = computed({
   get: () => props.diskExtendParam,
   set: (visible) => {
     emit('update:diskExtendParam', visible)
@@ -34,8 +35,11 @@ async function getMountPointList() {
     mountPointList.value = []
     for (let i = 0; i < data.length; i++) {
       const element = data[i]
+      if (i === 0 && !extendParam.value.path)
+        extendParam.value.path = element.mountpoint
+
       mountPointList.value.push({
-        label: element.device,
+        label: element.mountpoint,
         value: element.mountpoint,
       })
     }
@@ -52,26 +56,25 @@ onMounted(() => {
 
 <template>
   <div>
-    <!-- <div>{{ genericProgressStyleExtendParam }}</div>
-    <div>{{ data }}</div> -->
-    <div class="flex mb-5 justify-center">
+    <!-- <div>{{ diskExtendParam }}</div> -->
+    <div class="flex mb-5 justify-center transparent-grid p-2 rounded-xl border">
       <div class="w-[200px]">
         <GenericMonitorCard
           icon-text-icon-hide-title
           :card-type-style="PanelPanelConfigStyleEnum.info"
           icon="solar-cpu-bold"
-          :background-color="data.backgroundColor"
-          :text-color="data.color"
+          :background-color="extendParam.backgroundColor"
+          :text-color="extendParam.color"
         >
           <template #info>
             <GenericProgress
-              :progress-color="data.progressColor"
-              :progress-rail-color="data.progressRailColor"
+              :progress-color="extendParam.progressColor"
+              :progress-rail-color="extendParam.progressRailColor"
               :percentage="50"
               :progress-height="5"
               info-card-left-text="DEMO"
               info-card-right-text="TEXT"
-              :text-color="data.color"
+              :text-color="extendParam.color"
               :card-type-style="PanelPanelConfigStyleEnum.info"
             />
           </template>
@@ -83,15 +86,15 @@ onMounted(() => {
           icon-text-icon-hide-title
           :card-type-style="PanelPanelConfigStyleEnum.icon"
           icon="solar-cpu-bold"
-          :background-color="data.backgroundColor"
-          :icon-text-color="data.color"
+          :background-color="extendParam.backgroundColor"
+          :icon-text-color="extendParam.color"
         >
           <template #small>
             <GenericProgress
-              :progress-color="data.progressColor"
-              :progress-rail-color="data.progressRailColor"
+              :progress-color="extendParam.progressColor"
+              :progress-rail-color="extendParam.progressRailColor"
               :percentage="50"
-              :text-color="data.color"
+              :text-color="extendParam.color"
               :card-type-style="PanelPanelConfigStyleEnum.icon"
             />
           </template>
@@ -99,22 +102,32 @@ onMounted(() => {
       </div>
     </div>
 
-    <NForm ref="formRef" v-model="data">
-      <NFormItem label="挂载点">
-        <NSelect v-model:value="data.path" size="small" :options="mountPointList" />
+    <NForm ref="formRef" v-model="extendParam">
+      <NFormItem label="磁盘挂载点">
+        <NSelect v-model:value="extendParam.path" size="small" :options="mountPointList" />
       </NFormItem>
       <NFormItem label="主色">
-        <NColorPicker v-model:value="data.progressColor" :modes="['hex']" size="small" />
+        <NColorPicker v-model:value="extendParam.progressColor" :swatches="defautSwatchesBackground" :modes="['hex']" size="small" />
       </NFormItem>
       <NFormItem label="副色">
-        <NColorPicker v-model:value="data.progressRailColor" :modes="['hex']" size="small" />
+        <NColorPicker v-model:value="extendParam.progressRailColor" :swatches="defautSwatchesBackground" :modes="['hex']" size="small" />
       </NFormItem>
       <NFormItem label="文字图标颜色">
-        <NColorPicker v-model:value="data.color" :modes="['hex']" size="small" />
+        <NColorPicker v-model:value="extendParam.color" :swatches="defautSwatchesBackground" :modes="['hex']" size="small" />
       </NFormItem>
       <NFormItem label="卡片背景色">
-        <NColorPicker v-model:value="data.backgroundColor" :modes="['hex']" size="small" />
+        <NColorPicker v-model:value="extendParam.backgroundColor" :swatches="defautSwatchesBackground" :modes="['hex']" size="small" />
       </NFormItem>
     </NForm>
   </div>
 </template>
+
+<style>
+.transparent-grid {
+    background-image: linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%),
+                      linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%);
+    background-size: 16px 16px;
+    background-position: 0 0, 8px 8px;
+    background-color: #e2e8f0;
+}
+</style>
diff --git a/src/components/deskModule/SystemMonitor/Edit/GenericProgressStyleEditor/index.vue b/src/components/deskModule/SystemMonitor/Edit/GenericProgressStyleEditor/index.vue
index 6451c6c..bf23d44 100644
--- a/src/components/deskModule/SystemMonitor/Edit/GenericProgressStyleEditor/index.vue
+++ b/src/components/deskModule/SystemMonitor/Edit/GenericProgressStyleEditor/index.vue
@@ -5,6 +5,7 @@ import type { GenericProgressStyleExtendParam } from '../../typings'
 import GenericMonitorCard from '../../components/GenericMonitorCard/index.vue'
 import GenericProgress from '../../components/GenericProgress/index.vue'
 import { PanelPanelConfigStyleEnum } from '@/enums'
+import { defautSwatchesBackground } from '@/utils/defaultData'
 
 interface Emit {
   (e: 'update:genericProgressStyleExtendParam', visible: GenericProgressStyleExtendParam): void
@@ -27,7 +28,7 @@ const data = computed({
   <div>
     <!-- <div>{{ genericProgressStyleExtendParam }}</div>
     <div>{{ data }}</div> -->
-    <div class="flex mb-5 justify-center">
+    <div class="flex mb-5 justify-center transparent-grid p-2 rounded-xl border">
       <div class="w-[200px]">
         <GenericMonitorCard
           icon-text-icon-hide-title
@@ -74,17 +75,27 @@ const data = computed({
 
     <NForm ref="formRef" v-model="data">
       <NFormItem label="主色">
-        <NColorPicker v-model:value="data.progressColor" :modes="['hex']" size="small" />
+        <NColorPicker v-model:value="data.progressColor" :swatches="defautSwatchesBackground" :modes="['hex']" size="small" />
       </NFormItem>
       <NFormItem label="副色">
-        <NColorPicker v-model:value="data.progressRailColor" :modes="['hex']" size="small" />
+        <NColorPicker v-model:value="data.progressRailColor" :swatches="defautSwatchesBackground" :modes="['hex']" size="small" />
       </NFormItem>
       <NFormItem label="文字图标颜色">
-        <NColorPicker v-model:value="data.color" :modes="['hex']" size="small" />
+        <NColorPicker v-model:value="data.color" :swatches="defautSwatchesBackground" :modes="['hex']" size="small" />
       </NFormItem>
       <NFormItem label="卡片背景色">
-        <NColorPicker v-model:value="data.backgroundColor" :modes="['hex']" size="small" />
+        <NColorPicker v-model:value="data.backgroundColor" :swatches="defautSwatchesBackground" :modes="['hex']" size="small" />
       </NFormItem>
     </NForm>
   </div>
 </template>
+
+<style>
+.transparent-grid {
+    background-image: linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%),
+                      linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%);
+    background-size: 16px 16px;
+    background-position: 0 0, 8px 8px;
+    background-color: #e2e8f0;
+}
+</style>
diff --git a/src/components/deskModule/SystemMonitor/Edit/index.vue b/src/components/deskModule/SystemMonitor/Edit/index.vue
index 3456622..ee1a360 100644
--- a/src/components/deskModule/SystemMonitor/Edit/index.vue
+++ b/src/components/deskModule/SystemMonitor/Edit/index.vue
@@ -63,13 +63,16 @@ watch(() => props.visible, (value) => {
   active.value = props.monitorData?.monitorType || MonitorType.cpu
   if (props.monitorData?.monitorType === MonitorType.cpu || props.monitorData?.monitorType === MonitorType.memory)
     currentGenericProgressStyleExtendParam.value = { ...props.monitorData?.extendParam }
+  else if (props.monitorData?.monitorType === MonitorType.disk)
+    currentDiskExtendParam.value = { ...props.monitorData?.extendParam }
 
   if (!value)
-    handleResetGenericProgressStyleExtendParam()
+    handleResetExtendParam()
 })
 
-function handleResetGenericProgressStyleExtendParam() {
+function handleResetExtendParam() {
   currentGenericProgressStyleExtendParam.value = { ...defaultGenericProgressStyleExtendParam }
+  currentDiskExtendParam.value = { ...defaultDiskExtendParam }
 }
 
 // 保存提交
@@ -109,25 +112,26 @@ async function handleSubmit() {
 <template>
   <NModal v-model:show="show" preset="card" size="small" style="width: 600px;border-radius: 1rem;" :title="monitorData ? '修改项目' : '添加项目'">
     <!-- 选择监视器 -->
-    <div>
-      <!-- progressStyle值：{{ JSON.stringify(currentGenericProgressStyleExtendParam) }} -->
-    </div>
+    <!-- <div>
+      {{ JSON.stringify(currentGenericProgressStyleExtendParam) }}
+      {{ JSON.stringify(currentDiskExtendParam) }}
+    </div> -->
     <NTabs v-model:value="active" type="segment">
       <NTabPane :name="MonitorType.cpu" tab="CPU状态">
         <GenericProgressStyleEditor v-model:genericProgressStyleExtendParam="currentGenericProgressStyleExtendParam" />
-        <NButton @click="handleResetGenericProgressStyleExtendParam">
+        <NButton @click="handleResetExtendParam">
           重置
         </NButton>
       </NTabPane>
       <NTabPane :name="MonitorType.memory" tab="内存状态">
         <GenericProgressStyleEditor v-model:genericProgressStyleExtendParam="currentGenericProgressStyleExtendParam" />
-        <NButton @click="handleResetGenericProgressStyleExtendParam">
+        <NButton @click="handleResetExtendParam">
           重置
         </NButton>
       </NTabPane>
       <NTabPane :name="MonitorType.disk" tab="磁盘状态">
         <DiskEditor v-model:disk-extend-param="currentDiskExtendParam" />
-        <NButton @click="handleResetGenericProgressStyleExtendParam">
+        <NButton @click="handleResetExtendParam">
           重置
         </NButton>
       </NTabPane>
diff --git a/src/components/deskModule/SystemMonitor/index.vue b/src/components/deskModule/SystemMonitor/index.vue
index 786c439..b2058dc 100644
--- a/src/components/deskModule/SystemMonitor/index.vue
+++ b/src/components/deskModule/SystemMonitor/index.vue
@@ -62,8 +62,11 @@ const monitorDatas = ref<MonitorData[]>([])
 
 function handleClick(index: number, item: MonitorData) {
   editShowStatus.value = true
+
   editData.value = item
   editIndex.value = index
+
+  console.log(editData.value)
 }
 
 async function getData() {
@@ -77,6 +80,10 @@ onMounted(() => {
 function handleSaveDone() {
   getData()
 }
+
+function handleSaveSort() {
+
+}
 </script>
 
 <template>
@@ -118,7 +125,6 @@ function handleSaveDone() {
             v-for="item, index in monitorDatas" :key="index"
             :title="item.description"
             @click="handleClick(index, item)"
-            @contextmenu="(e) => handleContextMenu(e, itemGroupIndex, item)"
           >
             <AppIconSystemMonitor
               :extend-param="item.extendParam"
@@ -145,7 +151,6 @@ function handleSaveDone() {
               v-for="item, index in monitorDatas" :key="index"
               :title="item.description"
               @click="handleClick(index, item)"
-              @contextmenu="(e) => handleContextMenu(e, itemGroupIndex, item)"
             >
               <AppIconSystemMonitor
                 :extend-param="item.extendParam"
@@ -163,7 +168,7 @@ function handleSaveDone() {
       <!-- 编辑栏 -->
       <div v-if="monitorGroup.sortStatus" class="flex mt-[10px]">
         <div>
-          <NButton color="#2a2a2a6b" @click="handleSaveSort(monitorGroup)">
+          <NButton color="#2a2a2a6b" @click="handleSaveSort()">
             <template #icon>
               <SvgIcon class="text-white font-xl" icon="material-symbols:save" />
             </template>
diff --git a/src/utils/defaultData/index.ts b/src/utils/defaultData/index.ts
new file mode 100644
index 0000000..17b24f9
--- /dev/null
+++ b/src/utils/defaultData/index.ts
@@ -0,0 +1,10 @@
+export const defautSwatchesBackground = [
+  '#00000000',
+  '#000000',
+  '#ffffff',
+  '#18A058',
+  '#2080F0',
+  '#F0A020',
+  'rgba(208, 48, 80, 1)',
+  '#C418D1FF',
+]