Merge branch 'lwx_v26'

src/components/DesignForm/formControlPropertiNew.vue

@@ -5665,7 +5665,7 @@ const libraryList = ref([
           :data="customerFormTree[0].children"
           check-strictly
           :render-after-expand="false"
-          filterable
+          
           node-key="id"
           @change="formidChanged"
         />

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

@@ -982,7 +982,7 @@ 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.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];

src/widget/associatedforms/associatedForms.vue

@@ -3,12 +3,12 @@
 
   <div class="container">
     <!-- <span style="font-size: 14px; margin-right: 12px;padding-top: 4px;" class="small-span" >{{ props.data.item?props.data.item.label:"关联表单" }}</span> -->
-    <el-select v-if="!tableFlag" v-model="value1"  :placeholder="data.config.help" class="big-span" @change="asfValueChanged">
+    <el-select-v2 v-if="!tableFlag" v-model="value1" :options="options" filterable :placeholder="data.config.help" class="big-span" @change="asfValueChanged" >
-      <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+      <!-- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" /> -->
-    </el-select>
+    </el-select-v2>
-    <el-select v-if="tableFlag" v-model="value2"  :placeholder="data.config.help" class="big-span" @change="asfValueChangedTable">
+    <el-select-v2 v-if="tableFlag" v-model="value2" :options="options" filterable  :placeholder="data.config.help" class="big-span" @change="asfValueChangedTable">
-      <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+      <!-- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" /> -->
-    </el-select>
+    </el-select-v2>
   </div>
 
 </template>