From a3e91c18010ad2f510e2af50313304f2d25a82e2 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Wed, 25 Sep 2024 16:38:35 +0300
Subject: [PATCH] test

---
 assets/main.scss                  | 12 +++++++++---
 components/calc/values.vue        | 23 ++++++++++-------------
 components/dropdown/picker.vue    | 11 +++--------
 components/model/smoothCamera.vue |  2 --
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/assets/main.scss b/assets/main.scss
index 5dde5b9..5a2d2cb 100644
--- a/assets/main.scss
+++ b/assets/main.scss
@@ -354,23 +354,29 @@ button {
     &_open {
         @apply flex-wrap;
     }
+
     &_disabled {
         @apply pointer-events-none opacity-50;
     }
 
     &-input {
         @apply flex items-center justify-between;
+
+        span {
+            @apply select-none w-full h-full;
+        }
     }
+
     &-button {
-        @apply flex-grow h-full;
+        @apply min-w-10 shrink-0 h-full;
     }
 
     &-selected {
-        @apply size-10 rounded border-gray-300 shadow inline-block leading-none;
+        @apply h-10 overflow-hidden rounded border-gray-300 shadow inline-block leading-none grow;
     }
 
     &-changer {
-        @apply flex gap-4 mt-4 max-h-24 overflow-auto;
+        @apply flex gap-4 mt-4 max-h-40 overflow-auto;
     }
 
     &-list {
diff --git a/components/calc/values.vue b/components/calc/values.vue
index 147e3b2..1e8c2ec 100644
--- a/components/calc/values.vue
+++ b/components/calc/values.vue
@@ -187,13 +187,11 @@ const calc_table = computed(() => {
             <div class="form-item form-item_color">
                 <label for="lamelle_color">Цвет ламелей</label>
                 <DropdownPicker type="color" :cb="setLamelleColor" name="lamelle_color"
-                    :goto_target="new Vector3(0, lamelles_count * lamelle_height * 0.5, 0)"
-                    :goto_cam="new Vector3(0.5, 0.5, 0.5)">
-                    <input id="lamelle_color" type="text" :value.text="getColorNameFromRal(lamelle_color)"
-                        class="select-none" readonly :style="{
-                            backgroundColor: getColorHexFromRal(lamelle_color) ?? 'transparent',
-                            color: lamelle_text
-                        }" />
+                    :goto_target="new Vector3(0, lamelles_count * lamelle_height * 0.75, 0)"
+                    :goto_cam="new Vector3(0.75, 0.75, 0.75)">
+                    <span :style="[{ color: lamelle_text, backgroundColor: getColorHexFromRal(lamelle_color) ?? 'transparent' }]">
+                        {{ getColorNameFromRal(lamelle_color) }}
+                    </span>
                 </DropdownPicker>
             </div>
         </div>
@@ -203,10 +201,9 @@ const calc_table = computed(() => {
                 <DropdownPicker type="color" :cb="setPillarColor" name="pillar_color"
                     :goto_target="new Vector3(-fence_section * 0.5, lamelles_count * lamelle_height, 0)"
                     :goto_cam="new Vector3(-1, -1, 1)">
-                    <input id="pillar_color" type="text" :value="getColorNameFromRal(pillar_color)" :style="{
-                        backgroundColor: getColorHexFromRal(pillar_color) ?? 'transparent',
-                        color: pillar_text
-                    }" />
+                    <span :style="[{ color: pillar_text, backgroundColor: getColorHexFromRal(pillar_color) ?? 'transparent' }]">
+                        {{ getColorNameFromRal(pillar_color) }}
+                    </span>
                 </DropdownPicker>
             </div>
         </div>
@@ -215,8 +212,8 @@ const calc_table = computed(() => {
                 <label for="pillar_pattern">Узор столба</label>
                 <DropdownPicker type="pattern" :cb="setPillarPattern" name="pillar_pattern" :disabled="remove_pillar"
                     :goto_target="new Vector3(fence_section * 0.5, lamelles_count * lamelle_height, 0)"
-                    :goto_cam="new Vector3(1, -1, -1)">
-                    <input id="pillar_pattern" type="text" :value="pillar_pattern" :style="{
+                    :goto_cam="new Vector3(1, 2, -1)">
+                    <input id="pillar_pattern" type="text" readonly :value="pillar_pattern" :style="{
                         backgroundImage: `url(${getFilename(pillar_pattern)})`
                     }" />
                 </DropdownPicker>
diff --git a/components/dropdown/picker.vue b/components/dropdown/picker.vue
index 44c135b..d075fe3 100644
--- a/components/dropdown/picker.vue
+++ b/components/dropdown/picker.vue
@@ -39,14 +39,9 @@ watch(open_calc, () => {
         'picker_disabled': props.disabled,
     }]" ref="picker">
         <div class="picker-input">
-            <template v-if="$slots.default">
-                <div @click="toggleOpen(!is_open)">
-                    <slot></slot>
-                </div>
-            </template>
-            <template v-else>
-                <div class="picker-selected" @click="toggleOpen(!is_open)"
-                    :style="[props.color && { backgroundColor: getColorHexFromRal(props.color) ?? '' }]"></div>
+            <template>
+                <slot class="picker-selected" @click="toggleOpen(!is_open)"
+                    :style="[props.color && { backgroundColor: props.color ?? '' }]"></slot>
             </template>
             <Icon class="picker-button" :name="is_open ? 'mdi:chevron-down' : 'mdi:chevron-up'"
                 @click="toggleOpen(!is_open)" />
diff --git a/components/model/smoothCamera.vue b/components/model/smoothCamera.vue
index 067c581..7144ebb 100644
--- a/components/model/smoothCamera.vue
+++ b/components/model/smoothCamera.vue
@@ -19,12 +19,10 @@ const set_moveto = (obj: smooth, value: smooth["value"]) => {
 }
 
 watch(goto_target, () => {
-    console.log(goto_target.value)
     smooth_target.value = goto_target.value
     smooth_target.count = COUNT
 })
 watch(goto_camera, () => {
-    console.log(goto_camera.value)
     smooth_move.value = goto_camera.value
     smooth_move.count = COUNT
 })