askbot-dragon 1.4.65 → 1.4.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.4.65",
+  "version": "1.4.67",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/formTemplate.vue

@@ -1323,7 +1323,14 @@ export default {
     clearOptionStruct() {
       // this.fieldValue,this.cascadeDetail.field.id
       console.log(this.detailField,'this.cascadeDetail',this.fieldValue[this.detailField.fieldId]);
-      let options = this.detailField.formField.extInfo.cascadeDown.options
+      let options = [];
+      if (this.detailField.formField.extInfo.cascadeDown && this.detailField.formField.extInfo.cascadeDown.options){
+        options = this.detailField.formField.extInfo.cascadeDown.options
+      } else if (this.detailField.formField.extInfo.cascade){
+        options = this.detailField.formField.extInfo.cascade
+      } else if (this.detailField.formField.extInfo.cascadeDown && this.detailField.formField.extInfo.cascadeDown[0]){
+        options = this.detailField.formField.extInfo.cascadeDown[0].options
+      }
       let clear = (options, parent) => {
         for (let index = 0; index < options.length; index++) {
           const opt = options[index];
@@ -1427,11 +1434,12 @@ export default {
     setOptions(extInfo){
       let options = []
       console.debug('cascadeDown',extInfo)
-      if (extInfo.cascadeDown.options){
+      if (extInfo.cascadeDown && extInfo.cascadeDown.options){
         options = extInfo.cascadeDown.options
         return options
-      }
-      else if (extInfo.cascadeDown[0]){
+      } else if (extInfo.cascade){
+        options = extInfo.cascade
+      } else if (extInfo.cascadeDown && extInfo.cascadeDown[0]){
         options = extInfo.cascadeDown[0].options
       }
       return  options
@@ -2076,10 +2084,10 @@ export default {
           if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascade){
             cascader = this.formShow.form.formFieldRelation[i].formField.extInfo.cascade
           }
-          else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options){
+          else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown && this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options){
             cascader = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options
           }
-          else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0]){
+          else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown && this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0]){
             cascader = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options
           }
           cascader.forEach(item=>{
@@ -2285,10 +2293,10 @@ export default {
               if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascade){
                 this.data  = this.formShow.form.formFieldRelation[i].formField.extInfo.cascade
               }
-              else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options){
+              else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown && this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options){
                 this.data  = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options
               }
-              else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0]){
+              else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown && this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0]){
                 this.data  = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options
               }
               this.column[0].values = Object.values(this.data).map(function (e) {

package/src/components/tree.vue

@@ -131,7 +131,7 @@ export default {
   computed: {
     dataTree() {
       let arr = []
-      if (this.dataOptions.extInfo.cascadeDown.options){
+      if (this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown.options){
         arr = this.dataOptions.extInfo.cascadeDown.options
       }
       else if (this.dataOptions.extInfo.cascade){
@@ -147,8 +147,8 @@ export default {
       let options = [];
       let  arr = []
       if (this.dataOptions.extInfo && (this.dataOptions.extInfo.cascadeDown || this.dataOptions.extInfo.cascade)){
-        arr = this.dataOptions.extInfo.cascadeDown.options ? this.dataOptions.extInfo.cascadeDown.options :
-            (this.dataOptions.extInfo.cascadeDown[0] ? this.dataOptions.extInfo.cascadeDown[0].options :
+        arr = this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown.options ? this.dataOptions.extInfo.cascadeDown.options :
+            (this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown[0] ? this.dataOptions.extInfo.cascadeDown[0].options :
                 (this.dataOptions.extInfo.cascade ?  this.dataOptions.extInfo.cascade: []));
       }
       if (this.dataOptions.extInfo && this.dataOptions.extInfo.dependent && JSON.stringify(this.dataOptions.extInfo.dependent)!=='{}'){