fix

src/views/dataEntry_manage/chartSetting.vue

@@ -2327,9 +2327,19 @@ export default {
 
       if(this.classifyShowType === 'shared') {//共享
         res = await chartBaseV2Interface.getSharedChartList({
-					FilterSource: this.currentTreeName==='sharedReceive' ? 1 : 0
+					FilterSource: this.currentTreeName==='sharedReceive' ? 1 : 0,
+          PageSize: this.public_page_size,
+          CurrentIndex: this.public_page_no,
+          ClassifyId: this.default_classify || 0,
 				})
-      }else { //其他走es
+      }else if(this.classifyShowType==='own'&&this.currentTreeName==='collect'){ //收藏列表
+				res = await chartBaseV2Interface.getCollectChart({
+					PageSize: this.public_page_size,
+          CurrentIndex: this.public_page_no,
+          ClassifyId: this.default_classify || 0,
+					KeyWord: '',
+				})
+			}else { //其他走es
         let ChartAuth = 0;
 				if(this.classifyShowType==='own') { //我的
 					ChartAuth = 1;
@@ -2337,18 +2347,12 @@ export default {
 					ChartAuth = 2;
 				}
 
-				let ChartCollect = 0;
-				if(this.classifyShowType==='own'&&this.currentTreeName==='collect') {
-					ChartCollect = 1
-				}
-
         res = await dataBaseInterface.chartSearchByEs({
             PageSize: this.public_page_size,
             CurrentIndex: this.public_page_no,
             ClassifyId: this.default_classify || 0,
             Keyword: this.search_txt,
             ChartAuth,
-            ChartCollect
           })
       }
 

src/views/dataEntry_manage/databaseList.vue

@@ -1201,7 +1201,17 @@ export default {
 			
 			if(this.classifyShowType==='shared') { //共享列表
 				res = await edbBaseV2Interface.getSharedEdbList({
-					FilterSource: this.currentTreeName==='sharedReceive' ? 1 : 0
+					FilterSource: this.currentTreeName==='sharedReceive' ? 1 : 0,
+					PageSize:this.PageSize,
+					CurrentIndex:this.CurrentIndex,
+					ClassifyId:this.select_classifyId,
+				})
+			}else if(this.classifyShowType==='own'&&this.currentTreeName==='collect'){ //收藏列表
+				res = await edbCollectInterface.getCollectEdb({
+					PageSize:this.PageSize,
+					CurrentIndex:this.CurrentIndex,
+					ClassifyId:this.select_classifyId,
+					KeyWord: '',
 				})
 			}else{// 列表走es
 
@@ -1212,17 +1222,12 @@ export default {
 					EdbAuth = 2;
 				}
 
-				let EdbCollect = 0;
-				if(this.classifyShowType==='own'&&this.currentTreeName==='collect') {
-					EdbCollect = 1
-				}
 				let params = {
 					PageSize:this.PageSize,
 					CurrentIndex:this.CurrentIndex,
 					ClassifyId:this.select_classifyId,
 					KeyWord: this.search_txt,
-					EdbType: EdbCollect===1 ? '0' : (this.isBasicBase?'1':'2'),
-					EdbCollect,
+					EdbType: this.isBasicBase?'1':'2',
 					EdbAuth
 				}
 
@@ -1239,7 +1244,7 @@ export default {
 				this.IsListEnd = res.Data.Paging.IsEnd
 			}
 
-			if(type==='pageChange'){
+			if(type==='pageChange'&&this.isBasicBase){
 				//页码变化 选中项不做清空
 				this.$refs.edbTableListRef && this.$nextTick(() => {
 					this.$refs.edbTableListRef.checkedSomeSelection()

src/views/dataEntry_manage/sharedComponents/setSharedListDialog.vue

@@ -314,8 +314,8 @@ export default {
       //公开状态
       publicStatusLabel() {
         return new Map([
-          [0,''],
-          [1,'未公开'],
+          [0,'未公开'],
+          [1,'已提交'],
           [2,'已提交'],
           [3,'已公开'],
         ])