@eturnity/eturnity_reusable_components 1.2.78 → 1.2.81-EPDM-7194

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "1.2.78",
+  "version": "1.2.81-EPDM-7194",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -11,7 +11,6 @@
   },
   "dependencies": {
     "@vueform/slider": "1.0.5",
-    "core-js": "3.6.5",
     "vue": "2.6.11",
     "vue-styled-components": "1.6.0",
     "html-loader": "0.5.5",
@@ -60,4 +59,4 @@
   "author": "Aaron Enser",
   "license": "ISC",
   "homepage": "https://bitbucket.org/eturnitydevs/eturnity_reusable_components#readme"
-}
+}

package/src/components/inputs/inputNumber/index.vue

@@ -3,6 +3,10 @@
     <label-slot-wrapper
       v-if="hasLabelSlot"
       :isInteractive="isInteractive"
+      :alignItems="alignItems"
+      :noBorder="noBorder"
+      :isError="isError"
+      :borderColor="borderColor"
       @mousedown="initInteraction"
     >
       <slot name="label"></slot>
@@ -29,6 +33,7 @@
         :isError="isError"
         :inputHeight="inputHeight"
         :minWidth="minWidth"
+        :isInteractive="isInteractive"
         :value="formatWithCurrency(value)"
         @blur="onInputBlur($event)"
         @focus="focusInput()"
@@ -154,7 +159,7 @@ const InputContainer = styled('input', inputProps)`
       : isError && !showLinearUnitName
       ? '24px'
       : '5px'};
-  border-radius: 4px;
+  border-radius: ${props=>props.isInteractive && props.alignItems!="vertical" ? "0 4px 4px 0" : "4px"};
   text-align: ${(props) => props.textAlign};
   cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'auto')};
   font-size: ${(props) => (props.fontSize ? props.fontSize : '13px')};
@@ -246,6 +251,20 @@ const LabelSlotWrapper = styled('div', inputProps)`
   gap: 10px;
   align-items: center;
   cursor: ${(props) => (props.isInteractive ? 'ew-resize' : 'auto')};
+  border: ${(props) =>
+    props.alignItems=="vertical" 
+      ? "none" 
+      : props.isError
+      ? '1px solid ' + props.theme.colors.red
+      : props.noBorder
+      ? 'none'
+      : props.borderColor
+      ? props.theme.colors[props.borderColor]
+        ? '1px solid ' + props.theme.colors[props.borderColor]
+        : '1px solid ' + props.borderColor
+      : '1px solid ' + props.theme.colors.grey4};
+  border-radius: 4px 0 0 4px;
+  border-right:none;
 `
 
 const LabelText = styled('div', inputProps)`

package/src/components/inputs/searchInput/index.vue

@@ -98,14 +98,17 @@ export default {
   methods: {
     onChangeHandler(event) {
       this.$emit('on-change', event)
+    },
+    focusInputElement(){
+      this.$nextTick(() => {
+        this.$refs.inputElement.$el.focus();
+      });
     }
   },
   watch: {
     hasFocus(newVal) {
       if (newVal) {
-        this.$nextTick(() => {
-          this.$refs.inputElement.$el.focus();
-        });
+        this.focusInputElement()
       }
     }
   }

package/src/components/tableDropdown/index.vue

@@ -134,7 +134,7 @@
               :tabindex="0"
               @keyup.enter.native="onItemClick(item)"
             >
-              <template v-for="(option, idx) in optionsDisplay" :key="idx">
+              <template v-for="(option, idx) in optionsDisplay">
                 <span v-if="option !== 'template'" :key="idx">
                   {{ !!item[option] ? item[option] : '-' }}
                 </span>