heyang

pages/login.vue

@@ -88,19 +88,19 @@ export default {
 		 
 		  // 如果是管理员 检查者和整改者 
 		  if(data.data.adminGentle && data.data.applyGentle && data.data.rectifyGentle){
-			   self.pageType=0
+			   self.pageType=1
 		  }else if(data.data.adminGentle && data.data.applyGentle && !data.data.rectifyGentle){
-			  self.pageType=0
+			  self.pageType=1
 		  }else if(data.data.adminGentle && !data.data.applyGentle && data.data.rectifyGentle){
-			  self.pageType=0
-		  }else if(!data.data.adminGentle && data.data.applyGentle && data.data.rectifyGentle){
 			  self.pageType=1
+		  }else if(!data.data.adminGentle && data.data.applyGentle && data.data.rectifyGentle){
+			  self.pageType=2
 		  }else if(data.data.adminGentle && !data.data.applyGentle && !data.data.rectifyGentle){
-			  self.pageType=0
-		  }else if(!data.data.adminGentle && data.data.applyGentle && !data.data.rectifyGentle){
 			  self.pageType=1
-		  }else if(!data.data.adminGentle && !data.data.applyGentle && data.data.rectifyGentle){
+		  }else if(!data.data.adminGentle && data.data.applyGentle && !data.data.rectifyGentle){
 			  self.pageType=2
+		  }else if(!data.data.adminGentle && !data.data.applyGentle && data.data.rectifyGentle){
+			  self.pageType=3
 		  }else if(!data.data.adminGentle && !data.data.applyGentle && !data.data.rectifyGentle){
 			  console.log('暂无权限')
 			  self.pageType='mine'

pages/pages_safetyExamine/examineManage/examineAdd.vue

@@ -212,6 +212,9 @@ export default {
 	 	this.id=option.id
 	 	this.findCheckManage()
 	 }
+	 if(option.form){
+		 this.form=JSON.parse(decodeURIComponent(option.form)); 
+	 }
 	 //通过实验室id查询计划
 	 if(option.subId){
 	 	this.getCheckPlanBySubId(option.subId)

pages/pages_safetyExamine/examineManage/examineAddTow.vue

@@ -9,18 +9,23 @@
 						<view class="grade_l">隐患等级：</view>
 						<picker @change="gradeChange(item,$event)" :value="gradeIndex" :range="gradeArray" class="scope_r">
 							<view class="grade_r">
-								<view>{{item.hazardLevel==0?'一般隐患':(item.hazardLevel==1?'重大隐患':'问题管理')}}</view>
+								<view>{{item.hazardLevel==2?'一般隐患':(item.hazardLevel==1?'重大隐患':(item.hazardLevel==3?'管理问题':''))}}</view>
 								<img src="@/images/Version3.3.3/icon_06.png">
 							</view>
 						</picker>
 					</view>
 					<view class="project" v-if="checkOptionList.length>0">
 						<view class="project_l">检查项目：</view>
-						<uni-data-picker :ellipsis="false" :localdata="checkOptionList[index]" :map="{text:'name',value:'id'}"
+						<!-- <uni-data-picker :ellipsis="false" :localdata="checkOptionList[index]" :map="{text:'name',value:'id'}"
 						popup-title="请选择所属目录" @change="(e)=>onchange(e,index)" @nodeclick="onnodeclick()"
 						ref="uniDataPicker" :addType="true" :addIndex="index">
 							<view  class="project_r">{{item.hazardCheckName?item.hazardCheckName:'请选择检查项'}}</view>
+						</uni-data-picker> -->
+						<uni-data-picker placeholder="请选择班级" popup-title="请选择所属目录" :localdata="checkOptionList" :map="{text:'name',value:'id'}" v-model="item.hazardCheckName"
+										@change="(e)=>onchange(e,index)" @nodeclick="onnodeclick">
+							<view  class="project_r">{{item.hazardCheckName?item.hazardCheckName:'请选择检查项'}}</view>			
 						</uni-data-picker>
+						
 					</view>
 					<view class="point">
 						<view class="point_l">检查要点：</view>
@@ -97,7 +102,7 @@
 					checkHazardDtoList:[
 						{
 							voiceRemark:[],//语音备忘存储
-							hazardLevel:'0',//隐患等级
+							hazardLevel:1,//隐患等级
 							hazardCheckCode:'', //检查项目code序号 
 							hazardCheckName:'', //检查项目名称 
 							hazardCheckPro:'', //最后一级的id  
@@ -133,6 +138,28 @@
 				gradeIndex :0,
 				gradeArray:['一般隐患','重大隐患','问题管理'],
 				bottomBtnList:['上一步','保存','提交'],
+				items: [{
+				          text: "一年级",
+				          value: "1-0",
+				          children: [
+				            {
+				              text: "1.1班",
+				              value: "1-1"
+				            },
+				            {
+				              text: "1.2班",
+				              value: "1-2"
+				            }
+				          ]
+				        },
+				        {
+				          text: "二年级",
+				          value: "2-0"
+				        },
+				        {
+				          text: "三年级",
+				          value: "3-0"
+				        }]
             }
         },
         onLoad(option) {
@@ -146,7 +173,15 @@
         methods: {
 			//隐患等级
 			gradeChange(item,e){
-				item.hazardLevel=e.target.value
+				console.log(item)
+				console.log(e.target.value)
+				if(e.target.value==0){
+					item.hazardLevel=2
+				}else if(e.target.value==1){
+					item.hazardLevel=1
+				}else if(e.target.value==2){
+					item.hazardLevel=3
+				}
 				
 			},
 			//语音备忘播放
@@ -303,7 +338,9 @@
 				const {data} = await checkOptionListNew();
 				if(data.code == 200){
 					let list = this.getTreeData(data.data);
-					this.checkOptionList.push(JSON.parse(JSON.stringify(list)));
+					//this.checkOptionList.push(JSON.parse(JSON.stringify(list)));
+					this.checkOptionList=JSON.parse(JSON.stringify(list));
+					console.log(this.checkOptionList)
 				}
 			},
 			getTreeData(data){
@@ -359,6 +396,8 @@
 				//hazardCheckCode:'', //检查项目code序号
 				//hazardCheckName:'', //检查项目名称 
 				//hazardCheckPro:'', //最后一级的id 
+				console.log(e)
+				console.log(index)
 				let jcxSstkNum=this.getTreeName(this.checkOptionList[0],e.detail.value[e.detail.value.length-1].value)
 				this.$set(this.form.checkHazardDtoList[index],'hazardCheckPro',e.detail.value[e.detail.value.length-1].value);
 				this.$set(this.form.checkHazardDtoList[index],'hazardCheckCode',jcxSstkNum);
@@ -456,7 +495,7 @@
 				}
 				let obj = {
 					voiceRemark:[],//语音备忘存储
-					hazardLevel:'0',//隐患等级
+					hazardLevel:1,//隐患等级
 					hazardCheckCode:'', //检查项目code序号 
 					hazardCheckName:'', //检查项目名称 
 					hazardCheckPro:'', //最后一级的id  
@@ -616,7 +655,7 @@
 					}
 					.project_r{
 						width: 630rpx;
-						height: 80rpx;
+						min-height: 80rpx;
 						border-radius: 10rpx;
 						border: 1rpx solid #E0E0E0;
 						display: flex;

pages/pages_safetyExamine/examineManage/examineDetail.vue

@@ -50,7 +50,7 @@
 			</view>	
 			<view class="basics_li">
 				<text>整改通知：</text>
-				<text style="color: #0183FA;">{{infoData.rectifyNotice == 1?'整改告知书':(infoData.rectifyNotice == 2?'整改通知书':'')}}</text>
+				<text style="color: #0183FA;" @click="rectifyInform">{{infoData.rectifyNotice == 1?'整改告知书':(infoData.rectifyNotice == 2?'整改通知书':'')}}</text>
 			</view>
 			<view class="basics_li">
 				<text>检查者：</text>
@@ -98,7 +98,7 @@
 			<view class="pack_up" @click="switchFun(item)">{{item.switch?'收起':'展开'}}<img v-if="item.switch" src="@/images/Version3.3.3/icon_06_1.png"/><img v-if="!item.switch" src="@/images/Version3.3.3/icon_06.png"/></view>
 		</view>
 	</scroll-view>
-	<view class="report" @change="buttonChange" v-if="manageStatus==2">整改报告</view>	
+	<view class="report" @change="rectifyReport" v-if="manageStatus==2">整改报告</view>	
 	<view class="bottom_btn" v-if="manageStatus==0" @click="handleClick('','startInspect')">开始检查</view>
   </view>
 
@@ -212,82 +212,73 @@ export default {
 		switchFun(item){
 			item.switch=!item.switch
 		},
-		//查看报告按钮
-		async buttonChange(e){
-			let namestatus;
-			let sealstatus;
-			//判断有没有电子签名
-			const {data} = await checkSign();
-			if(data.code==200){
-				namestatus=data.data
-				if(data.data==false){//true有电子签名false没有电子签名
-		
-					uni.showModal({
-					  title: '',
-					  cancelColor:'#999999',
-					  confirmColor:'#FF6E6E',
-					  cancelText: "取消", // 取消按钮的文字
-					  confirmText: "去上传", // 确认按钮文字
-					  content: '您未上传电子签名，无法生成整改通知书/整改报告!',
-					  success (res) {
-						if (res.confirm) {
-						  console.log('用户点击确定')
-						  uni.navigateTo({
-							  url: '/pages_manage/workbench/signature/signature'
-						  });
-		
-						} else if (res.cancel) {
-						  console.log('用户点击取消')
-		
+		//整改通知
+		rectifyInform(){//rectifyNotice 整改通知(1整改告知书 2整改通知书)
+			if(this.infoData.rectifyNotice==1){//1整改告知书
+				this.genReport(this.infoData.id)
+			}else if(this.infoData.rectifyNotice==2){//2整改通知书
+				this.genNotice(this.infoData.id)
+			}
+		},
+		//整改报告
+		rectifyReport(){
+			uni.showLoading({
+				title: '下载中'
+			});
+			wx.downloadFile({
+				url: config.base_url+'/zd-security/checkRectify/genReport/' + this.infoData.id,
+				header: {
+					Authorization: uni.getStorageSync('token')
+				},
+				success: function (res) {
+					const fileManager = wx.getFileSystemManager()
+					const filePath = wx.env.USER_DATA_PATH + '/(整改报告).docx'
+					fileManager.saveFile({
+						tempFilePath: res.tempFilePath,
+						filePath,
+						success: () => {
+							uni.hideLoading();
+							wx.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							fileType: 'docx'
+							})
+						},
+						fail: function (res){
+							uni.hideLoading();
+							uni.showToast({
+								title: '下载失败',
+								icon:"none",
+								mask:true,
+								duration: 2000
+							});
 						}
-					  }
 					})
-				}else{
-		
-				}
-			}
-			//如果有电子签名判断有没有电子签章
-			if(namestatus){
-				const {data} = await queryDeptSignByUserId();
-				if(data.code==200){
-					console.log(data.data.data.isUpload)
-					sealstatus=data.data.data.isUpload
-					if(data.data.data.isUpload==false){
-						uni.showToast({
-							title: '学院未上传电子签章，无法生成整改通知书/整改报告',
-							icon:"none",
-							mask:true,
-							duration: 2000
-						});
-					}
-				};
-			}
-			//如果有电子签名和电气签章开始下载
-			if(namestatus==true && sealstatus==true){
-				if(this.buttonArrayType == 1){
-					if(e.target.value == 0){
-						this.genNotice();
-					}else if(e.target.value == 1){
-						this.genReport();
-					}
-				}else if(this.buttonArrayType == 2){
-					this.genNotice();
+				},
+				fail: function (res){
+					uni.hideLoading();
+					uni.showToast({
+						title: '下载失败',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
 				}
-			}
-		
+			})
 		},
-		genNotice(){
+		//整改通知书
+		genNotice(id){
 			uni.showLoading({
 				title: '下载中'
 			});
 			wx.downloadFile({
-				url: config.base_url+'/laboratory/checkOption/genNotice/' + this.newData.id,
+				url: config.base_url+'/zd-security/checkManage/getRectifyAdviceNote/' + id,
 				header: {
 					Authorization: uni.getStorageSync('token')
 				},
 				success: function (res) {
 					const fileManager = wx.getFileSystemManager()
-					const filePath = wx.env.USER_DATA_PATH + '/整改通知书.docx'
+					const filePath = wx.env.USER_DATA_PATH + '/(整改通知书).docx'
 					fileManager.saveFile({
 						tempFilePath: res.tempFilePath,
 						filePath,
@@ -321,12 +312,13 @@ export default {
 				}
 			})
 		},
-		genReport(){
+		//整改告知书
+		genReport(id){
 			uni.showLoading({
 				title: '下载中'
 			});
 			wx.downloadFile({
-				url: config.base_url+'/laboratory/checkOption/genReport/' + this.newData.id,
+				url: config.base_url+'/zd-security/checkManage/getRectifyNotification/' + id,
 				header: {
 					Authorization: uni.getStorageSync('token')
 				},

pages/pages_safetyExamine/examineManage/examineList.vue

@@ -55,7 +55,7 @@
 					<img src="@/images/Version3.3.3/icon_djcsys.png"/>
 					<text>整改进度：</text>
 					<text @click="handleClick(item,'detail')">{{item.rectifySchedule}}</text>
-					<text class="report">整改报告</text>
+					<text class="report" @click="handleClick(item,'download')">整改报告</text>
 				</view>
 			</view>
 		</view>
@@ -217,9 +217,149 @@ export default {
 			  uni.navigateTo({
 			      url: '/pages/pages_safetyExamine/examineManage/examineAdd'
 			  });
+		  }else if(doType=='download'){//整改报告下载rectifyNotice 整改通知(1整改告知书 2整改通知书)
+			  this.rectifyReport(row.id)
 		  }
 		  
 	    },
+		//整改报告
+		rectifyReport(id){
+			uni.showLoading({
+				title: '下载中'
+			});
+			wx.downloadFile({
+				url: config.base_url+'/zd-security/checkRectify/genReport/' + id,
+				header: {
+					Authorization: uni.getStorageSync('token')
+				},
+				success: function (res) {
+					const fileManager = wx.getFileSystemManager()
+					const filePath = wx.env.USER_DATA_PATH + '/(整改报告).docx'
+					fileManager.saveFile({
+						tempFilePath: res.tempFilePath,
+						filePath,
+						success: () => {
+							uni.hideLoading();
+							wx.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							fileType: 'docx'
+							})
+						},
+						fail: function (res){
+							uni.hideLoading();
+							uni.showToast({
+								title: '下载失败',
+								icon:"none",
+								mask:true,
+								duration: 2000
+							});
+						}
+					})
+				},
+				fail: function (res){
+					uni.hideLoading();
+					uni.showToast({
+						title: '下载失败',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+				}
+			})
+		},
+		//整改通知书
+		genNotice(id){
+			uni.showLoading({
+				title: '下载中'
+			});
+			wx.downloadFile({
+				url: config.base_url+'/zd-security/checkManage/getRectifyAdviceNote/' + id,
+				header: {
+					Authorization: uni.getStorageSync('token')
+				},
+				success: function (res) {
+					const fileManager = wx.getFileSystemManager()
+					const filePath = wx.env.USER_DATA_PATH + '/(整改通知书).docx'
+					fileManager.saveFile({
+						tempFilePath: res.tempFilePath,
+						filePath,
+						success: () => {
+							uni.hideLoading();
+							wx.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							fileType: 'docx'
+							})
+						},
+						fail: function (res){
+							uni.hideLoading();
+							uni.showToast({
+								title: '下载失败',
+								icon:"none",
+								mask:true,
+								duration: 2000
+							});
+						}
+					})
+				},
+				fail: function (res){
+					uni.hideLoading();
+					uni.showToast({
+						title: '下载失败',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+				}
+			})
+		},
+		//整改告知书
+		genReport(id){
+			uni.showLoading({
+				title: '下载中'
+			});
+			wx.downloadFile({
+				url: config.base_url+'/zd-security/checkManage/getRectifyNotification/' + id,
+				header: {
+					Authorization: uni.getStorageSync('token')
+				},
+				success: function (res) {
+					const fileManager = wx.getFileSystemManager()
+					const filePath = wx.env.USER_DATA_PATH + '/整改报告.docx'
+					fileManager.saveFile({
+						tempFilePath: res.tempFilePath,
+						filePath,
+						success: () => {
+							uni.hideLoading();
+							wx.openDocument({
+								filePath: filePath,
+								showMenu: true,
+								fileType: 'docx'
+							})
+						},
+						fail: function (res){
+							uni.hideLoading();
+							uni.showToast({
+								title: '下载失败',
+								icon:"none",
+								mask:true,
+								duration: 2000
+							});
+						}
+					})
+				},
+				fail: function (res){
+					uni.hideLoading();
+					uni.showToast({
+						title: '下载失败',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+				}
+			})
+		},
 		//获取当前日期函数
 		getNowFormatDate() {
 		  let date = new Date(),

pages/pages_safetyExamine/patrolPlan/patrolPlanAdd.vue

@@ -38,6 +38,10 @@
 			<view class="scope_btn" v-if="scopeIndex==1 || scopeIndex==2" @click="collegeOrLab()">{{scopeIndex==1?'选择学院':'选择实验室'}}</view>
 			<view class="scope_text" v-if="scopeIndex==0 || scopeIndex==1">已选择<text>{{form.collegeNum}}</text>个学院，共<text>{{form.subjectNum}}</text>间实验室</view>
 			<view class="scope_text" v-if="scopeIndex==2">已选择<text>{{form.subjectNum}}</text>间实验室</view>
+			<view class="title">
+				<view class="title_t">检查要求</view>
+				<textarea class="title_b" type="text" v-model="form.checkDemand" maxlength="200" placeholder="请输入检查计划标题" placeholder-style="color:#999999;font-size:30rpx;"></textarea>
+			</view>
 		</view>
 		<view class="patrol_group" v-if="form.checkType==1">
 			<view class="patrol">
@@ -50,8 +54,8 @@
 			<view class="list">
 				<view class="list_title"><img src="@/images/Version3.3.3/icon_jcjh_cy.png">成员</view>
 				<view class="list_header"><text>工号</text><text>姓名</text></view>
-				<view class="list_li" v-for="(item,index) in form.checkGroupMemberList"><text>12345678</text><text>{{item.name}}</text></view>
-				<view class="list_bottom" v-if="form.checkGroupMemberList.length==0">无数据</view>
+				<view class="list_li" v-for="(item,index) in form.checkMemberDtoList"><text>12345678</text><text>{{item.name}}</text></view>
+				<view class="list_bottom" v-if="form.checkMemberDtoList.length==0">无数据</view>
 			</view>
 		</view>
 	</scroll-view>	
@@ -97,15 +101,16 @@ export default {
 			cycleEndTime:'',
 			checkRange:0,//检查范围 1全校 2学院 3实验室
 			checkLevel:'',//巡查组层级
-			checkGroupMemberList:[],//巡查组成员
+			seleteListMember:[],//临时存储选中巡查组
+			checkMemberDtoList:[],//巡查组成员
 			collegeIds:'',//学院id组
 			collegeNum:0,//学院数量
 			subIds:'',//实验室id组
 			subjectNum:0,//实验室数量
+			checkDemand:'',//检查要求
 			tiemQuickList:[],
 			scopeIndex:'',
 			seleteListLab:[],
-			seleteListMember:[],
 		},
 		tiemQuickList:[{name:'本月',type:false},{name:'本季度',type:false},{name:'全年',type:false}],
 		scopeIndex:0,

pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember.vue

@@ -44,8 +44,8 @@ export default {
       },
 	  total:0,
 	  dataList:[],
-	  
-	  seleteListMember:[],//临时存储选中的 
+	  seleteListMember:[],//临时存储选中巡查组
+	  checkMemberDtoList:[],//临时存储选中的 
 	  form:{},
 	}
   },
@@ -119,7 +119,9 @@ export default {
 		this.$set(this.form,'checkGroupName',this.seleteListMember[0].groupName)
 	  	const {data} = await checkGroupDetail({id:id,selectEnable:'1'});
 	  	if(data.code == 200){
-	  	    this.$set(this.form,'checkGroupMemberList',data.data.checkGroupMemberList)
+	  	    this.$set(this.form,'checkMemberDtoList',data.data.checkGroupMemberList)
+			console.log(this.pageType)
+			
 			if(this.pageType==1){
 				uni.redirectTo({
 				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAdd?form='+encodeURIComponent(JSON.stringify(this.form))

pages/pages_safetyExamine/patrolPlan/patrolPlanEdit.vue

@@ -77,6 +77,10 @@
 				<view class="scope_btn" v-if="scopeIndex==1 || scopeIndex==2" @click="collegeOrLab()">{{scopeIndex==1?'选择学院':'选择实验室'}}</view>
 				<view class="scope_text" v-if="scopeIndex==0 || scopeIndex==1">已选择<text>{{form.collegeNum}}</text>个学院，共<text>{{form.subjectNum}}</text>间实验室</view>
 				<view class="scope_text" v-if="scopeIndex==2">已选择<text>{{form.subjectNum}}</text>间实验室</view>
+				<view class="title">
+					<view class="title_t">检查要求</view>
+					<textarea class="title_b" type="text" v-model="form.checkDemand" maxlength="200" placeholder="请输入检查计划标题" placeholder-style="color:#999999;font-size:30rpx;"></textarea>
+				</view>
 			</view>
 			<view class="attachment" v-if="form.uploadDtoList.length>0">
 				<view class="attachment_t">
@@ -100,8 +104,8 @@
 				<view class="list">
 					<view class="list_title"><img src="@/images/Version3.3.3/icon_jcjh_cy.png">成员</view>
 					<view class="list_header"><text>工号</text><text>姓名</text></view>
-					<view class="list_li" v-for="(item,index) in form.checkGroupMemberList"><text>12345678</text><text>{{item.name}}</text></view>
-					<view class="list_bottom" v-if="form.checkGroupMemberList.length==0">无数据</view>
+					<view class="list_li" v-for="(item,index) in form.checkMemberDtoList"><text>12345678</text><text>{{item.name}}</text></view>
+					<view class="list_bottom" v-if="form.checkMemberDtoList.length==0">无数据</view>
 				</view>
 			</view>
 		</view>
@@ -193,13 +197,14 @@ export default {
 			checkRange:0,//检查范围 1全校 2学院 3实验室
 			checkGroupId:[],//巡查组id
 			checkLevel:'',//巡查组层级
-			checkGroupMemberList:[],//巡查组成员
+			checkMemberDtoList:[],//巡查组成员
 			collegeIds:'',//学院id组
 			collegeNum:0,//学院数量
 			subIds:'',//实验室id组
 			subjectNum:0,//实验室数量
 			checkStatus:0,//检查状态
 			checkSchedule:'',//检查进度
+			checkDemand:'',//检查要求
 			tiemQuickList:[],
 			scopeIndex:'',
 			seleteListLab:[],
@@ -565,11 +570,14 @@ export default {
 				this.form.uploadDtoList=data.data.uploadDtoList;
 				this.form.checkStatus=data.data.checkStatus;
 				this.form.checkSchedule=data.data.checkSchedule;
+				this.form.checkDemand=data.data.checkDemand;
 				
 				this.scopeIndex=Number(data.data.checkRange)-1;//检查范围
-				if(data.data.checkGroupId){//判断如果有巡查组id
-					this.checkGroupDetail(data.data.checkGroupId);
-				}
+				this.$set(this.form,'checkMemberDtoList',data.data.checkMemberDtoList)
+				//this.$set(this.form,'checkGroupName',data.data.groupName)
+				// if(data.data.checkGroupId){//判断如果有巡查组id
+				// 	this.checkGroupDetail(data.data.checkGroupId);
+				// }
 				
 			}
 		},
@@ -578,8 +586,7 @@ export default {
 			let _this = this;
 			const {data} = await checkGroupDetail({id:id,selectEnable:'1'});
 			if(data.code == 200){
-				 this.$set(this.form,'checkGroupMemberList',data.data.checkGroupMemberList)
-				 this.$set(this.form,'checkGroupName',data.data.groupName)
+				
 				 
 			}
 		},

pages/safetyExamineWorkbench.vue

@@ -3,13 +3,13 @@
   <view class="examine">
 	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 		<view>
-			<view class="statistics" v-if="pageType==0 || pageType==1">
+			<view class="statistics" v-if="pageType==1 || pageType==2">
 					<view class="statistics_li" v-for="(item,index) in  statisticsList" :key="index">
 						<text>{{item.name}}</text>
 						<text>{{item.value}}</text>
 					</view>
 				</view>
-				<viwe class="inspect_btn" v-if="pageType==0 || pageType==1">
+				<viwe class="inspect_btn" v-if="pageType==1 || pageType==2">
 					<view class="inspect_btn_li" @click="handleClick('','patrolPlan')">
 						<img src="@/images/Version3.3.3/icon_xyxc_xyxc.png"/>
 						<text>校院巡查</text>
@@ -31,13 +31,13 @@
 					</view>
 				</viwe>
 				<!--管理员------------- -->
-				<view class="tabTitle" v-if="pageType==0">
+				<view class="tabTitle" v-if="pageType==1">
 					<view class="tabTitle_li" @tap="tabClick(index)"  :key="index" v-for="(item,index) in tabText">
 						<view :class="{on:curTab==index}" class="tabTitle_text">{{item.name}}<text>{{item.num}}</text></view>
 					    <view :class="{on:curTab==index}" class="tabTitle_across"></view>
 					</view>
 				</view>
-				<view class="list" v-if="pageType==0">
+				<view class="list" v-if="pageType==1">
 					<view class="list_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick(item,'edit')">
 						<view class="list_li_t">
 							<view class="list_li_t_l">
@@ -67,13 +67,13 @@
 					</view>
 				</view>
 				<!--检查者------------- -->
-				<view class="tabTitle_tow" v-if="pageType==1">
+				<view class="tabTitle_tow" v-if="pageType==2">
 					<view class="tabTitle_tow_li" @tap="tabClickTow(index)"  :key="index" v-for="(item,index) in tabTextTow">
 						<view :class="{on:curTabTow==index}" class="tabTitle_tow_text">{{item.name}}<text>{{item.num}}</text></view>
 					    <view :class="{on:curTabTow==index}" class="tabTitle_tow_across"></view>
 					</view>
 				</view>
-				<view class="list_tow" v-if="pageType==1">
+				<view class="list_tow" v-if="pageType==2">
 					<view class="list_tow_li" v-for="(item,index) in  dataList2" :key="index">
 						<view class="list_tow_li_t">
 							<view class="list_tow_li_t_l">
@@ -111,13 +111,13 @@
 					</view>
 				</view>
 				<!-- 整改人----------- -->
-				<view class="statistics_three" v-if="pageType==2">
+				<view class="statistics_three" v-if="pageType==3">
 					<view class="statistics_three_li" v-for="(item,index) in  statisticsListThree" :key="index">
 						<text>{{item.name}}</text>
 						<text>{{item.value}}</text>
 					</view>
 				</view>
-				<viwe class="inspect_btn_three" v-if="pageType==2">
+				<viwe class="inspect_btn_three" v-if="pageType==3">
 					<view class="inspect_btn_three_li" @click="handleClick('','schoolDanger')">
 						<img src="@/images/Version3.3.3/icon_xyxc_xyxc.png"/>
 						<text>校院巡查隐患</text>
@@ -134,13 +134,13 @@
 					</view>
 				</viwe>
 				
-				<view class="tabTitle_three" v-if="pageType==2">
+				<view class="tabTitle_three" v-if="pageType==3">
 					<view class="tabTitle_three_li" @tap="tabClickThree(index)"  :key="index" v-for="(item,index) in tabTextThree">
 						<view :class="{on:curTabThree==index}" class="tabTitle_three_text">{{item.name}}<text>{{item.num}}</text></view>
 					    <view :class="{on:curTabThree==index}" class="tabTitle_three_across"></view>
 					</view>
 				</view>
-				<view class="list_three" v-if="pageType==2">
+				<view class="list_three" v-if="pageType==3">
 					<view class="list_three_li" v-for="(item,index) in  dataList3" :key="index" @click="handleThreeClick(item,'detail')">
 						<view class="list_three_li_t">
 							<view class="list_three_li_t_l">
@@ -212,7 +212,7 @@
 <script>
 import { config } from '@/api/request/config.js'
 import { tabBar } from '@/component/tabBar.vue'
-import {checkPlanList,getCheckStatusCount,getManageStatusCount,dataStatistics,checkManageList,checkHazardAppList,getGentleIdentifier,checkClapList,getCheckPlanBySubId} from '@/api/index.js'
+import {checkPlanList,getCheckStatusCount,getManageStatusCount,dataStatistics,checkManageList,checkHazardAppList,checkClapList,getCheckPlanBySubId} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -220,7 +220,7 @@ export default {
   },
   data() {
     return {
-	  pageType:uni.getStorageSync('gentleIdentifier'),
+	  pageType:uni.getStorageSync('gentleIdentifier'),//人员类型 3整改人 2检查人 1管理员
       //列表请求参数
       getData:{
         pageNum:1,
@@ -294,11 +294,11 @@ export default {
 	  this.dataStatistics();
 	  this.checkClapListAllNum();//随手拍待整改总数
 	  
-	  if(this.pageType==0){//管理员
+	  if(this.pageType==1){//管理员
 		   this.getList();
-	  }else if(this.pageType==1){//检查者
+	  }else if(this.pageType==2){//检查者
 		   this.getList2();
-	  }else if(this.pageType==2){//整改者
+	  }else if(this.pageType==3){//整改者
 		  this.checkHazardAppList();
 	  }
 	 
@@ -307,7 +307,7 @@ export default {
 	  //滚动事件
 	  scrollGet(){
 		  let self=this;
-		  if(this.pageType==0){//管理员
+		  if(this.pageType==1){//管理员
 			  if(self.total/self.getData.pageSize<=self.getData.pageNum){
 			      console.log('没有更多数据!')
 			  }else{
@@ -317,7 +317,7 @@ export default {
 				  },1000)
 			  			 
 			  }
-		  }else if(this.pageType==1){//检查者
+		  }else if(this.pageType==2){//检查者
 			  if(self.total2/self.getData2.pageSize<=self.getData2.pageNum){
 			      console.log('没有更多数据!')
 			  }else{
@@ -331,7 +331,7 @@ export default {
 					   }
 				  },1000)	 
 			  }
-		  }else if(this.pageType==2){//整改者
+		  }else if(this.pageType==3){//整改者
 			  if(self.total3/self.getData3.pageSize<=self.getData3.pageNum){
 			      console.log('没有更多数据!')
 			  }else{
@@ -391,35 +391,35 @@ export default {
 	  handleClick(row,doType){
 		  let self=this;
 		  
-		  if(self.pageType==0 && doType=='patrolPlan'){//校院巡查-计划
+		  if(self.pageType==1 && doType=='patrolPlan'){//校院巡查-计划
 			 uni.navigateTo({
 			     url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanList?pageType=1'
 			 });
-		  }else if(self.pageType==0 && doType=='selfPlan'){//实验室自查-计划
+		  }else if(self.pageType==1 && doType=='selfPlan'){//实验室自查-计划
 			  uni.navigateTo({
 			      url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanList?pageType=2'
 			  });
-		  }else if(self.pageType==0 && doType=='dangerPlan'){//安全隐患-计划
+		  }else if(self.pageType==1 && doType=='dangerPlan'){//安全隐患-计划
 			  uni.navigateTo({
 			      url: '/pages/pages_safetyExamine/dangerManage/dangerManage?pageType=1'
 			  });
-		  }else if(self.pageType==1 && doType=='patrolPlan'){//校院巡查-检查
+		  }else if(self.pageType==2 && doType=='patrolPlan'){//校院巡查-检查
 			  uni.navigateTo({
 			      url: '/pages/pages_safetyExamine/examineManage/examineList?pageType=1'
 			  });
-		  }else if(self.pageType==1 && doType=='selfPlan'){//实验室自查-检查
+		  }else if(self.pageType==2 && doType=='selfPlan'){//实验室自查-检查
 			  uni.navigateTo({
 			      url: '/pages/pages_safetyExamine/examineManage/examineList?pageType=2'
 			  });
-		  }else if(self.pageType==1 && doType=='dangerPlan'){//安全隐患-检查
+		  }else if(self.pageType==2 && doType=='dangerPlan'){//安全隐患-检查
 			  uni.navigateTo({
 			      url: '/pages/pages_safetyExamine/dangerManage/dangerManage?pageType=2'
 			  });
-		  }else if(self.pageType==2 && doType=='schoolDanger'){//校院巡查隐患
+		  }else if(self.pageType==3 && doType=='schoolDanger'){//校院巡查隐患
 			  uni.navigateTo({
 			      url: '/pages/pages_safetyExamine/dangerManage/dangerList?pageType=1'
 			  });
-		  }else if(self.pageType==2 && doType=='labDanger'){//实验室自查隐患
+		  }else if(self.pageType==3 && doType=='labDanger'){//实验室自查隐患
 			  uni.navigateTo({
 			      url: '/pages/pages_safetyExamine/dangerManage/dangerList?pageType=2'
 			  });
@@ -484,9 +484,9 @@ export default {
 	  				subId = list[0];
 	  				if(subId){
 						
-						if(self.pageType==0 || self.pageType==1){//管理员和检查者
+						if(self.pageType==1 || self.pageType==2){//管理员和检查者
 							self.getCheckPlanBySubId(subId)
-						}else if(self.pageType==2){//整改者
+						}else if(self.pageType==3){//整改者
 						  let obj={
 							pageNum:1,
 							pageSize:100,
@@ -584,9 +584,9 @@ export default {
 	  //数据统计
 	  async dataStatistics(){
 	      let self = this;
-	      const {data} = await dataStatistics({'userType':this.userType,});
+	      const {data} = await dataStatistics();
 	      if(data.code==200){
-			  if(this.userType==1 || this.userType==1){//管理员和检查者
+			  if(data.data.userType==1 || data.data.userType==2){//管理员和检查者
 				  this.statisticsList=[
 				  	  {name:'本月已检查',value:data.data.checkTotal},
 				  	  {name:'本月检查隐患',value:data.data.hazardTotal},
@@ -595,7 +595,7 @@ export default {
 				  	  {name:'本月整改率',value:data.data. rectificationRate},
 				  	  {name:'本月复核通过率',value:data.data.passRate},
 				  ]
-			  }else if(this.userType==3){//整改者
+			  }else if(data.data.userType==3){//整改者
 				  this.statisticsListThree=[
 				  		{name:'本月已检查',value:data.data.checkTotal},
 				  		{name:'本月已整改',value:data.data.rectifyTotal},
@@ -632,33 +632,7 @@ export default {
 	  	    }   
 	  },
 	  
-	  //获取用户身份标识"adminGentle": false,   管理员身份 "rectifyGentle": false,   整改身份"applyGentle": false    检查者身份
-	  async getGentleIdentifier(){
-	      let self = this;
-	      const {data} = await getGentleIdentifier();
-	      if(data.code==200){
-			 
-			  // 如果是管理员 检查者和整改者 
-			  if(data.data.adminGentle && data.data.applyGentle && data.data.rectifyGentle){
-				   self.pageType=0
-			  }else if(data.data.adminGentle && data.data.applyGentle && !data.data.rectifyGentle){
-				  self.pageType=0
-			  }else if(data.data.adminGentle && !data.data.applyGentle && data.data.rectifyGentle){
-				  self.pageType=0
-			  }else if(!data.data.adminGentle && data.data.applyGentle && data.data.rectifyGentle){
-				  self.pageType=1
-			  }else if(data.data.adminGentle && !data.data.applyGentle && !data.data.rectifyGentle){
-				  self.pageType=0
-			  }else if(!data.data.adminGentle && data.data.applyGentle && !data.data.rectifyGentle){
-				  self.pageType=1
-			  }else if(!data.data.adminGentle && !data.data.applyGentle && data.data.rectifyGentle){
-				  self.pageType=2
-			  }else if(!data.data.adminGentle && !data.data.applyGentle && !data.data.rectifyGentle){
-				  console.log('暂无权限')
-				  self.pageType=0
-			  }
-	  	  }
-	  },
+	 
 	  //检查计划各检查状态数据数量
 	  async getCheckStatusCount(){
 	      let self = this;
@@ -706,14 +680,14 @@ export default {
 	  async checkHazardAppList(){
 	  	let self = this;
 		let obj={};
-		if(this.pageType==1){//检查者
+		if(this.pageType==2){//检查者
 			 obj={
 				pageNum:this.getData2.pageNum,
 				pageSize:this.getData2.pageSize,
 				hazardType:'',
 				rectifyStatus:'3',
 			};
-		}else if(this.pageType==2){//整改者
+		}else if(this.pageType==3){//整改者
 			 obj={
 				pageNum:this.getData3.pageNum,
 				pageSize:this.getData3.pageSize,
@@ -724,10 +698,10 @@ export default {
 	  	const {data} = await checkHazardAppList(obj);
 	  	if(data.code==200){
 	  		
-			if(self.pageType==1){//检查者
+			if(self.pageType==2){//检查者
 				this.dataList2=[...this.dataList2,...data.data.records]
 				this.total2=data.data.total;
-			}else if(self.pageType==2){
+			}else if(self.pageType==3){
 				this.dataList3=[...this.dataList3,...data.data.records]
 				this.total3=data.data.total;
 				this.tabTextThree[0].num=data.data.total;

uni_modules/uni-data-picker/changelog.md

@@ -1,3 +1,26 @@
+## 1.1.2（2023-04-11）
+- 修复 更改 modelValue 报错的 bug
+- 修复 v-for 未使用 key 值控制台 warning
+## 1.1.1（2023-02-21）
+- 修复代码合并时引发 value 属性为空时不渲染数据的问题
+## 1.1.0（2023-02-15）
+- 修复 localdata 不支持动态更新的bug
+## 1.0.9（2023-02-15）
+- 修复 localdata 不支持动态更新的bug
+## 1.0.8（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 1.0.7（2022-07-06）
+- 优化 pc端图标位置不正确的问题
+## 1.0.6（2022-07-05）
+- 优化 显示样式
+## 1.0.5（2022-07-04）
+- 修复 uni-data-picker 在 uni-forms-item 中宽度不正确的bug
+## 1.0.4（2022-04-19）
+- 修复 字节小程序 本地数据无法选择下一级的Bug
+## 1.0.3（2022-02-25）
+- 修复 nvue 不支持的 v-show 的 bug
+## 1.0.2（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
 ## 1.0.1（2021-11-23）
 - 修复 由上个版本引发的map、v-model等属性不生效的bug
 ## 1.0.0（2021-11-19）

uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js

@@ -42,7 +42,7 @@ export default {
     },
     pageSize: {
       type: Number,
-      default: 20
+      default: 500
     },
     getcount: {
       type: [Boolean, String],
@@ -94,7 +94,7 @@ export default {
     },
     map: {
       type: Object,
-      default() {
+      default () {
         return {
           text: "text",
           value: "value"
@@ -122,19 +122,22 @@ export default {
     }
   },
   computed: {
-    isLocaldata() {
-      return !this.collection.length
+    isLocalData() {
+      return !this.collection.length;
     },
-    postField() {
-      let fields = [this.field];
-      if (this.parentField) {
-        fields.push(`${this.parentField} as parent_value`);
-      }
-      return fields.join(',');
+    isCloudData() {
+      return this.collection.length > 0;
+    },
+    isCloudDataList() {
+      return (this.isCloudData && (!this.parentField && !this.selfField));
+    },
+    isCloudDataTree() {
+      return (this.isCloudData && this.parentField && this.selfField);
     },
     dataValue() {
-      let isModelValue = Array.isArray(this.modelValue) ? (this.modelValue.length > 0) : (this.modelValue !== null || this.modelValue !== undefined)
-      return isModelValue ? this.modelValue : this.value
+      let isModelValue = Array.isArray(this.modelValue) ? (this.modelValue.length > 0) : (this.modelValue !== null ||
+        this.modelValue !== undefined);
+      return isModelValue ? this.modelValue : this.value;
     },
     hasValue() {
       if (typeof this.dataValue === 'number') {
@@ -183,8 +186,169 @@ export default {
   },
   methods: {
     onPropsChange() {
-      this._treeData = []
+      this._treeData = [];
+    },
+
+    // 填充 pickview 数据
+    async loadData() {
+      if (this.isLocalData) {
+        this.loadLocalData();
+      } else if (this.isCloudDataList) {
+        this.loadCloudDataList();
+      } else if (this.isCloudDataTree) {
+        this.loadCloudDataTree();
+      }
+    },
+
+    // 加载本地数据
+    async loadLocalData() {
+      this._treeData = [];
+      this._extractTree(this.localdata, this._treeData);
+
+      let inputValue = this.dataValue;
+      if (inputValue === undefined) {
+        return;
+      }
+
+      if (Array.isArray(inputValue)) {
+        inputValue = inputValue[inputValue.length - 1];
+        if (typeof inputValue === 'object' && inputValue[this.map.value]) {
+          inputValue = inputValue[this.map.value];
+        }
+      }
+
+      this.selected = this._findNodePath(inputValue, this.localdata);
+    },
+
+    // 加载 Cloud 数据 (单列)
+    async loadCloudDataList() {
+      if (this.loading) {
+        return;
+      }
+      this.loading = true;
+
+      try {
+        let response = await this.getCommand();
+        let responseData = response.result.data;
+
+        this._treeData = responseData;
+
+        this._updateBindData();
+        this._updateSelected();
+
+        this.onDataChange();
+      } catch (e) {
+        this.errorMessage = e;
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    // 加载 Cloud 数据 (树形)
+    async loadCloudDataTree() {
+      if (this.loading) {
+        return;
+      }
+      this.loading = true;
+
+      try {
+        let commandOptions = {
+          field: this._cloudDataPostField(),
+          where: this._cloudDataTreeWhere()
+        };
+        if (this.gettree) {
+          commandOptions.startwith = `${this.selfField}=='${this.dataValue}'`;
+        }
+
+        let response = await this.getCommand(commandOptions);
+        let responseData = response.result.data;
+
+        this._treeData = responseData;
+        this._updateBindData();
+        this._updateSelected();
+
+        this.onDataChange();
+      } catch (e) {
+        this.errorMessage = e;
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    // 加载 Cloud 数据 (节点)
+    async loadCloudDataNode(callback) {
+      if (this.loading) {
+        return;
+      }
+      this.loading = true;
+
+      try {
+        let commandOptions = {
+          field: this._cloudDataPostField(),
+          where: this._cloudDataNodeWhere()
+        };
+
+        let response = await this.getCommand(commandOptions);
+        let responseData = response.result.data;
+
+        callback(responseData);
+      } catch (e) {
+        this.errorMessage = e;
+      } finally {
+        this.loading = false;
+      }
     },
+
+    // 回显 Cloud 数据
+    getCloudDataValue() {
+      if (this.isCloudDataList) {
+        return this.getCloudDataListValue();
+      }
+
+      if (this.isCloudDataTree) {
+        return this.getCloudDataTreeValue();
+      }
+    },
+
+    // 回显 Cloud 数据 (单列)
+    getCloudDataListValue() {
+      // 根据 field's as value标识匹配 where 条件
+      let where = [];
+      let whereField = this._getForeignKeyByField();
+      if (whereField) {
+        where.push(`${whereField} == '${this.dataValue}'`)
+      }
+
+      where = where.join(' || ');
+
+      if (this.where) {
+        where = `(${this.where}) && (${where})`
+      }
+
+      return this.getCommand({
+        field: this._cloudDataPostField(),
+        where
+      }).then((res) => {
+        this.selected = res.result.data;
+        return res.result.data;
+      });
+    },
+
+    // 回显 Cloud 数据 (树形)
+    getCloudDataTreeValue() {
+      return this.getCommand({
+        field: this._cloudDataPostField(),
+        getTreePath: {
+          startWith: `${this.selfField}=='${this.dataValue}'`
+        }
+      }).then((res) => {
+        let treePath = [];
+        this._extractTreePath(res.result.data, treePath);
+        this.selected = treePath;
+        return treePath;
+      });
+    },
+
     getCommand(options = {}) {
       /* eslint-disable no-undef */
       let db = uniCloud.database(this.spaceInfo)
@@ -229,125 +393,16 @@ export default {
 
       return db
     },
-		getNodeData(callback) {
-		  if (this.loading) {
-		    return
-		  }
-		  this.loading = true
-		  this.getCommand({
-		    field: this.postField,
-				where: this._pathWhere()
-		  }).then((res) => {
-		    this.loading = false
-		    this.selected = res.result.data
-		    callback && callback()
-		  }).catch((err) => {
-		    this.loading = false
-		    this.errorMessage = err
-		  })
-		},
-    getTreePath(callback) {
-      if (this.loading) {
-        return
-      }
-      this.loading = true
 
-      this.getCommand({
-        field: this.postField,
-        getTreePath: {
-          startWith: `${this.selfField}=='${this.dataValue}'`
-        }
-      }).then((res) => {
-        this.loading = false
-        let treePath = []
-        this._extractTreePath(res.result.data, treePath)
-        this.selected = treePath
-        callback && callback()
-      }).catch((err) => {
-        this.loading = false
-        this.errorMessage = err
-      })
-    },
-    loadData() {
-      if (this.isLocaldata) {
-        this._processLocalData()
-        return
-      }
-
-      if (this.dataValue != null) {
-        this._loadNodeData((data) => {
-          this._treeData = data
-          this._updateBindData()
-          this._updateSelected()
-        })
-        return
-      }
-
-      if (this.stepSearh) {
-        this._loadNodeData((data) => {
-          this._treeData = data
-          this._updateBindData()
-        })
-      } else {
-        this._loadAllData((data) => {
-          this._treeData = []
-          this._extractTree(data, this._treeData, null)
-          this._updateBindData()
-        })
+    _cloudDataPostField() {
+      let fields = [this.field];
+      if (this.parentField) {
+        fields.push(`${this.parentField} as parent_value`);
       }
+      return fields.join(',');
     },
-    _loadAllData(callback) {
-      if (this.loading) {
-        return
-      }
-      this.loading = true
-
-      this.getCommand({
-        field: this.postField,
-        gettree: true,
-        startwith: `${this.selfField}=='${this.dataValue}'`
-      }).then((res) => {
-        this.loading = false
-        callback(res.result.data)
-        this.onDataChange()
-      }).catch((err) => {
-        this.loading = false
-        this.errorMessage = err
-      })
-    },
-    _loadNodeData(callback, pw) {
-      if (this.loading) {
-        return
-      }
-      this.loading = true
 
-      this.getCommand({
-        field: this.postField,
-        where: pw || this._postWhere(),
-        pageSize: 500
-      }).then((res) => {
-        this.loading = false
-        callback(res.result.data)
-        this.onDataChange()
-      }).catch((err) => {
-        this.loading = false
-        this.errorMessage = err
-      })
-    },
-    _pathWhere() {
-      let result = []
-      let where_field = this._getParentNameByField();
-      if (where_field) {
-        result.push(`${where_field} == '${this.dataValue}'`)
-      }
-
-      if (this.where) {
-        return `(${this.where}) && (${result.join(' || ')})`
-      }
-
-      return result.join(' || ')
-    },
-    _postWhere() {
+    _cloudDataTreeWhere() {
       let result = []
       let selected = this.selected
       let parentField = this.parentField
@@ -364,17 +419,35 @@ export default {
       if (this.where) {
         where.push(`(${this.where})`)
       }
+
       if (result.length) {
         where.push(`(${result.join(' || ')})`)
       }
 
       return where.join(' && ')
     },
-    _nodeWhere() {
-      let result = []
-      let selected = this.selected
+
+    _cloudDataNodeWhere() {
+      let where = []
+      let selected = this.selected;
       if (selected.length) {
-        result.push(`${this.parentField} == '${selected[selected.length - 1].value}'`)
+        where.push(`${this.parentField} == '${selected[selected.length - 1].value}'`);
+      }
+
+      where = where.join(' || ');
+
+      if (this.where) {
+        return `(${this.where}) && (${where})`
+      }
+
+      return where
+    },
+
+    _getWhereByForeignKey() {
+      let result = []
+      let whereField = this._getForeignKeyByField();
+      if (whereField) {
+        result.push(`${whereField} == '${this.dataValue}'`)
       }
 
       if (this.where) {
@@ -383,41 +456,23 @@ export default {
 
       return result.join(' || ')
     },
-    _getParentNameByField() {
-      const fields = this.field.split(',');
-      let where_field = null;
+
+    _getForeignKeyByField() {
+      let fields = this.field.split(',');
+      let whereField = null;
       for (let i = 0; i < fields.length; i++) {
         const items = fields[i].split('as');
         if (items.length < 2) {
           continue;
         }
         if (items[1].trim() === 'value') {
-          where_field = items[0].trim();
+          whereField = items[0].trim();
           break;
         }
       }
-      return where_field
-    },
-    _isTreeView() {
-      return (this.parentField && this.selfField)
-    },
-    _updateSelected() {
-      var dl = this.dataList
-      var sl = this.selected
-      let textField = this.map.text
-      let valueField = this.map.value
-      for (var i = 0; i < sl.length; i++) {
-        var value = sl[i].value
-        var dl2 = dl[i]
-        for (var j = 0; j < dl2.length; j++) {
-          var item2 = dl2[j]
-          if (item2[valueField] === value) {
-            sl[i].text = item2[textField]
-            break
-          }
-        }
-      }
+      return whereField;
     },
+
     _updateBindData(node) {
       const {
         dataList,
@@ -445,6 +500,25 @@ export default {
         hasNodes
       }
     },
+
+    _updateSelected() {
+      let dl = this.dataList
+      let sl = this.selected
+      let textField = this.map.text
+      let valueField = this.map.value
+      for (let i = 0; i < sl.length; i++) {
+        let value = sl[i].value
+        let dl2 = dl[i]
+        for (let j = 0; j < dl2.length; j++) {
+          let item2 = dl2[j]
+          if (item2[valueField] === value) {
+            sl[i].text = item2[textField]
+            break
+          }
+        }
+      }
+    },
+
     _filterData(data, paths) {
       let dataList = []
       let hasNodes = true
@@ -453,8 +527,8 @@ export default {
         return (item.parent_value === null || item.parent_value === undefined || item.parent_value === '')
       }))
       for (let i = 0; i < paths.length; i++) {
-        var value = paths[i].value
-        var nodes = data.filter((item) => {
+        let value = paths[i].value
+        let nodes = data.filter((item) => {
           return item.parent_value === value
         })
 
@@ -470,6 +544,7 @@ export default {
         hasNodes
       }
     },
+
     _extractTree(nodes, result, parent_value) {
       let list = result || []
       let valueField = this.map.value
@@ -493,6 +568,7 @@ export default {
         }
       }
     },
+
     _extractTreePath(nodes, result) {
       let list = result || []
       for (let i = 0; i < nodes.length; i++) {
@@ -512,6 +588,7 @@ export default {
         }
       }
     },
+
     _findNodePath(key, nodes, path = []) {
       let textField = this.map.text
       let valueField = this.map.value
@@ -540,24 +617,6 @@ export default {
         path.pop()
       }
       return []
-    },
-    _processLocalData() {
-      this._treeData = []
-      this._extractTree(this.localdata, this._treeData)
-
-      var inputValue = this.dataValue
-      if (inputValue === undefined) {
-        return
-      }
-
-      if (Array.isArray(inputValue)) {
-        inputValue = inputValue[inputValue.length - 1]
-        if (typeof inputValue === 'object' && inputValue[this.map.value]) {
-          inputValue = inputValue[this.map.value]
-        }
-      }
-
-      this.selected = this._findNodePath(inputValue, this.localdata)
     }
   }
 }

uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue

@@ -1,235 +1,174 @@
 <template>
-	<view class="uni-data-pickerview">
-		<view class="add-input-max-box" v-if="addType">
-			<view class="add-title">检查项</view>
-			<view class="add-input">
-				<input type="text" v-model="inputText" placeholder="请输入检查项目" maxlength="10">
-				<img src="@/images/icon_aqjc_ss.png" @click="searchClick">
-			</view>
-			<view class="add-button" @click="resetClick">重置</view>
-		</view>
-		<scroll-view class="selected-area" scroll-x="true" scroll-y="false" :show-scrollbar="false">
-			<view class="selected-list">
-				<template v-for="(item,index) in selected">
-					<view class="selected-item"
-						:class="{'selected-item-active':index==selectedIndex, 'selected-item-text-overflow': ellipsis}"
-						:key="index" v-if="item.text" @click="handleSelect(index)">
-						<text class="">{{item.text}}</text>
-					</view>
-				</template>
-			</view>
-		</scroll-view>
-		<view class="tab-c">
-			<template v-for="(child, i) in dataList">
-				<scroll-view class="list" :key="i" v-if="i==selectedIndex" :scroll-y="true">
-					<view class="item" :class="{'is-disabled': !!item.disable}" v-for="(item, j) in child" :key="j"
-						@click="handleNodeClick(item, i, j)">
-						<text class="item-text item-text-overflow">{{item[map.text]}}</text>
-						<view class="check" v-if="selected.length > i && item[map.value] == selected[i].value"></view>
-					</view>
-				</scroll-view>
-			</template>
+  <view class="uni-data-pickerview">
+    <scroll-view v-if="!isCloudDataList" class="selected-area" scroll-x="true">
+      <view class="selected-list">
+          <view 
+            class="selected-item"
+            v-for="(item,index) in selected"
+            :key="index"
+            :class="{
+              'selected-item-active':index == selectedIndex
+            }"
+            @click="handleSelect(index)"
+          >
+            <text>{{item.text || ''}}</text>
+          </view>
+      </view>
+    </scroll-view>
+    <view class="tab-c">
+      <scroll-view class="list" :scroll-y="true">
+        <view class="item" :class="{'is-disabled': !!item.disable}" v-for="(item, j) in dataList[selectedIndex]" :key="j"
+          @click="handleNodeClick(item, selectedIndex, j)">
+          <text class="item-text">{{item[map.text]}}</text>
+          <view class="check" v-if="selected.length > selectedIndex && item[map.value] == selected[selectedIndex].value"></view>
+        </view>
+      </scroll-view>
 
-			<view class="loading-cover" v-if="loading">
-				<uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
-			</view>
-			<view class="error-message" v-if="errorMessage">
-				<text class="error-text">{{errorMessage}}</text>
-			</view>
-		</view>
-	</view>
+      <view class="loading-cover" v-if="loading">
+        <uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
+      </view>
+      <view class="error-message" v-if="errorMessage">
+        <text class="error-text">{{errorMessage}}</text>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import dataPicker from "./uni-data-picker.js"
+  import dataPicker from "./uni-data-picker.js"
 
-	/**
-	 * DataPickerview
-	 * @description uni-data-pickerview
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3796
-	 * @property {Array} localdata 本地数据，参考
-	 * @property {Boolean} step-searh = [true|false] 是否分布查询
-	 * @value true 启用分布查询，仅查询当前选中节点
-	 * @value false 关闭分布查询，一次查询出所有数据
-	 * @property {String|DBFieldString} self-field 分布查询当前字段名称
-	 * @property {String|DBFieldString} parent-field 分布查询父字段名称
-	 * @property {String|DBCollectionString} collection 表名
-	 * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
-	 * @property {String} orderby 排序字段及正序倒叙设置
-	 * @property {String|JQLString} where 查询条件
-	 */
-	export default {
-		name: 'UniDataPickerView',
-		emits: ['nodeclick', 'change', 'datachange', 'update:modelValue'],
-		mixins: [dataPicker],
-		props: {
-			addType:{},
-			addIndex:{},
-			managedMode: {
-				type: Boolean,
-				default: false
-			},
-			ellipsis: {
-				type: Boolean,
-				default: true
-			}
-		},
-		data() {
-			return {
-				inputText:"",
-			}
-		},
-		created() {
-			if (this.managedMode) {
-				return
-			}
+  /**
+   * DataPickerview
+   * @description uni-data-pickerview
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=3796
+   * @property {Array} localdata 本地数据，参考
+   * @property {Boolean} step-searh = [true|false] 是否分布查询
+   * @value true 启用分布查询，仅查询当前选中节点
+   * @value false 关闭分布查询，一次查询出所有数据
+   * @property {String|DBFieldString} self-field 分布查询当前字段名称
+   * @property {String|DBFieldString} parent-field 分布查询父字段名称
+   * @property {String|DBCollectionString} collection 表名
+   * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+   * @property {String} orderby 排序字段及正序倒叙设置
+   * @property {String|JQLString} where 查询条件
+   */
+  export default {
+    name: 'UniDataPickerView',
+    emits: ['nodeclick', 'change', 'datachange', 'update:modelValue'],
+    mixins: [dataPicker],
+    props: {
+      managedMode: {
+        type: Boolean,
+        default: false
+      },
+      ellipsis: {
+        type: Boolean,
+        default: true
+      }
+    },
+    created() {
+      if (!this.managedMode) {
+        this.$nextTick(() => {
+          this.loadData();
+        })
+      }
+    },
+    methods: {
+      onPropsChange() {
+        this._treeData = [];
+        this.selectedIndex = 0;
+        this.$nextTick(() => {
+          this.loadData();
+        })
+      },
+      handleSelect(index) {
+        this.selectedIndex = index;
+      },
+      handleNodeClick(item, i, j) {
+        if (item.disable) {
+          return;
+        }
 
-			this.$nextTick(() => {
-				this.load()
-			})
-		},
-		methods: {
-			//搜索
-			searchClick(){
-				this.$parent.$parent.searchClick(this.inputText,this.addIndex);
-			},
-			//重置
-			resetClick(){
-				this.inputText = "";
-				this.$parent.$parent.resetClick(this.addIndex);
-			},
-			onPropsChange() {
-				this._treeData = []
-				this.selectedIndex = 0
-				this.load()
-			},
-			load() {
-				if (this.isLocaldata) {
-					this.loadData()
-				} else if (this.dataValue.length) {
-					this.getTreePath((res) => {
-						this.loadData()
-					})
-				}
-			},
-			handleSelect(index) {
-				this.selectedIndex = index
-			},
-			handleNodeClick(item, i, j) {
-				if (item.disable) {
-					return
-				}
-				const node = this.dataList[i][j]
-				const text = node[this.map.text]
-				const value = node[this.map.value]
-				if (i < this.selected.length - 1) {
-					this.selected.splice(i, this.selected.length - i)
-					this.selected.push({
-						text,
-						value
-					})
-				} else if (i === this.selected.length - 1) {
-					this.selected.splice(i, 1, {
-						text,
-						value
-					})
-				}
+        const node = this.dataList[i][j];
+        const text = node[this.map.text];
+        const value = node[this.map.value];
 
-				if (node.isleaf) {
-					this.onSelectedChange(node, node.isleaf)
-					return
-				}
+        if (i < this.selected.length - 1) {
+          this.selected.splice(i, this.selected.length - i)
+          this.selected.push({
+            text,
+            value
+          })
+        } else if (i === this.selected.length - 1) {
+          this.selected.splice(i, 1, {
+            text,
+            value
+          })
+        }
 
-				const {
-					isleaf,
-					hasNodes
-				} = this._updateBindData()
+        if (node.isleaf) {
+          this.onSelectedChange(node, node.isleaf)
+          return
+        }
 
-				if (!this._isTreeView() && !hasNodes) {
-					this.onSelectedChange(node, true)
-					return
-				}
+        const {
+          isleaf,
+          hasNodes
+        } = this._updateBindData()
 
-				if (this.isLocaldata && (!hasNodes || isleaf)) {
-					this.onSelectedChange(node, true)
-					return
-				}
+        // 本地数据
+        if (this.isLocalData) {
+          this.onSelectedChange(node, (!hasNodes || isleaf))
+        } else if (this.isCloudDataList) { // Cloud 数据 (单列)
+          this.onSelectedChange(node, true)
+        } else if (this.isCloudDataTree) { // Cloud 数据 (树形)
+          if (isleaf) {
+            this.onSelectedChange(node, node.isleaf)
+          } else if (!hasNodes) { // 请求一次服务器以确定是否为叶子节点
+            this.loadCloudDataNode((data) => {
+              if (!data.length) {
+                node.isleaf = true
+              } else {
+                this._treeData.push(...data)
+                this._updateBindData(node)
+              }
+              this.onSelectedChange(node, node.isleaf)
+            })
+          }
+        }
+      },
+      updateData(data) {
+        this._treeData = data.treeData
+        this.selected = data.selected
+        if (!this._treeData.length) {
+          this.loadData()
+        } else {
+          //this.selected = data.selected
+          this._updateBindData()
+        }
+      },
+      onDataChange() {
+        this.$emit('datachange');
+      },
+      onSelectedChange(node, isleaf) {
+        if (isleaf) {
+          this._dispatchEvent()
+        }
 
-				if (!isleaf && !hasNodes) {
-					this._loadNodeData((data) => {
-						if (!data.length) {
-							node.isleaf = true
-						} else {
-							this._treeData.push(...data)
-							this._updateBindData(node)
-						}
-						this.onSelectedChange(node, node.isleaf)
-					}, this._nodeWhere())
-					return
-				}
+        if (node) {
+          this.$emit('nodeclick', node)
+        }
+      },
+      _dispatchEvent() {
+        this.$emit('change', this.selected.slice(0))
+      }
+    }
+  }
+</script>
 
-				this.onSelectedChange(node, false)
-			},
-			updateData(data) {
-				this._treeData = data.treeData
-				this.selected = data.selected
-				if (!this._treeData.length) {
-					this.loadData()
-				} else {
-					//this.selected = data.selected
-					this._updateBindData()
-				}
-			},
-			onDataChange() {
-				this.$emit('datachange')
-			},
-			onSelectedChange(node, isleaf) {
-				if (isleaf) {
-					this._dispatchEvent()
-				}
+<style lang="scss">
+	$uni-primary: #007aff !default;
 
-				if (node) {
-					this.$emit('nodeclick', node)
-				}
-			},
-			_dispatchEvent() {
-				this.$emit('change', this.selected.slice(0))
-			}
-		}
-	}
-</script>
-<style lang="stylus" scoped>
-	.add-input-max-box{
-		display: flex;
-		font-size:30rpx;
-		.add-title{
-			width:167rpx;
-			text-align center;
-			line-height:80rpx;
-		}
-		.add-input{
-			display flex;
-			width:500rpx;
-			height:80rpx;
-			border:1rpx solid #E0E0E0;
-			border-radius:10rpx;
-			input{
-				flex:1;
-				height:80rpx;
-				margin-left:20rpx;
-			}
-			img{
-				width:32rpx;
-				height:32rpx;
-				margin:25rpx 18rpx;
-			}
-		}
-		.add-button{
-			text-align center
-			width:104rpx;
-			line-height:80rpx;
-		}
-	}
 	.uni-data-pickerview {
 		flex: 1;
 		/* #ifndef APP-NVUE */
@@ -240,138 +179,137 @@
 		height: 100%;
 	}
 
-	.error-text {
-		color: #DD524D;
-	}
+  .error-text {
+    color: #DD524D;
+  }
 
-	.loading-cover {
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(255, 255, 255, .5);
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		align-items: center;
-		z-index: 1001;
-	}
+  .loading-cover {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(255, 255, 255, .5);
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+    align-items: center;
+    z-index: 1001;
+  }
 
-	.load-more {
-		/* #ifndef APP-NVUE */
-		margin: auto;
-		/* #endif */
-	}
+  .load-more {
+    /* #ifndef APP-NVUE */
+    margin: auto;
+    /* #endif */
+  }
 
-	.error-message {
-		background-color: #fff;
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		padding: 15px;
-		opacity: .9;
-		z-index: 102;
-	}
+  .error-message {
+    background-color: #fff;
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    padding: 15px;
+    opacity: .9;
+    z-index: 102;
+  }
 
-	/* #ifdef APP-NVUE */
-	.selected-area {
-		width: 750rpx;
-	}
+  /* #ifdef APP-NVUE */
+  .selected-area {
+    width: 750rpx;
+  }
+  /* #endif */
 
-	/* #endif */
+  .selected-list {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    flex-wrap: nowrap;
+    /* #endif */
+    flex-direction: row;
+    padding: 0 5px;
+    border-bottom: 1px solid #f8f8f8;
+  }
 
-	.selected-list {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		flex-wrap: nowrap;
-		padding: 0 5px;
-		border-bottom: 1px solid #f8f8f8;
-	}
-
-	.selected-item {
-		margin-left: 10px;
-		margin-right: 10px;
-		padding: 12px 0;
-		text-align: center;
-		/* #ifndef APP-NVUE */
-		white-space: nowrap;
-		/* #endif */
-	}
+  .selected-item {
+    margin-left: 10px;
+    margin-right: 10px;
+    padding: 12px 0;
+    text-align: center;
+    /* #ifndef APP-NVUE */
+    white-space: nowrap;
+    /* #endif */
+  }
 
-	.selected-item-text-overflow {
-		width: 168px;
-		/* fix nvue */
-		overflow: hidden;
-		/* #ifndef APP-NVUE */
-		width: 6em;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		-o-text-overflow: ellipsis;
-		/* #endif */
-	}
+  .selected-item-text-overflow {
+    width: 168px;
+    /* fix nvue */
+    overflow: hidden;
+    /* #ifndef APP-NVUE */
+    width: 6em;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    /* #endif */
+  }
 
 	.selected-item-active {
-		border-bottom: 2px solid #007aff;
+		border-bottom: 2px solid $uni-primary;
 	}
 
 	.selected-item-text {
-		color: #007aff;
+		color: $uni-primary;
 	}
 
-	.tab-c {
-		position: relative;
-		flex: 1;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		overflow: hidden;
-	}
+  .tab-c {
+    position: relative;
+    flex: 1;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+    overflow: hidden;
+  }
 
-	.list {
-		flex: 1;
-	}
+  .list {
+    flex: 1;
+  }
 
-	.item {
-		padding: 12px 15px;
-		/* border-bottom: 1px solid #f0f0f0; */
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: space-between;
-	}
+  .item {
+    padding: 12px 15px;
+    /* border-bottom: 1px solid #f0f0f0; */
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+    justify-content: space-between;
+  }
 
-	.is-disabled {
-		opacity: .5;
-	}
+  .is-disabled {
+    opacity: .5;
+  }
 
-	.item-text {
-		/* flex: 1; */
-		color: #333333;
-	}
+  .item-text {
+    /* flex: 1; */
+    color: #333333;
+  }
 
-	.item-text-overflow {
-		width: 280px;
-		/* fix nvue */
-		overflow: hidden;
-		/* #ifndef APP-NVUE */
-		width: 20em;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		-o-text-overflow: ellipsis;
-		/* #endif */
-	}
+  .item-text-overflow {
+    width: 280px;
+    /* fix nvue */
+    overflow: hidden;
+    /* #ifndef APP-NVUE */
+    width: 20em;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    /* #endif */
+  }
 
 	.check {
 		margin-right: 5px;
-		border: 2px solid #007aff;
+		border: 2px solid $uni-primary;
 		border-left: 0;
 		border-top: 0;
 		height: 12px;

uni_modules/uni-data-picker/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-data-picker",
   "displayName": "uni-data-picker 数据驱动的picker选择器",
-  "version": "1.0.1",
+  "version": "1.1.2",
   "description": "单列、多列级联选择器，常用于省市区城市选择、公司部门选择、多级分类等场景",
   "keywords": [
     "uni-ui",
@@ -18,11 +18,7 @@
   "directories": {
     "example": "../../temps/example_temps"
   },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -39,7 +35,8 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
   },
   "uni_modules": {
     "dependencies": [
@@ -56,7 +53,7 @@
       "client": {
         "App": {
           "app-vue": "y",
-          "app-nvue": "y"
+          "app-nvue": "u"
         },
         "H5-mobile": {
           "Safari": "y",
@@ -76,7 +73,8 @@
           "阿里": "y",
           "百度": "y",
           "字节跳动": "y",
-          "QQ": "y"
+        "QQ": "y",
+        "京东": "u"
         },
         "快应用": {
           "华为": "u",

uni_modules/uni-icons/changelog.md

@@ -1,3 +1,9 @@
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
 ## 1.3.2（2021-12-01）
 - 优化 示例可复制图标名称
 ## 1.3.1（2021-11-23）

uni_modules/uni-icons/components/uni-icons/icons.js

@@ -173,6 +173,13 @@ export default {
       "unicode": "e6bb",
       "unicode_decimal": 59067
     },
+		{
+		  "icon_id": "24923353",
+		  "name": "arrowthinright",
+		  "font_class": "arrowthinright",
+		  "unicode": "e6bb",
+		  "unicode_decimal": 59067
+		},
     {
       "icon_id": "24923354",
       "name": "arrowthinleft",
@@ -180,6 +187,13 @@ export default {
       "unicode": "e6bc",
       "unicode_decimal": 59068
     },
+		{
+		  "icon_id": "24923354",
+		  "name": "arrowthinleft",
+		  "font_class": "arrowthinleft",
+		  "unicode": "e6bc",
+		  "unicode_decimal": 59068
+		},
     {
       "icon_id": "24923355",
       "name": "arrowthinup",
@@ -187,12 +201,25 @@ export default {
       "unicode": "e6bd",
       "unicode_decimal": 59069
     },
+		{
+		  "icon_id": "24923355",
+		  "name": "arrowthinup",
+		  "font_class": "arrowthinup",
+		  "unicode": "e6bd",
+		  "unicode_decimal": 59069
+		},
     {
       "icon_id": "24923356",
       "name": "arrowthindown",
       "font_class": "arrow-down",
       "unicode": "e6be",
       "unicode_decimal": 59070
+    },{
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrowthindown",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
     },
     {
       "icon_id": "24923349",
@@ -200,6 +227,12 @@ export default {
       "font_class": "bottom",
       "unicode": "e6b8",
       "unicode_decimal": 59064
+    },{
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "arrowdown",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
     },
     {
       "icon_id": "24923346",
@@ -208,6 +241,13 @@ export default {
       "unicode": "e6b5",
       "unicode_decimal": 59061
     },
+		{
+		  "icon_id": "24923346",
+		  "name": "arrowright",
+		  "font_class": "arrowright",
+		  "unicode": "e6b5",
+		  "unicode_decimal": 59061
+		},
     {
       "icon_id": "24923347",
       "name": "arrowup",
@@ -215,6 +255,13 @@ export default {
       "unicode": "e6b6",
       "unicode_decimal": 59062
     },
+		{
+		  "icon_id": "24923347",
+		  "name": "arrowup",
+		  "font_class": "arrowup",
+		  "unicode": "e6b6",
+		  "unicode_decimal": 59062
+		},
     {
       "icon_id": "24923348",
       "name": "arrowleft",
@@ -222,6 +269,13 @@ export default {
       "unicode": "e6b7",
       "unicode_decimal": 59063
     },
+		{
+		  "icon_id": "24923348",
+		  "name": "arrowleft",
+		  "font_class": "arrowleft",
+		  "unicode": "e6b7",
+		  "unicode_decimal": 59063
+		},
     {
       "icon_id": "24923334",
       "name": "eye",

uni_modules/uni-icons/components/uni-icons/uni-icons.vue

@@ -1,14 +1,18 @@
 <template>
 	<!-- #ifdef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
 	<!-- #endif -->
 	<!-- #ifndef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
 	<!-- #endif -->
 </template>
 
 <script>
 	import icons from './icons.js';
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
+	} 
 	// #ifdef APP-NVUE
 	var domModule = weex.requireModule('dom');
 	import iconUrl from './uniicons.ttf'
@@ -61,6 +65,9 @@
 					return unescape(`%u${code.unicode}`)
 				}
 				return ''
+			},
+			iconSize(){
+				return getVal(this.size)
 			}
 		},
 		methods: {

uni_modules/uni-icons/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "1.3.2",
+  "version": "1.3.5",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",

uni_modules/uni-load-more/changelog.md

@@ -1,3 +1,9 @@
+## 1.3.3（2022-01-20）
+- 新增 showText属性 ，是否显示文本
+## 1.3.2（2022-01-19）
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1（2022-01-19）
+- 修复 微信小程序平台样式选择器报警告的问题
 ## 1.3.0（2021-11-19）
 - 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
 - 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)

uni_modules/uni-load-more/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-load-more",
   "displayName": "uni-load-more 加载更多",
-  "version": "1.3.0",
+  "version": "1.3.3",
   "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
   "keywords": [
     "uni-ui",

uni_modules/uni-scss/changelog.md

@@ -1,3 +1,5 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
 ## 1.0.2（2021-11-22）
 - 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
 ## 1.0.1（2021-11-22）

uni_modules/uni-scss/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-scss",
   "displayName": "uni-scss 辅助样式",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
   "keywords": [
     "uni-scss",
@@ -14,8 +14,8 @@
   },
   "dcloudext": {
     "category": [
-        "uni-app前端模板",
-        "前端页面模板"
+        "JS SDK",
+        "通用 SDK"
     ],
     "sale": {
       "regular": {