From 576a108fa9abeebbc0737e14f6e886a09253b2b1 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 30 Dec 2024 16:55:47 +0800 Subject: [PATCH 1/9] release/2.18.2.2412.02 --- .../hrmSalary/components/FormInfo/index.js | 36 ++++++++++--------- .../excelEditor/extendCodeMirror.js | 9 +++-- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/pc4mobx/hrmSalary/components/FormInfo/index.js b/pc4mobx/hrmSalary/components/FormInfo/index.js index 5c14f828..d6940489 100644 --- a/pc4mobx/hrmSalary/components/FormInfo/index.js +++ b/pc4mobx/hrmSalary/components/FormInfo/index.js @@ -1,27 +1,28 @@ import React, { Component } from "react"; -import { WeaCheckbox, WeaFormItem, WeaSearchGroup } from "ecCom"; +import { WeaCheckbox, WeaFormItem, WeaLocaleProvider, WeaSearchGroup } from "ecCom"; import { observer } from "mobx-react"; import { WeaSwitch } from "comsMobx"; +const getLabel = WeaLocaleProvider.getLabel; @observer export default class FormInfo extends Component { renderForm = () => { const { - formFields, form, colCount, itemRender, onSelectedChangeHandle, - showLabel, multiColumn, custLabelCol, childrenComponents + formFields, form, colCount, itemRender, onSelectedChangeHandle, showLabel, multiColumn, custLabelCol, + childrenComponents } = this.props; let groupArr = []; const formParams = form.getFormParams(); const labelVisible = showLabel == null || showLabel == true; const col = colCount ? colCount : 1; - const labelCol = labelVisible ? (custLabelCol || `${window.HrmEngineLabelCol}`) : 0; + const labelCol = labelVisible ? (custLabelCol || 6) : 0; const itemProps = { - ratio1to2: labelVisible && custLabelCol == null, + // ratio1to2: labelVisible && custLabelCol == null, style: { marginLeft: 0 }, tipPosition: "bottom", labelCol: { span: labelCol }, - wrapperCol: { span: 24 - labelCol } + wrapperCol: { span: 22 - labelCol } }; const textAreaProps = { minRows: 4, maxRows: 4 }; @@ -30,7 +31,7 @@ export default class FormInfo extends Component { fields.items.map((field, j) => { const customerRender = itemRender != null ? itemRender[field.domkey[0]] : null; const showCheckbox = field.checkbox || false; - let label = field.label; + let label = getLabel(field.lanId, field.label); if (showCheckbox) label = { field.checkboxValue = v === "1"; @@ -38,13 +39,17 @@ export default class FormInfo extends Component { }}/>; let coms; if (customerRender == null) { - coms = ; + coms = ; } else { - coms = customerRender(field, textAreaProps, form, formParams); + coms = customerRender({ + ...field, helpfulTip: getLabel(field.helpfulTipLanId || "", field.helpfulTip || "") + }, textAreaProps, form, formParams); } Object.assign(itemProps, { label, error: form.getError(field) }); - let col = 1; + let col = colCount ? colCount : 1; if (multiColumn != null) {//检查有哪些字段需要一行显示多个 const idx = _.findIndex(multiColumn, item => item.key === field.domkey[0]); if (idx > -1) { @@ -61,7 +66,6 @@ export default class FormInfo extends Component { }); } } - coms != null && formItems.push({ com: ({coms}), col @@ -85,12 +89,10 @@ export default class FormInfo extends Component { }; render() { - const { formFields, className } = this.props; - if (formFields == null) return (
); + const { formFields, className, form } = this.props; + if (formFields == null || !form.isFormInit) return (
); return ( -
- {this.renderForm()} -
+
{this.renderForm()}
); } } diff --git a/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js b/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js index e70c6967..32a5e5b0 100644 --- a/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js +++ b/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js @@ -18,8 +18,10 @@ CodeMirror.extendMode("javascript", { if (this.jsonMode) { return /^[\[,{]$/.test(content) || /^}/.test(textAfter) || /^]/.test(textAfter); } else { - if (content == ";" && state.lexical && state.lexical.type == ")") return false; - return /^[;{}]$/.test(content) && !/^;/.test(textAfter); + if (content == ";" && state.lexical && state.lexical.type == "}") return false; + // if (content == ";" && state.lexical && state.lexical.type == ")") return false; + return /[=,]/.test(content) || /.*\)/.test(textAfter); + // return /^[;{}]$/.test(content) && !/^;/.test(textAfter); } } }); @@ -94,7 +96,8 @@ CodeMirror.defineExtension("autoFormatRange", function (from, to) { atSol = false; } if (!atSol && inner.mode.newlineAfterToken && - inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos) || text[i + 1] || "", inner.state)) + // inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos) || text[i + 1] || "", inner.state)) + inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos, stream.pos + 2) || text[i + 1] || "", inner.state)) newline(); } if (!stream.pos && outer.blankLine) outer.blankLine(state); From a3f0e27f49d4b75b3563f2ba3954be56ad146ee0 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 09:21:25 +0800 Subject: [PATCH 2/9] release/2.18.2.2412.02 --- .../pages/salaryItem/syncToSalaryAccountSetDialog.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js b/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js index f97ef453..d7d11617 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js @@ -78,14 +78,12 @@ class SyncToSalaryAccountSetDialog extends Component { const { conditions } = this.state; return ( (pre += cur.items.length), 0) * 47 + 33 }} buttons={[]} > -
- {getSearchs(salarySetform, conditions, 1)} -
+
{getSearchs(salarySetform, conditions, 1, false)}
); } From 2d659768aca816ac833302c3b98bbcc66b36cc74 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 13:42:33 +0800 Subject: [PATCH 3/9] release/2.18.2.2412.02 --- .../hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js | 2 +- .../pages/ledgerPage/components/ledgerSalaryItemTable.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js index 934b777e..65912404 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js @@ -318,7 +318,7 @@ class LedgerSalaryItem extends Component { items: [...it.items, { ...extraItems, salaryItemGroupId: moveToItemId, - key: moveId, + key: moveId ? moveId : items.key, sortedIndex: !_.isEmpty(it.items) ? it.items[it.items.length - 1].sortedIndex + 1 : 0 }] }; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 73540fea..45bb59c7 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -288,7 +288,9 @@ class LedgerSalaryItemTable extends Component { width: 80, render: (text, record) => this.handleChangeItem(value, record.id || record.key)} + onChange={value => { + this.handleChangeItem(value, record.id || record.key) + }} /> }, { From cdc75b766815547ec112bf8378bad29e060fc7a5 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 15:04:09 +0800 Subject: [PATCH 4/9] release/2.18.2.2412.02 --- .../pages/ledgerPage/components/ledgerSalaryItemTable.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 45bb59c7..5b623e79 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -128,8 +128,10 @@ class LedgerSalaryItemTable extends Component { formulaContent, formulaId, name, hideDefault: _.isNil(hideDefault) ? "0" : hideDefault, valueType, roundingMode, pattern, - originFormulaContent, originSqlContent, - useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0" + useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0", + //不能改成其他空值 + originFormulaContent: (valueType.toString() === "2" && _.isNil(originFormulaContent)) ? formulaContent : "", + originSqlContent: (valueType.toString() === "3" && _.isNil(originSqlContent)) ? formulaContent : "" }, record, userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel })) @@ -289,7 +291,7 @@ class LedgerSalaryItemTable extends Component { render: (text, record) => { - this.handleChangeItem(value, record.id || record.key) + this.handleChangeItem(value, record.id || record.key); }} /> }, From a8e2a530376b1c3f091554087ef1f8e79641fdf6 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 15:26:54 +0800 Subject: [PATCH 5/9] release/2.18.2.2412.02 --- .../pages/ledgerPage/components/ledgerSalaryItemTable.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 5b623e79..4f126ef9 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -130,8 +130,8 @@ class LedgerSalaryItemTable extends Component { valueType, roundingMode, pattern, useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0", //不能改成其他空值 - originFormulaContent: (valueType.toString() === "2" && _.isNil(originFormulaContent)) ? formulaContent : "", - originSqlContent: (valueType.toString() === "3" && _.isNil(originSqlContent)) ? formulaContent : "" + originFormulaContent: _.isNil(originFormulaContent) ? formulaContent : originFormulaContent, + originSqlContent: _.isNil(originSqlContent) ? formulaContent : originSqlContent }, record, userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel })) From db99c081fb08afc5be6b77d1c8756c93c5db27cb Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 15:38:09 +0800 Subject: [PATCH 6/9] release/2.18.2.2412.02 --- pc4mobx/hrmSalary/components/PersonalScopeModal/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js index 935e1e00..f4c62718 100644 --- a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js +++ b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js @@ -53,7 +53,7 @@ class PersonalScopeModal extends Component { if (!_.isEmpty(nextProps.record)) { this.setState({ targetType: nextProps.record.targetType, - targetTypeIds: String(nextProps.record.targetId), + targetTypeIds: nextProps.record.targetType !== "SQL" ? String(nextProps.record.targetId) : nextProps.record.target, targetTypeIdsNames: nextProps.record.targetName, status: nextProps.record.status, statusAll: "" From 9d8cd5c6fa5307d504bd963821e8cda1d6e54162 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 16:07:35 +0800 Subject: [PATCH 7/9] release/2.18.2.2412.02 --- .../components/payrollTempNormalSet/formRender.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js index b004e177..5e7f1398 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js +++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js @@ -41,7 +41,7 @@ export const payrollTempNormalSetForm = (form, condition, background, onChange = /> } { - getKey(fields) === "theme" && c.viewAttr === 3 && + getKey(fields) === "theme" && fields.viewAttr === 3 &&
{getLabel(500143, "插入变量")}： Date: Thu, 2 Jan 2025 14:32:25 +0800 Subject: [PATCH 8/9] release/2.18.2.2412.02 --- .../standingBookDetail/components/index.less | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less index 235eba25..c7117046 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less @@ -4,12 +4,16 @@ height: 100%; background: #f6f6f6; + .wea-tab { + border-bottom: none !important; + } + .wea-new-top-req-wapper .wea-new-top-req { z-index: 0 !important; } .wea-search-tab, .wea-input-focus { - background: #f6f6f6; + background: #f1f1f1; } .normalWapper { From 4212bf9ff5759b4d4ada2c0e2c569e68f082ccae Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 2 Jan 2025 15:31:55 +0800 Subject: [PATCH 9/9] release/2.18.2.2412.02 --- pc4mobx/hrmSalary/components/pcTemplate/index.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pc4mobx/hrmSalary/components/pcTemplate/index.less b/pc4mobx/hrmSalary/components/pcTemplate/index.less index e57fe5e5..4f834426 100644 --- a/pc4mobx/hrmSalary/components/pcTemplate/index.less +++ b/pc4mobx/hrmSalary/components/pcTemplate/index.less @@ -82,6 +82,8 @@ } .data-detail { + padding-bottom: 16px; + .salary-group { background: #FFF;