release/2.15.2.2409.01

This commit is contained in:
黎永顺 2024-10-10 13:57:09 +08:00
parent ab7d0c1f7f
commit ca3c9079a1
2 changed files with 17 additions and 9 deletions

View File

@ -30,7 +30,6 @@ class Layout extends Component {
}
componentDidMount() {
this.checkData();
if (window.e9LibsConfigCustomF && _.some(window.e9LibsConfigCustomF, o => (_.some(o, k => k === "h_hrmSalary")))) {
const src = "/spa/hrmSalary/hrmSalaryCalculateDetail/css/iconfont/iconfont.css";
const link = document.createElement("link");
@ -42,23 +41,32 @@ class Layout extends Component {
top.$(".ant-message").remove();
window.location.hash.indexOf("mobilepayroll") === -1 && stores.taxAgentStore.getPermission();
}
window.addEventListener("storage", this.checkData);
window.addEventListener("storage", this.setFontSize);
}
componentWillUnmount() {
window.removeEventListener("storage", this.checkData);
window.removeEventListener("storage", this.setFontSize);
}
checkData = () => {
componentDidUpdate(prevProps, prevState, snapshot) {
this.setFontSize();
}
setFontSize = (init = false) => {
const { themeFontSize } = JSON.parse(localStorage.getItem("theme-themeInfo")) || { themeFontSize: "12" };
if (window.location.href.indexOf("/spa/hrmSalary/") !== -1) {
const src = `/cloudstore/resource/pc/com/font-size/${themeFontSize}px.css`;
const href = `/cloudstore/resource/pc/com/font-size/${themeFontSize}px.css`;
jQuery("#theme-font").remove();
window.parent.jQuery("#theme-font1").remove();
jQuery(jQuery("head")[0]).append(`<link id="theme-font" rel="stylesheet" type="text/css" href="${href}" />`);
const link = document.createElement("link");
link.setAttribute("rel", "stylesheet");
link.setAttribute("type", "text/css");
link.setAttribute("href", src);
let header = document.getElementById("container");
header.appendChild(link);
link.setAttribute("href", href);
link.setAttribute("id", "theme-font1");
setTimeout(() => {
window.parent.document.head.appendChild(link);
}, 500);
}
};

View File

@ -174,7 +174,7 @@ class Index extends Component {
if (it === "ackFeedbackStatus" || it === "feedbackStatus") {
payrollTempFeedbackForm.updateFields({ [it]: fieldsEchoData[it] ? "1" : "0" });
} else {
payrollTempFeedbackForm.updateFields({ [it]: !_.isNil(fieldsEchoData[it]) ? fieldsEchoData[it].toString() : "/" });
payrollTempFeedbackForm.updateFields({ [it]: (!_.isNil(fieldsEchoData[it]) && fieldsEchoData[it]) ? fieldsEchoData[it].toString() : "/" });
}
});
this.setState({