Merge branch 'qin_23'

# Conflicts:
#	src/components/DesignForm/public/form/form.vue

src/components/DesignForm/public/form/form.vue

@@ -982,7 +982,10 @@ function showOrHide(data: any) {
         for (let j = 0; j < checkboxShowConfigArr2[i].length; j++) {
           //console.log(j)
           //console.log(checkboxShowConfigArr2[i][j].showFields)
-          if (checkboxShowConfigArr2[i][j].showFields&&checkboxShowConfigArr2[i][j].showFields.length > 0) {
+          if (
+            checkboxShowConfigArr2[i][j].showFields &&
+            checkboxShowConfigArr2[i][j].showFields.length > 0
+          ) {
             for (let n = 0; n < checkboxShowConfigArr2[i][j].showFields.length; n++) {
               let fieldKeyArr = checkboxShowConfigArr2[i][j].showFields[n].split(":");
               let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];