Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

This commit is contained in:
Alessandro Francia
2018-06-14 11:19:15 +02:00
4 changed files with 12 additions and 2 deletions
@@ -57,6 +57,8 @@
<input-box v-for="t in toolsConfiguration" :key="t.name"
v-if="t.name != '' && t.category == c"
v-model="selectedTool[t.name]"
:minValue="t.minValue"
:maxValue="t.maxValue"
:read-only="t.readOnly || !disableList"
:title="'tooling_equipment_param_' + t.name | localize(t.name)"
:type="t.type">
@@ -85,6 +87,8 @@
<input-box v-for="c in edgeConfiguration" :key="c.name"
v-if="c.name != '' && c.category == ce"
v-model="ed[c.name]"
:minValue="c.minValue"
:maxValue="c.maxValue"
:read-only="c.readOnly || !disableList"
:title="'tooling_equipment_cedgepar_' + c.name | localize(c.name)"
:type="c.type">
@@ -94,6 +98,8 @@
<div class="skill-equipment-category">{{'tooling_equipment_list_category_geometry' | localize('geometry')}}</div>
<input-box v-for="ad in getDynamicFields(selectedTool.toolType)" :key="ad"
v-model="ed.edgeAdditionalParams[ad]"
:minValue="ad.minValue"
:maxValue="ad.maxValue"
:read-only="ad.readOnly || !disableList"
:title="'tooling_equipment_cedgepar_' + ad | localize(ad)"
type="double">
@@ -37,6 +37,8 @@
<input-box v-for="m in magposConfiguration" :key="m.name"
v-if="m.name != ''"
v-model="selectedTool[m.name]"
:minValue="m.minValue"
:maxValue="m.maxValue"
:read-only="m.readOnly || !disableList"
:title="'tooling_equipment_param_magpos_' + m.name | localize(m.name)"
:type="m.type">
@@ -20,7 +20,7 @@
</div>
</div>
<div class="list-vertical scrollable" ref="shankList">
<equipment v-for="s in shanks.filter(i => i.name.toLowerCase().indexOf(currentFilter) >=0)"
<equipment v-for="s in shanks.filter(i => i.name.toLowerCase().indexOf(currentFilter) >=0)"
:key="s.id"
v-if="s.id != null"
:code="'tooling_shank_abbreviation' | localize('S%d',s.id)"
@@ -61,6 +61,8 @@
<input-box v-for="s in shankConfiguration" :key="s.name"
v-if="s.name != '' && s.category == c"
v-model="selectedTool[s.name]"
:minValue="s.minValue"
:maxValue="s.maxValue"
:read-only="s.readOnly || !disableList"
:title="'tooling_equipment_param_' + s.name | localize(s.name)"
:type="s.type">
@@ -9,7 +9,7 @@
<slot></slot>
</select>
<input v-if="type=='int' || type=='double'" v-model.number="bindingValue" type="number"
:min="minValue" :max="maxValue" v-validate="{min_value:minValue, max_value: maxValue}"
:min="minValue" :max="maxValue" v-validate.initial="{min_value:minValue, max_value: maxValue}"
:readonly="readOnly">
<div class="togglebutton" v-if="type=='boolean'">
<label>