Merge branch 'master' of http://159.75.9.201:3000/client-2022/pc-component-v3

# Conflicts:
#	packages/info/src/InfoSearchWidget.vue

packages/info/src/DocGenerator.vue

@@ -156,8 +156,8 @@ export default {
       });
 
             
-      InfoUtil.restoreInfoFilterField(_self.infoWindowDto.no, _self.infoWindowDto.infoFilterFields);
-      InfoUtil.restoreInfoGridField(_self.infoWindowDto.no, _self.infoWindowDto.infoGridFields);
+      InfoUtil.restoreInfoFilterFields(_self.infoWindowDto.no, _self.infoWindowDto.infoFilterFields);
+      InfoUtil.restoreInfoGridFields(_self.infoWindowDto.no, _self.infoWindowDto.infoGridFields);
 
       _self.infoFilterFields = _self.infoWindowDto.infoFilterFields;
       _self.infoGridFields = _self.infoWindowDto.infoGridFields;

packages/info/src/InfoSearchWidget.vue

@@ -165,7 +165,6 @@ export default {
         }
       });
     },
-  },
 
   methods: {
     selectDown: function () {