askbot-dragon 0.7.51 → 0.7.54
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/formTemplate.vue +25 -21
package/package.json
CHANGED
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
:placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
|
|
117
117
|
style="width: 100%"
|
|
118
118
|
filterable
|
|
119
|
-
v-if="item.formField.extInfo.option"
|
|
119
|
+
v-if="item.formField.extInfo && item.formField.extInfo.option"
|
|
120
120
|
>
|
|
121
121
|
<el-option
|
|
122
122
|
v-for="(items,index) in item.formField.extInfo.option"
|
|
@@ -130,7 +130,7 @@
|
|
|
130
130
|
:placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
|
|
131
131
|
style="width: 100%"
|
|
132
132
|
filterable
|
|
133
|
-
v-else-if="item.formField.extInfo.options"
|
|
133
|
+
v-else-if="item.formField.extInfo && item.formField.extInfo.options"
|
|
134
134
|
>
|
|
135
135
|
<el-option
|
|
136
136
|
v-for="(items,index) in item.formField.extInfo.options"
|
|
@@ -945,32 +945,36 @@ export default {
|
|
|
945
945
|
}
|
|
946
946
|
}
|
|
947
947
|
else {
|
|
948
|
-
|
|
949
|
-
|
|
950
|
-
this.formList.form.formFieldRelation[i].formField.extInfo.options[j].value
|
|
948
|
+
if(this.formList.form.formFieldRelation[i].formField.extInfo && this.formList.form.formFieldRelation[i].formField.extInfo.option) {
|
|
949
|
+
for (let j = 0; j < this.formList.form.formFieldRelation[i].formField.extInfo.options.length; j++) {
|
|
950
|
+
if (this.formList.form.formFieldRelation[i].formField.extInfo.options[j].value === '') {
|
|
951
|
+
this.formList.form.formFieldRelation[i].formField.extInfo.options[j].value = this.formList.form.formFieldRelation[i].formField.extInfo.options[j].label
|
|
952
|
+
}
|
|
951
953
|
}
|
|
952
954
|
}
|
|
953
|
-
|
|
954
|
-
{
|
|
955
|
-
for (let j=0;j<this.formList.form.formFieldRelation[i].formField.extInfo.options.length;j++)
|
|
955
|
+
if(this.formList.form.formFieldRelation[i].value && this.formList.form.formFieldRelation[i].formField.extInfo && this.formList.form.formFieldRelation[i].formField.extInfo.option)
|
|
956
956
|
{
|
|
957
|
-
|
|
957
|
+
for (let j=0;j<this.formList.form.formFieldRelation[i].formField.extInfo.options.length;j++)
|
|
958
958
|
{
|
|
959
|
-
this.
|
|
959
|
+
if (this.formList.form.formFieldRelation[i].value === this.formList.form.formFieldRelation[i].formField.extInfo.options[j].value)
|
|
960
|
+
{
|
|
961
|
+
this.selectValues[this.formList.form.formFieldRelation[i].fieldId] =this.formList.form.formFieldRelation[i].formField.extInfo.options[j].label
|
|
962
|
+
}
|
|
960
963
|
}
|
|
961
|
-
|
|
962
|
-
/*this.selectValues[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value*/
|
|
964
|
+
/*this.selectValues[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value*/
|
|
963
965
|
|
|
964
|
-
|
|
965
|
-
|
|
966
|
-
|
|
967
|
-
|
|
968
|
-
|
|
969
|
-
|
|
970
|
-
|
|
966
|
+
}
|
|
967
|
+
else
|
|
968
|
+
{
|
|
969
|
+
if(this.formList.form.formFieldRelation[i].formField.extInfo && this.formList.form.formFieldRelation[i].formField.extInfo.option) {
|
|
970
|
+
for (let j = 0; j < this.formList.form.formFieldRelation[i].formField.extInfo.options.length; j++) {
|
|
971
|
+
if (this.formList.form.formFieldRelation[i].formField.extInfo.options[j]._default === 'true') {
|
|
972
|
+
this.selectValues[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].formField.extInfo.options[j].label
|
|
973
|
+
this.formList.form.formFieldRelation[i].value=this.formList.form.formFieldRelation[i].formField.extInfo.options[j].value
|
|
974
|
+
}
|
|
975
|
+
}
|
|
971
976
|
}
|
|
972
977
|
}
|
|
973
|
-
}
|
|
974
978
|
}
|
|
975
979
|
|
|
976
980
|
}
|
|
@@ -1138,7 +1142,7 @@ export default {
|
|
|
1138
1142
|
this.formShow.form.formFieldRelation[i].value=value
|
|
1139
1143
|
}
|
|
1140
1144
|
|
|
1141
|
-
if(this.formShow.form.formFieldRelation[i].display===true && this.formShow.form.formFieldRelation[i].required === true&&this.formShow.form.formFieldRelation[i].fieldId!=='workorder_name'&& this.formShow.form.formFieldRelation[i].type !== 'EXPLANATION')
|
|
1145
|
+
if(this.formShow.form.formFieldRelation[i].display===true && this.formShow.form.formFieldRelation[i].required === true&&this.formShow.form.formFieldRelation[i].fieldId!=='workorder_name'&& this.formShow.form.formFieldRelation[i].formField.type !== 'EXPLANATION')
|
|
1142
1146
|
{
|
|
1143
1147
|
|
|
1144
1148
|
if(!this.formShow.form.formFieldRelation[i].value || (this.formShow.form.formFieldRelation[i].value&&this.formShow.form.formFieldRelation[i].value.length===0))
|