cloud-web-corejs-haier 1.0.4 → 1.0.6

package/src/components/xform/form-designer/form-widget/dialog/searchFormDialog.vue

@@ -72,6 +72,7 @@
 <script>
 import { selectDialogMixins } from "../../../../../mixins/selectDialog/index.js";
 import VFormRender from "../../../../../components/xform/form-render/index.vue";
+import {traverseAllWidgetsNew} from "../../../../../components/xform/utils/util"
 
 export default {
   // name: "vabSearchDialog",
@@ -233,11 +234,22 @@ export default {
         },
       });
     },
+    getDataTableWidget(){
+      let result = null
+      traverseAllWidgetsNew(this.formJson.widgetList, (widget) => {
+        //修复data-table旧数据表格列widget与editWidget为空的问题
+        if (!result && widget.type == "data-table") {
+          result = widget
+        }
+      });
+      return result;
+    },
     getGrid() {
       if (!this.$grid) {
-        let widgetList = this.formJson.widgetList;
+        // let widgetList = this.formJson.widgetList;
+        let dataTableWidget = this.getDataTableWidget();
         this.$grid = this.$refs.vFormRef
-          .getWidgetRef(widgetList[0].options.name)
+          .getWidgetRef(dataTableWidget.options.name)
           .getGridTable();
       }
       return this.$grid;
@@ -245,8 +257,9 @@ export default {
     initShowFormField() {
       let showFormField = this.formJson.formConfig.searchDialogNameField || null;
       if (!showFormField) {
-        let widgetList = this.formJson.widgetList;
-        let tableColumns = widgetList[0].options.tableColumns;
+        // let widgetList = this.formJson.widgetList;
+        let dataTableWidget = this.getDataTableWidget();
+        let tableColumns = dataTableWidget.options.tableColumns;
         let column = tableColumns.find((column) => !!column.prop);
         this.showFormField = column.prop;
       } else {