Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图

# Conflicts:
#	src/pages/calcTable/index.tsx

src/pages/calcTable/index.tsx

@@ -141,7 +141,7 @@ const index: FunctionComponent<Props> = (props) => {
                     {text}
                   </span>
                   <Icon type="icon-piliangfenpei" title={i18n["查看拓扑图"]} className={styles.diagramIcon} onClick={() => handleDiagramTd(item?.dataIndex, record?.id)} />
-                  {record.lockItems.includes(item.dataIndex) ? <LockOutlined title={item.i18n["锁定的项目值"]} /> : null}
+                  {record.lockItems && record.lockItems.includes(item.dataIndex) ? <LockOutlined title={item.i18n["锁定的项目值"]} /> : null}
                 </span>
               </Dropdown>
             );
@@ -150,9 +150,6 @@ const index: FunctionComponent<Props> = (props) => {
       }
     });
   };
-  const handleDiagramTd = (salaryItemId: string, acctEmpId: string) => {
-    window.parent.postMessage({ type: "turn", payload: { id: "DIAGRAM", params: { salaryItemId, acctEmpId } } }, "*");
-  };
   const handleFormulaTd = (dataIndex: string) => {
     window.parent.postMessage({ type: "turn", payload: { id: "FORMULA", params: { dataIndex } } }, "*");
   };
@@ -224,6 +221,9 @@ const index: FunctionComponent<Props> = (props) => {
       }
     />
   );
+  const handleDiagramTd = (salaryItemId: string, acctEmpId: string) => {
+    window.parent.postMessage({ type: "turn", payload: { id: "DIAGRAM", params: { salaryItemId, acctEmpId } } }, "*");
+  };
 };
 
 export default index;