adata-ui 0.1.40 → 0.1.43

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "adata-ui",
-  "version": "0.1.33",
+  "version": "0.1.40",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adata-ui",
-  "version": "0.1.40",
+  "version": "0.1.43",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/App.vue

@@ -1,37 +1,11 @@
 <template>
-  <div id="app">
-<!--    <text-field label="Пример" v-model="value" @input="inputHandle" @enterPressed="inputHandle" />-->
-    <search-text-field label="Пример2" v-model="value" @input="inputHandle" @enterPressed="inputHandle" :options="options" :optionFields="['id', 'name']" />
-  </div>
+  <div id="app"></div>
 </template>
 
 <script>
-
-// import TextField from "./components/TextField/TextField";
-import SearchTextField from "./components/SearchTextField/SearchTextField";
-
 export default {
-  name: 'App',
-  components: {
-    // TextField,
-    SearchTextField
-  },
-  data() {
-    return {
-      value: "",
-      options: [{
-        id: 1,
-        name: "reg"
-      }
-      ]
-    }
-  },
-  methods: {
-    inputHandle(val) {
-      console.log(val);
-    }
-  }
-}
+  name: "App",
+};
 </script>
 
 <style>

package/src/components/Header/Header.vue

@@ -75,7 +75,7 @@
 
 <script>
 import Profile from "./Profile";
