Merge branch 'master' into feature/业务线管理

src/pages/calcTable/index.tsx

@@ -139,7 +139,7 @@ const index: FunctionComponent<Props> = (props) => {
                   <span title={text} className={styles.contentTitle} style={{ color: `${record?.[item.dataIndex + "_color"]}` }}>
                     {text}
                   </span>
-                  {record.lockItems.includes(item.dataIndex) ? <LockOutlined title={item.i18n["锁定的项目值"]} /> : null}
+                  {record.lockItems && record.lockItems.includes(item.dataIndex) ? <LockOutlined title={item.i18n["锁定的项目值"]} /> : null}
                 </span>
               </Dropdown>
             );