From 427d9084c07881cb5ecf912edb4cc3a2e9dcaee3 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 6 Aug 2022 12:39:34 +0300
Subject: [PATCH] feat(gui-v2): implement color picker to rating and checkbox
 options

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../smartsheet-column/CheckboxOptions.vue     | 27 +++++++++----------
 .../smartsheet-column/RatingOptions.vue       | 27 +++++++++----------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/CheckboxOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CheckboxOptions.vue
index c407b1cd25..2c73e40594 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/CheckboxOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/CheckboxOptions.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import { Sketch } from '@ckpack/vue-color'
 import { useColumnCreateStoreOrThrow } from '#imports'
-import { enumColor, getMdiIcon } from '@/utils'
+import { getMdiIcon } from '@/utils'
 
 const { formState } = useColumnCreateStoreOrThrow()
 
@@ -37,9 +36,12 @@ const iconList = [
   },
 ]
 
-const advanced = ref(true)
-
-const picked = ref(formState.value.meta.color || enumColor.light[0])
+const picked = computed({
+  get: () => formState.value.meta.color,
+  set: (val) => {
+    formState.value.meta.color = val
+  },
+})
 
 // set default value
 formState.value.meta = {
@@ -92,16 +94,11 @@ watch(
     </a-col>
   </a-row>
   <a-row>
-    <a-card class="w-full shadow-lg mt-2" body-style="padding: 0px">
-      <a-collapse v-model:activeKey="advanced" accordion ghost expand-icon-position="right">
-        <a-collapse-panel key="1" header="Advanced" class="">
-          <a-button class="!bg-primary text-white w-full" @click="formState.meta.color = picked.hex"> Pick Color </a-button>
-          <div class="px-7 py-3">
-            <Sketch v-model="picked" />
-          </div>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
+    <GeneralColorPicker
+      v-model="picked"
+      :row-size="8"
+      :colors="['#fcb401', '#faa307', '#f48c06', '#e85d04', '#dc2f02', '#d00000', '#9d0208', '#777']"
+    />
   </a-row>
 </template>
 
diff --git a/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue
index 55e780efac..c9aebc4042 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import { Sketch } from '@ckpack/vue-color'
 import { useColumnCreateStoreOrThrow } from '#imports'
-import { enumColor, getMdiIcon } from '@/utils'
+import { getMdiIcon } from '@/utils'
 
 const { formState } = useColumnCreateStoreOrThrow()
 
@@ -29,9 +28,12 @@ const iconList = [
   },
 ]
 
-const advanced = ref(true)
-
-const picked = ref(formState.value.meta.color || enumColor.light[0])
+const picked = computed({
+  get: () => formState.value.meta.color,
+  set: (val) => {
+    formState.value.meta.color = val
+  },
+})
 
 // set default value
 formState.value.meta = {
@@ -95,16 +97,11 @@ watch(
     </a-col>
   </a-row>
   <a-row>
-    <a-card class="w-full shadow-lg mt-2" body-style="padding: 0px">
-      <a-collapse v-model:activeKey="advanced" accordion ghost expand-icon-position="right">
-        <a-collapse-panel key="1" header="Advanced" class="">
-          <a-button class="!bg-primary text-white w-full" @click="formState.meta.color = picked.hex"> Pick Color </a-button>
-          <div class="px-7 py-3">
-            <Sketch v-model="picked" />
-          </div>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
+    <GeneralColorPicker
+      v-model="picked"
+      :row-size="8"
+      :colors="['#fcb401', '#faa307', '#f48c06', '#e85d04', '#dc2f02', '#d00000', '#9d0208', '#777']"
+    />
   </a-row>
 </template>