-import { profileDropDown } from "@/configs/profileDropDown"
+import { profileDropDown } from "../../configs/profileDropDown"
 import MobileToggle from "../transitions/VerticalMobileToggle";
 
 export default {

package/src/components/Header/Profile.vue

@@ -50,15 +50,15 @@
               <div v-for="(elem, index) in listDropDown" :key="index">
                 <div :class="elem.link ? 'profile-menu__balance-link': 'profile-menu__links'"
                      class="gray-text"
-                     v-if="elem.url"
-                     @click="handleClick(elem.url, elem.name)"
+                     v-if="elem[mode]"
+                     @click="handleClick(elem[mode], elem.name)"
                      >
                   <div>
                     {{ elem.name }}
                   </div>
                   <span
                       v-if="elem.link"
-                      @click="showModal(elem.url, elem.name)"
+                      @click="showModal(elem[mode], elem.name)"
                       class="profile-menu__balance"
                   >
                       {{ elem.link }}
@@ -79,8 +79,8 @@
                         <div
                             class="profile-menu__item__child"
                             :key="idx + 'link'"
-                            v-if="child.url"
-                            @click="handleClick(child.url, child.name)"
+                            v-if="child[mode]"
+                            @click="handleClick(child[mode], child.name)"
                         >
                           <span>
                             <svg width="4" height="4" viewBox="0 0 4 4" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -122,8 +122,8 @@
               <div class="profile-menu-mobile__items" v-if="listDropDown.length > 0">
                 <div v-for="(elem, index) in listDropDown" :key="index" class="bb">
                   <div
-                      @click="handleClick(elem.url, elem.name)"
-                      v-if="elem.url"
+                      @click="handleClick(elem[mode], elem.name)"
+                      v-if="elem[mode]"
                       :class="elem.link ? 'profile-menu-mobile__balance-link': 'profile-menu-mobile__links'"
                   >
                     <div v-if="!elem.link" class="button-inner">
@@ -201,8 +201,8 @@
             <div class="profile-menu-mobile__inner">
               <div class="profile-menu-mobile__items" v-if="chosenElem.children.length > 0">
                 <div v-for="(elem, index) in chosenElem.children" :key="index" class="bb">
-                  <div @click="handleClick(elem.url, elem.name)"
-                       v-if="elem.url"
+                  <div @click="handleClick(elem[mode], elem.name)"
+                       v-if="elem[mode]"
                        :class="elem.link ? 'profile-menu-mobile__balance-link': 'profile-menu-mobile__links'">
                     <div class="button-inner">
                       <div>{{ elem.name }}</div>
@@ -330,8 +330,8 @@ export default {
     handleClick(url, name) {
       if (!name.includes('Текущий')) {
         window.open(url, "_self");
-        this.active = false;
-        if (this.chosenElem) this.chosenElem.opened = false;
+        // this.active = false;
+        // if (this.chosenElem) this.chosenElem.opened = false;
       }
     },
     rotateItem(index) {

package/src/components/SearchTextField/SearchTextField.vue

@@ -1,52 +1,86 @@
 <template>
-  <div class="adt-text-block"
-       v-click-outside="onOutsideClick"
-       @keydown.down.up.prevent="onUpOrDownClicked"
+  <div
+    class="adt-text-block"
+    v-click-outside="onOutsideClick"
+    @keydown.down.up.prevent="onUpOrDownClicked"
   >
     <div :class="['adt-text-block__field', { error: !!errorText }]">
       <input
-          ref="input"
-          :type="type"
-          v-mask="mask"
-          v-model="value"
-          :placeholder="placeholder"
-          required
-          @keyup.enter="pressedEnter"
-          @input="inputHandler"
-          @focus="showAutocomplete = true"
-          @click="$emit('showVTour')"
-          class="adt-text-block__input"
-          :class="{ error: !!errorText }"
+        ref="input"
+        :type="type"
+        :value="value"
+        :placeholder="placeholder"
+        required
+        @keyup.enter="enterPressed"
+        @input="$emit('input', $event.target.value)"
+        @focus="showAutocomplete = true"
+        @click="$emit('showVTour')"
+        class="adt-text-block__input"
+        :class="{ error: !!errorText }"
       />
       <label class="adt-text-block__label">
         {{ label }}
       </label>
-      <div class="adt-text-block__icon" v-if="clearable && value" @click="$emit('input', '')">
-        <svg width="12" height="12" fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" id="clearIcon">
-          <path d="M2 2l12 12m0-12L2 14" stroke="#2C3E50" stroke-linecap="round" stroke-linejoin="round"></path>
+      <div
+        class="adt-text-block__icon"
+        v-if="clearable && value"
+        @click="$emit('input', '')"
+      >
+        <svg
+          width="12"
+          height="12"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 16 16"
+          id="clearIcon"
+        >
+          <path
+            d="M2 2l12 12m0-12L2 14"
+            stroke="#2C3E50"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          ></path>
         </svg>
       </div>
     </div>
     <div class="adt-text-block__error" v-if="!!errorText">
-      <svg width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon__attention">
-        <path d="M8.5 4C8.5 3.72386 8.27614 3.5 8 3.5C7.72386 3.5 7.5 3.72386 7.5 4H8.5ZM7.5 9C7.5 9.27614 7.72386 9.5 8 9.5C8.27614 9.5 8.5 9.27614 8.5 9H7.5ZM7.5 4V9H8.5V4H7.5Z" fill="#FF2E43"/>
-        <path d="M8.5 11C8.5 10.7239 8.27614 10.5 8 10.5C7.72386 10.5 7.5 10.7239 7.5 11H8.5ZM7.5 11.5C7.5 11.7761 7.72386 12 8 12C8.27614 12 8.5 11.7761 8.5 11.5H7.5ZM7.5 11V11.5H8.5V11H7.5Z" fill="#FF2E43"/>
-        <circle cx="8" cy="8" r="7" stroke="#FF2E43"/>
+      <svg
+        width="14"
+        height="14"
+        viewBox="0 0 16 16"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+        id="icon__attention"
+      >
+        <path
+          d="M8.5 4C8.5 3.72386 8.27614 3.5 8 3.5C7.72386 3.5 7.5 3.72386 7.5 4H8.5ZM7.5 9C7.5 9.27614 7.72386 9.5 8 9.5C8.27614 9.5 8.5 9.27614 8.5 9H7.5ZM7.5 4V9H8.5V4H7.5Z"
+          fill="#FF2E43"
+        />
+        <path
+          d="M8.5 11C8.5 10.7239 8.27614 10.5 8 10.5C7.72386 10.5 7.5 10.7239 7.5 11H8.5ZM7.5 11.5C7.5 11.7761 7.72386 12 8 12C8.27614 12 8.5 11.7761 8.5 11.5H7.5ZM7.5 11V11.5H8.5V11H7.5Z"
+          fill="#FF2E43"
+        />
+        <circle cx="8" cy="8" r="7" stroke="#FF2E43" />
       </svg>
       {{ errorText }}
     </div>
-    <div class="adt-text-block__options search-options" v-show="options && options.length > 0 && showAutocomplete">
+    <div
+      class="adt-text-block__options search-options"
+      v-show="options && options.length > 0 && showAutocomplete"
+    >
       <PerfectScrollbar>
         <div class="search-options__wrapper">
           <div
-              class="search-options__item"
-              v-for="(option, index) in options"
-              :key="index"
-              @click="onAutocompleteOptionClick(option)"
-              ref="searchOptions"
+            class="search-options__item"
+            v-for="(option, index) in options"
+            :key="index"
+            @click="onAutocompleteOptionClick(option)"
+            ref="searchOptions"
           >
             {{ !!optionFields.length ? textByOption(option) : option }}
-            <div class="hiddenOne" v-if="option.type && isTypeRequired"> ${{ option.type }}$</div>
+            <div class="hiddenOne" v-if="option.type && isTypeRequired">
+              ${{ option.type }}$
+            </div>
           </div>
         </div>
       </PerfectScrollbar>
@@ -55,8 +89,8 @@
 </template>
 
 <script>
-import '../../assets/style.scss';
-import { VueMaskDirective } from "v-mask";
+import "../../assets/style.scss";
+
 import { PerfectScrollbar } from "vue2-perfect-scrollbar";
 import vClickOutside from "v-click-outside";
 
@@ -64,20 +98,24 @@ export default {
   name: "SearchTextField",
   directives: {
     clickOutside: vClickOutside.directive,
-    mask: VueMaskDirective
   },
   props: {
     errorText: {
       type: String,
-      default: ""
+      default: "",
     },
     placeholder: {
       type: String,
-      default: ""
+      default: "",
     },
     mask: {
       type: String,
-      default: ""
+      default: "",
+    },
+    value: {
+      type: String,
+      required: true,
+      default: "",
     },
     label: {
       type: String,
@@ -89,15 +127,15 @@ export default {
     },
     clearable: {
       type: Boolean,
-      default: false
+      default: false,
     },
     isWithIcon: {
       type: Boolean,
-      default: false
+      default: false,
     },
     isTypeRequired: {
       type: Boolean,
-      default: false
+      default: false,
     },
     options: {
       type: Array,
@@ -105,34 +143,33 @@ export default {
     },
     optionFields: {
       type: Array,
-      default: null
+      default: null,
     },
     isMobile: {
       type: Boolean,
-      default: false
+      default: false,
     },
   },
   components: {
-    PerfectScrollbar
+    PerfectScrollbar,
   },
   data() {
     return {
       showAutocomplete: false,
       showPlaceholder: false,
-      value: ""
-    }
+    };
   },
   computed: {
     inputPlaceholder() {
-      return this.showPlaceholder ? this.placeholder : ""
-    }
+      return this.showPlaceholder ? this.placeholder : "";
+    },
   },
   methods: {
-    pressedEnter() {
-      this.$emit('enter', this.showAutocomplete, this.value);
+    enterPressed() {
+      this.$emit("enterPressed", this.showAutocomplete);
     },
     onOutsideClick() {
-      if (!this.isMobile) this.showAutocomplete = false
+      if (!this.isMobile) this.showAutocomplete = false;
     },
     onUpOrDownClicked(e) {
       const autoCompleteOptions = this.$refs.searchOptions;
@@ -140,44 +177,48 @@ export default {
       if (length > 0) {
         switch (e.which) {
           case 40:
-            this.moveOption(autoCompleteOptions, 'nextElementSibling');
+            this.moveOption(autoCompleteOptions, "nextElementSibling");
             break;
           case 38:
-            this.moveOption(autoCompleteOptions, 'previousElementSibling');
+            this.moveOption(autoCompleteOptions, "previousElementSibling");
             break;
         }
       }
     },
     moveOption(autoCompleteOptions, elementType) {
-      const selectedOption = autoCompleteOptions.find((option) => option.hasAttribute('id'));
+      const selectedOption = autoCompleteOptions.find((option) =>
+        option.hasAttribute("id")
+      );
       if (selectedOption) {
         const siblingElement = selectedOption[elementType];
-        this.$emit('castOption', siblingElement?.innerText || "");
-        if (siblingElement?.classList.contains('search-options__item')) {
+        this.$emit("castOption", siblingElement?.innerText || "");
+        if (siblingElement?.classList.contains("search-options__item")) {
           selectedOption.removeAttribute("id");
-          siblingElement.setAttribute("id", 'searchVariant');
+          siblingElement.setAttribute("id", "searchVariant");
           return;
         }
         selectedOption.removeAttribute("id");
         return;
       }
       let innerText = "";
-      if (elementType === 'nextElementSibling')
+      if (elementType === "nextElementSibling")
         innerText = this.getAutocompleteOptionText(autoCompleteOptions?.[0]);
-      if (elementType === 'previousElementSibling')
-        innerText = this.getAutocompleteOptionText(autoCompleteOptions?.[autoCompleteOptions.length - 1]);
-      this.$emit('castOption', innerText);
+      if (elementType === "previousElementSibling")
+        innerText = this.getAutocompleteOptionText(
+          autoCompleteOptions?.[autoCompleteOptions.length - 1]
+        );
+      this.$emit("castOption", innerText);
     },
     getAutocompleteOptionText(autocompleteOption) {
-      autocompleteOption.setAttribute("id", 'searchVariant');
+      autocompleteOption.setAttribute("id", "searchVariant");
       return autocompleteOption.innerText;
     },
-    inputHandler() {
-      this.$emit('input', this.value);
+    inputHandler(e) {
+      this.$emit("input", e.target.value);
       this.showAutocomplete = true;
     },
     onAutocompleteOptionClick(option) {
-      this.$emit('click', option);
+      this.$emit("click", option);
       this.showAutocomplete = false;
     },
     textByOption(obj) {
@@ -186,8 +227,7 @@ export default {
         acc += obj[curr];
         return acc;
       }, "");
-    }
-  }
-}
+    },
+  },
+};
 </script>
-

package/src/components/TextField/TextField.vue

@@ -2,51 +2,74 @@
   <div class="adt-text-block">
     <div :class="['adt-text-block__field', { error: !!errorText }]">
       <input
-          ref="input"
-          v-mask="mask"
-          :type="type"
-          v-model="value"
-          :placeholder="placeholder"
-          required
-          @keyup.enter="pressedEnter"
-          class="adt-text-block__input"
-          :class="{ error: !!errorText }"
-          @input="() => {$emit('input', value)}"
+        ref="input"
+        :type="type"
+        :value="value"
+        :placeholder="placeholder"
+        required
+        @input="$emit('input', $event.target.value)"
+        @keyup.enter="enterPressed"
+        class="adt-text-block__input"
+        :class="{ error: !!errorText }"
       />
       <label class="adt-text-block__label">
         {{ label }}
         <span v-if="required" class="adt-text-block__required">*</span>
       </label>
-      <div class="adt-text-block__icon desktop" v-if="clearable && value && value.length > 0"
-           @click="$emit('input', '')">
-        <svg width="12" height="12" fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" id="clearIcon">
-          <path d="M2 2l12 12m0-12L2 14" stroke="#2C3E50" stroke-linecap="round" stroke-linejoin="round"></path>
+      <div
+        class="adt-text-block__icon desktop"
+        v-if="clearable && value && value.length > 0"
+        @click="$emit('input', '')"
+      >
+        <svg
+          width="12"
+          height="12"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 16 16"
+          id="clearIcon"
+        >
+          <path
+            d="M2 2l12 12m0-12L2 14"
+            stroke="#2C3E50"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          ></path>
         </svg>
       </div>
     </div>
     <div class="adt-text-block__error" v-if="!!errorText">
-      <svg width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon__attention">
-        <path d="M8.5 4C8.5 3.72386 8.27614 3.5 8 3.5C7.72386 3.5 7.5 3.72386 7.5 4H8.5ZM7.5 9C7.5 9.27614 7.72386 9.5 8 9.5C8.27614 9.5 8.5 9.27614 8.5 9H7.5ZM7.5 4V9H8.5V4H7.5Z" fill="#FF2E43"/>
-        <path d="M8.5 11C8.5 10.7239 8.27614 10.5 8 10.5C7.72386 10.5 7.5 10.7239 7.5 11H8.5ZM7.5 11.5C7.5 11.7761 7.72386 12 8 12C8.27614 12 8.5 11.7761 8.5 11.5H7.5ZM7.5 11V11.5H8.5V11H7.5Z" fill="#FF2E43"/>
-        <circle cx="8" cy="8" r="7" stroke="#FF2E43"/>
+      <svg
+        width="14"
+        height="14"
+        viewBox="0 0 16 16"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+        id="icon__attention"
+      >
+        <path
+          d="M8.5 4C8.5 3.72386 8.27614 3.5 8 3.5C7.72386 3.5 7.5 3.72386 7.5 4H8.5ZM7.5 9C7.5 9.27614 7.72386 9.5 8 9.5C8.27614 9.5 8.5 9.27614 8.5 9H7.5ZM7.5 4V9H8.5V4H7.5Z"
+          fill="#FF2E43"
+        />
+        <path
+          d="M8.5 11C8.5 10.7239 8.27614 10.5 8 10.5C7.72386 10.5 7.5 10.7239 7.5 11H8.5ZM7.5 11.5C7.5 11.7761 7.72386 12 8 12C8.27614 12 8.5 11.7761 8.5 11.5H7.5ZM7.5 11V11.5H8.5V11H7.5Z"
+          fill="#FF2E43"
+        />
+        <circle cx="8" cy="8" r="7" stroke="#FF2E43" />
       </svg>
       {{ errorText }}
     </div>
   </div>
 </template>
 <script>
-import '../../assets/style.scss';
-import { VueMaskDirective } from "v-mask";
+import "../../assets/style.scss";
 
 export default {
   name: "TextField",
-  directives: {
-    mask: VueMaskDirective
-  },
   props: {
     errorText: {
       type: String,
-      default: ""
+      default: "",
     },
     label: {
       type: String,
@@ -56,38 +79,42 @@ export default {
       type: String,
       default: "text",
     },
-    mask: {
+    value: {
       type: String,
-      default: ""
+      required: true,
+      default: "",
     },
     placeholder: {
       type: String,
-      default: ""
+      default: "",
     },
     clearable: {
       type: Boolean,
-      default: false
+      default: false,
     },
     required: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     return {
       showPlaceholder: false,
-      value: ""
-    }
+    };
   },
   computed: {
     inputPlaceholder() {
-      return this.showPlaceholder ? this.placeholder : ""
-    }
+      return this.showPlaceholder ? this.placeholder : "";
+    },
   },
   methods: {
-    pressedEnter() {
-      this.$emit('enterPressed', this.value);
-    }
-  }
-}
+    enterPressed() {
+      this.$emit("enterPressed", this.showAutocomplete);
+    },
+    inputHandler(e) {
+      this.$emit("input", e.target.value);
+      this.showAutocomplete = true;
+    },
+  },
+};
 </script>