Merge remote-tracking branch 'origin/master'

FormInsertDiy/AffairPage/Detail.js

@@ -236,7 +236,7 @@ export default class Detail extends Component {
 							}}
 						/>
 					) : (
-						<div id={'detailIframeId'}>
+						<div id={'detailIframeId'} data-page-info={'detail'}>
 							<DetailOneStop id={id} {...this.props} code={code} showPrint={showPrint || false} />
 						</div>
 					)}

one_stop_public/DetailForAudit/DetailSplit.js

@@ -51,6 +51,7 @@ import { getIsGui_Jian, isJSON } from '@/webPublic/zyd_public/utils/utils';
 import HistoryFormList from '@/webPublic/one_stop_public/DetailForAudit/HistoryFormList';
 import { getServicesNomal, getUaaServicesNomal } from '../Services/services';
 import { getAllApi, getDetailsApi, queryUserSetApi } from '../Services/apiConfig';
+import { getFormDetail } from "@/webPublic/FormInsertDiy/AffairPage/publicApiService";
 
 @connect()
 class DetailSplit extends Component {
@@ -207,8 +208,21 @@ class DetailSplit extends Component {
 			}
 			if (val) {
 			  // console.log(val);
-        this.getTaskInfos(val).then((res) => {
+        this.getTaskInfos(val).then( async (res) => {
 					val.taskInfo = res.taskInfo;
+					if(res.taskInfo && res.taskInfo.length > 1 && !val.taskFormKey){
+					  if(res.taskInfo[0].taskDefKey === res.taskInfo[res.taskInfo.length - 1].taskDefKey && !val.hisTaskForm.formKeys?.length){
+					    const formKey = res.taskInfo[0].formKey
+					    // 驳回到发起节点没有展示的bug-3673 查看已驳回的数据的详情，无数据显示
+              val.taskFormKey = formKey;
+              val.hisTaskForm.formKeys = [
+                {
+                  formKey: formKey,
+                  taskName: res.taskInfo[0].name,
+                },
+              ];
+            }
+          }
 					this.setState(
 						{
 							data: val,
@@ -458,11 +472,8 @@ class DetailSplit extends Component {
 			route: this.props?.route,
 		};
 
-		// console.log(data, isAllPrint);
-		// let formV = this.props.form.getFieldsValue();
-		// if(formV?.LiPGpLRKXXm && formV?.LiPGpLRKXXm['41073']){
-		//   console.log(formV?.LiPGpLRKXXm['41073']);
-		// }
+    // console.log("🚀 ~ file:DetailSplit method:render line:467 -----", "data", data);
+
 		return (
 			<Fragment>
 				<div

one_stop_public/libs/formList/FormListButtons.js

@@ -54,8 +54,7 @@ export function FormListButtons(props) {
 	if (!ConcatButtons || !ConcatButtons.length) {
 		return null;
 	}
-
-	console.log(ConcatButtons);
+	// console.log(ConcatButtons);
 
 	return ConcatButtons.map((r, i) => {
 		if (r.ButtonType === 'Normal') {

zyd_public/WangEditor/OneStopWangEditor.js

@@ -102,21 +102,11 @@ export default function Index({
     editor.create();
     editor.txt.html(value);
 
-    // if (value && value.indexOf('wangEditorHtml') > -1) {
-    //   editor.txt.html(value);
-    // } else {
-    //    editor.txt.html('<div class="wangEditorHtml">' + value + '</div>');
-    // }
-
     return () => {
-      console.log('是否销毁了editor');
+      console.log('销毁了editor');
       editor.destroy();
     };
   }, []);
-  // useEffect(() => {
-  //   if (value && editor && editor.txt) {
-  //     editor.txt.html('<div class="wangEditorHtml">' + value + '</div>');
-  //   }
-  // }, [value]);
+
   return <div id={`wangEditor${domKey}`} />;
 }

zyd_public/WangEditor/OnstopWang.js

-import React, { useState, useEffect, forwardRef } from 'react';
+import React, { useState, useEffect, forwardRef, useMemo } from 'react';
 import WangEditor from './OneStopWangEditor';
 
 function Index({ onChange, value, otherProps, dataColumn, disabled, json, uuid }) {
@@ -19,11 +19,8 @@ function Index({ onChange, value, otherProps, dataColumn, disabled, json, uuid }
     if(!value || value === 'null'){
       return <div></div>
     }
-    return <div dangerouslySetInnerHTML={{__html: `<div class="wangEditorHtml">${value}</div>`}}>
-
-    </div>
+    return <div dangerouslySetInnerHTML={{__html: `<div class="wangEditorHtml">${value}</div>`}} />
   }
-
   return (
     <WangEditor
       key={'cmsContent'}
@@ -39,19 +36,25 @@ function Index({ onChange, value, otherProps, dataColumn, disabled, json, uuid }
 }
 
 export default forwardRef((props, _ref) => {
-  let otherProps = {};
   // console.log(props);
   if(!props.uuid){
     return <div></div>;
   }
+
+  const otherProps = useMemo(() => {
+    let other = {};
     if (props.json?.otherProps) {
-    otherProps = props.json?.otherProps;
+      let a = props.json?.otherProps;
       try {
-      otherProps = new Function(otherProps)();
+        other = new Function(a)();
         // console.log(this.otherProps);
       } catch (e) {
-
+        other = {};
       }
     }
+    return other;
+  }, [props.json?.otherProps]);
+
+
   return <Index {...props} otherProps={otherProps}/>;
 });