askbot-dragon 0.7.91 → 0.7.92

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "askbot-dragon",
3
- "version": "0.7.91",
3
+ "version": "0.7.92",
4
4
  "scripts": {
5
5
  "serve": "vue-cli-service serve",
6
6
  "build": "vue-cli-service build",
@@ -145,14 +145,14 @@
145
145
  v-model=item.value
146
146
  :options=item.formField.extInfo.cascade
147
147
  style="width: 100%;"
148
- :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择时间'"
148
+ :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
149
149
  v-if="item.formField.extInfo.cascade"
150
150
  ></el-cascader>
151
151
  <el-cascader
152
152
  v-model=item.value
153
- :options=item.formField.extInfo.cascadeDown[0].options
153
+ :options=setOptions(item.formField.extInfo)
154
154
  style="width: 100%;"
155
- :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择时间'"
155
+ :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
156
156
  v-else-if="item.formField.extInfo.cascadeDown"
157
157
  ></el-cascader>
158
158
  </div>
@@ -626,6 +626,18 @@ export default {
626
626
  that.defaultClick()
627
627
  },
628
628
  methods: {
629
+ setOptions(extInfo){
630
+ let options = []
631
+ console.debug('cascadeDown',extInfo)
632
+ if (extInfo.cascadeDown.options){
633
+ options = extInfo.cascadeDown.options
634
+ return options
635
+ }
636
+ else if (extInfo.cascadeDown[0]){
637
+ options = extInfo.cascadeDown[0].options
638
+ }
639
+ return options
640
+ },
629
641
  onReady(){
630
642
 
631
643
 
@@ -1121,7 +1133,16 @@ export default {
1121
1133
  {
1122
1134
  if(this.formShow.form.formFieldRelation[i].formField.type==='CASCADER')
1123
1135
  {
1124
- let cascader = this.formShow.form.formFieldRelation[i].formField.extInfo.cascade?this.formShow.form.formFieldRelation[i].formField.extInfo.cascade:this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options?this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options:[]
1136
+ let cascader = []
1137
+ if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascade){
1138
+ cascader = this.formShow.form.formFieldRelation[i].formField.extInfo.cascade
1139
+ }
1140
+ else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options){
1141
+ cascader = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options
1142
+ }
1143
+ else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0]){
1144
+ cascader = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options
1145
+ }
1125
1146
  cascader.forEach(item=>{
1126
1147
  if(item.children!==undefined)
1127
1148
  {
@@ -1249,8 +1270,16 @@ export default {
1249
1270
  this.keyValue+=this.formShow.form.formFieldRelation[i].value[m]
1250
1271
  }
1251
1272
  }
1252
-
1253
- this.data = this.formShow.form.formFieldRelation[i].formField.extInfo.cascade?this.formShow.form.formFieldRelation[i].formField.extInfo.cascade:this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown?this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options:[]
1273
+ this.data = []
1274
+ if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascade){
1275
+ this.data = this.formShow.form.formFieldRelation[i].formField.extInfo.cascade
1276
+ }
1277
+ else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options){
1278
+ this.data = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options
1279
+ }
1280
+ else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0]){
1281
+ this.data = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options
1282
+ }
1254
1283
  this.column[0].values = Object.values(this.data).map(function (e) {
1255
1284
  return {text: e.value, code: e.value}
1256
1285
  })