@eturnity/eturnity_reusable_components 1.2.31-3d-master.9 → 1.2.31-3d-master.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "1.2.31-3d-master.9",
+  "version": "1.2.31-3d-master.11",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

package/src/App.vue

@@ -17,7 +17,7 @@
                   inputWidth="420px"
                   textAlign="left"
                   :isInteractive="true"
-                  :interactionStep="50"
+                  :interactionStep="1"
                   alignItems="horizontal"
                   @on-input="value=$event"
                   @input-change="changeHandler"
@@ -30,68 +30,28 @@
                     </div>
                   </template>
                 </input-number>
-      <input-number
-                  :value="value2"
-                  :minNumber="0"
-                  unitName="mm"
-                  :numberPrecision="0"
-                  backgroundColor="transparent"
-                  inputHeight="34px"
-                  inputWidth="420px"
-                  textAlign="left"
-                  :isInteractive="true"
-                  :interactionStep="50"
-                  alignItems="horizontal"
-                  @input-change="changeHandler"
-                  @input-focus="focusHandler"
-                  @input-blur="blurHandler"
-                  @on-input="inputHandler"
-                >
-                  <template v-slot:label>
-                    <div>
-                      Interactive Label
-                    </div>
-                  </template>
-                </input-number>
-                <Select 
-                  selectWidth="100%"
-                  optionWidth="50%"
-                  label="that is a label"
-                  alignItems="vertical"
-                  colorMode="light"
-                  >
-                  <template #selector="{selectedValue}">
-                    value selected: {{selectedValue}}
-                  </template>
-                  <template #dropdown>
-                    <Option value="1">value one</Option>
-                    <Option value="2">value two</Option>
-                    <Option value="3">value three</Option>
-                    <Option value="4">value four</Option>
-                  </template>
-                </Select> 
-                <Select 
-                  selectWidth="100%"
-                  optionWidth="50%"
-                  label="that is a label"
-                  alignItems="vertical"
-                  >
-                  <template #selector="{selectedValue}">
-                    value selected: {{selectedValue}}
-                  </template>
-                  <template #dropdown>
-                    <Option value="1">value one</Option>
-                    <Option value="2">value two</Option>
-                    <Option value="3">value three</Option>
-                    <Option value="4">value four</Option>
-                  </template>
-                </Select> 
+
+                <SwitchField
+                  @on-switch-change="onInputChange($event)"
+                  :options="[{value:0,content:'zero'},{value:1,content:'one'},{value:2,content:'two'}]"
+                  :value="value"
+                  label="label"
+                  toggleColor="red"
+                  size="large"
+                  backgroundColor="blue"
+                  labelAlign="left"
+                  fontColor="black"
+                  :disabled="false"
+                />
+               
                 <Select 
+                  :value="value"
                   selectWidth="100%"
                   optionWidth="50%"
                   label="that is a label"
                   alignItems="vertical"
                   colorMode="dark"
+                  @input-change="value=$event"
                   >
                   <template #selector="{selectedValue}">
                     value selected: {{selectedValue}}
@@ -103,34 +63,8 @@
                     <Option value="4">value four</Option>
                   </template>
                 </Select> 
-                <hr>
-                <SwitchField
-                  @on-switch-change="onInputChange($event)"
-                  :options="[{value:0,content:'zero'},{value:1,content:'one'},{value:2,content:'two'}]"
-                  :value="1"
-                  label="label"
-                  toggleColor="red"
-                  size="large"
-                  backgroundColor="blue"
-                  labelAlign="left"
-                  fontColor="black"
-                  :disabled="false"
-                />
-                <div :style="{padding:'50px',backgroundColor:'#1e1e1e'}">
-                <SwitchField
-                  @on-switch-change="onInputChange($event)"
-                  :options="[{value:'test',content:'zero'},{value:'1',content:'one'},{value:'2',content:'two'}]"
-                  value='test'
-                  label="label"
-                  toggleColor="red"
-                  size="large"
-                  backgroundColor="blue"
-                  labelAlign="left"
-                  colorMode="dark"
-                  alignItems="vertical"
-                />
+                
                 </div>
-    </div>
       </modal>
     </page-container>
   </ThemeProvider>
@@ -142,9 +76,9 @@ import theme from "./assets/theme"
 import styled from "vue-styled-components"
 import InputNumber from "@/components/inputs/inputNumber"
 import Select from "@/components/inputs/select"
+import SwitchField from "@/components/inputs/switchField"
 import Option from "@/components/inputs/select/option"
 import Modal from "@/components/modals/modal"
-import SwitchField from "@/components/inputs/switchField"
  
 // import TableDropdown from "@/components/tableDropdown"
 

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

@@ -456,10 +456,13 @@ export default {
       return evaluated
     },
     onInput(value){
+      let evaluatedVal
       try{
-      const evaluatedVal=this.onEvaluateCode(value)
-      this.$emit('on-input',evaluatedVal)
-      }catch(err){
+       evaluatedVal=this.onEvaluateCode(value)
+      }finally {
+        if(evaluatedVal){
+            this.$emit('on-input',evaluatedVal)
+        }
       }
     },
     onInputBlur(e) {

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

@@ -269,6 +269,11 @@ const InputWrapper = styled('div', inputAttrs)`
         },
     },
     computed: {
+    },
+    watch:{
+        value(val){
+            this.selectedValue=val
+        }
     }
   }
   </script>

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

@@ -55,18 +55,18 @@
   <script>
     // import Toggle from "@eturnity/eturnity_reusable_components/src/components/inputs/toggle"
     // To use:
-    // <SwitchField
-    //     @on-switch-change="onInputChange($event)"
-    //     :options="[{value:0,content:'zero'},{value:1,content:'one'},{value:2,content:'two'}]"
-    //     :value="1"
-    //     label="label"
-    //     toggleColor="red"
-    //     size="large"
-    //     backgroundColor="blue"
-    //     labelAlign="left"
-    //     fontColor="black"
-    //     :disabled="false"
-    // />
+      // <SwitchField
+      //   @on-switch-change="onInputChange($event)"
+      //   :options="[{value:0,content:'zero'},{value:1,content:'one'},{value:2,content:'two'}]"
+      //   :value="1"
+      //   label="label"
+      //   toggleColor="red"
+      //   size="large"
+      //   backgroundColor="blue"
+      //   labelAlign="left"
+      //   fontColor="black"
+      //   :disabled="false"
+      // />
   
 import styled from "vue-styled-components"
   import InfoText from "../../infoText"
@@ -234,6 +234,11 @@ import styled from "vue-styled-components"
             this.$emit("on-switch-change", this.selectedValue)
         },
     },
+    watch:{
+      value(val){
+        this.selectedValue=val
+      }
+    }
   }
   </script>