优化指令集功能；

zhangzzzz
1 parent 59378d2a
Showing 3 changed files with 11 additions and 11 deletions
src/components/Common/CommonComponent/index.js
src/components/Common/CommonNewBill.js
src/components/Common/InstructSetSetting/index.js
@@ -493,9 +493,10 @@ export default class CommonComponent extends Component {
     } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf("sAssignField") > -1) {
       /* 赋值字段 变量设置双击弹出 */
       this.props.onFieldDoubleClick(this.state.dataValue, this.props.showConfig, this.props.name);
-    } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf("sInstruct") > -1) {
+    } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.toLowerCase().includes('instruct')) {
       /* 赋值字段 变量设置双击弹出 */
-      this.props.onFieldDoubleClick(this.state.dataValue, this.props.showConfig, this.props.name);
+      // this.props.onFieldDoubleClick(this.state.dataValue, this.props.showConfig, this.props.name);
+      this.handleEditInstruct();
     }
   };
@@ -1827,7 +1828,7 @@ export default class CommonComponent extends Component {
       rows: commonUtils.isNotEmptyNumber(this.props.showConfig.iRowValue) ? this.props.showConfig.iRowValue : 1,
     };
-    if (this.props.showConfig.sName.toLowerCase().includes('instruct')) {
+    if (this.props.showConfig.sName.toLowerCase().includes('instruct') && this.props.enabled) {
       obj.suffix = (
         <span style={{ width: "8px" }} onClick={this.handleEditInstruct}>
           <EditOutlined style={{ color: "rgba(0,0,0,.85)" }} />
@@ -2077,7 +2078,7 @@ export default class CommonComponent extends Component {
       ),
     };
-    if (this.props.showConfig.sName.toLowerCase().includes('instruct')) {
+    if (this.props.showConfig.sName.toLowerCase().includes('instruct') && this.props.enabled) {
       obj.suffix = (
         <span style={{ width: "8px" }} onClick={this.handleEditInstruct}>
           <EditOutlined style={{ color: "rgba(0,0,0,.85)" }} />
@@ -1073,11 +1073,11 @@ class CommonNewBill extends Component {
       }
     } else if (showConfig?.sName === "sInstruct") {
       /* 指令集弹窗 */
-      const sInstructJsonString = sValue;
-      this.props.onSaveState({
-        visibleInstructField: true,
-        sInstructJsonString,
-      });
+      // const sInstructJsonString = sValue;
+      // this.props.onSaveState({
+      //   visibleInstructField: true,
+      //   sInstructJsonString,
+      // });
     }
   };
   /* 拿到赋值字段 */
@@ -7,8 +7,7 @@ import styles from &quot;./index.less&quot;;
 import { Input, Button, Space } from "antd-v4";
 import { MinusOutlined, CloseOutlined } from "@ant-design/icons";
-const IFRAMEURL = "http://project.xlyprint.cn";
-// const IFRAMEURL = "http://localhost:9099";
+const IFRAMEURL =  location.hostname === "localhost" ? "http://localhost:9099" : "http://project.xlyprint.cn";
 const InstructSetSetting = (props = {}) => {
   const { instructSetSettingVisible } = props;