组件优化

one_stop_public/libs/UploadCom.js

@@ -26,7 +26,7 @@ export function checkIsImage(path) {
 }
 
 export default function index(props) {
-	if (window.location.href.indexOf('jy/geren/subsidy') > -1) {
+	if (window.specialImportantSystemConfig.schoolName === '黔南民族职业技术学院' && window.location.href.indexOf('jy/geren/subsidy') > -1) {
 		return <UploadComDiyForQnZy {...props} />;
 	} else {
 		return <UploadCom {...props} />;
@@ -56,6 +56,7 @@ class UploadCom extends React.Component {
 			previewImage: '',
 		};
 		this.otherProps = {};
+		console.log(props.json);
 		if (props.json?.otherProps) {
 			this.otherProps = props.json?.otherProps;
 			try {

one_stop_public/tableCompon/index.jsx

@@ -1958,7 +1958,7 @@ export default class tableCom extends Component {
 		var initValue;
 		const objinit = { ...init, ...obj };
 
-		if (objinit != null && Object.keys(objinit).length > 0) {
+		if (objinit !== null && Object.keys(objinit).length > 0) {
 			if (this.props.fatherCode != null) {
 				initValue =
 					objinit[this.props.index] != null
@@ -1976,19 +1976,16 @@ export default class tableCom extends Component {
 				}
 			}
 		}
-		// console.log(initValue, 'initValue');
-		// console.table({
-		//   objinit,
-		//   fatherCode: this.props.fatherCode,
-		//   json,
-		//   index: this.props.index,
-		//   bindObj,
-		//   dataColumn,
-		// });
-
-		// if(initValue === null || initValue === undefined){
-		//   initValue = '';
-		// }
+		// if(json.comName === "Cascader" && this.props.uuid === 'id_32691685234912400529714267d34dc585a2'){
+		//   console.log({
+    //     objinit,
+    //     fatherCode: this.props.fatherCode,
+    //     index: this.props.fatherCode,
+    //     bindObj,
+    //     dataColumn,
+    //
+    //   });
+    // }
 
 		if (!isEdit) {
 			if (this.props.fatherCode) {
@@ -2991,6 +2988,14 @@ ${obj[dataColumn.base52]}
 							(option) => option?.label?.toLowerCase()?.indexOf(inputValue.toLowerCase()) > -1,
 						);
 					};
+					// if(this.props.uuid === 'id_32691685234912400529714267d34dc585a2'){
+					//   console.log(initValue,
+          //     dataColumn.base52,
+          //     // options,
+          //     // otherProps,
+          //   );
+					//   console.log(this.props.form.getFieldsValue())
+          // }
 					cm = getFieldDecorator(dataColumn.base52, {
 						initialValue: initValue,
 						rules:
@@ -3006,6 +3011,7 @@ ${obj[dataColumn.base52]}
 						<Cascader // 这里的options 获取方式存在bug 公式会重复调用
 							options={options}
 							allowClear
+              data-cell-uuid-cascader={this.props.uuid}
 							showSearch={{ filter: filterF }}
 							disabled={disabled}
 							getPopupContainer={
@@ -3276,7 +3282,7 @@ ${obj[dataColumn.base52]}
 					if (initValue != null && !isEmpty(initValue.files)) {
 						filesPictureSignature = initValue.files;
 					}
-					console.log(filesPictureSignature);
+					console.log('签章组件', json, filesPictureSignature);
 
 					cm = getFieldDecorator(dataColumn.base52, {
 						initialValue: { files: filesPictureSignature },