From d4cfca1edae12ed86cfffc0b6cb1e3d11fa8f576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 18 May 2023 15:52:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=85=AC=E5=BC=8F?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
index 5bba9d3f..af53df43 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
@@ -339,8 +339,9 @@ export default class FormalFormModal extends React.Component {
     const title = <div className="formulaTitleWrapper">
       <div>{`${(this.props.valueType == 2 || this.props.valueType === "FORMULA") ? "函数" : "SQL"}公式`}</div>
       {
-        value && <Button type="primary" onClick={() => {
+        !_.isEmpty(this.parameters) && <Button type="primary" onClick={() => {
           const isSaveBool = _.every(this.parameters, it => !!it.id);
+          console.log("parameters", this.parameters);
           if (isSaveBool) {
             this.setState({ testVisible: true });
           } else {

From 67ef55da46095e582b742fb22723404e64c76a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 18 May 2023 16:42:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=85=AC=E5=BC=8F?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/excelEditor/components/codeAction.js        | 2 +-
 pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js      | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js b/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js
index 1ab26b1f..bca61000 100644
--- a/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js
+++ b/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js
@@ -117,7 +117,7 @@ class CodeAction extends Component {
     const variableDatalist = _.filter(variableList, it => it.value.indexOf(variableText) !== -1);
     const funcDatalist = _.map(funcList, it => ({
       ...it,
-      children: _.filter(it.children, child => _.lowerCase(child.name).indexOf(funcText) !== -1)
+      children: _.filter(it.children, child => _.lowerCase(child.name).indexOf(_.lowerCase(funcText)) !== -1)
     }));
     return (
       <div className="excel-codeAction">
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
index af53df43..1dcfce4a 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
@@ -16,6 +16,7 @@ export default class FormalFormModal extends React.Component {
       validateType: "",
       returnType: "",
       value: "",
+      formula: "",
       extendParam: {
         isCustomFunction: "0",
         sqlReturnKey: "",
@@ -66,6 +67,7 @@ export default class FormalFormModal extends React.Component {
         }
         this.setState({
           value: data.formula,
+          formula: data.formula,
           returnType: data.returnType,
           validateType: data.validateType
         });
@@ -335,14 +337,13 @@ export default class FormalFormModal extends React.Component {
   render() {
     const { salaryItemStore } = this.props;
     const { searchGroup, searchFields } = salaryItemStore;
-    const { value, formulaDatasourceList, extendParam, testVisible, showTestVal, groupParams } = this.state;
+    const { value, formula, formulaDatasourceList, extendParam, testVisible, showTestVal, groupParams } = this.state;
     const title = <div className="formulaTitleWrapper">
       <div>{`${(this.props.valueType == 2 || this.props.valueType === "FORMULA") ? "函数" : "SQL"}公式`}</div>
       {
         !_.isEmpty(this.parameters) && <Button type="primary" onClick={() => {
           const isSaveBool = _.every(this.parameters, it => !!it.id);
-          console.log("parameters", this.parameters);
-          if (isSaveBool) {
+          if (isSaveBool && value === formula) {
             this.setState({ testVisible: true });
           } else {
             message.info("请先保存公式后再进行测试");