Merge branch 'gn2.3' into debug

src/api/modules/chartApi.js

@@ -1726,6 +1726,15 @@ const edbBaseV2Interface = {
 		 */
 		movePublicClassify: params => {
 			return http.post('/datamanage/edb_public/edb_classify/move',params)
+		},
+		
+		/**
+		 * 撤销公开指标
+		 * @param {*} params EdbInfoId
+		 * @returns 
+		 */
+		cancelPublic: params => {
+			return  http.post('/datamanage/edb_info/public/cancel',params)
 		}
 
 }
@@ -1933,6 +1942,7 @@ const chartBaseV2Interface = {
 	movePublicBatch: params => {
 		return http.post('/datamanage/chart_info/public/batch_move',params)
 	},
+	
 
 	/**
 	 * 批量移动我的
@@ -1959,6 +1969,15 @@ const chartBaseV2Interface = {
 		return http.post('/datamanage/chart_public/chart_classify/move',params)
 	},
 
+	/**
+		 * 撤销公开图表
+		 * @param {*} params ChartInfoId
+		 * @returns 
+		 */
+	cancelPublic: params => {
+		return  http.post('/datamanage/chart_info/public/cancel',params)
+	},
+
 
 	/* ====收藏==== */
 

src/views/dataEntry_manage/databaseList.vue

@@ -34,10 +34,11 @@
 						v-for="item in searchOptions"
 						:key="item.EdbInfoId"
 						:value="item.EdbInfoId"
+						:label="item.EdbName"
 					>
 						<div class="edb-search-item">
 								{{item.EdbName}}
-								<i class="el-icon-star-on" style="color: #0052D9;font-size:18px;" v-if="item.CollectClassifyIdList"/>
+								<i class="el-icon-star-on" style="color: #0052D9;font-size:18px;" v-if="item.CollectClassifyIdList&&item.CollectClassifyIdList.length"/>
 							</div>
 					</el-option>
 				</el-select>
@@ -86,6 +87,7 @@
 							v-for="item in searchOptions"
 							:key="item.EdbInfoId"
 							:value="item.EdbInfoId"
+							:label="item.EdbName"
 						>
 							<div class="edb-search-item">
 								{{item.EdbName}}

src/views/dataEntry_manage/sharedComponents/setSharedListDialog.vue

@@ -631,7 +631,13 @@ export default {
 
       /* 撤销公开 */
       async handleCancelPublic(item) {
-        // const res = this.source === 'edb'
+        const res = this.source === 'edb'
+          ? await edbBaseV2Interface.cancelPublic({ EdbInfoId: item.EdbInfoId })
+          : await chartBaseV2Interface.cancelPublic({ ChartInfoId: item.ChartInfoId })
+        
+        if(res.Ret !== 200) return
+        this.$message.success('撤销成功')
+        this.getList();
       },
 
       handleSetConfirm() {