From 7ff008b383ab5072c4247d041904d85d68771405 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <67171972+IoTManagerProject@users.noreply.github.com>
Date: Mon, 17 Jan 2022 22:19:14 +0100
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D0=B1=D1=89=D0=B8=D0=B9=20=D1=81=D0=BF=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BE=D0=BA=20=D0=B2=D0=B8=D0=B4=D0=B6=D0=B5=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.svelte | 60 ++++++++++++++------------------------------------
 1 file changed, 16 insertions(+), 44 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 80a9740..6c9735a 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -163,35 +163,6 @@
   let widgetCollection = [];
   let widgetCollectionBuf = [];
 
-  let widgetsDropdown = [];
-
-  //widgetsDropdown = [
-  //  {
-  //    id: "toggle",
-  //    val: "Переключатель",
-  //  },
-  //  {
-  //    id: "btn",
-  //    val: "Кнопка",
-  //  },
-  //  {
-  //    id: "select",
-  //    val: "Кнопка переключатель",
-  //  },
-  //  {
-  //    id: "range",
-  //    val: "Ползунок",
-  //  },
-  //  {
-  //    id: "anydata",
-  //    val: "Текст",
-  //  },
-  //  {
-  //    id: "inputDigit",
-  //    val: "Ввод цифры",
-  //  },
-  //];
-
   //web sockets
   let socket = [];
   let socketConnected = false;
@@ -335,7 +306,6 @@
               widgetCollection = JSON.parse(widgetCollectionBuf);
               widgetCollectionBuf = [];
               widgetCollection = widgetCollection;
-              createWidgetsDropdown();
               if (debug) console.log("[i]", "widgetCollection parsed");
             }
           }
@@ -360,17 +330,6 @@
     sendCurrentPageName();
   }
 
-  function createWidgetsDropdown() {
-    widgetCollection.forEach((widget) => {
-      widgetsDropdown.push({
-        id: widget.name,
-        val: widget.rus,
-      });
-    });
-    widgetsDropdown = widgetsDropdown;
-    if (debug) console.log("[i]", widgetsDropdown);
-  }
-
   function clearData() {
     configJson = [];
     configJsonBuf = [];
@@ -528,6 +487,19 @@
     return true;
   }
 
+  //пример как формировать массив json
+  function createWidgetsDropdown() {
+    let widgetsDropdown = [];
+    widgetCollection.forEach((widget) => {
+      widgetsDropdown.push({
+        id: widget.name,
+        val: widget.rus,
+      });
+    });
+    widgetsDropdown = widgetsDropdown;
+    if (debug) console.log("[i]", widgetsDropdown);
+  }
+
   //**********************************************************post and get************************************************************/
   //editRequest("192.168.88.235", "data data data data", "file.json")
 
@@ -693,9 +665,9 @@
                     <td class="tbl-bdy"><input bind:value={element.id} class="tbl-ipt w-full" type="text" /></td>
                     <td class="tbl-bdy"
                       ><select bind:value={element.widget} class="tbl-ipt w-full">
-                        {#each widgetsDropdown as widget}
-                          <option value={widget.id}>
-                            {widget.val}
+                        {#each widgetCollection as select}
+                          <option value={select.name}>
+                            {select.label}
                           </option>
                         {/each}
                       </select></td>