Merge branch 'ETA_1.6.0'

src/views/dataEDB/AddBaseEDB.vue

@@ -174,14 +174,15 @@ function handleShowEditBaseEDB(){
 		Source: dataSourceVal.value,
     }
     //隆众指标和手工指标、交易所等将名称 频度 单位带到下一步
-    if([9, 10, 11, 15, 16, 17, 18, 19, 20, 21, 26,38,41,57,60,71,76].includes(dataSourceVal.value)){
+    // if([9, 10, 11, 15, 16, 17, 18, 19, 20, 21, 26,38,41,57,60,71,76].includes(dataSourceVal.value)){
+        // 不做限制了，为空带出来就是空
         obj={
             ...obj,
-            edb_name: result.value.SearchItem.EdbName,
-			unit: result.value.SearchItem.Unit,
-			frequency: result.value.SearchItem.Frequency,
+            edb_name: result.value.SearchItem.EdbName || '',
+			unit: result.value.SearchItem.Unit || '',
+			frequency: result.value.SearchItem.Frequency || '',
         }
-    }
+    // }
     baseInfo.value=obj
     showEditBaseEDB.value=true
 }