Merge branch 'qin_v4'

src/components/DesignForm/app/formPage.vue

@@ -1083,11 +1083,12 @@ function optionsValue3Get2(data: any,fieldName: string){
 					}"
 				>
 				
-					<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list"  :alldata="formData"  :purview="formData.powerstr" :node-key="nodeKey" />
+					<!-- <FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list"  :alldata="formData"  :purview="formData.powerstr" :node-key="nodeKey" /> -->
-					
+					<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list"  :alldata="formData"   :node-key="nodeKey" />
 					<slot></slot>
 				</el-form>
 
+			
 			</el-main>
 			<el-aside class="flowBox">
 				<el-text size="large">审批流程</el-text>

src/components/DesignForm/public/form/formItem.vue

@@ -545,21 +545,24 @@ const judgeIsShow = (key:string) => {
 			return true;
 		}else{
 			let isShow = false;
-			props.purview.forEach((item)=>{
+			if(Array.isArray(props.purview)){
-				if(item.nodeKey == props.nodeKey){
+				props.purview.forEach((item)=>{
-					
+					if(item.nodeKey == props.nodeKey){
-					if(item.powerAry && item.powerAry.length > 0){
+						
-						item.powerAry.forEach((itm)=>{
+						if(item.powerAry && item.powerAry.length > 0){
-							if(itm.id == key){
+							item.powerAry.forEach((itm)=>{
-								// console.log("判断此组件是否可见",itm,itm.id == key,"--------->",itm.isLook)
+								if(itm.id == key){
-								isShow =  itm.isLook
+									// console.log("判断此组件是否可见",itm,itm.id == key,"--------->",itm.isLook)
-								
+									isShow =  itm.isLook
-							}
+									
-						})
+								}
+							})
+						}
 					}
-				}
 					
-			})
+				})
+			}
+			
 			return isShow
 		}
 	}else{

src/views/demo/wangEditor.vue

@@ -6,6 +6,6 @@ const value = ref("初始内容");
 
 <template>
   <div class="app-container">
-    <editor v-model="value" style="height: calc(100vh - 124px)" />
+    <editor v-model="value" style="height: calc(100vh - 124px); z-index:9999" />
   </div>
 </template>