盒型设计新增svg图片

陈鑫涛
1 parent baf4a6d6
Showing 3 changed files with 1351 additions and 863 deletions
src/components/Common/CommonComponent/index.js
src/mobile/quotation/detailNew.jsx
src/mobile/quotation/master.jsx
-import moment from 'moment';
-import React, { Component, createRef } from 'react';
-import reactComponentDebounce from '@/components/Common/ReactDebounce';
-import * as commonFunc from '@/components/Common//commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
+import moment from "moment";
+import React, { Component, createRef } from "react";
+import reactComponentDebounce from "@/components/Common/ReactDebounce";
+import * as commonFunc from "@/components/Common//commonFunc"; /* 通用单据方法 */ /* 通用单据方法 */
 // import '@ant-design/compatible/assets/index.css';
 import {
   InputNumber,
@@ -21,24 +21,18 @@ import {
   Table,
   Pagination,
   Tooltip,
-} from 'antd-v4';
-import {
-  EyeOutlined,
-  FilePdfOutlined,
-  FileWordOutlined,
-  FileExcelOutlined,
-  FileOutlined,
-  RightOutlined,
-} from '@ant-design/icons';
-import * as commonUtils from '@/utils/utils';
-import styles from '@/index.less';
-import Provinces from '@/assets/provinces.json';
-import Cities from '@/assets/cities.json';
-import Areas from '@/assets/areas.json';
-import commonConfig from '@/utils/config';
-import { VirtualKeyboard } from '@/oee/common/oeeKeyBoard';// 虚拟软键盘
-import 'braft-editor/dist/output.css';
-import SvgBox from '../BoxDesignCompontent/svg';
+  Modal,
+} from "antd-v4";
+import {DeleteOutlined, EyeOutlined, FilePdfOutlined, FileWordOutlined, FileExcelOutlined, FileOutlined, RightOutlined } from "@ant-design/icons";
+import * as commonUtils from "@/utils/utils";
+import styles from "@/index.less";
+import Provinces from "@/assets/provinces.json";
+import Cities from "@/assets/cities.json";
+import Areas from "@/assets/areas.json";
+import commonConfig from "@/utils/config";
+import { VirtualKeyboard } from "@/oee/common/oeeKeyBoard"; // 虚拟软键盘
+import "braft-editor/dist/output.css";
+import SvgBox from "../BoxDesignCompontent/svg";
  
 const FormItem = Form.Item;
 const { Option } = Select;
@@ -59,18 +53,18 @@ export default class CommonComponent extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      dataValue: props.dataValue, /*   本showType数据 */
-      enabled: props.enabled, /*   是否是查看状态(数据格式:布尔)   */
-      dropDownData: [], /*   下拉数据集(如果不是下拉控件该值为空,数据格式:数组对象)   */
+      dataValue: props.dataValue /*   本showType数据 */,
+      enabled: props.enabled /*   是否是查看状态(数据格式:布尔)   */,
+      dropDownData: [] /*   下拉数据集(如果不是下拉控件该值为空,数据格式:数组对象)   */,
       conditonValues: {},
       sFieldName: props.showConfig.sName, // 字段名
       bNotEmpty: props.showConfig.bNotEmpty,
-      mode: props.showConfig.bMultipleChoice ? 'multiple' : 'default',
-      bNewRecord: props.showConfig.bNewRecord, /* 是否有新纪录 */
+      mode: props.showConfig.bMultipleChoice ? "multiple" : "default",
+      bNewRecord: props.showConfig.bNewRecord /* 是否有新纪录 */,
       sActiveDisplay: true,
       pageNum: 0,
       totalPageCount: 1,
-      searchValue: '',
+      searchValue: "",
       searchDropDownData: [],
       searchTotalPageCount: 1,
       searchPageNum: 0,
@@ -89,31 +83,39 @@ export default class CommonComponent extends Component {
     // this.getFieldDecorator = commonUtils.isUndefined(props.form) ? undefined : undefined; /*   字段验证(数据格式:数字)   */
     this.floatNum = this.props.getFloatNum(props.showConfig.sName); /*   数字格式化规范转换(数据格式:数字)   */
     this.floatPrice = this.getFloatPrice(this.floatNum); /*   价格格式化规范转换(数据格式:数字)   */
-    this.formItemLayout = commonUtils.isNotEmptyObject(props.formItemLayout) ?
-      props.formItemLayout :
-      location.pathname.toLowerCase().indexOf('oee') > -1 ? { labelCol: { span: 7, style: { color: 'rgba(0, 0, 0, 0.65)', backgroundColor: '#BFEFFF' } }, wrapperCol: { span: 15 } } :
-        { labelCol: { span: 7, style: { height: '27.82px', color: 'rgba(0, 0, 0, 0.65)', backgroundColor: '#BFEFFF' } }, wrapperCol: { span: 15 } }; /*   表格样式(主要是colspan和rowspan,数据格式:对象)   */
+    this.formItemLayout = commonUtils.isNotEmptyObject(props.formItemLayout)
+      ? props.formItemLayout
+      : location.pathname.toLowerCase().indexOf("oee") > -1
+      ? { labelCol: { span: 7, style: { color: "rgba(0, 0, 0, 0.65)", backgroundColor: "#BFEFFF" } }, wrapperCol: { span: 15 } }
+      : {
+          labelCol: { span: 7, style: { height: "27.82px", color: "rgba(0, 0, 0, 0.65)", backgroundColor: "#BFEFFF" } },
+          wrapperCol: { span: 15 },
+        }; /*   表格样式(主要是colspan和rowspan,数据格式:对象)   */
     this.isDropdownFilter = false;
     this.V = { value: props.dataValue };
     this.myRef = createRef();
     this.dropDownCount = 0;
-    this.bSpecial = location.pathname?.includes('ResearchTableTree') && props.showConfig.sName === 'sProductName';
+    this.bSpecial = location.pathname?.includes("ResearchTableTree") && props.showConfig.sName === "sProductName";
   }
  
   /**   渲染前只执行一次   */
   componentWillMount() {
     this.mounted = true;
-    if (this.props.showConfig.sDropDownType === 'const') { /*   常量下拉   */
+    if (this.props.showConfig.sDropDownType === "const") {
+      /*   常量下拉   */
       /*  常量下拉其实只取一次数据就可以啦,去过数据的会给state中的dropDownData赋值,所以dropDownData有值的情况就不需要再获取了   */
-      const showDropDown = commonUtils.isNotEmptyArr(this.props.showConfig.dropDownData) ? this.props.showConfig.dropDownData :
-        (typeof this.props.showConfig.showDropDown === 'object') ? this.props.showConfig.showDropDown : commonUtils.objectToArr(commonUtils.convertStrToObj(this.props.showConfig.showDropDown));
+      const showDropDown = commonUtils.isNotEmptyArr(this.props.showConfig.dropDownData)
+        ? this.props.showConfig.dropDownData
+        : typeof this.props.showConfig.showDropDown === "object"
+        ? this.props.showConfig.showDropDown
+        : commonUtils.objectToArr(commonUtils.convertStrToObj(this.props.showConfig.showDropDown));
       /*  给state赋值  */
       if (this.mounted) {
         this.setState({
           dropDownData: showDropDown,
         });
       }
-    } else if (this.props.showConfig.sDropDownType === 'sql' && !commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
+    } else if (this.props.showConfig.sDropDownType === "sql" && !commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
       if (this.mounted) {
         this.setState({
           dropDownData: this.props.showConfig.dropDownData,
@@ -128,10 +130,10 @@ export default class CommonComponent extends Component {
     const antInput = currentNode.querySelector("input[class*='ant-input']");
     const oInput = selectInputNode || antInput;
     if (oInput) {
-      oInput.addEventListener('compositionstart', () => {
+      oInput.addEventListener("compositionstart", () => {
         this.chineseInputting = true;
       });
-      oInput.addEventListener('compositionend', () => {
+      oInput.addEventListener("compositionend", () => {
         this.chineseInputting = false;
         if (this.handleCompleteInputEventCache) {
           this.handleCompleteInputEventCache();
@@ -140,20 +142,20 @@ export default class CommonComponent extends Component {
     }
  
     if (currentNode) {
-      if (['t', 'm', 'y'].includes(this.firstDataIndex)) {
+      if (["t", "m", "y"].includes(this.firstDataIndex)) {
         const oInput = currentNode.querySelector(`input[id*="${this.props.showConfig.sName}"]`);
         if (oInput) {
           let { sDateFormat } = this.props.showConfig;
           if (commonUtils.isEmptyStr(sDateFormat)) {
-            if (this.firstDataIndex === 'm') {
-              sDateFormat = 'YYYY-MM';
-            } else if (this.firstDataIndex === 'y') {
-              sDateFormat = 'YYYY';
+            if (this.firstDataIndex === "m") {
+              sDateFormat = "YYYY-MM";
+            } else if (this.firstDataIndex === "y") {
+              sDateFormat = "YYYY";
             } else {
               sDateFormat = this.props.getDateFormat();
             }
           }
-          oInput.oninput = (e) => {
+          oInput.oninput = e => {
             const { value } = e.target;
             const isValidDate = moment(value, sDateFormat, true).isValid();
             if (isValidDate) {
@@ -163,22 +165,24 @@ export default class CommonComponent extends Component {
         }
       }
     }
-    document.addEventListener('mousedown', this.handleSelectClick);
+    document.addEventListener("mousedown", this.handleSelectClick);
   }
  
   /**   props改变的时候触发   */
   componentWillReceiveProps(nextProps) {
     /*   如果是下拉控件,则要获取数据(获取下拉数据前要先更新sqlCondition)   */
-    const {
-      dataValue, enabled, sFieldName, bNotEmpty, showName, sDropDownType,
-    } = this.state;
+    const { dataValue, enabled, sFieldName, bNotEmpty, showName, sDropDownType } = this.state;
     if (nextProps.showConfig === undefined || this.props.showConfig === undefined) return;
     this.firstDataIndex = nextProps.showConfig.sName.substring(0, 1); /*   控件首字母(数据格式:字符串)   */
  
-    if (nextProps.showConfig.sDropDownType === 'const') { /*   常量下拉   */
+    if (nextProps.showConfig.sDropDownType === "const") {
+      /*   常量下拉   */
       /*   常量下拉其实只取一次数据就可以啦,去过数据的会给state中的dropDownData赋值,所以dropDownData有值的情况就不需要再获取了   */
-      const showDropDown = commonUtils.isNotEmptyArr(nextProps.showConfig.dropDownData) ? nextProps.showConfig.dropDownData :
-        (typeof nextProps.showConfig.showDropDown === 'object') ? nextProps.showConfig.showDropDown : commonUtils.objectToArr(commonUtils.convertStrToObj(nextProps.showConfig.showDropDown));
+      const showDropDown = commonUtils.isNotEmptyArr(nextProps.showConfig.dropDownData)
+        ? nextProps.showConfig.dropDownData
+        : typeof nextProps.showConfig.showDropDown === "object"
+        ? nextProps.showConfig.showDropDown
+        : commonUtils.objectToArr(commonUtils.convertStrToObj(nextProps.showConfig.showDropDown));
       // 对应工序单独处理
       // if (this.props.showConfig.showName === '对应工序') {
       //   showDropDown = nextProps.customDropData;
@@ -189,7 +193,7 @@ export default class CommonComponent extends Component {
           dropDownData: showDropDown,
         });
       }
-    } else if (nextProps.showConfig.sDropDownType === 'sql' && !commonUtils.isEmptyArr(nextProps.showConfig.dropDownData)) {
+    } else if (nextProps.showConfig.sDropDownType === "sql" && !commonUtils.isEmptyArr(nextProps.showConfig.dropDownData)) {
       if (this.mounted) {
         this.setState({
           dropDownData: nextProps.showConfig.dropDownData,
@@ -197,7 +201,16 @@ export default class CommonComponent extends Component {
       }
     }
     /*   把需要更新的数据setState */
-    if (dataValue !== nextProps.dataValue || enabled !== nextProps.enabled || bNotEmpty !== nextProps.showConfig.bNotEmpty || sFieldName !== nextProps.showConfig.sName || (showName !== nextProps.showConfig.showName || !showName) || sDropDownType !== nextProps.showConfig.sDropDownType || (this.bSpecial && this.props.record.sProductNo !== nextProps.record.sProductNo)) {
+    if (
+      dataValue !== nextProps.dataValue ||
+      enabled !== nextProps.enabled ||
+      bNotEmpty !== nextProps.showConfig.bNotEmpty ||
+      sFieldName !== nextProps.showConfig.sName ||
+      showName !== nextProps.showConfig.showName ||
+      !showName ||
+      sDropDownType !== nextProps.showConfig.sDropDownType ||
+      (this.bSpecial && this.props.record.sProductNo !== nextProps.record.sProductNo)
+    ) {
       if (this.mounted) {
         if (commonUtils.isEmpty(nextProps.dataValue)) {
           this.lastValue = nextProps.dataValue;
@@ -221,20 +234,40 @@ export default class CommonComponent extends Component {
  
   shouldComponentUpdate(nextProps, nextState) {
     const {
-      dataValue, enabled, dropDownData, searchValue, searchDropDownData, sFieldName, bNotEmpty, sActiveDisplay, sDropDownType, spinState, showConfig,
+      dataValue,
+      enabled,
+      dropDownData,
+      searchValue,
+      searchDropDownData,
+      sFieldName,
+      bNotEmpty,
+      sActiveDisplay,
+      sDropDownType,
+      spinState,
+      showConfig,
     } = this.state;
  
-    return nextProps.showConfig !== undefined && (dataValue !== nextState.dataValue || enabled !== nextState.enabled ||
-      sFieldName !== nextState.sFieldName || sDropDownType !== nextState.sDropDownType || bNotEmpty !== nextState.bNotEmpty || JSON.stringify(dropDownData) !== JSON.stringify(nextState.dropDownData) ||
-      searchValue !== nextState.searchValue || JSON.stringify(searchDropDownData) !== JSON.stringify(nextState.searchDropDownData) ||
-      JSON.stringify(sActiveDisplay) !== JSON.stringify(nextState.sActiveDisplay) || nextProps.showTime !== this.props.showTime ||
-      spinState !== nextState.spinState || JSON.stringify(nextState.selectTableData) !== JSON.stringify(this.state.selectTableData) ||
-      JSON.stringify(nextProps.showConfig) !== JSON.stringify(showConfig));
+    return (
+      nextProps.showConfig !== undefined &&
+      (dataValue !== nextState.dataValue ||
+        enabled !== nextState.enabled ||
+        sFieldName !== nextState.sFieldName ||
+        sDropDownType !== nextState.sDropDownType ||
+        bNotEmpty !== nextState.bNotEmpty ||
+        JSON.stringify(dropDownData) !== JSON.stringify(nextState.dropDownData) ||
+        searchValue !== nextState.searchValue ||
+        JSON.stringify(searchDropDownData) !== JSON.stringify(nextState.searchDropDownData) ||
+        JSON.stringify(sActiveDisplay) !== JSON.stringify(nextState.sActiveDisplay) ||
+        nextProps.showTime !== this.props.showTime ||
+        spinState !== nextState.spinState ||
+        JSON.stringify(nextState.selectTableData) !== JSON.stringify(this.state.selectTableData) ||
+        JSON.stringify(nextProps.showConfig) !== JSON.stringify(showConfig))
+    );
   }
  
   componentWillUnmount() {
     this.mounted = false;
-    document.removeEventListener('mousedown', this.handleSelectClick);
+    document.removeEventListener("mousedown", this.handleSelectClick);
   }
  
   onFocus = () => {
@@ -242,8 +275,8 @@ export default class CommonComponent extends Component {
     this.setState({ sActiveDisplay: false });
   };
  
-  onBlur = (event) => {
-    if (this.onExecInstructSet('blur')) return;
+  onBlur = event => {
+    if (this.onExecInstructSet("blur")) return;
  
     this.isDropdownFilter = false;
     if (commonUtils.isNotEmptyStr(this.props.showConfig.sTableTitleSql) && this.props.showConfig.iVisCount > 1) {
@@ -251,13 +284,17 @@ export default class CommonComponent extends Component {
         searchPageNum: 1,
         searchTotalPageCount: 1,
         searchDropDownData: [],
-        searchValue: '',
+        searchValue: "",
         spinState: false,
         sActiveDisplay: true,
       });
-    } else if (this.state.searchValue !== '' && this.props.showConfig.sDropDownType === 'sql' && commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
+    } else if (
+      this.state.searchValue !== "" &&
+      this.props.showConfig.sDropDownType === "sql" &&
+      commonUtils.isEmptyArr(this.props.showConfig.dropDownData)
+    ) {
       if (!this.props.showConfig.bCanInput) {
-        this.handleSelectOptionEvent('');
+        this.handleSelectOptionEvent("");
       }
       this.setState({
         searchPageNum: 1,
@@ -273,7 +310,10 @@ export default class CommonComponent extends Component {
       });
     }
     /* 若下拉配置了movesql 则离开时 调用下拉sql数据 */
-    if (this.props.showConfig && (this.props.showConfig.sDropDownType === 'movesql' || commonUtils.isNotEmptyObject(this.props.showConfig.sButtonParam))) {
+    if (
+      this.props.showConfig &&
+      (this.props.showConfig.sDropDownType === "movesql" || commonUtils.isNotEmptyObject(this.props.showConfig.sButtonParam))
+    ) {
       this.props.onDropDownBlur(this.props.name, this.props.showConfig.sName, this.props.record, this.props.showConfig);
     }
  
@@ -282,40 +322,34 @@ export default class CommonComponent extends Component {
   };
  
   onBlurText = (event, timeout = 0) => {
-    if (this.onExecInstructSet('blur')) return;
+    if (this.onExecInstructSet("blur")) return;
     const currentValue = event?.target?.value;
     if (currentValue === this.lastValue) return;
     setTimeout(() => {
-      const {
-        name,
-        record,
-        sBtnSendDialogConfigList,
-        onToolBarBtnClick,
-      } = this.props;
-      if (name !== 'master') return;
+      const { name, record, sBtnSendDialogConfigList, onToolBarBtnClick } = this.props;
+      if (name !== "master") return;
       if (commonUtils.isEmptyArr(sBtnSendDialogConfigList)) return;
       const { sName } = this.props.showConfig;
       if (!record[sName]) return;
  
       const { sActiveKey, sControlName } =
-        sBtnSendDialogConfigList.find((item) => {
-          const { sActiveKey = '' } = item;
-          return sActiveKey.split(',').includes(`${name}.${sName}`);
-        })
-      || {};
-      if (sControlName !== 'BtnSendDialog') {
+        sBtnSendDialogConfigList.find(item => {
+          const { sActiveKey = "" } = item;
+          return sActiveKey.split(",").includes(`${name}.${sName}`);
+        }) || {};
+      if (sControlName !== "BtnSendDialog") {
         if (!sActiveKey) return;
         this.lastValue = currentValue;
         onToolBarBtnClick({ key: sControlName });
       }
     }, timeout);
-  }
+  };
  
-  onExecInstructSet = (type) => {
+  onExecInstructSet = type => {
     const { sInstruct: sInstructStr, showName, sOnChangeInstruct } = this.props.showConfig;
     const sInstruct = commonUtils.convertStrToObj(sInstructStr, {});
     let { [type]: instructType } = sInstruct;
-    if (type === 'change') {
+    if (type === "change") {
       const onChangeNew = commonUtils.convertStrToObj(sOnChangeInstruct, {});
       instructType = onChangeNew[type];
     }
@@ -324,48 +358,46 @@ export default class CommonComponent extends Component {
         this.props.onExecInstructSet({
           type,
           sInstruct: instructType,
-          showName: `${showName}-${type === 'blur' ? '离焦' : '变化'}`,
+          showName: `${showName}-${type === "blur" ? "离焦" : "变化"}`,
         });
       } else {
-        message.error('未定义调用指令集事件！');
+        message.error("未定义调用指令集事件！");
       }
       return true;
     }
     return false;
-  }
+  };
  
   onCheckFields = () => {
     // 手机号、邮箱校验等校验
     // setTimeout(() => {
-    const sDateFormatTypeList = ['phone', 'mobile', 'mail', 'postcode'];
+    const sDateFormatTypeList = ["phone", "mobile", "mail", "postcode"];
     const { sName, showName, sDateFormat } = this.props.showConfig;
     const { record } = this.props;
-    const IncorrectFormat = commonFunc.showLocalMessage(this.props, 'IncorrectFormat', '格式不正确');
+    const IncorrectFormat = commonFunc.showLocalMessage(this.props, "IncorrectFormat", "格式不正确");
     const value = record[sName];
-    if (
-      value !== undefined && value !== '' && sDateFormatTypeList.includes(sDateFormat)
-    ) {
+    if (value !== undefined && value !== "" && sDateFormatTypeList.includes(sDateFormat)) {
       let flag = false;
-      if (sDateFormat === 'phone') {
+      if (sDateFormat === "phone") {
         const reg = /^0\d{2,3}-\d{7,8}$/;
         const reg1 = /^1[0-9]{10}$/;
         const reg2 = /^0\d{2,3}-\d{7,8}-\d{1,8}$/;
         if (!reg.test(value) && !reg1.test(value) && !reg2.test(value)) {
           flag = true;
         }
-      } else if (sDateFormat === 'mobile') {
+      } else if (sDateFormat === "mobile") {
         const reg = /^0\d{2,3}-\d{7,8}$/;
         const reg1 = /^1[0-9]{10}$/;
         const reg2 = /^0\d{2,3}-\d{7,8}-\d{1,8}$/;
         if (!reg.test(value) && !reg1.test(value) && !reg2.test(value)) {
           flag = true;
         }
-      } else if (sDateFormat === 'mail') {
+      } else if (sDateFormat === "mail") {
         const reg = /^[a-zA-Z0-9]{1,20}@[a-zA-Z0-9]{1,5}\.[a-zA-Z0-9]{1,5}$/;
         if (!reg.test(value)) {
           flag = true;
         }
-      } else if (sDateFormat === 'postcode') {
+      } else if (sDateFormat === "postcode") {
         const reg = /^[1-9][0-9]{5}$/;
         if (!reg.test(value)) {
           flag = true;
@@ -373,26 +405,30 @@ export default class CommonComponent extends Component {
       }
  
       if (flag) {
-        this.props.onChange(this.props.name, 'verificationFailed', { verificationFailed: true, verificationFailedMsg: `【${showName}】【${sName}】${IncorrectFormat}！` }, this.props.sId, []);
+        this.props.onChange(
+          this.props.name,
+          "verificationFailed",
+          { verificationFailed: true, verificationFailedMsg: `【${showName}】【${sName}】${IncorrectFormat}！` },
+          this.props.sId,
+          []
+        );
         message.warning(`【${showName}】【${sName}】${IncorrectFormat}！`);
       } else if (record.verificationFailed) {
         record.verificationFailed = undefined;
       }
     }
     // }, timeout);
-  }
+  };
  
   /**   下拉时看是否要重新获取数据   */
-  onDropdownVisibleChange = (open) => {
-    const {
-      dropDownData, bNewRecord, pageNum: pageNumOld, totalPageCount: totalPageCountOld, searchValue, conditonValues,
-    } = this.state;
+  onDropdownVisibleChange = open => {
+    const { dropDownData, bNewRecord, pageNum: pageNumOld, totalPageCount: totalPageCountOld, searchValue, conditonValues } = this.state;
  
     if (this.mounted && open) {
       const conditonValuesNew = this.props.getSqlCondition(this.props.showConfig, this.props.name, this.props.record);
       const pageNum = JSON.stringify(conditonValuesNew) !== JSON.stringify(conditonValues) ? 1 : pageNumOld === 0 ? 1 : pageNumOld;
       const totalPageCount = conditonValuesNew !== conditonValues ? 1 : totalPageCountOld;
-      if (pageNum === 1 && this.props.showConfig.sDropDownType === 'sql' && commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
+      if (pageNum === 1 && this.props.showConfig.sDropDownType === "sql" && commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
         this.setState({ spinState: true });
         this.getDropDownData(pageNum, totalPageCount, searchValue, this.dropDownCount);
       }
@@ -411,14 +447,17 @@ export default class CommonComponent extends Component {
       }
       this.props.onDropdownVisibleChange(open);
     }
-  }
+  };
  
   onDoubleClick = () => {
     const sMemo = this.props.showConfig.sName;
     const title = this.props.showConfig.showName;
-    const bSParamValue = sMemo === 'sParamValue';
-    if ((commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf('Memo') > -1) || (bSParamValue && !this.props.record.sDropDownData) ||
-      (this.props.showConfig.sControlName && this.props.showConfig.sControlName.toLowerCase().indexOf('memo') > -1)) {
+    const bSParamValue = sMemo === "sParamValue";
+    if (
+      (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf("Memo") > -1) ||
+      (bSParamValue && !this.props.record.sDropDownData) ||
+      (this.props.showConfig.sControlName && this.props.showConfig.sControlName.toLowerCase().indexOf("memo") > -1)
+    ) {
       const sCurrMemoProps = {
         title,
         name: this.props.name,
@@ -434,16 +473,20 @@ export default class CommonComponent extends Component {
       } else if (this.props.onSaveState) {
         this.props.onSaveState({ sCurrMemoProps });
       }
-    } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf('sName') > -1) { /* 计算方案 变量设置双击弹出 */
+    } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf("sName") > -1) {
+      /* 计算方案 变量设置双击弹出 */
       this.props.onFieldDoubleClick(this.props.record, this.state.dataValue, this.props.showConfig, this.props.name);
-    } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf('sValue') > -1) { /* 计算方案 变量设置双击弹出 */
+    } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf("sValue") > -1) {
+      /* 计算方案 变量设置双击弹出 */
       this.props.onFieldDoubleClick(this.props.record, this.state.dataValue, this.props.showConfig, this.props.name);
-    } else if (commonUtils.isNotEmptyObject(sMemo) && sMemo.indexOf('sAssignField') > -1) { /* 赋值字段 变量设置双击弹出 */
+    } 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.indexOf("sInstruct") > -1) {
+      /* 赋值字段 变量设置双击弹出 */
       this.props.onFieldDoubleClick(this.state.dataValue, this.props.showConfig, this.props.name);
     }
-  }
+  };
  
   onEditorClick = () => {
     // if (this.props.enabled) {
@@ -459,42 +502,44 @@ export default class CommonComponent extends Component {
       config: this.props.showConfig,
     };
     this.props.onSaveState({ curEditorProps });
-  }
+  };
  
-  onKeyUp = (e) => {
+  onKeyUp = e => {
     if (this.props.onKeyUp) {
       this.props.onKeyUp(e);
     }
-  }
+  };
  
-  onKeyDown = (e) => {
+  onKeyDown = e => {
     // 如果输入的是字母数字或者中文
     if (!this.state.bDropDownOpen && /^[a-zA-Z0-9\u4e00-\u9fa5]+$/.test(e.keyCode)) {
       this.setState({ bDropDownOpen: true });
     }
-    if (e.ctrlKey && e.keyCode === 82) { /* CTRL+ALT+R 代替右击事件 */
+    if (e.ctrlKey && e.keyCode === 82) {
+      /* CTRL+ALT+R 代替右击事件 */
       this.onContextMenu(e);
-    } else if (e.key === 'F10') {
+    } else if (e.key === "F10") {
       message.info(this.props.showConfig.sName);
-    } else if (e.ctrlKey && (e.altKey || e.metaKey) && e.keyCode === 71) { /* CTRL+ALT+G F7 设置界面 */
+    } else if (e.ctrlKey && (e.altKey || e.metaKey) && e.keyCode === 71) {
+      /* CTRL+ALT+G F7 设置界面 */
       const { sType } = this.props?.app?.userinfo || {};
-      if (!['sysadmin'].includes(sType)) {
+      if (!["sysadmin"].includes(sType)) {
         return;
       }
       if (commonUtils.isNotEmptyObject(this.props)) {
-        const {
-          name, tableConfig, record, configName,
-        } = this.props;
+        const { name, tableConfig, record, configName } = this.props;
         if (commonUtils.isNotEmptyObject(tableConfig)) {
           const myTableConfig = JSON.parse(JSON.stringify(tableConfig));
-          myTableConfig.sActiveId = '16411004790004762980820285096000';
+          myTableConfig.sActiveId = "16411004790004762980820285096000";
           myTableConfig.sName = this.props.showConfig.sName;
           const myTableConfigArr = [];
           myTableConfigArr.push(myTableConfig);
-          if (this.props.name === 'master') { /* 主表 */
-            this.props.onViewClick(name, 'myTableConfig', record, 0, myTableConfigArr, configName);
-          } else { /* 从表 */
-            this.props.onViewClick(name, 'myTableConfig', record, 0, myTableConfigArr, configName);
+          if (this.props.name === "master") {
+            /* 主表 */
+            this.props.onViewClick(name, "myTableConfig", record, 0, myTableConfigArr, configName);
+          } else {
+            /* 从表 */
+            this.props.onViewClick(name, "myTableConfig", record, 0, myTableConfigArr, configName);
           }
         }
       }
@@ -502,28 +547,33 @@ export default class CommonComponent extends Component {
       const { showConfig, record, name } = this.props;
       this.props.onKeyDown(e, record, showConfig.sName, name);
     }
-  }
+  };
  
   /* CommonList列表onkeydown-F10处理 */
-  onKeyDownDiv = (e) => {
+  onKeyDownDiv = e => {
     if (this.props.onKeyDown) {
       this.props.onKeyDown(e);
     }
-    if (e.key === 'F10') {
+    if (e.key === "F10") {
       message.info(this.props.showConfig.sName);
     } else if (e.ctrlKey && e.keyCode === 67) {
-      console.log('复制成功！');
+      console.log("复制成功！");
     } else if (e.ctrlKey && e.keyCode === 65) {
-      console.log('全选成功！');
+      console.log("全选成功！");
     } else {
       e.preventDefault();
       return false;
     }
-  }
+  };
  
   /* 单击右键全部更新，弹出窗选择后，更新此列所有数据 （只更新非只读字段） */
-  onContextMenu = (e) => {
-    if (this.state.enabled && commonUtils.isNotEmptyObject(this.props) && this.props.name !== 'master' && commonUtils.isNotEmptyObject(this.props.showConfig)) {
+  onContextMenu = e => {
+    if (
+      this.state.enabled &&
+      commonUtils.isNotEmptyObject(this.props) &&
+      this.props.name !== "master" &&
+      commonUtils.isNotEmptyObject(this.props.showConfig)
+    ) {
       const { showConfig, name } = this.props;
       const { bReadonly } = showConfig;
       if (bReadonly) {
@@ -535,47 +585,47 @@ export default class CommonComponent extends Component {
         this.props.onContextMenu(e, record, showConfig, name);
       }
     }
-  }
+  };
  
   /* 字段选择弹窗 */
   onFieldPopupModal = (showConfig, name, open) => {
     if (open !== undefined) {
       this.props.onFieldPopupModal(showConfig, name);
     }
-  }
+  };
   /**   获取selectprops对象   */
   getSelectProps = () => {
     /*   返回值声明   */
     const obj = {
       id: `${this.props.showConfig.sName}${this.props.record ? this.props.record.sId : commonUtils.createSid()}`,
-      showSearch: true, /*   是否有查找功能   */
+      showSearch: true /*   是否有查找功能   */,
       // disabled: !this.state.enabled /*   修改的时候传过来的数据   */
       onSelect: () => {
-        if (this.state.mode !== 'multiple') {
+        if (this.state.mode !== "multiple") {
           this.setState({ bDropDownOpen: false, bNotFirstEnter: true });
         }
       },
-      onChange: this.handleSelectOptionEvent, /*   选择触发事件   */
-      filterOption: this.filterOption, /*  搜索时过滤对应的 option 属性  */
+      onChange: this.handleSelectOptionEvent /*   选择触发事件   */,
+      filterOption: this.filterOption /*  搜索时过滤对应的 option 属性  */,
       onDropdownVisibleChange: this.onDropdownVisibleChange,
       onPopupScroll: this.handlePopupScroll,
       onSearch: this.handleSearch,
-      notFoundContent: this.state.spinState ? <Spin /> : '暂无数据',
+      notFoundContent: this.state.spinState ? <Spin /> : "暂无数据",
       // getPopupContainer: this.props.name === 'slave' || this.props.name === 'searchColumnShow' ? this.getPopupContainer : null,/*解决下拉框不随浏览器滚动问题 */
       onFocus: this.onFocus,
       // onBlur: this.onBlur,
-      onBlur: (e) => {
+      onBlur: e => {
         this.setState({ bDropDownOpen: false, bNotFirstEnter: false });
         this.onBlur(e);
       },
       mode: this.state.mode,
-      onPaste: (event) => {
+      onPaste: event => {
         if (this.props.showConfig.bMultipleChoice) {
-          const clipboardText = event.clipboardData.getData('text/plain').trim();
+          const clipboardText = event.clipboardData.getData("text/plain").trim();
           if (clipboardText) {
-            const { dataValue = '' } = this.state;
+            const { dataValue = "" } = this.state;
             let dataValueNew = dataValue;
-            if (dataValueNew === '') {
+            if (dataValueNew === "") {
               dataValueNew += clipboardText;
             } else {
               dataValueNew += `,${clipboardText}`;
@@ -586,22 +636,30 @@ export default class CommonComponent extends Component {
         }
       },
     };
-    if (this.props.showConfig.sDropDownType === 'sql') {
-      obj.optionLabelProp = 'title';
+    if (this.props.showConfig.sDropDownType === "sql") {
+      obj.optionLabelProp = "title";
     }
     if (this.props.readOnly) {
-      obj.readOnly = 'readOnly';
+      obj.readOnly = "readOnly";
     } else {
       obj.disabled = !this.state.enabled;
     }
     obj.placeholder = this.props.showConfig.placeholder;
     /* 区分Oee设置字体与其他系统设置字体 */
-    obj.dropdownStyle = commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf('oee') > -1 ? { fontSize: '1.3rem' } : { fontSize: '12px' };
-    obj.dropdownClassName = commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf('oee') > -1 ? (location.pathname.toLowerCase().indexOf('loginoee') > -1 ? 'loginOeeDropDown' : 'oeeDropDown') : '';
+    obj.dropdownStyle =
+      commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf("oee") > -1
+        ? { fontSize: "1.3rem" }
+        : { fontSize: "12px" };
+    obj.dropdownClassName =
+      commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf("oee") > -1
+        ? location.pathname.toLowerCase().indexOf("loginoee") > -1
+          ? "loginOeeDropDown"
+          : "oeeDropDown"
+        : "";
     /*   主表时才赋值value   */
     if (this.props.bTable) {
       if (this.props.showConfig.bMultipleChoice) {
-        obj.value = !commonUtils.isEmpty(this.state.dataValue) ? this.state.dataValue.split(',') : []; /*   数据值   */
+        obj.value = !commonUtils.isEmpty(this.state.dataValue) ? this.state.dataValue.split(",") : []; /*   数据值   */
       } else {
         obj.value = this.state.dataValue; /*   数据值   */
       }
@@ -611,7 +669,7 @@ export default class CommonComponent extends Component {
       obj.dropdownMatchSelectWidth = false; /* true时 下拉菜单和选择器同宽。默认将设置 min-width，当值小于选择框宽度时会被忽略。 */
       obj.dropdownStyle.width = this.props.showConfig.iDropWidth;
     }
-    obj.onInputKeyDown = (e) => {
+    obj.onInputKeyDown = e => {
       const { bDropDownOpen, bNotFirstEnter } = this.state;
       if (bDropDownOpen && [38, 40, 13].includes(e.keyCode)) {
         // eslint-disable-next-line no-console
@@ -637,25 +695,25 @@ export default class CommonComponent extends Component {
     /*   返回值   */
     return obj;
   };
-  getLocalizedString = (jsonStr, language) =>{
+  getLocalizedString = (jsonStr, language) => {
     try {
       const data = JSON.parse(jsonStr);
-      return data[language] || '';
+      return data[language] || "";
     } catch (e) {
-      console.error('Error parsing JSON:', e);
-      return '';
+      console.error("Error parsing JSON:", e);
+      return "";
     }
-  }
+  };
   getSelectTableProps = () => {
     const { currentPage, tempCurrentPage, searchValue } = this.state;
-    const pageNum = searchValue === '' ? currentPage : tempCurrentPage;
+    const pageNum = searchValue === "" ? currentPage : tempCurrentPage;
  
     /*   返回值声明   */
     const obj = {
       id: `${this.props.showConfig.sName}${this.props.record ? this.props.record.sId : commonUtils.createSid()}`,
       dropdownMatchSelectWidth: false,
-      filterOption: this.filterOption, /*  搜索时过滤对应的 option 属性  */
-      onDropdownVisibleChange: (open) => {
+      filterOption: this.filterOption /*  搜索时过滤对应的 option 属性  */,
+      onDropdownVisibleChange: open => {
         this.onDropdownVisibleChange(open);
         if (open === false) {
           clearTimeout(this.blurtimer);
@@ -672,41 +730,47 @@ export default class CommonComponent extends Component {
       // onFocus: this.onFocus,
       // onBlur: this.onBlur,
     };
-    if (this.props.showConfig.sDropDownType === 'sql') {
-      obj.optionLabelProp = 'title';
+    if (this.props.showConfig.sDropDownType === "sql") {
+      obj.optionLabelProp = "title";
     }
     if (this.props.readOnly) {
-      obj.readOnly = 'readOnly';
+      obj.readOnly = "readOnly";
     } else {
       obj.disabled = !this.state.enabled;
     }
     obj.placeholder = this.props.showConfig.placeholder;
     /* 区分Oee设置字体与其他系统设置字体 */
-    obj.dropdownStyle = commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf('oee') > -1 ? { fontSize: '1.3rem' } : { fontSize: '12px' };
-    obj.dropdownClassName = commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf('oee') > -1 ? (location.pathname.toLowerCase().indexOf('loginoee') > -1 ? 'loginOeeDropDown' : 'oeeDropDown') : '';
+    obj.dropdownStyle =
+      commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf("oee") > -1
+        ? { fontSize: "1.3rem" }
+        : { fontSize: "12px" };
+    obj.dropdownClassName =
+      commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf("oee") > -1
+        ? location.pathname.toLowerCase().indexOf("loginoee") > -1
+          ? "loginOeeDropDown"
+          : "oeeDropDown"
+        : "";
     /*   主表时才赋值value   */
     if (this.props.bTable) {
-      obj.value = this.props.showConfig.bMultipleChoice && !commonUtils.isEmpty(this.state.dataValue) ? this.state.dataValue.split(',') : this.state.dataValue; /*   数据值   */
+      obj.value =
+        this.props.showConfig.bMultipleChoice && !commonUtils.isEmpty(this.state.dataValue)
+          ? this.state.dataValue.split(",")
+          : this.state.dataValue; /*   数据值   */
       obj.className = this.props.costomClassName === undefined ? styles.editSelect : this.props.costomClassName;
     }
     if (this.props.showConfig.iDropWidth > 0) {
       obj.dropdownMatchSelectWidth = false; /* true时 下拉菜单和选择器同宽。默认将设置 min-width，当值小于选择框宽度时会被忽略。 */
     }
-    obj.onInputKeyDown = (e) => {
-      const {
-        selectTableData = [],
-        selectTableIndex = 0,
-        bDropDownOpen,
-        bNotFirstEnter,
-      } = this.state;
+    obj.onInputKeyDown = e => {
+      const { selectTableData = [], selectTableIndex = 0, bDropDownOpen, bNotFirstEnter } = this.state;
       const { keyCode } = e;
  
       try {
         if (bDropDownOpen) {
-          const oTBody = this.selectTableRef1.querySelector('.ant-table-body');
+          const oTBody = this.selectTableRef1.querySelector(".ant-table-body");
           const { scrollTop } = oTBody;
  
-          const oTr = this.selectTableRef1.querySelector('.selected-record-row');
+          const oTr = this.selectTableRef1.querySelector(".selected-record-row");
           const trRect = oTr.getBoundingClientRect();
           const tbodyRect = oTBody.getBoundingClientRect();
  
@@ -771,7 +835,7 @@ export default class CommonComponent extends Component {
     };
     obj.onKeyUp = this.onKeyUp;
     /* eslint-disable */
-    obj.dropdownRender = (menu) => (
+    obj.dropdownRender = menu => (
       <>
         {/* <div className="select-search">
           <Search allowClear onSearch={e => this.selectTableSearch(e)}/>
@@ -779,7 +843,9 @@ export default class CommonComponent extends Component {
         {menu}
         <div
           className="select-pagination"
-          onMouseEnter={() => { this.bInPagination = true; }}
+          onMouseEnter={() => {
+            this.bInPagination = true;
+          }}
           onMouseLeave={() => {
             this.bInPagination = false;
             if (this.selectTableRef) {
@@ -787,50 +853,57 @@ export default class CommonComponent extends Component {
             }
           }}
         >
-          <Pagination onChange={e => this.selectTableChange(e)} showSizeChanger={false} current={pageNum} pageSize={20} size="small" total={this.state.totalCount} />
+          <Pagination
+            onChange={e => this.selectTableChange(e)}
+            showSizeChanger={false}
+            current={pageNum}
+            pageSize={20}
+            size="small"
+            total={this.state.totalCount}
+          />
           <Space>
             {this.props.showConfig.bFirstEmpty && (
               <Button
-                type='link'
+                type="link"
                 onClick={() => {
-                  document.querySelectorAll('.ant-select-dropdown').forEach(item => {
-                    item.classList.add('ant-select-dropdown-hidden');
+                  document.querySelectorAll(".ant-select-dropdown").forEach(item => {
+                    item.classList.add("ant-select-dropdown-hidden");
                     const displayBak = item.style.display;
-                    item.style.display = 'none';
+                    item.style.display = "none";
                     setTimeout(() => {
                       item.style.display = displayBak;
                     }, 200);
                   });
                   this.setState({ tempCurrentPage: null });
-                  this.handleSelectOptionEvent('');
+                  this.handleSelectOptionEvent("");
                 }}
               >
                 清空
-              </Button>)
-            }
+              </Button>
+            )}
             {this.props.showConfig.bNewRecord && (
               <Button
-                type='link'
+                type="link"
                 onClick={() => {
-                  document.querySelectorAll('.ant-select-dropdown').forEach(item => {
-                    item.classList.add('ant-select-dropdown-hidden');
+                  document.querySelectorAll(".ant-select-dropdown").forEach(item => {
+                    item.classList.add("ant-select-dropdown-hidden");
                     const displayBak = item.style.display;
-                    item.style.display = 'none';
+                    item.style.display = "none";
                     setTimeout(() => {
                       item.style.display = displayBak;
                     }, 200);
                   });
                   this.setState({ tempCurrentPage: null });
-                  this.handleSelectOptionEvent('@#*000@');
+                  this.handleSelectOptionEvent("@#*000@");
                 }}
               >
                 NEW RECORD
-              </Button>)
-            }
+              </Button>
+            )}
           </Space>
         </div>
       </>
-    )
+    );
     /* eslint-enable */
     /*   返回值   */
     return obj;
@@ -838,38 +911,40 @@ export default class CommonComponent extends Component {
  
   getSelectTableOption = () => {
     const { selectTableData, selectTableIndex = 0 } = this.state;
-    const { showConfig , app} = this.props;
+    const { showConfig, app } = this.props;
     const { userinfo } = app;
     let { sTableTitleSql } = showConfig;
     /* 根据用户配置语言 设置表格标题 */
-    if(commonUtils.isJSON(sTableTitleSql) && sTableTitleSql.includes('Chinese')) {
+    if (commonUtils.isJSON(sTableTitleSql) && sTableTitleSql.includes("Chinese")) {
       sTableTitleSql = this.getLocalizedString(sTableTitleSql, userinfo.sLanguage);
     }
-    const tempColumnArr = sTableTitleSql.split(',');
+    const tempColumnArr = sTableTitleSql.split(",");
     let scrollX = 0;
     const columns = tempColumnArr.map((item, index) => {
-      const tempArr = item.split(':');
+      const tempArr = item.split(":");
       const [value, title, columnWidth] = tempArr;
       let width;
-      if (!Number.isNaN(Number(columnWidth))) { // 如果配置了列宽
+      if (!Number.isNaN(Number(columnWidth))) {
+        // 如果配置了列宽
         width = Number(columnWidth);
-      } else { // 没有配置列宽，就根据字符数算宽度
+      } else {
+        // 没有配置列宽，就根据字符数算宽度
         // 获取中文字数、非中文字数， 中文12px，其它8px
         const titleStr = title;
         const totalStringLen = titleStr.length;
-        const otherStrLen = titleStr.replace(/[^\x00-\xff]/g, '').length; // eslint-disable-line
+        const otherStrLen = titleStr.replace(/[^\x00-\xff]/g, "").length; // eslint-disable-line
         const chineseStrLen = totalStringLen - otherStrLen;
-        const defaultWidth = (chineseStrLen * 12) + (otherStrLen * 8);
+        const defaultWidth = chineseStrLen * 12 + otherStrLen * 8;
         const maxStrLen = selectTableData.reduce((res, pre) => {
-          let tempValue = pre[value] !== undefined ? pre[value] : '';
-          if (tempValue === '') {
+          let tempValue = pre[value] !== undefined ? pre[value] : "";
+          if (tempValue === "") {
             return res;
           }
-          tempValue = typeof tempValue === 'string' ? tempValue : JSON.stringify(tempValue);
+          tempValue = typeof tempValue === "string" ? tempValue : JSON.stringify(tempValue);
           const totalStringLen = tempValue.length;
-          const otherStrLen = tempValue.replace(/[^\x00-\xff]/g, '').length; // eslint-disable-line
+          const otherStrLen = tempValue.replace(/[^\x00-\xff]/g, "").length; // eslint-disable-line
           const chineseStrLen = totalStringLen - otherStrLen;
-          const tempWidth = (chineseStrLen * 12) + (otherStrLen * 8);
+          const tempWidth = chineseStrLen * 12 + otherStrLen * 8;
           return Math.max(tempWidth, res);
         }, defaultWidth);
         width = Math.min(maxStrLen + 8, 300);
@@ -882,20 +957,29 @@ export default class CommonComponent extends Component {
         dataIndex: value,
         key: value,
         width: index !== tempColumnArr.length - 1 ? width : undefined,
-        render: (text) => {
-          return (<Tooltip placement="topRight" title={text}>{text}</Tooltip>);
+        render: text => {
+          return (
+            <Tooltip placement="topRight" title={text}>
+              {text}
+            </Tooltip>
+          );
         },
       };
     });
  
     return (
       <Option key="" className="select-table-option">
-        <div style={{ width: scrollX + 8, maxWidth: 'calc(100vw - 16px)', minWidth: '100%' }} ref={(ref) => { this.selectTableRef1 = ref; }}>
+        <div
+          style={{ width: scrollX + 8, maxWidth: "calc(100vw - 16px)", minWidth: "100%" }}
+          ref={ref => {
+            this.selectTableRef1 = ref;
+          }}
+        >
           <Table
             size="small"
             className="select-table"
             rowClassName={(_, index) => {
-              return selectTableIndex === index ? 'selected-record-row' : '';
+              return selectTableIndex === index ? "selected-record-row" : "";
             }}
             rowKey="sId"
             onRow={(record, index) => {
@@ -921,8 +1005,9 @@ export default class CommonComponent extends Component {
             columns={columns}
           />
         </div>
-      </Option>);
-  }
+      </Option>
+    );
+  };
  
   /**   获取complete对象   */
   getCompleteProps = () => {
@@ -930,12 +1015,12 @@ export default class CommonComponent extends Component {
     const obj = {
       id: `${this.props.showConfig.sName}${this.props.record ? this.props.record.sId : commonUtils.createSid()}`,
       // disabled: !this.state.enabled /*   修改的时候传过来的数据  */
-      onChange: this.handleCompleteInputEvent, /*   选择触发事件   */
-      onSelect: (value) => {
+      onChange: this.handleCompleteInputEvent /*   选择触发事件   */,
+      onSelect: value => {
         this.setState({ bDropDownOpen: false, bNotFirstEnter: true });
         this.completeSelectFlag = true;
-        if (value === '') {
-          if (this.props.showConfig.sDropDownType === 'sql') {
+        if (value === "") {
+          if (this.props.showConfig.sDropDownType === "sql") {
             this.props.handleSqlDropDownNewRecord(this.props.showConfig, this.props.name);
           }
         } else if (this.state.dataValue === value) {
@@ -956,40 +1041,56 @@ export default class CommonComponent extends Component {
           }
         }
       },
-      filterOption: this.filterOption, /*  搜索时过滤对应的 option 属性  */
+      filterOption: this.filterOption /*  搜索时过滤对应的 option 属性  */,
       onDropdownVisibleChange: this.onDropdownVisibleChange,
       onPopupScroll: this.handlePopupScroll,
       /* 区分Oee设置字体与其他系统设置字体 */
-      dropdownClassName: commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf('oee') > -1 ? (location.pathname.toLowerCase().indexOf('loginoee') > -1 ? 'loginOeeDropDown' : 'oeeDropDown') : '',
+      dropdownClassName:
+        commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf("oee") > -1
+          ? location.pathname.toLowerCase().indexOf("loginoee") > -1
+            ? "loginOeeDropDown"
+            : "oeeDropDown"
+          : "",
       onSearch: this.handleSearch,
-      notFoundContent: this.state.spinState ? <Spin /> : '暂无数据',
+      notFoundContent: this.state.spinState ? <Spin /> : "暂无数据",
       onFocus: this.onFocus,
-      onBlur: (e) => {
+      onBlur: e => {
         this.setState({ bDropDownOpen: false, bNotFirstEnter: false });
         this.onBlur(e);
       },
     };
     if (this.props.readOnly) {
-      obj.readOnly = 'readOnly';
+      obj.readOnly = "readOnly";
     } else {
       obj.disabled = !this.state.enabled;
     }
     obj.placeholder = this.props.showConfig.placeholder;
     /* 区分Oee设置字体与其他系统设置字体 */
-    obj.dropdownStyle = commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf('oee') > -1 ? { fontSize: '1.3rem' } : { fontSize: '12px' };
+    obj.dropdownStyle =
+      commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf("oee") > -1
+        ? { fontSize: "1.3rem" }
+        : { fontSize: "12px" };
     /*   主表时才赋值value  */
     if (this.props.bTable) {
-      obj.value = this.props.showConfig.bMultipleChoice && !commonUtils.isEmpty(this.state.dataValue) ? this.state.dataValue.split(',') : this.state.dataValue; /*   数据值   */
+      obj.value =
+        this.props.showConfig.bMultipleChoice && !commonUtils.isEmpty(this.state.dataValue)
+          ? this.state.dataValue.split(",")
+          : this.state.dataValue; /*   数据值   */
       obj.className = this.props.costomClassName === undefined ? styles.editSelect : this.props.costomClassName;
     }
     if (this.props.showConfig.iDropWidth > 0) {
       obj.dropdownMatchSelectWidth = false; /* true时 下拉菜单和选择器同宽。默认将设置 min-width，当值小于选择框宽度时会被忽略。 */
       obj.dropdownStyle.width = this.props.showConfig.iDropWidth;
     }
-    if (typeof commonUtils.convertStrToNumber(this.max) === 'number' && commonUtils.convertStrToNumber(this.max) !== 0 && this.max.indexOf('.d') === -1 && this.max.indexOf('.i') === -1) {
+    if (
+      typeof commonUtils.convertStrToNumber(this.max) === "number" &&
+      commonUtils.convertStrToNumber(this.max) !== 0 &&
+      this.max.indexOf(".d") === -1 &&
+      this.max.indexOf(".i") === -1
+    ) {
       obj.maxLength = this.max; /*   最大长度   */
     }
-    obj.onInputKeyDown = (e) => {
+    obj.onInputKeyDown = e => {
       const { bDropDownOpen, bNotFirstEnter } = this.state;
       if (bDropDownOpen && [38, 40, 13].includes(e.keyCode)) {
         // eslint-disable-next-line no-console
@@ -1012,43 +1113,44 @@ export default class CommonComponent extends Component {
   };
  
   getSearchProps = () => {
-    let chooseTitle = '选择';
-    if(commonUtils.isNotEmptyObject(this.props.app) && commonUtils.isNotEmptyObject(this.props.app.commonConst)) {
-      chooseTitle = commonFunc.showMessage(this.props.app.commonConst, 'choose') ;
+    let chooseTitle = "选择";
+    if (commonUtils.isNotEmptyObject(this.props.app) && commonUtils.isNotEmptyObject(this.props.app.commonConst)) {
+      chooseTitle = commonFunc.showMessage(this.props.app.commonConst, "choose");
     }
     const obj = {
       onKeyDown: this.onKeyDown,
-      onChange: e => this.handleSelectOptionEvent(e.target.value), /*   数据改变回带到父组件   */
-      value: commonUtils.isUndefined(this.state.dataValue) ? chooseTitle : commonUtils.strUndefinedToEmpty(this.state.dataValue), /*   数据值   */
+      onChange: e => this.handleSelectOptionEvent(e.target.value) /*   数据改变回带到父组件   */,
+      value: commonUtils.isUndefined(this.state.dataValue) ? chooseTitle : commonUtils.strUndefinedToEmpty(this.state.dataValue) /*   数据值   */,
     };
     return obj;
-  }
+  };
   /**   获取optionValue对象   */
-  getOptionValues = (data) => {
+  getOptionValues = data => {
     /*   返回值声明   */
-    let res = '';
+    let res = "";
     /*   计数器   */
     let count = 1;
     /*   遍历每一条数据   */
-    const iVisCount = commonUtils.isEmpty(this.props.showConfig.iVisCount) || this.props.showConfig.iVisCount === 0 ? 1 : this.props.showConfig.iVisCount;
+    const iVisCount =
+      commonUtils.isEmpty(this.props.showConfig.iVisCount) || this.props.showConfig.iVisCount === 0 ? 1 : this.props.showConfig.iVisCount;
     if (commonUtils.isNotEmptyStr(this.props.showConfig.sVisColumnName)) {
       res = data[this.props.showConfig.sVisColumnName];
     } else {
       for (const key of Object.keys(data)) {
         /*   这里主要是为了实现配置中控制下拉的展现列数   */
-        if (count <= iVisCount && key !== 'sId') {
-          if (res === '') {
+        if (count <= iVisCount && key !== "sId") {
+          if (res === "") {
             res = data[key];
           } else {
-            res = res.concat('-').concat(data[key]);
+            res = res.concat("-").concat(data[key]);
           }
           count += 1;
         }
       }
     }
     // 如果res值为''时，下拉会显示value值，为了解决这种情况，返回' '
-    if (res === '') {
-      res = ' ';
+    if (res === "") {
+      res = " ";
     }
     /*   返回值   */
     return res;
@@ -1059,11 +1161,11 @@ export default class CommonComponent extends Component {
     const { formId, app, enabled } = this.props;
     const { token } = app;
     return {
-      listType: 'picture-card',
-      className: 'avatar-uploader',
+      listType: "picture-card",
+      className: "avatar-uploader",
       action: `${commonConfig.file_host}file/upload?sModelsId=${formId}&token=${token}&sUploadType=model`,
       disabled: !enabled || false,
-      onChange: (info) => {
+      onChange: info => {
         const { file } = info;
         if (file.response && file.response.code === 1) {
           const sPicturePath = file.response.dataset.rows[0].savePathStr;
@@ -1072,97 +1174,113 @@ export default class CommonComponent extends Component {
           message.error(file.response.msg);
         }
       },
-      accept: 'image/*',
+      accept: "image/*",
       showUploadList: false,
     };
   };
  
   // 获取上传组件内容
   getUploadContents = () => {
-    const fileName = commonUtils.isUndefined(this.state.dataValue) ? '' : commonUtils.strUndefinedToEmpty(this.state.dataValue);
+    const fileName = commonUtils.isUndefined(this.state.dataValue) ? "" : commonUtils.strUndefinedToEmpty(this.state.dataValue);
     const imageUrl = `${commonConfig.file_host}file/download?savePathStr=${fileName}&sModelsId=100&token=${this.props.token}`;
-    return fileName ?
-      (<Image
+    return fileName ? (
+      <Image
         key={fileName}
         src={imageUrl}
-        alt={fileName.split('/').pop()}
+        alt={fileName.split("/").pop()}
         style={{
-          width: '100%',
+          width: "100%",
         }}
         preview={!this.props.enabled}
-      />) : (
-        <div>
-          <div style={{ marginTop: 8 }} >
-            上传
-          </div>
-        </div>);
+      />
+    ) : (
+      <div>
+        <div style={{ marginTop: 8 }}>上传</div>
+      </div>
+    );
   };
  
   // 获取上传图片右上角清空按钮属性
   getUploadButtonProps = () => {
-    const fileName = commonUtils.isUndefined(this.state.dataValue) ? '' : commonUtils.strUndefinedToEmpty(this.state.dataValue);
+    const fileName = commonUtils.isUndefined(this.state.dataValue) ? "" : commonUtils.strUndefinedToEmpty(this.state.dataValue);
     return {
-      type: 'link',
+      type: "link",
       style: {
-        position: 'absolute',
+        position: "absolute",
         top: 0,
         left: 75,
-        display: this.props.enabled && fileName ? '' : 'none',
+        display: this.props.enabled && fileName ? "" : "none",
       },
       onClick: () => {
-        this.props.onChange(this.props.name, this.props.showConfig.sName, { [this.props.showConfig.sName]: '' }, this.props.sId, []);
+        this.props.onChange(this.props.name, this.props.showConfig.sName, { [this.props.showConfig.sName]: "" }, this.props.sId, []);
       },
     };
   };
   /**   获取innerinput控件1   */
-  getInnerInput = (innerInputProps) => {
-    const {
-      sTableTitleSql, iVisCount, sName, sDateFormat,
-    } = this.props.showConfig;
-    let chooseTitle = '选择';
-    if(commonUtils.isNotEmptyObject(this.props.app) && commonUtils.isNotEmptyObject(this.props.app.commonConst)) {
-      chooseTitle = commonFunc.showMessage(this.props.app.commonConst, 'choose') ;
+  getInnerInput = innerInputProps => {
+    const { sTableTitleSql, iVisCount, sName, sDateFormat } = this.props.showConfig;
+    let chooseTitle = "选择";
+    if (commonUtils.isNotEmptyObject(this.props.app) && commonUtils.isNotEmptyObject(this.props.app.commonConst)) {
+      chooseTitle = commonFunc.showMessage(this.props.app.commonConst, "choose");
     }
     if (commonUtils.isNotEmptyStr(sTableTitleSql) && iVisCount > 1) {
-      return <Select ref={(ref) => { this.selectTableRef = ref; }} {...this.getSelectTableProps()}>{this.getSelectTableOption()}</Select>;
+      return (
+        <Select
+          ref={ref => {
+            this.selectTableRef = ref;
+          }}
+          {...this.getSelectTableProps()}
+        >
+          {this.getSelectTableOption()}
+        </Select>
+      );
     }
-    if (sName === 'sIcon') {
-      return (<><Upload {...this.getUploadProps()}>{this.getUploadContents()}</Upload><Button {...this.getUploadButtonProps()}>X</Button></>);
+    if (sName === "sIcon") {
+      return (
+        <>
+          <Upload {...this.getUploadProps()}>{this.getUploadContents()}</Upload>
+          <Button {...this.getUploadButtonProps()}>X</Button>
+        </>
+      );
     }
-    if (sName === 'sPackPath' || sName === 'sPackDetailPathUpLoad') {
+    if (sName === "sPackPath" || sName === "sPackDetailPathUpLoad" || sName === "sSvgPath") {
+      let imageUrls = "";
       const uploadProps = {
-        listType: 'picture-card',
-        className: 'avatar-uploader',
+        listType: "picture-card",
+        className: "avatar-uploader",
         action: `${commonConfig.server_host}file/uploadLogo?sLogoName=logo${sName}${this.props.record.sName}`,
         disabled: !this.props.enabled,
-        onChange: (info) => {
+        onChange: info => {
           const { fileList } = info;
           const file = fileList[fileList.length - 1];
           const { status, response } = file;
-          if (status === 'done') {
+          if (status === "done") {
             if (response && response.code === 1) {
-              const imageUrlNew = `${commonConfig.server_host}file/downloadLogo?sLogoName=logo${sName}${this.props.record.sName}&date=${new Date().getTime()}`;
-              if (sName === 'sPackPath') {
-                 this.props.onChange(this.props.name, sName, { sPackPath: imageUrlNew }, this.props.sId, []);
-              } else {
+              const imageUrlNew = `${commonConfig.server_host}file/downloadLogo?sLogoName=logo${sName}${
+                this.props.record.sName
+              }&date=${new Date().getTime()}`;
+              if (sName === "sPackPath") {
+                this.props.onChange(this.props.name, sName, { sPackPath: imageUrlNew }, this.props.sId, []);
+              } else if (sName === "sPackDetailPathUpLoad") {
                 this.props.onChange(this.props.name, sName, { sPackDetailPathUpLoad: imageUrlNew }, this.props.sId, []);
+              } else {
+                this.props.onChange(this.props.name, sName, { sSvgPath: imageUrlNew }, this.props.sId, []);
               }
+              imageUrls = imageUrlNew;
             } else if (response && response.code === -1) {
               message.error(response.msg);
             }
           }
         },
-        accept: 'image/*',
+        accept: "image/*",
         showUploadList: false,
         openFileDialogOnClick: this.props.enabled,
       };
-      const imageUrl = sName === 'sPackPath' ? this.props.record.sPackPath : this.props.record.sPackDetailPathUpLoad;
+      const imageUrl = sName === "sPackPath" ? this.props.record.sPackPath : sName === "sPackDetailPathUpLoad" ? this.props.record.sPackDetailPathUpLoad : this.props.record.sSvgPath;
       return (
         <div>
-          <Upload
-            {...uploadProps}
-          >
-            {imageUrl ? (
+            <Upload {...uploadProps}>
+              {imageUrl ? (
               <Image
                 key={imageUrl}
                 src={imageUrl}
@@ -1170,62 +1288,60 @@ export default class CommonComponent extends Component {
                 style={{ width: '100%' }}
                 preview={!this.props.enabled}
               />
-                ) : (
-                  <div>
-                    <div
-                      style={{ marginTop: 8 }}
-                    >
-                      上传
-                    </div>
-                  </div>
-                )}
-          </Upload>
+             
+            ) : (
+              <div>
+                <div style={{ marginTop: 8 }}>上传</div>
+              </div>
+            )}
+            </Upload>
+            <Button {...this.getUploadButtonProps()}><DeleteOutlined /></Button>
         </div>
       );
     }
-    if (sName === 'sPackDetailPath') {
+    if (sName === "sPackDetailPath") {
       const boxList = [];
       const tables = [
-        { name: '盒型类别', value: this.props.record.sBoxType, type: null },
-        { name: '盒身', value: this.props.record.sBoxBody, type: this.props.record.sTypes },
-        { name: '盒长', value: this.props.record.dBoxLength, type: null },
-        { name: '盒宽', value: this.props.record.dBoxWidth, type: null },
-        { name: '盒高', value: this.props.record.dBoxHeight, type: null },
+        { name: "盒型类别", value: this.props.record.sBoxType, type: null },
+        { name: "盒身", value: this.props.record.sBoxBody, type: this.props.record.sTypes },
+        { name: "盒长", value: this.props.record.dBoxLength, type: null },
+        { name: "盒宽", value: this.props.record.dBoxWidth, type: null },
+        { name: "盒高", value: this.props.record.dBoxHeight, type: null },
       ];
       const { slaveData = [] } = this.props;
       const titleList1 = [
-        { name: '上方盒舌', value: 'dSFHS' },
-        { name: '盒底组件', value: 'dHDC' },
-        { name: '下方盒舌', value: 'dXFHS' },
-        { name: '左(上)插位组件', value: 'dZSCW' },
-        { name: '左贴边位', value: 'dZTBW' },
-        { name: '左(下)插位组件', value: 'dZXCW' },
-        { name: '右(上)插位组件', value: 'dYSCW' },
-        { name: '右贴边位', value: 'dYTBW' },
-        { name: '右(下)插位组件', value: 'dYXCW' },
+        { name: "上方盒舌", value: "dSFHS" },
+        { name: "盒底组件", value: "dHDC" },
+        { name: "下方盒舌", value: "dXFHS" },
+        { name: "左(上)插位组件", value: "dZSCW" },
+        { name: "左贴边位", value: "dZTBW" },
+        { name: "左(下)插位组件", value: "dZXCW" },
+        { name: "右(上)插位组件", value: "dYSCW" },
+        { name: "右贴边位", value: "dYTBW" },
+        { name: "右(下)插位组件", value: "dYXCW" },
       ];
-      slaveData.forEach((x) => {
+      slaveData.forEach(x => {
         boxList.push({
           value: x.iValue,
-          sName: titleList1.find(item => item.value === x.sCode)?.name || '',
+          sName: titleList1.find(item => item.value === x.sCode)?.name || "",
           isEditable: true,
           isSelect: false,
           selectValue: null,
-          selectLabel: '',
+          selectLabel: "",
           selectImage: null,
           type: x.sTypes || null,
           show: true,
           showName: x.sName, // 参数名称
         });
       });
-      tables.forEach((x) => {
+      tables.forEach(x => {
         boxList.push({
           value: x.value,
           sName: x.name,
           isEditable: true,
           isSelect: false,
           selectValue: null,
-          selectLabel: '',
+          selectLabel: "",
           selectImage: null,
           type: x.type || null,
           show: true,
@@ -1240,54 +1356,115 @@ export default class CommonComponent extends Component {
         showNew: 1,
       };
       return (
-        <div style={{ width: '100px', height: '100px' }}>
+        <div style={{ width: "100px", height: "100px" }}>
           <SvgBox {...svgProps} />
         </div>
       );
     }
-    if (this.props.showConfig.sName && this.props.showConfig.sName.toLowerCase().includes('fullmemo')) {
+    if (this.props.showConfig.sName && this.props.showConfig.sName.toLowerCase().includes("fullmemo")) {
       const row = commonUtils.isNotEmptyNumber(this.props.showConfig.iRowValue) ? this.props.showConfig.iRowValue : 1;
-      const minHeight = (row * 20) + 6 + 4 + 2;
-      return <div onDoubleClick={this.onEditorClick} style={{ minHeight }} className="braft-output-content" dangerouslySetInnerHTML={{ __html: this.state.dataValue }} />;
+      const minHeight = row * 20 + 6 + 4 + 2;
+      return (
+        <div
+          onDoubleClick={this.onEditorClick}
+          style={{ minHeight }}
+          className="braft-output-content"
+          dangerouslySetInnerHTML={{ __html: this.state.dataValue }}
+        />
+      );
     }
-    if ((this.props.showConfig.sDropDownType === 'sql' || this.props.showConfig.sDropDownType === 'const')
-      && (this.firstDataIndex === 'i' || this.firstDataIndex === 'd' || this.firstDataIndex === 's')) { /*   下拉选择框(数字和文本选择框才会下拉)   */
-      if (this.props.showConfig.bCanInput) { /*   文本输入下拉框   */
+    if (
+      (this.props.showConfig.sDropDownType === "sql" || this.props.showConfig.sDropDownType === "const") &&
+      (this.firstDataIndex === "i" || this.firstDataIndex === "d" || this.firstDataIndex === "s")
+    ) {
+      /*   下拉选择框(数字和文本选择框才会下拉)   */
+      if (this.props.showConfig.bCanInput) {
+        /*   文本输入下拉框   */
         const propsObj = { ...this.getCompleteProps() };
-        return <AutoCompleteA {...propsObj}>{this.getSelectOption('autoComplete')}</AutoCompleteA>;
-      } else { /*   普通下拉框   */
-        return <Select {...this.getSelectProps()} >{this.getSelectOption()}</Select>;
-      }
-    } else if (this.state.enabled && commonUtils.isNotEmptyObject(this.props.showConfig.sName) && this.props.showConfig.sDropDownType === 'popup') { /* 通用弹窗 */
-      return (<Search placeholder={chooseTitle} defaultValue={chooseTitle}  {...this.getSearchProps()} onSearch={this.onFieldPopupModal.bind(this, this.props.showConfig, this.props.name)} />);
-    } else if (this.firstDataIndex === 'i' || this.firstDataIndex === 'd') { /*   数字输入框(整形i和浮点型d)   */
-      return innerInputProps.readOnly ? <span onKeyDown={this.onKeyDown} suppressContentEditableWarning contentEditable="true"><InputNumberA {...innerInputProps} /></span> :
-        location.pathname.includes('quotationPackTableTree') && this.props.name === 'control' && this.props.showConfig.sName === 'dSinglePQty' ? <span style={{ position: 'relative' }}><InputNumberA {...innerInputProps} /><span onClick={this.handleViewClick} style={{ position: 'absolute', right: '2px' }}><EyeOutlined /></span></span> : <InputNumberA {...innerInputProps} style={{ width: '100%' }} />;
-    } else if (this.firstDataIndex === 'b') { /*   选择框(布尔类型b)   */
+        return <AutoCompleteA {...propsObj}>{this.getSelectOption("autoComplete")}</AutoCompleteA>;
+      } else {
+        /*   普通下拉框   */
+        return <Select {...this.getSelectProps()}>{this.getSelectOption()}</Select>;
+      }
+    } else if (this.state.enabled && commonUtils.isNotEmptyObject(this.props.showConfig.sName) && this.props.showConfig.sDropDownType === "popup") {
+      /* 通用弹窗 */
+      return (
+        <Search
+          placeholder={chooseTitle}
+          defaultValue={chooseTitle}
+          {...this.getSearchProps()}
+          onSearch={this.onFieldPopupModal.bind(this, this.props.showConfig, this.props.name)}
+        />
+      );
+    } else if (this.firstDataIndex === "i" || this.firstDataIndex === "d") {
+      /*   数字输入框(整形i和浮点型d)   */
+      return innerInputProps.readOnly ? (
+        <span onKeyDown={this.onKeyDown} suppressContentEditableWarning contentEditable="true">
+          <InputNumberA {...innerInputProps} />
+        </span>
+      ) : location.pathname.includes("quotationPackTableTree") && this.props.name === "control" && this.props.showConfig.sName === "dSinglePQty" ? (
+        <span style={{ position: "relative" }}>
+          <InputNumberA {...innerInputProps} />
+          <span onClick={this.handleViewClick} style={{ position: "absolute", right: "2px" }}>
+            <EyeOutlined />
+          </span>
+        </span>
+      ) : (
+        <InputNumberA {...innerInputProps} style={{ width: "100%" }} />
+      );
+    } else if (this.firstDataIndex === "b") {
+      /*   选择框(布尔类型b)   */
       return <Checkbox {...innerInputProps}>{this.showName}</Checkbox>;
       // return <span onKeyDown={this.onKeyDownDiv} suppressContentEditableWarning contentEditable="true"> <Checkbox {...innerInputProps}>{this.showName}</Checkbox></span>;
-    } else if (this.firstDataIndex === 'm' || sDateFormat === 'YYYY-MM' || sDateFormat === 'YYYYMM') { /*   月份选择框(月份类型m)   */
-      return this.props.bTable ? <span onKeyDown={this.onKeyDown} suppressContentEditableWarning contentEditable="true"><MonthPicker {...innerInputProps} /></span> : <MonthPicker {...innerInputProps} />;
-    } else if (this.firstDataIndex === 't') { /*   时间选择框(时间类型t)   */
-      if (['tYear'].includes(this.props.showConfig.sName)) {
-        innerInputProps.picker = 'year';
-        innerInputProps.format = 'YYYY';
+    } else if (this.firstDataIndex === "m" || sDateFormat === "YYYY-MM" || sDateFormat === "YYYYMM") {
+      /*   月份选择框(月份类型m)   */
+      return this.props.bTable ? (
+        <span onKeyDown={this.onKeyDown} suppressContentEditableWarning contentEditable="true">
+          <MonthPicker {...innerInputProps} />
+        </span>
+      ) : (
+        <MonthPicker {...innerInputProps} />
+      );
+    } else if (this.firstDataIndex === "t") {
+      /*   时间选择框(时间类型t)   */
+      if (["tYear"].includes(this.props.showConfig.sName)) {
+        innerInputProps.picker = "year";
+        innerInputProps.format = "YYYY";
         innerInputProps.allowClear = false;
       }
-      return this.props.bTable ? <span onKeyDown={this.onKeyDown} suppressContentEditableWarning contentEditable="true"><DatePicker {...innerInputProps} /></span> : <DatePicker {...innerInputProps} dropdownClassName="datePickerWrapper" />;
-    } else if (this.firstDataIndex === 'y') { /*   年份选择框(年份类型y)   */
-      return this.props.bTable ? <span onKeyDown={this.onKeyDown} suppressContentEditableWarning contentEditable="true"><DatePicker {...innerInputProps} /></span> : <DatePicker {...innerInputProps} picker="year" />;
-    } else if (this.firstDataIndex === 'p') { /*   时间选择框(时间类型t)   */
+      return this.props.bTable ? (
+        <span onKeyDown={this.onKeyDown} suppressContentEditableWarning contentEditable="true">
+          <DatePicker {...innerInputProps} />
+        </span>
+      ) : (
+        <DatePicker {...innerInputProps} dropdownClassName="datePickerWrapper" />
+      );
+    } else if (this.firstDataIndex === "y") {
+      /*   年份选择框(年份类型y)   */
+      return this.props.bTable ? (
+        <span onKeyDown={this.onKeyDown} suppressContentEditableWarning contentEditable="true">
+          <DatePicker {...innerInputProps} />
+        </span>
+      ) : (
+        <DatePicker {...innerInputProps} picker="year" />
+      );
+    } else if (this.firstDataIndex === "p") {
+      /*   时间选择框(时间类型t)   */
       return <RangePicker {...innerInputProps} />;
-    } else if (this.firstDataIndex === 's') { /*   文本输入框(文本s)   */
-      if (this.props.textArea) { /*   大文本输入框   */
+    } else if (this.firstDataIndex === "s") {
+      /*   文本输入框(文本s)   */
+      if (this.props.textArea) {
+        /*   大文本输入框   */
         return <TextAreaA {...innerInputProps} />;
-      } else { /*   普通文本输入框   */
+      } else {
+        /*   普通文本输入框   */
         return <InputA {...innerInputProps} />;
       }
-    } else if (this.firstDataIndex === 'c') { /*   地址联动框(联动下拉类型c)   */
+    } else if (this.firstDataIndex === "c") {
+      /*   地址联动框(联动下拉类型c)   */
       return <Cascader {...innerInputProps} />;
-    } else { /*   文本输入框(默认类型)   */
+    } else {
+      /*   文本输入框(默认类型)   */
       return <InputA {...innerInputProps} />;
     }
   };
@@ -1300,15 +1477,19 @@ export default class CommonComponent extends Component {
         const { sName } = this.props.showConfig;
         const config = gdsconfigformslave.find(item => item.sControlName === `BtnPopup.${sName}`);
         if (config && this.props.onFieldPopupModal) {
-          this.props.onFieldPopupModal(config, this.props.name, 'CommonListSelect');
+          this.props.onFieldPopupModal(config, this.props.name, "CommonListSelect");
         }
       },
     };
-    return <Button {...props}><span style={{ fontWeight: 'bold' }}>...</span></Button>;
-  }
+    return (
+      <Button {...props}>
+        <span style={{ fontWeight: "bold" }}>...</span>
+      </Button>
+    );
+  };
  
   // 获取innerinput控件后面的按钮(自定义)
-  getInnerButtonCostom = (showConfig) => {
+  getInnerButtonCostom = showConfig => {
     const { name, sysEnabled } = this.props;
     const { showName } = showConfig;
     let disabled = this.props.showConfig?.buttonbReadonly;
@@ -1316,7 +1497,7 @@ export default class CommonComponent extends Component {
       disabled = !sysEnabled;
     }
     const props = {
-      type: 'primary',
+      type: "primary",
       disabled,
       loading: this.state.buttonLoading,
       onClick: () => {
@@ -1326,10 +1507,10 @@ export default class CommonComponent extends Component {
       },
     };
     return <Button {...props}>{showName}</Button>;
-  }
+  };
  
   /**   获取selectOption对象   */
-  getSelectOption = (type) => {
+  getSelectOption = type => {
     /*   返回值声明   */
     const options = [];
     /*   执行条件   */
@@ -1341,40 +1522,52 @@ export default class CommonComponent extends Component {
         if (commonUtils.isNotEmptyObject(each)) {
           /*   拼接optoin对象   */
           let keyValue = !commonUtils.isEmpty(each.sSlaveId) ? each.sSlaveId : each.sId;
-          if (this.firstDataIndex === 'i') {
+          if (this.firstDataIndex === "i") {
             keyValue = parseInt(keyValue, 0);
-          } else if (this.firstDataIndex === 'd') {
+          } else if (this.firstDataIndex === "d") {
             keyValue = parseFloat(keyValue);
           }
-          let res = '';
+          let res = "";
           if (commonUtils.isNotEmptyStr(this.props.showConfig.sVisColumnName)) {
             res = each[this.props.showConfig.sVisColumnName];
           } else {
-            res = Object.keys(each).length > 0 ? each[Object.keys(each)[0]] : '';
+            res = Object.keys(each).length > 0 ? each[Object.keys(each)[0]] : "";
           }
-          keyValue = commonUtils.isEmpty(keyValue) ? '' : keyValue;
-          if (type === 'autoComplete') {
+          keyValue = commonUtils.isEmpty(keyValue) ? "" : keyValue;
+          if (type === "autoComplete") {
             // 为autoComplete作特殊处理
-            const option = this.props.showConfig.bCanInput ?
-              (<Option key={keyValue.toString()} label={res} value={res} title={res}>{this.getOptionValues(each)}</Option>) :
-              (<Option key={keyValue} value={res} label={res} title={res}>{this.getOptionValues(each)}</Option>);
+            const option = this.props.showConfig.bCanInput ? (
+              <Option key={keyValue.toString()} label={res} value={res} title={res}>
+                {this.getOptionValues(each)}
+              </Option>
+            ) : (
+              <Option key={keyValue} value={res} label={res} title={res}>
+                {this.getOptionValues(each)}
+              </Option>
+            );
             /*   返回值赋值s   */
             options.push(option);
           } else {
-            const option = this.props.showConfig.bCanInput ?
-              (<Option key={keyValue.toString()} label={res} value={keyValue.toString()} title={res}>{this.getOptionValues(each)}</Option>) :
-              (<Option key={keyValue} value={keyValue} label={res} title={res}>{this.getOptionValues(each)}</Option>);
+            const option = this.props.showConfig.bCanInput ? (
+              <Option key={keyValue.toString()} label={res} value={keyValue.toString()} title={res}>
+                {this.getOptionValues(each)}
+              </Option>
+            ) : (
+              <Option key={keyValue} value={keyValue} label={res} title={res}>
+                {this.getOptionValues(each)}
+              </Option>
+            );
             /*   返回值赋值   */
             options.push(option);
           }
         }
       }
     }
-    if (this.state.searchValue === '') {
+    if (this.state.searchValue === "") {
       /*   下拉空处理   */
       if (this.props.showConfig.bFirstEmpty) {
         // 重构修改 options.unshift(<Option className="dropdown-empty" key=" " value="=+@" />);
-        if (type === 'autoComplete') {
+        if (type === "autoComplete") {
           // options.unshift(<Option className="dropdown-empty" key=" " value="=+@" />);/* 解决销售订单-产品名称,五笔输入法输入不支持直接输入中文 */
         } else {
           options.unshift(<Option className="dropdown-empty" key=" " value="" />);
@@ -1383,10 +1576,14 @@ export default class CommonComponent extends Component {
       /*   下拉新增处理   */
       if (this.props.showConfig.bNewRecord) {
         // 重构修改  options.unshift(<Option key="@#*000@" value="">NEW RECORD</Option>);
-        if (type === 'autoComplete') {
+        if (type === "autoComplete") {
           options.unshift(<Option value="">NEW RECORD</Option>);
         } else {
-          options.unshift(<Option key="@#*000@" title="">NEW RECORD</Option>);
+          options.unshift(
+            <Option key="@#*000@" title="">
+              NEW RECORD
+            </Option>
+          );
         }
       }
     }
@@ -1395,13 +1592,13 @@ export default class CommonComponent extends Component {
   };
  
   /*   获取sqlCondition对象   */
-  getFloatPrice = (floatNum) => {
+  getFloatPrice = floatNum => {
     /*   返回值声明   */
-    let floatPrice = '';
+    let floatPrice = "";
     /*   返回值赋值   */
     if (!commonUtils.isUndefined(floatNum)) {
       for (let i = 0; i < floatNum; i += 1) {
-        floatPrice += '\\d';
+        floatPrice += "\\d";
       }
     }
     /*   返回值   */
@@ -1417,15 +1614,23 @@ export default class CommonComponent extends Component {
      1、判断是否直接传下拉，如果传了就直接用,并存储到store中去
      2、没有传看 getStoreDropDownData有没有存储，存储后直接取用
      3、 没有存储时直接调用后台SQL语句去下拉 */
-    if (this.props.showConfig.sDropDownType === 'sql') { /*   数据下拉   */
+    if (this.props.showConfig.sDropDownType === "sql") {
+      /*   数据下拉   */
       const { dropDownData: dropDownDataOld, searchDropDownData: searchDropDownDataOld } = this.state;
       if (pageNum <= totalPageCount) {
-        const sqlDropDownData = await this.props.getSqlDropDownData(this.props.formId, this.props.name, this.props.showConfig, this.props.record, searchValue, pageNum);
+        const sqlDropDownData = await this.props.getSqlDropDownData(
+          this.props.formId,
+          this.props.name,
+          this.props.showConfig,
+          this.props.record,
+          searchValue,
+          pageNum
+        );
         if (dropDownCount !== undefined && dropDownCount < this.dropDownCount) {
           return;
         }
         if (this.mounted) {
-          if (searchValue !== '') {
+          if (searchValue !== "") {
             const dropDownData = [];
             if (commonUtils.isNotEmptyArr(sqlDropDownData.dropDownData)) {
               if (pageNum !== 1) {
@@ -1457,7 +1662,7 @@ export default class CommonComponent extends Component {
               totalPageCount: sqlDropDownData.totalPageCount,
               pageNum: sqlDropDownData.currentPageNo,
               spinState: false,
-              searchValue: '',
+              searchValue: "",
               totalCount: sqlDropDownData.totalCount,
               selectTableData: sqlDropDownData.dropDownData,
             });
@@ -1470,9 +1675,11 @@ export default class CommonComponent extends Component {
   /**   获取innerinput控件参数   */
   getInnerInputProps = () => {
     /*   主表和从表的innerinputprops对象有区别   */
-    if (!this.props.bTable) { /*   主表   */
+    if (!this.props.bTable) {
+      /*   主表   */
       return this.getInnerInputPropsMaster();
-    } else { /*   主从表   */
+    } else {
+      /*   主从表   */
       return this.getInnerInputPropsSlave();
     }
   };
@@ -1481,16 +1688,21 @@ export default class CommonComponent extends Component {
   getInnerInputPropsSlave = () => {
     /*   返回值声明   */
     let obj = {};
-    if (this.firstDataIndex === 'i' || this.firstDataIndex === 'd') { /*   数字输入框(整形i和浮点型d)   */
+    if (this.firstDataIndex === "i" || this.firstDataIndex === "d") {
+      /*   数字输入框(整形i和浮点型d)   */
       obj = this.getNumberInnerInputPropsSlave();
-    } else if (this.firstDataIndex === 'b') { /*   选择框(布尔类型b)   */
+    } else if (this.firstDataIndex === "b") {
+      /*   选择框(布尔类型b)   */
       obj = this.getBooleanInnerInputPropsSlave();
-    } else if (this.firstDataIndex === 't' || this.firstDataIndex === 'p' || this.firstDataIndex === 'm' || this.firstDataIndex === 'y') { /*   时间选择框(时间类型t)   */
+    } else if (this.firstDataIndex === "t" || this.firstDataIndex === "p" || this.firstDataIndex === "m" || this.firstDataIndex === "y") {
+      /*   时间选择框(时间类型t)   */
       obj = this.getDateInnerInputPropsSlave();
-    } else if (this.firstDataIndex === 's') { /*   文本输入框(文本s)   */
+    } else if (this.firstDataIndex === "s") {
+      /*   文本输入框(文本s)   */
       obj = this.getTextInnerInputPropsSlave();
       obj.onDoubleClick = this.onDoubleClick;
-    } else if (this.firstDataIndex === 'c') { /*   地址联动框(联动下拉类型c)   */
+    } else if (this.firstDataIndex === "c") {
+      /*   地址联动框(联动下拉类型c)   */
       obj = this.getAddressInnerInputPropsSlave();
     }
     obj.onKeyDown = this.onKeyDown;
@@ -1498,7 +1710,7 @@ export default class CommonComponent extends Component {
     obj.onBlur = this.onBlur;
     obj.onMouseEnter = this.onFocus;
     obj.id = `${this.props.showConfig.sName}${this.props.record ? this.props.record.sId : commonUtils.createSid()}`; /* 所有从表组件添加id */
-    obj.placeholder = this.props.showConfig.placeholder || '';
+    obj.placeholder = this.props.showConfig.placeholder || "";
     /*   返回值   */
     return obj;
   };
@@ -1508,15 +1720,18 @@ export default class CommonComponent extends Component {
     /*   返回值   */
     const obj = {
       // disabled: !this.state.enabled, /*   是否可编辑   */
-      placeholder: '请选择省市区', /*   预期值的提示信息   */
-      options: this.getProvinceCityAreaData(), /*   数据   */
-      changeOnSelect: true, /*   对每个选择值进行更改   */
-      onChange: this.handleSelectOptionEvent, /*   数据改变回带到父组件   */
-      value: commonUtils.isUndefined(this.state.dataValue) ? [] : typeof this.state.dataValue === 'string' ?
-        this.state.dataValue.split(',') : commonUtils.convertUndefinedToEmptyArr(this.state.dataValue), /*   数据值   */
+      placeholder: "请选择省市区" /*   预期值的提示信息   */,
+      options: this.getProvinceCityAreaData() /*   数据   */,
+      changeOnSelect: true /*   对每个选择值进行更改   */,
+      onChange: this.handleSelectOptionEvent /*   数据改变回带到父组件   */,
+      value: commonUtils.isUndefined(this.state.dataValue)
+        ? []
+        : typeof this.state.dataValue === "string"
+        ? this.state.dataValue.split(",")
+        : commonUtils.convertUndefinedToEmptyArr(this.state.dataValue) /*   数据值   */,
     };
     if (this.props.readOnly) {
-      obj.readOnly = 'readOnly';
+      obj.readOnly = "readOnly";
     } else {
       obj.disabled = !this.state.enabled;
     }
@@ -1527,32 +1742,51 @@ export default class CommonComponent extends Component {
   /*   获取文本innerinputprops对象(从)   */
   getTextInnerInputPropsSlave = () => {
     /*   返回值声明   */
-    const bShowSuffix = this.props.showConfig.sName === 'sSaveProName' || this.props.showConfig.sName === 'sDeleteProName' || this.props.showConfig.sName === 'sSaveProNameBefore' || this.props.showConfig.sName === 'sProcName' || this.props.showConfig.sName === 'sButtonParam'; /* 是否展示后缀图标 */
-    const bShowArrow = this.props.showConfig.sName === 'dNeedAuxiliaryQty';
+    const bShowSuffix =
+      this.props.showConfig.sName === "sSaveProName" ||
+      this.props.showConfig.sName === "sDeleteProName" ||
+      this.props.showConfig.sName === "sSaveProNameBefore" ||
+      this.props.showConfig.sName === "sProcName" ||
+      this.props.showConfig.sName === "sButtonParam"; /* 是否展示后缀图标 */
+    const bShowArrow = this.props.showConfig.sName === "dNeedAuxiliaryQty";
     const obj = {
       // disabled: !this.state.enabled, /*   是否可编辑   */
-      id: `${this.props.showConfig.sName}${commonUtils.createSid()}`, /*   虚拟数字键盘使用id获取光标   */
-      onChange: e => this.handleSelectOptionEvent(e), /*   数据改变回带到父组件   */
-      value: commonUtils.isUndefined(this.state.dataValue) ? '' : commonUtils.strUndefinedToEmpty(this.state.dataValue), /*   数据值   */
+      id: `${this.props.showConfig.sName}${commonUtils.createSid()}` /*   虚拟数字键盘使用id获取光标   */,
+      onChange: e => this.handleSelectOptionEvent(e) /*   数据改变回带到父组件   */,
+      value: commonUtils.isUndefined(this.state.dataValue) ? "" : commonUtils.strUndefinedToEmpty(this.state.dataValue) /*   数据值   */,
       // eslint-disable-next-line no-return-assign
-      ref: ref => this[this.props.showConfig.sName] = ref, /*   虚拟数字键盘获得光标需用   */
-      onClick: this.handleInputOnClick.bind(this, this.props.showConfig.sName), /*   虚拟数字键盘 第二个参数必须id  */
-      suffix: bShowSuffix ? <span style={{ width: '8px' }} onClick={this.handleOpenWin}><EyeOutlined style={{ color: 'rgba(0,0,0,.85)' }} /></span> :
-        (bShowArrow ? <span style={{ width: '8px' }} onClick={this.handleRightArrow}><RightOutlined style={{ color: 'rgba(0,0,0,.85)' }} /></span> : ''),
+      ref: ref => (this[this.props.showConfig.sName] = ref) /*   虚拟数字键盘获得光标需用   */,
+      onClick: this.handleInputOnClick.bind(this, this.props.showConfig.sName) /*   虚拟数字键盘 第二个参数必须id  */,
+      suffix: bShowSuffix ? (
+        <span style={{ width: "8px" }} onClick={this.handleOpenWin}>
+          <EyeOutlined style={{ color: "rgba(0,0,0,.85)" }} />
+        </span>
+      ) : bShowArrow ? (
+        <span style={{ width: "8px" }} onClick={this.handleRightArrow}>
+          <RightOutlined style={{ color: "rgba(0,0,0,.85)" }} />
+        </span>
+      ) : (
+        ""
+      ),
       rows: commonUtils.isNotEmptyNumber(this.props.showConfig.iRowValue) ? this.props.showConfig.iRowValue : 1,
     };
     if (this.props.readOnly) {
-      obj.readOnly = 'readOnly';
+      obj.readOnly = "readOnly";
     } else {
       obj.disabled = !this.state.enabled;
     }
     /*   最大值最小值   */
-    if (typeof commonUtils.convertStrToNumber(this.max) === 'number' && commonUtils.convertStrToNumber(this.max) !== 0 && this.max.indexOf('.d') === -1 && this.max.indexOf('.i') === -1) {
+    if (
+      typeof commonUtils.convertStrToNumber(this.max) === "number" &&
+      commonUtils.convertStrToNumber(this.max) !== 0 &&
+      this.max.indexOf(".d") === -1 &&
+      this.max.indexOf(".i") === -1
+    ) {
       obj.maxLength = this.max; /*   最大长度   */
       obj.title = obj.value;
     }
     obj.placeholder = this.props.showConfig.placeholder;
-    obj.autocomplete = 'new-password';
+    obj.autocomplete = "new-password";
     /*   返回值   */
     return obj;
   };
@@ -1561,10 +1795,10 @@ export default class CommonComponent extends Component {
   getDateInnerInputPropsSlave = () => {
     let { sDateFormat } = this.props.showConfig;
     if (commonUtils.isEmptyStr(sDateFormat)) {
-      if (this.firstDataIndex === 'm') {
-        sDateFormat = 'YYYY-MM';
-      } else if (this.firstDataIndex === 'y') {
-        sDateFormat = 'YYYY';
+      if (this.firstDataIndex === "m") {
+        sDateFormat = "YYYY-MM";
+      } else if (this.firstDataIndex === "y") {
+        sDateFormat = "YYYY";
       } else {
         sDateFormat = this.props.getDateFormat();
       }
@@ -1578,15 +1812,15 @@ export default class CommonComponent extends Component {
     }
     /*   返回值声明   */
     const obj = {
-      placeholder: '', /*   时间的提示信息   */
-      disabled: !this.state.enabled, /*   是否可编辑   */
-      onChange: this.handleSelectOptionEvent, /*   数据改变回带到父组件   */
+      placeholder: "" /*   时间的提示信息   */,
+      disabled: !this.state.enabled /*   是否可编辑   */,
+      onChange: this.handleSelectOptionEvent /*   数据改变回带到父组件   */,
       format: sDateFormat, // this.props.getDateFormat(), /*   格式化规则   */
-      disabledDate: this.getDataMaxAndMin, /*   不可选日期   */
+      disabledDate: this.getDataMaxAndMin /*   不可选日期   */,
       showTime: showtimeFormat,
-      style: { width: '100%' }, /*   样式   */
+      style: { width: "100%" } /*   样式   */,
       onBlur: () => {
-        this.onExecInstructSet('blur');
+        this.onExecInstructSet("blur");
       },
     };
     // if (this.props.readOnly) {
@@ -1607,9 +1841,9 @@ export default class CommonComponent extends Component {
   getBooleanInnerInputPropsSlave = () => {
     /*   返回值声明   */
     const obj = {
-      disabled: !this.state.enabled, /*   是否可编辑   */
-      onChange: this.handleSelectOptionEvent, /*   数据改变回带到父组件   */
-      checked: commonUtils.isUndefined(this.state.dataValue) ? false : commonUtils.converNumStrToBoolean(this.state.dataValue), /*   是否选中   */
+      disabled: !this.state.enabled /*   是否可编辑   */,
+      onChange: this.handleSelectOptionEvent /*   数据改变回带到父组件   */,
+      checked: commonUtils.isUndefined(this.state.dataValue) ? false : commonUtils.converNumStrToBoolean(this.state.dataValue) /*   是否选中   */,
     };
     // if (this.props.readOnly) {
     //   obj.readOnly = true;
@@ -1622,23 +1856,27 @@ export default class CommonComponent extends Component {
  
   /*   获取数字innerinputprops对象(从)   */
   getNumberInnerInputPropsSlave = () => {
-    const bShowArrow = this.props.showConfig.sName === 'dNeedAuxiliaryQty' && this.props.showConfig.sControlName !== 'slaveInfo';
+    const bShowArrow = this.props.showConfig.sName === "dNeedAuxiliaryQty" && this.props.showConfig.sControlName !== "slaveInfo";
     /*   返回值声明   */
     const obj = {
-      id: `${this.props.showConfig.sName}${this.props.showConfig.sId}`, /*   虚拟数字键盘使用id获取光标   */
-      className: styles.inputNum, /*   样式名称   */
+      id: `${this.props.showConfig.sName}${this.props.showConfig.sId}` /*   虚拟数字键盘使用id获取光标   */,
+      className: styles.inputNum /*   样式名称   */,
       // disabled: !this.state.enabled, /*   是否可编辑   */
-      onChange: this.handleSelectOptionEvent, /*   数据改变回带到父组件   */
-      parser: (oldValue) => {
+      onChange: this.handleSelectOptionEvent /*   数据改变回带到父组件   */,
+      parser: oldValue => {
         const value = this.handleCheckNumberInnerInput(oldValue);
         return value;
       },
       // eslint-disable-next-line no-return-assign
-      ref: ref => this[this.props.showConfig.sName] = ref, /*   虚拟数字键盘获得光标需用   */
-      onClick: this.handleInputOnClick.bind(this, this.props.showConfig.sName), /*   虚拟数字键盘 第二个参数必须id  */
+      ref: ref => (this[this.props.showConfig.sName] = ref) /*   虚拟数字键盘获得光标需用   */,
+      onClick: this.handleInputOnClick.bind(this, this.props.showConfig.sName) /*   虚拟数字键盘 第二个参数必须id  */,
     };
     if (bShowArrow) {
-      obj.addonAfter = <span style={{ width: '5px' }} onClick={this.handleRightArrow}><RightOutlined style={{ color: 'rgba(0,0,0,.85)' }} /></span>;
+      obj.addonAfter = (
+        <span style={{ width: "5px" }} onClick={this.handleRightArrow}>
+          <RightOutlined style={{ color: "rgba(0,0,0,.85)" }} />
+        </span>
+      );
     }
     if (this.props.readOnly) {
       obj.readOnly = true;
@@ -1646,20 +1884,26 @@ export default class CommonComponent extends Component {
       obj.disabled = !this.state.enabled;
     }
     /*   最大值最小值   */
-    if (typeof commonUtils.convertStrToNumber(this.max) === 'number' && commonUtils.convertStrToNumber(this.max) !== 0 && this.max.indexOf('.d') === -1 && this.max.indexOf('.i') === -1) {
+    if (
+      typeof commonUtils.convertStrToNumber(this.max) === "number" &&
+      commonUtils.convertStrToNumber(this.max) !== 0 &&
+      this.max.indexOf(".d") === -1 &&
+      this.max.indexOf(".i") === -1
+    ) {
       obj.max = this.max; /*   最大值   */
-    } else if (!commonUtils.isEmpty(this.max) && this.max.indexOf('.') > -1 && commonUtils.isNotEmptyObject(this.props.record)) {
-      obj.max = this.props.record[this.max.substring(this.max.indexOf('.') + 1)];
+    } else if (!commonUtils.isEmpty(this.max) && this.max.indexOf(".") > -1 && commonUtils.isNotEmptyObject(this.props.record)) {
+      obj.max = this.props.record[this.max.substring(this.max.indexOf(".") + 1)];
     }
-    if (typeof commonUtils.convertStrToNumber(this.min) === 'number' && commonUtils.convertStrToNumber(this.min) !== 0) {
+    if (typeof commonUtils.convertStrToNumber(this.min) === "number" && commonUtils.convertStrToNumber(this.min) !== 0) {
       obj.min = this.min; /*   最小值   */
     }
-    if (obj.max < 0) { /* 为解决收付款单据未收款为负数时收款金额不能大于未收款问题，当最大值小于0时，变更为设为最小值 */
+    if (obj.max < 0) {
+      /* 为解决收付款单据未收款为负数时收款金额不能大于未收款问题，当最大值小于0时，变更为设为最小值 */
       obj.min = obj.max;
       obj.max = 0;
     }
     /*   浮点型需要格式化   */
-    if (this.firstDataIndex === 'd') {
+    if (this.firstDataIndex === "d") {
       // obj.formatter = value => this.toFamatter(value);
       // obj.parser = value => this.toFamatter(value);
       // obj.precision = this.floatNum;
@@ -1671,7 +1915,7 @@ export default class CommonComponent extends Component {
     const { dNetPrice } = this.props.app.decimals;
     const { showConfig } = this.props;
     const { sName, showName } = showConfig;
-    const digit = sName.includes('Price') ? dNetPrice : 6;
+    const digit = sName.includes("Price") ? dNetPrice : 6;
     const numCheck = new RegExp(`^(-?\\d+)(\\.?)(\\d{1,${digit}})?$`);
     const numValue = this.state.dataValue;
     if (!isNaN(+numValue)) {
@@ -1689,23 +1933,30 @@ export default class CommonComponent extends Component {
   getInnerInputPropsMaster = () => {
     /*   返回值声明   */
     let obj = {};
-    if (this.firstDataIndex === 'i' || this.firstDataIndex === 'd') { /*   数字输入框(整形i和浮点型d)   */
+    if (this.firstDataIndex === "i" || this.firstDataIndex === "d") {
+      /*   数字输入框(整形i和浮点型d)   */
       obj = this.getNumberInnerInputPropsMaster();
-    } else if (this.firstDataIndex === 'b') { /*   选择框(布尔类型b)   */
+    } else if (this.firstDataIndex === "b") {
+      /*   选择框(布尔类型b)   */
       obj = this.getBooleanInnerInputPropsMaster();
-    } else if (this.firstDataIndex === 't' || this.firstDataIndex === 'p' || this.firstDataIndex === 'm' || this.firstDataIndex === 'y') { /*   时间选择框(时间类型t)   */
+    } else if (this.firstDataIndex === "t" || this.firstDataIndex === "p" || this.firstDataIndex === "m" || this.firstDataIndex === "y") {
+      /*   时间选择框(时间类型t)   */
       obj = this.getDateInnerInputPropsMaster();
-    } else if (this.firstDataIndex === 's') { /*   文本输入框(文本s)   */
-      if (this.props.textArea) { /*   大文本输入框   */
+    } else if (this.firstDataIndex === "s") {
+      /*   文本输入框(文本s)   */
+      if (this.props.textArea) {
+        /*   大文本输入框   */
         obj = this.getTextAreaInnerInputPropsMaster();
         obj.onDoubleClick = this.onDoubleClick;
-      } else { /*   普通文本输入框   */
+      } else {
+        /*   普通文本输入框   */
         obj = this.getTextInnerInputPropsMaster();
-        if (this.props?.showConfig?.sName === 'sInstruct') {
+        if (this.props?.showConfig?.sName === "sInstruct") {
           obj.onDoubleClick = this.onDoubleClick;
         }
       }
-    } else if (this.firstDataIndex === 'c') { /*   地址联动框(联动下拉类型c)   */
+    } else if (this.firstDataIndex === "c") {
+      /*   地址联动框(联动下拉类型c)   */
       obj = this.getAddressInnerInputPropsMaster();
     }
     obj.onKeyDown = this.onKeyDown;
@@ -1714,7 +1965,7 @@ export default class CommonComponent extends Component {
     if (this.props.allowClear) {
       obj.allowClear = this.props.allowClear; /* 带移除图标 */
     }
-    obj.placeholder = this.props.showConfig.placeholder || '';
+    obj.placeholder = this.props.showConfig.placeholder || "";
     // obj.onContextMenu = this.onContextMenu;
     /*   返回值   */
     return obj;
@@ -1724,13 +1975,13 @@ export default class CommonComponent extends Component {
   getAddressInnerInputPropsMaster = () => {
     const obj = {
       // disabled: !this.state.enabled, /*   是否可编辑   */
-      placeholder: '请选择省市区', /*   预期值的提示信息   */
-      options: this.getProvinceCityAreaData(), /*   数据   */
-      changeOnSelect: true, /*   对每个选择值进行更改   */
-      onChange: this.handleSelectOptionEvent, /*   数据改变回带到父组件   */
+      placeholder: "请选择省市区" /*   预期值的提示信息   */,
+      options: this.getProvinceCityAreaData() /*   数据   */,
+      changeOnSelect: true /*   对每个选择值进行更改   */,
+      onChange: this.handleSelectOptionEvent /*   数据改变回带到父组件   */,
     };
     if (this.props.readOnly) {
-      obj.readOnly = 'readOnly';
+      obj.readOnly = "readOnly";
     } else {
       obj.disabled = !this.state.enabled;
     }
@@ -1740,33 +1991,48 @@ export default class CommonComponent extends Component {
   /*   获取文本innerinputprops对象(主)   */
   getTextInnerInputPropsMaster = () => {
     /*   返回值声明   */
-    const bShowSuffix = this.props.showConfig.sName === 'sButtonParam' || this.props.showConfig.sName === 'sSqlStr' || this.props.showConfig.sName === 'sConfigSqlStr' || this.props.showConfig.sName === 'sProcName'; /* 是否展示后缀图标 */
+    const bShowSuffix =
+      this.props.showConfig.sName === "sButtonParam" ||
+      this.props.showConfig.sName === "sSqlStr" ||
+      this.props.showConfig.sName === "sConfigSqlStr" ||
+      this.props.showConfig.sName === "sProcName"; /* 是否展示后缀图标 */
     const obj = {
-      id: `${this.props.showConfig.sName}${commonUtils.createSid()}`, /*   虚拟数字键盘使用id获取光标   */
+      id: `${this.props.showConfig.sName}${commonUtils.createSid()}` /*   虚拟数字键盘使用id获取光标   */,
       // disabled: !this.state.enabled, /*   是否可编辑   */
-      onChange: e => this.handleSelectOptionEvent(e), /*   数据改变回带到父组件   */
+      onChange: e => this.handleSelectOptionEvent(e) /*   数据改变回带到父组件   */,
       // eslint-disable-next-line no-return-assign
-      ref: ref => this[this.props.showConfig.sName] = ref, /*   虚拟数字键盘获得光标需用   */
-      onClick: this.handleInputOnClick.bind(this, this.props.showConfig.sName), /*   虚拟数字键盘 第二个参数必须id  */
-      suffix: bShowSuffix ? <span onClick={this.handleOpenWin}><EyeOutlined style={{ color: 'rgba(0,0,0,.85)' }} /></span> : '',
+      ref: ref => (this[this.props.showConfig.sName] = ref) /*   虚拟数字键盘获得光标需用   */,
+      onClick: this.handleInputOnClick.bind(this, this.props.showConfig.sName) /*   虚拟数字键盘 第二个参数必须id  */,
+      suffix: bShowSuffix ? (
+        <span onClick={this.handleOpenWin}>
+          <EyeOutlined style={{ color: "rgba(0,0,0,.85)" }} />
+        </span>
+      ) : (
+        ""
+      ),
     };
     if (this.props.readOnly) {
-      obj.readOnly = 'readOnly';
+      obj.readOnly = "readOnly";
     } else {
       obj.disabled = !this.state.enabled;
     }
     if (this.props.bPassWord) {
-      obj.type = 'password'; /* 文本密码类型 */
+      obj.type = "password"; /* 文本密码类型 */
     }
     /*   最大值最小值   */
     // if (this.props.showConfig.sName === 'sZmmGgxh') {
     //   console.log('sZmmGgxhsZmmGgxh', this.max, (typeof commonUtils.convertStrToNumber(this.max) === 'number' && commonUtils.convertStrToNumber(this.max) !== 0 && this.max.indexOf('.d') === -1 && this.max.indexOf('.i') === -1));
     // }
-    if (typeof commonUtils.convertStrToNumber(this.max) === 'number' && commonUtils.convertStrToNumber(this.max) !== 0 && this.max.indexOf('.d') === -1 && this.max.indexOf('.i') === -1) {
+    if (
+      typeof commonUtils.convertStrToNumber(this.max) === "number" &&
+      commonUtils.convertStrToNumber(this.max) !== 0 &&
+      this.max.indexOf(".d") === -1 &&
+      this.max.indexOf(".i") === -1
+    ) {
       obj.maxLength = this.max; /*   最大长度   */
     }
     obj.onBlur = this.onBlurText;
-    obj.autocomplete = 'new-password';
+    obj.autocomplete = "new-password";
     /*   返回值   */
     return obj;
   };
@@ -1775,21 +2041,23 @@ export default class CommonComponent extends Component {
   getTextAreaInnerInputPropsMaster = () => {
     /*   返回值声明   */
     const obj = {
-      id: `${this.props.showConfig.sName}${commonUtils.createSid()}`, /*   虚拟数字键盘使用id获取光标   */
+      id: `${this.props.showConfig.sName}${commonUtils.createSid()}` /*   虚拟数字键盘使用id获取光标   */,
       // disabled: !this.state.enabled, /*   是否可编辑   */
       // rows: 3, /*   纵跨度   */
-      rows: commonUtils.isNotEmptyNumber(this.props.showConfig.iRowValue) ? this.props.showConfig.iRowValue : 1, /* 产品部要求 备注设置成一行到底 */
-      onChange: this.handleSelectOptionEvent, /*   数据改变回带到父组件   */
+      rows: commonUtils.isNotEmptyNumber(this.props.showConfig.iRowValue) ? this.props.showConfig.iRowValue : 1 /* 产品部要求 备注设置成一行到底 */,
+      onChange: this.handleSelectOptionEvent /*   数据改变回带到父组件   */,
       // eslint-disable-next-line no-return-assign
-      ref: ref => this[this.props.showConfig.sName] = ref, /*   虚拟数字键盘获得光标需用   */
-      onClick: this.handleInputOnClick.bind(this, this.props.showConfig.sName), /*   虚拟数字键盘 第二个参数必须id  */
+      ref: ref => (this[this.props.showConfig.sName] = ref) /*   虚拟数字键盘获得光标需用   */,
+      onClick: this.handleInputOnClick.bind(this, this.props.showConfig.sName) /*   虚拟数字键盘 第二个参数必须id  */,
     };
     if (this.props.readOnly) {
-      obj.readOnly = 'readOnly';
-    } if (commonUtils.isNotEmptyObject(this.props.showConfig.sName) && this.props.showConfig.sName.toLowerCase().endsWith('memo')) {
-      if (!this.state.enabled) { /* 非编辑模式下 */
+      obj.readOnly = "readOnly";
+    }
+    if (commonUtils.isNotEmptyObject(this.props.showConfig.sName) && this.props.showConfig.sName.toLowerCase().endsWith("memo")) {
+      if (!this.state.enabled) {
+        /* 非编辑模式下 */
         obj.readOnly = true;
-        obj.style = { backgroundColor: '#f1f2f8' };
+        obj.style = { backgroundColor: "#f1f2f8" };
       } else {
         obj.disabled = !this.state.enabled;
       }
@@ -1797,57 +2065,66 @@ export default class CommonComponent extends Component {
       obj.disabled = !this.state.enabled;
     }
     /*   最大值最小值   */
-    if (typeof commonUtils.convertStrToNumber(this.max) === 'number' && commonUtils.convertStrToNumber(this.max) !== 0 && this.max.indexOf('.d') === -1 && this.max.indexOf('.i') === -1) {
+    if (
+      typeof commonUtils.convertStrToNumber(this.max) === "number" &&
+      commonUtils.convertStrToNumber(this.max) !== 0 &&
+      this.max.indexOf(".d") === -1 &&
+      this.max.indexOf(".i") === -1
+    ) {
       obj.maxLength = this.max; /*   最大长度   */
     }
     return obj;
   };
  
   /*   获取日期最大值和最小值   */
-  getDataMaxAndMin = (current) => {
+  getDataMaxAndMin = current => {
     return this.getDataMax(current) || this.getDataMin(current);
-  }
+  };
  
   /*   获取日期最大值   */
-  getDataMax = (current) => {
+  getDataMax = current => {
     const showtimeFormat = this.props.showConfig.sDateFormat?.length > 11;
-    if (commonUtils.isNotEmptyStr(this.props.showConfig.sMaxValue) && this.props.showConfig.sMaxValue.split('.').length > 1) {
-      const conditionValues = this.props.getSqlCondition({ sSqlCondition: this.props.showConfig.sMaxValue }, '', {});
+    if (commonUtils.isNotEmptyStr(this.props.showConfig.sMaxValue) && this.props.showConfig.sMaxValue.split(".").length > 1) {
+      const conditionValues = this.props.getSqlCondition({ sSqlCondition: this.props.showConfig.sMaxValue }, "", {});
       const sMaxValue = Object.keys(conditionValues).length > 0 ? conditionValues[Object.keys(conditionValues)[0]] : this.props.showConfig.sMaxValue;
-      const tDate = this.props.showConfig.sMaxValue === 'now' ? moment() : moment(sMaxValue);
-      return showtimeFormat ? commonUtils.isNotEmptyStr(this.props.showConfig.sMaxValue) && current > tDate :
-        commonUtils.isNotEmptyStr(this.props.showConfig.sMaxValue) && current.endOf('day') > tDate.endOf('day');
+      const tDate = this.props.showConfig.sMaxValue === "now" ? moment() : moment(sMaxValue);
+      return showtimeFormat
+        ? commonUtils.isNotEmptyStr(this.props.showConfig.sMaxValue) && current > tDate
+        : commonUtils.isNotEmptyStr(this.props.showConfig.sMaxValue) && current.endOf("day") > tDate.endOf("day");
     } else {
-      const tDate = this.props.showConfig.sMaxValue === 'now' ? moment() : moment(this.props.showConfig.sMaxValue);
-      return showtimeFormat ? commonUtils.isNotEmptyStr(this.props.showConfig.sMaxValue) && current > tDate :
-        commonUtils.isNotEmptyStr(this.props.showConfig.sMaxValue) && current.endOf('day') > tDate.endOf('day');
+      const tDate = this.props.showConfig.sMaxValue === "now" ? moment() : moment(this.props.showConfig.sMaxValue);
+      return showtimeFormat
+        ? commonUtils.isNotEmptyStr(this.props.showConfig.sMaxValue) && current > tDate
+        : commonUtils.isNotEmptyStr(this.props.showConfig.sMaxValue) && current.endOf("day") > tDate.endOf("day");
     }
-  }
+  };
  
   /*   获取日期最小值   */
-  getDataMin = (current) => {
+  getDataMin = current => {
     const showtimeFormat = this.props.showConfig.sDateFormat?.length > 11;
-    if (commonUtils.isNotEmptyStr(this.props.showConfig.sMinValue) && this.props.showConfig.sMinValue.split('.').length > 1) {
-      const conditionValues = this.props.getSqlCondition({ sSqlCondition: this.props.showConfig.sMinValue }, '', {});
+    if (commonUtils.isNotEmptyStr(this.props.showConfig.sMinValue) && this.props.showConfig.sMinValue.split(".").length > 1) {
+      const conditionValues = this.props.getSqlCondition({ sSqlCondition: this.props.showConfig.sMinValue }, "", {});
       const sMinValue = Object.keys(conditionValues).length > 0 ? conditionValues[Object.keys(conditionValues)[0]] : this.props.showConfig.sMinValue;
-      const tDate = this.props.showConfig.sMinValue === 'now' ? moment() : moment(sMinValue);
-      return showtimeFormat ? commonUtils.isNotEmptyStr(this.props.showConfig.sMinValue) && current < tDate :
-        commonUtils.isNotEmptyStr(this.props.showConfig.sMinValue) && current.endOf('day') < tDate.endOf('day');
+      const tDate = this.props.showConfig.sMinValue === "now" ? moment() : moment(sMinValue);
+      return showtimeFormat
+        ? commonUtils.isNotEmptyStr(this.props.showConfig.sMinValue) && current < tDate
+        : commonUtils.isNotEmptyStr(this.props.showConfig.sMinValue) && current.endOf("day") < tDate.endOf("day");
     } else {
-      const tDate = this.props.showConfig.sMinValue === 'now' ? moment() : moment(this.props.showConfig.sMinValue);
-      return showtimeFormat ? commonUtils.isNotEmptyStr(this.props.showConfig.sMinValue) && current < tDate :
-        commonUtils.isNotEmptyStr(this.props.showConfig.sMinValue) && current.endOf('day') < tDate.endOf('day');
+      const tDate = this.props.showConfig.sMinValue === "now" ? moment() : moment(this.props.showConfig.sMinValue);
+      return showtimeFormat
+        ? commonUtils.isNotEmptyStr(this.props.showConfig.sMinValue) && current < tDate
+        : commonUtils.isNotEmptyStr(this.props.showConfig.sMinValue) && current.endOf("day") < tDate.endOf("day");
     }
-  }
+  };
  
   /*   获取时间innerinputprops对象(主)   */
   getDateInnerInputPropsMaster = () => {
     let { sDateFormat } = this.props.showConfig;
     if (commonUtils.isEmptyStr(sDateFormat)) {
-      if (this.firstDataIndex === 'm') {
-        sDateFormat = 'YYYY-MM';
-      } else if (this.firstDataIndex === 'y') {
-        sDateFormat = 'YYYY';
+      if (this.firstDataIndex === "m") {
+        sDateFormat = "YYYY-MM";
+      } else if (this.firstDataIndex === "y") {
+        sDateFormat = "YYYY";
       } else {
         sDateFormat = this.props.getDateFormat();
       }
@@ -1861,17 +2138,17 @@ export default class CommonComponent extends Component {
     }
     // 2021-6-5日修改，生产排程日期选择精确到小时
     const obj = {
-      placeholder: '', /*   时间的提示信息   */
-      disabled: !this.state.enabled, /*   是否可编辑   */
-      style: { width: '100%' }, /*   样式   */
+      placeholder: "" /*   时间的提示信息   */,
+      disabled: !this.state.enabled /*   是否可编辑   */,
+      style: { width: "100%" } /*   样式   */,
       // showTime: this.props.showTime ? { format: 'HH:mm', defaultValue: [moment('00:00', 'HH:mm'), moment('00:00', 'HH:mm')] } : '',
       // showTime: this.props.showTime,
       showTime: showtimeFormat,
-      format: this.props.showTime ? 'YYYY-MM-DD HH:mm:ss' : sDateFormat, // this.props.getDateFormat(), /*   格式化规则  */
-      onChange: this.handleSelectOptionEvent, /*   数据改变回带到父组件   */
-      disabledDate: this.getDataMaxAndMin, /*   不可选日期   */
+      format: this.props.showTime ? "YYYY-MM-DD HH:mm:ss" : sDateFormat, // this.props.getDateFormat(), /*   格式化规则  */
+      onChange: this.handleSelectOptionEvent /*   数据改变回带到父组件   */,
+      disabledDate: this.getDataMaxAndMin /*   不可选日期   */,
       onBlur: () => {
-        this.onExecInstructSet('blur');
+        this.onExecInstructSet("blur");
       },
     };
     // if (this.props.readOnly) {
@@ -1885,9 +2162,9 @@ export default class CommonComponent extends Component {
   /*   获取布尔innerinputprops对象(主)   */
   getBooleanInnerInputPropsMaster = () => {
     const obj = {
-      disabled: !this.state.enabled, /*   是否显示   */
-      onChange: this.handleSelectOptionEvent, /*   数据改变回带到父组件   */
-      checked: commonUtils.isUndefined(this.state.dataValue) ? false : commonUtils.converNumStrToBoolean(this.state.dataValue), /*   是否选中   */
+      disabled: !this.state.enabled /*   是否显示   */,
+      onChange: this.handleSelectOptionEvent /*   数据改变回带到父组件   */,
+      checked: commonUtils.isUndefined(this.state.dataValue) ? false : commonUtils.converNumStrToBoolean(this.state.dataValue) /*   是否选中   */,
     };
     // if (this.props.readOnly) {
     //   obj.readOnly = true;
@@ -1897,17 +2174,18 @@ export default class CommonComponent extends Component {
     return obj;
   };
   // eslint-disable-next-line react/sort-comp
-  handleInputOnClick = (id) => {
+  handleInputOnClick = id => {
     // 判断是否是oee系统，否则不显示虚拟键盘
-    if (commonUtils.isNotEmptyObject(location.pathname) && location.pathname.indexOf('/indexOee') > -1) {
-      if (VirtualKeyboard.isKeyBoard()) { // 关闭上次键盘
+    if (commonUtils.isNotEmptyObject(location.pathname) && location.pathname.indexOf("/indexOee") > -1) {
+      if (VirtualKeyboard.isKeyBoard()) {
+        // 关闭上次键盘
         VirtualKeyboard.closeKeyboard();
       }
       const keyboardValue = {};
       if (commonUtils.isNotEmptyObject(this.props.dataValue)) {
         keyboardValue.value = this.props.dataValue;
       } else {
-        keyboardValue.value = '';
+        keyboardValue.value = "";
       }
       VirtualKeyboard.showKeyboardSetState(keyboardValue, this, id);
     }
@@ -1917,29 +2195,29 @@ export default class CommonComponent extends Component {
       const rowId = this.props.record.sId;
       this.props.onInputClick(rowId, sName);
     }
-  }
+  };
  
   /*   获取数字innerinputprops对象(主)   */
   getNumberInnerInputPropsMaster = () => {
     /*   如果是浮点型并且有格式规定,display类型需要变为block   */
-    let display = 'inline-block';
-    if (this.firstDataIndex === 'd' && this.floatNum !== 0) {
-      display = 'block';
+    let display = "inline-block";
+    if (this.firstDataIndex === "d" && this.floatNum !== 0) {
+      display = "block";
     }
     // const sInputId = `id${commonUtils.createSid()}`;
     /*   返回值赋值   */
     const obj = {
-      id: `${this.props.showConfig.sName}${commonUtils.createSid()}`, /*   虚拟数字键盘使用id获取光标   */
-      style: { width: 'auto', display, marginRight: 0 }, /*   样式   */
+      id: `${this.props.showConfig.sName}${commonUtils.createSid()}` /*   虚拟数字键盘使用id获取光标   */,
+      style: { width: "auto", display, marginRight: 0 } /*   样式   */,
       // disabled: !this.state.enabled, /*   是否显示   */
-      onChange: this.handleSelectOptionEvent, /*   数据改变回带到父组件   */
-      parser: (oldValue) => {
+      onChange: this.handleSelectOptionEvent /*   数据改变回带到父组件   */,
+      parser: oldValue => {
         const value = this.handleCheckNumberInnerInput(oldValue);
         return value;
       },
       // eslint-disable-next-line no-return-assign
-      ref: ref => this[this.props.showConfig.sName] = ref, /*   虚拟数字键盘获得光标需用 这里得ref中得变量必须是input得id   */
-      onClick: this.handleInputOnClick.bind(this, this.props.showConfig.sName), /*   虚拟数字键盘 第二个参数必须id  */
+      ref: ref => (this[this.props.showConfig.sName] = ref) /*   虚拟数字键盘获得光标需用 这里得ref中得变量必须是input得id   */,
+      onClick: this.handleInputOnClick.bind(this, this.props.showConfig.sName) /*   虚拟数字键盘 第二个参数必须id  */,
     };
     if (this.props.readOnly) {
       obj.readOnly = true;
@@ -1947,12 +2225,17 @@ export default class CommonComponent extends Component {
       obj.disabled = !this.state.enabled;
     }
     /*   最大值最小值   */
-    if (typeof commonUtils.convertStrToNumber(this.max) === 'number' && commonUtils.convertStrToNumber(this.max) !== 0 && this.max.indexOf('.d') === -1 && this.max.indexOf('.i') === -1) {
+    if (
+      typeof commonUtils.convertStrToNumber(this.max) === "number" &&
+      commonUtils.convertStrToNumber(this.max) !== 0 &&
+      this.max.indexOf(".d") === -1 &&
+      this.max.indexOf(".i") === -1
+    ) {
       obj.max = this.max; /*   最大值   */
-    } else if (!commonUtils.isEmpty(this.max) && this.max.indexOf('.') > -1 && commonUtils.isNotEmptyObject(this.props.record)) {
-      obj.max = this.props.record[this.max.substring(this.max.indexOf('.') + 1)];
+    } else if (!commonUtils.isEmpty(this.max) && this.max.indexOf(".") > -1 && commonUtils.isNotEmptyObject(this.props.record)) {
+      obj.max = this.props.record[this.max.substring(this.max.indexOf(".") + 1)];
     }
-    if (typeof commonUtils.convertStrToNumber(this.min) === 'number' && commonUtils.convertStrToNumber(this.min) !== 0) {
+    if (typeof commonUtils.convertStrToNumber(this.min) === "number" && commonUtils.convertStrToNumber(this.min) !== 0) {
       obj.min = this.min; /*   最小值   */
     }
     obj.placeholder = this.props.showConfig.placeholder;
@@ -1979,28 +2262,28 @@ export default class CommonComponent extends Component {
   };
  
   /*   获取省数据   */
-  getProvinceData = (options) => {
-    Provinces.forEach((childProvince) => {
+  getProvinceData = options => {
+    Provinces.forEach(childProvince => {
       options.push({
-        value: childProvince.name, /*   文字   */
-        label: childProvince.name, /*   标签   */
-        code: childProvince.code, /*   编码   */
-        children: [], /*   子节点(city)   */
+        value: childProvince.name /*   文字   */,
+        label: childProvince.name /*   标签   */,
+        code: childProvince.code /*   编码   */,
+        children: [] /*   子节点(city)   */,
       });
     });
   };
  
   /*   获取市数据   */
-  getCityData = (options) => {
-    options.forEach((childProvince) => {
+  getCityData = options => {
+    options.forEach(childProvince => {
       const cities = Cities.filter(item => item.provinceCode === childProvince.code);
       if (cities.length > 0) {
-        cities.forEach((childCity) => {
+        cities.forEach(childCity => {
           childProvince.children.push({
-            value: childCity.name, /*   文字   */
-            label: childCity.name, /*   标签   */
-            code: childCity.code, /*   编码   */
-            children: [], /*   子节点(area)   */
+            value: childCity.name /*   文字   */,
+            label: childCity.name /*   标签   */,
+            code: childCity.code /*   编码   */,
+            children: [] /*   子节点(area)   */,
           });
         });
       }
@@ -2008,17 +2291,17 @@ export default class CommonComponent extends Component {
   };
  
   /*   获取区数据   */
-  getAreaData = (options) => {
-    options.forEach((childProvince) => {
+  getAreaData = options => {
+    options.forEach(childProvince => {
       const cities = childProvince.children;
-      cities.forEach((childCity) => {
-        const areas = Areas.filter((item => item.cityCode === childCity.code));
+      cities.forEach(childCity => {
+        const areas = Areas.filter(item => item.cityCode === childCity.code);
         if (areas.length > 0) {
-          areas.forEach((area) => {
+          areas.forEach(area => {
             childCity.children.push({
-              value: area.name, /*   文字   */
-              label: area.name, /*   标签   */
-              code: area.code, /*   编码   */
+              value: area.name /*   文字   */,
+              label: area.name /*   标签   */,
+              code: area.code /*   编码   */,
             });
           });
         }
@@ -2029,11 +2312,14 @@ export default class CommonComponent extends Component {
   /*   获取formitemprops对象   */
   getOutFormItemProps = () => {
     /*   主表和从表的formitemprops对象有区别   */
-    if (!this.props.bTable) { /*   主表   */
+    if (!this.props.bTable) {
+      /*   主表   */
       return this.getOutFormItemPropsMaster();
-    } else if (this.props.bViewTable) { /*   表格单行显示   */
+    } else if (this.props.bViewTable) {
+      /*   表格单行显示   */
       return this.getOutFormItemPropsViewSlave();
-    } else { /*   从表   */
+    } else {
+      /*   从表   */
       return this.getOutFormItemPropsSlave();
     }
   };
@@ -2042,36 +2328,40 @@ export default class CommonComponent extends Component {
   getOutFormItemPropsMaster = () => {
     /*   返回值声明   */
     let obj = {};
-    if (this.firstDataIndex === 'i'
-      || this.firstDataIndex === 'd'
-      || this.firstDataIndex === 'p'
-      || this.firstDataIndex === 't'
-      || this.firstDataIndex === 'm'
-      || this.firstDataIndex === 's'
-      || this.firstDataIndex === 'c') { /*   数字输入框(整形i和浮点型d),
+    if (
+      this.firstDataIndex === "i" ||
+      this.firstDataIndex === "d" ||
+      this.firstDataIndex === "p" ||
+      this.firstDataIndex === "t" ||
+      this.firstDataIndex === "m" ||
+      this.firstDataIndex === "s" ||
+      this.firstDataIndex === "c"
+    ) {
+      /*   数字输入框(整形i和浮点型d),
      时间选择框(时间类型t),
      文本输入框(文本s),
      地址联动框(联动下拉类型c)   */
       obj = {
-        label: this.props.showConfig.showName, /*   标签   */
-        className: styles.formItemMargin, /*   样式名称   */
-        ...this.formItemLayout, /*   主要是rowspan和colspan   */
+        label: this.props.showConfig.showName /*   标签   */,
+        className: styles.formItemMargin /*   样式名称   */,
+        ...this.formItemLayout /*   主要是rowspan和colspan   */,
       };
-    } else if (this.firstDataIndex === 'b') { /*   选择框(布尔类型b)   */
+    } else if (this.firstDataIndex === "b") {
+      /*   选择框(布尔类型b)   */
       obj = {
-        label: this.props.showConfig.showName, /*   标签   */
-        className: styles.formItemMag10, /*   样式名称   */
-        ...this.formItemLayout, /*   主要是rowspan和colspan   */
+        label: this.props.showConfig.showName /*   标签   */,
+        className: styles.formItemMag10 /*   样式名称   */,
+        ...this.formItemLayout /*   主要是rowspan和colspan   */,
       };
     }
-    if (this.props.itemLabel === 'hide') {
+    if (this.props.itemLabel === "hide") {
       delete obj.label;
     }
     /* 设置标题颜色 */
     if (this.props.showConfig.sFontColor) {
       // eslint-disable-next-line prefer-destructuring
       const sFontColor = this.props.showConfig.sFontColor;
-      obj.labelCol.style = { color: sFontColor, fontWeight: 'bold', backgroundColor: '#BFEFFF' };
+      obj.labelCol.style = { color: sFontColor, fontWeight: "bold", backgroundColor: "#BFEFFF" };
     }
     /*   返回值   */
     return obj;
@@ -2081,69 +2371,78 @@ export default class CommonComponent extends Component {
   getOutFormItemPropsViewSlave = () => {
     /*   返回值声明   */
     let obj = {};
-    if (this.firstDataIndex === 'i'
-      || this.firstDataIndex === 'd'
-      || this.firstDataIndex === 'p'
-      || this.firstDataIndex === 't'
-      || this.firstDataIndex === 'm'
-      || this.firstDataIndex === 's'
-      || this.firstDataIndex === 'c') { /*   数字输入框(整形i和浮点型d),
+    if (
+      this.firstDataIndex === "i" ||
+      this.firstDataIndex === "d" ||
+      this.firstDataIndex === "p" ||
+      this.firstDataIndex === "t" ||
+      this.firstDataIndex === "m" ||
+      this.firstDataIndex === "s" ||
+      this.firstDataIndex === "c"
+    ) {
+      /*   数字输入框(整形i和浮点型d),
      时间选择框(时间类型t),
      文本输入框(文本s),
      地址联动框(联动下拉类型c)   */
       obj = {
-        label: this.props.showConfig.showName, /*   标签   */
-        className: styles.formItemMargin, /*   样式名称   */
-        ...this.formItemLayout, /*   主要是rowspan和colspan   */
+        label: this.props.showConfig.showName /*   标签   */,
+        className: styles.formItemMargin /*   样式名称   */,
+        ...this.formItemLayout /*   主要是rowspan和colspan   */,
       };
-    } else if (this.firstDataIndex === 'b') { /*   选择框(布尔类型b)   */
+    } else if (this.firstDataIndex === "b") {
+      /*   选择框(布尔类型b)   */
       obj = {
-        label: this.props.showConfig.showName, /*   标签   */
-        className: styles.formItemMag10, /*   样式名称   */
-        ...this.formItemLayout, /*   主要是rowspan和colspan   */
+        label: this.props.showConfig.showName /*   标签   */,
+        className: styles.formItemMag10 /*   样式名称   */,
+        ...this.formItemLayout /*   主要是rowspan和colspan   */,
       };
     }
-    if (this.props.itemLabel === 'hide') {
+    if (this.props.itemLabel === "hide") {
       delete obj.label;
     }
     /* 设置标题颜色 */
     if (this.props.showConfig.sFontColor) {
       // eslint-disable-next-line prefer-destructuring
       const sFontColor = this.props.showConfig.sFontColor;
-      obj.labelCol.style = { color: sFontColor, fontWeight: 'bold', backgroundColor: '#BFEFFF' };
+      obj.labelCol.style = { color: sFontColor, fontWeight: "bold", backgroundColor: "#BFEFFF" };
     }
     /*   返回值   */
     return obj;
   };
  
-
   /*   获取formitemprops对象(从)   */
   getOutFormItemPropsSlave = () => {
     /*   返回值声明   */
     let obj = {};
-    if (this.firstDataIndex === 'i'
-      || this.firstDataIndex === 'd'
-      || this.firstDataIndex === 'c'
-      || this.props.showConfig.sDropDownType === 'sql'
-      || this.props.showConfig.sDropDownType === 'const') { /*   数字输入框(整形i和浮点型d),
+    if (
+      this.firstDataIndex === "i" ||
+      this.firstDataIndex === "d" ||
+      this.firstDataIndex === "c" ||
+      this.props.showConfig.sDropDownType === "sql" ||
+      this.props.showConfig.sDropDownType === "const"
+    ) {
+      /*   数字输入框(整形i和浮点型d),
      时间选择框(时间类型t),
      文本输入框(文本s),
      地址联动框(联动下拉类型c),
      所有的下拉(从表只有文字下拉,分常量和sql两种)   */
       obj = {
-        className: styles.formItemMargin0, /*   样式名称   */
+        className: styles.formItemMargin0 /*   样式名称   */,
       };
-    } else if (this.firstDataIndex === 'b') { /*   选择框(布尔类型b)   */
+    } else if (this.firstDataIndex === "b") {
+      /*   选择框(布尔类型b)   */
       obj = {
-        className: styles.tableCheckBox, /*   样式名称   */
+        className: styles.tableCheckBox /*   样式名称   */,
       };
-    } else if (this.firstDataIndex === 't' || this.firstDataIndex === 'p' || this.firstDataIndex === 'm' || this.firstDataIndex === 'y') { /*   时间选择框(时间类型t)   */
+    } else if (this.firstDataIndex === "t" || this.firstDataIndex === "p" || this.firstDataIndex === "m" || this.firstDataIndex === "y") {
+      /*   时间选择框(时间类型t)   */
       obj = {
-        className: styles.tableDataPicker, /*   样式名称   */
+        className: styles.tableDataPicker /*   样式名称   */,
       };
-    } else if (this.firstDataIndex === 's') { /*   文本输入框(文本s)   */
+    } else if (this.firstDataIndex === "s") {
+      /*   文本输入框(文本s)   */
       obj = {
-        className: styles.editInput, /*   样式名称   */
+        className: styles.editInput /*   样式名称   */,
       };
     }
     /*   返回值   */
@@ -2154,53 +2453,62 @@ export default class CommonComponent extends Component {
   getFieldDecoratorProps = () => {
     /*   返回值声明   */
     let obj = {};
-    if (this.firstDataIndex === 'i' || this.firstDataIndex === 'd' || this.firstDataIndex === 't' || this.firstDataIndex === 'p' || this.firstDataIndex === 's' || this.firstDataIndex === 'b') { /*   数字输入框(整形i和浮点型d),时间选择框(时间类型t),文本输入框(文本s),选择框(布尔类型b)   */
+    if (
+      this.firstDataIndex === "i" ||
+      this.firstDataIndex === "d" ||
+      this.firstDataIndex === "t" ||
+      this.firstDataIndex === "p" ||
+      this.firstDataIndex === "s" ||
+      this.firstDataIndex === "b"
+    ) {
+      /*   数字输入框(整形i和浮点型d),时间选择框(时间类型t),文本输入框(文本s),选择框(布尔类型b)   */
       obj = { rules: [{ required: this.props.showConfig.bNotEmpty, message: `${this.props.showConfig.showName}为必填项` }] };
-    } else if (this.firstDataIndex === 'c') { /*   地址联动框(联动下拉类型c)   */
+    } else if (this.firstDataIndex === "c") {
+      /*   地址联动框(联动下拉类型c)   */
       obj = {
-        initialValue: ['北京市', '市辖区', '东城区'], /*   默认值   */
-        rules: [{ required: this.props.showConfig.bNotEmpty, message: `${this.props.showConfig.showName}为必填项` }], /*   规则   */
+        initialValue: ["北京市", "市辖区", "东城区"] /*   默认值   */,
+        rules: [{ required: this.props.showConfig.bNotEmpty, message: `${this.props.showConfig.showName}为必填项` }] /*   规则   */,
       };
     }
     /*   返回值   */
     return obj;
   };
-  getPopupContainer = (triggerNode) => {
+  getPopupContainer = triggerNode => {
     const trigger = triggerNode;
     if (commonUtils.isNotEmptyObject(trigger)) {
       return triggerNode;
     }
-  }
+  };
   handleCancel = () => {
     this.state.previewOpen = false;
-  }
+  };
   handleSelectClick = () => {
     if (this.bInputIn) {
       this.setState({ bDropDownOpen: true });
     }
-  }
+  };
  
   // 限制数字位数
-  handleCheckNumberInnerInput = (value) => {
+  handleCheckNumberInnerInput = value => {
     const { sDateFormat: sDateFormatOld, sFieldValidation: sFieldValidationOld, sName } = this.props.showConfig;
     const { record = {}, app = {} } = this.props;
     const { auxiliaryQty = {} } = app;
  
     let sDateFormat = sDateFormatOld;
     let sFieldValidation = sFieldValidationOld;
-    if (sName === 'dAuxiliaryQty' && commonUtils.isNotEmptyObject(record.sAuxiliaryUnit)) {
+    if (sName === "dAuxiliaryQty" && commonUtils.isNotEmptyObject(record.sAuxiliaryUnit)) {
       const decimal = auxiliaryQty[record.sAuxiliaryUnit];
       if (decimal !== undefined) {
-        sDateFormat = 'decimalPoint';
+        sDateFormat = "decimalPoint";
         sFieldValidation = `,${decimal}`;
       }
     }
  
-    if (sDateFormat !== 'decimalPoint' || sFieldValidation === undefined || value === null || (typeof value === 'string' && !value)) {
+    if (sDateFormat !== "decimalPoint" || sFieldValidation === undefined || value === null || (typeof value === "string" && !value)) {
       return value;
     }
  
-    const [length1, length2] = sFieldValidation.split(',');
+    const [length1, length2] = sFieldValidation.split(",");
  
     let newValue = value;
     if (length2 !== undefined) {
@@ -2209,9 +2517,9 @@ export default class CommonComponent extends Component {
     if (isNaN(newValue) || Object.is(newValue, -0)) {
       return value;
     }
-    if (length1 !== undefined && length1 !== '') {
+    if (length1 !== undefined && length1 !== "") {
       const str = newValue.toString();
-      const [integerPart, decimalPart] = str.split('.');
+      const [integerPart, decimalPart] = str.split(".");
       if (integerPart.length > length1) {
         const truncatedInteger = integerPart.slice(0, length1);
         if (decimalPart !== undefined) {
@@ -2223,9 +2531,9 @@ export default class CommonComponent extends Component {
     }
  
     return newValue;
-  }
+  };
  
-  selectTableChange = (pageNum) => {
+  selectTableChange = pageNum => {
     if (this.selectTableRef) {
       this.selectTableRef.focus();
     }
@@ -2234,11 +2542,11 @@ export default class CommonComponent extends Component {
     } else {
       this.setState({ currentPage: pageNum, selectTableIndex: 0 });
     }
-    this.selectTableRef1.querySelector('.ant-table-body').scrollTop = 0;
+    this.selectTableRef1.querySelector(".ant-table-body").scrollTop = 0;
     this.getDropDownData(pageNum, this.state.totalPageCount, this.state.searchValue);
   };
  
-  selectTableSearch = (searchValue) => {
+  selectTableSearch = searchValue => {
     if (this.dropDownTimer) {
       clearTimeout(this.dropDownTimer);
     }
@@ -2253,7 +2561,7 @@ export default class CommonComponent extends Component {
     }, 500);
   };
  
-  toFamatter = (values) => {
+  toFamatter = values => {
     if (values !== 0 && commonUtils.isNotEmptyNumber(values) && values !== null) {
       const { sDateFormat } = this.props.showConfig;
       const { dNetMoney, dNetPrice } = this.props.app.decimals;
@@ -2261,7 +2569,7 @@ export default class CommonComponent extends Component {
       if (commonUtils.isNotEmptyObject(sDateFormat)) {
         /* 取小数点位数 */
         let point = 0;
-        const strIndex = sDateFormat.indexOf('.');
+        const strIndex = sDateFormat.indexOf(".");
         if (strIndex > -1 && sDateFormat.length > 1) {
           point = sDateFormat.substring(strIndex + 1, sDateFormat.length).length;
           if (commonUtils.isNotEmptyNumber(values) && values !== null) {
@@ -2271,14 +2579,16 @@ export default class CommonComponent extends Component {
             }
           }
         }
-      } else if (this.props.showConfig.sName.toLowerCase().endsWith('price')) { /* 单价格式化显示1 */
+      } else if (this.props.showConfig.sName.toLowerCase().endsWith("price")) {
+        /* 单价格式化显示1 */
         if (commonUtils.isNotEmptyNumber(values) && values !== null) {
           const dResult = commonUtils.convertFixNum(Number(values), dNetPrice).toFixed(dNetPrice);
           if (!isNaN(dResult)) {
             values = dResult;
           }
         }
-      } else if (this.props.showConfig.sName.toLowerCase().endsWith('money')) { /* 金额格式化显示 */
+      } else if (this.props.showConfig.sName.toLowerCase().endsWith("money")) {
+        /* 金额格式化显示 */
         if (commonUtils.isNotEmptyNumber(values) && values !== null) {
           const dResult = commonUtils.convertFixNum(Number(values), dNetMoney).toFixed(dNetMoney);
           if (!isNaN(dResult)) {
@@ -2290,7 +2600,7 @@ export default class CommonComponent extends Component {
     } else {
       return values;
     }
-  }
+  };
   /**   处理下拉选择事件   */
   handleSelectOptionEvent = (newValue, dateString) => {
     if (this.chineseInputting) {
@@ -2306,13 +2616,22 @@ export default class CommonComponent extends Component {
     //   return;
     // }
     if (newValue === undefined) return;
-    if (newValue !== null && newValue.target && newValue.target.type !== 'checkbox') {
+    if (newValue !== null && newValue.target && newValue.target.type !== "checkbox") {
       newValue = newValue.target.value;
     }
     /*   下拉新增单独处理   */
-    const dEmptyValue = this.props.showConfig.sName === 'dMachineLength' || this.props.showConfig.sName === 'dMachineWidth' ? newValue : null; /* 设置数值型为空值时 数据置为0 或空值 */
-    let value = this.firstDataIndex === 's' && !this.props.textArea && commonUtils.isEmpty(newValue) ? newValue.replace('--', '') :
-      ['t', 'm'].includes(this.firstDataIndex) ? dateString : (this.firstDataIndex === 'd' || this.firstDataIndex === 'i') && commonUtils.isEmpty(newValue) ? dEmptyValue : newValue;
+    const dEmptyValue =
+      this.props.showConfig.sName === "dMachineLength" || this.props.showConfig.sName === "dMachineWidth"
+        ? newValue
+        : null; /* 设置数值型为空值时 数据置为0 或空值 */
+    let value =
+      this.firstDataIndex === "s" && !this.props.textArea && commonUtils.isEmpty(newValue)
+        ? newValue.replace("--", "")
+        : ["t", "m"].includes(this.firstDataIndex)
+        ? dateString
+        : (this.firstDataIndex === "d" || this.firstDataIndex === "i") && commonUtils.isEmpty(newValue)
+        ? dEmptyValue
+        : newValue;
     value = this.props.showConfig.bMultipleChoice ? value.toString() : value;
     // if (value === 0) {
     //   setTimeout(() => {
@@ -2322,24 +2641,24 @@ export default class CommonComponent extends Component {
     //   }, 51);
     // }
     this.isDropdownFilter = true;
-    if (this.props.showConfig.sDropDownType === 'sql' && value === '@#*000@') {
+    if (this.props.showConfig.sDropDownType === "sql" && value === "@#*000@") {
       this.props.handleSqlDropDownNewRecord(this.props.showConfig, this.props.name);
       if (this.mounted) {
-        this.setState({ dataValue: '' });
+        this.setState({ dataValue: "" });
       }
       return;
     }
-    if (this.props.showConfig.sDropDownType === 'sql' && value === '=+@') { /* 如果是选择空值，则将特殊字符过滤为空值 */
-      value = '';
+    if (this.props.showConfig.sDropDownType === "sql" && value === "=+@") {
+      /* 如果是选择空值，则将特殊字符过滤为空值 */
+      value = "";
     }
-    if (this.props.showConfig.sDropDownType === 'const' && value === '=+@') { /* 如果是选择空值，则将特殊字符过滤为空值 */
-      value = '';
+    if (this.props.showConfig.sDropDownType === "const" && value === "=+@") {
+      /* 如果是选择空值，则将特殊字符过滤为空值 */
+      value = "";
     }
     /*   回带值声明   */
     const returnValue = {};
-    const {
-      searchValue, searchDropDownData, dropDownData, selectTableData,
-    } = this.state;
+    const { searchValue, searchDropDownData, dropDownData, selectTableData } = this.state;
     let dropDownDataNew = [];
     /* 如果是表格下拉的话 */
     if (commonUtils.isNotEmptyStr(this.props.showConfig?.sTableTitleSql) && this.props.showConfig?.iVisCount > 1) {
@@ -2347,8 +2666,8 @@ export default class CommonComponent extends Component {
     } else {
       dropDownDataNew = commonUtils.isEmptyArr(searchValue) ? dropDownData : searchDropDownData;
     }
-    const getTValue = (value) => {
-      const { sDateFormat = 'YYYY-MM-DD' } = this.props.showConfig;
+    const getTValue = value => {
+      const { sDateFormat = "YYYY-MM-DD" } = this.props.showConfig;
  
       if (moment(value, sDateFormat, true).isValid()) return value; // 如果数据满足日期格式，则直接返回
  
@@ -2364,21 +2683,34 @@ export default class CommonComponent extends Component {
     /*   回带值赋值(sName:value)   */
     returnValue[this.props.showConfig.sName] =
       // this.firstDataIndex === 's' && this.props.textArea ? value.target.value :
-      this.firstDataIndex === 'i' ? commonUtils.isEmpty(value) ? undefined : this.props.showConfig.sName === 'iOrder' ? value : parseInt(value, 0) :
-        this.firstDataIndex === 'd' ? commonUtils.isEmpty(value) ? undefined : this.floatNumberCheck(value) :
-          this.firstDataIndex === 't' ? getTValue(value) :
-            this.firstDataIndex === 'b' ? value.target.checked : value === null ? undefined : value;
+      this.firstDataIndex === "i"
+        ? commonUtils.isEmpty(value)
+          ? undefined
+          : this.props.showConfig.sName === "iOrder"
+          ? value
+          : parseInt(value, 0)
+        : this.firstDataIndex === "d"
+        ? commonUtils.isEmpty(value)
+          ? undefined
+          : this.floatNumberCheck(value)
+        : this.firstDataIndex === "t"
+        ? getTValue(value)
+        : this.firstDataIndex === "b"
+        ? value.target.checked
+        : value === null
+        ? undefined
+        : value;
     if (!this.props.showConfig.bMultipleChoice) {
       const { sAssignField } = this.props.showConfig;
       const [changeData] = dropDownDataNew.filter(item => (!commonUtils.isEmpty(item.sSlaveId) ? item.sSlaveId : item.sId) === value.toString());
       if (!commonUtils.isEmpty(sAssignField)) {
         /* 赋值数组 */
-        const sAssignFieldObj = sAssignField.split(',');
+        const sAssignFieldObj = sAssignField.split(",");
         if (commonUtils.isNotEmptyObject(changeData)) {
           for (const child of sAssignFieldObj) {
-            if (child.indexOf(':') > -1) {
-              const sFieldName = child.split(':')[0].trim() === 'self' ? this.props.showConfig.sName : child.split(':')[0].trim();
-              const sValueName = child.split(':')[1].trim();
+            if (child.indexOf(":") > -1) {
+              const sFieldName = child.split(":")[0].trim() === "self" ? this.props.showConfig.sName : child.split(":")[0].trim();
+              const sValueName = child.split(":")[1].trim();
               // returnValue[sFieldName] = changeData[sValueName] || changeData.value;
               returnValue[sFieldName] = changeData[sValueName] === 0 ? 0 : changeData[sValueName] || changeData.value;
             }
@@ -2386,26 +2718,28 @@ export default class CommonComponent extends Component {
         } else if (!this.props.showConfig.bCanInput) {
           // 下拉选择空时，需要，  bCanInput一定要为false不然印件名称输入时也被置空了
           for (const child of sAssignFieldObj) {
-            if (child.indexOf(':') > -1) {
-              const sFieldName = child.split(':')[0].trim() === 'self' ? this.props.showConfig.sName : child.split(':')[0].trim();
-              returnValue[sFieldName] = '';
+            if (child.indexOf(":") > -1) {
+              const sFieldName = child.split(":")[0].trim() === "self" ? this.props.showConfig.sName : child.split(":")[0].trim();
+              returnValue[sFieldName] = "";
             }
           }
         }
       }
     } else {
       const { sAssignField } = this.props.showConfig;
-      const changeData = dropDownDataNew.filter(item => (`,${value.toString()},`).includes((!commonUtils.isEmpty(item.sSlaveId) ? `,${item.sSlaveId},` : `,${item.sId},`)));
+      const changeData = dropDownDataNew.filter(item =>
+        `,${value.toString()},`.includes(!commonUtils.isEmpty(item.sSlaveId) ? `,${item.sSlaveId},` : `,${item.sId},`)
+      );
       if (!commonUtils.isEmpty(sAssignField)) {
         /* 赋值数组 */
-        const sAssignFieldObj = sAssignField.split(',');
+        const sAssignFieldObj = sAssignField.split(",");
         if (commonUtils.isNotEmptyArr(changeData)) {
           for (const child of sAssignFieldObj) {
-            if (child.indexOf(':') > -1) {
-              const sFieldName = child.split(':')[0].trim() === 'self' ? this.props.showConfig.sName : child.split(':')[0].trim();
-              const sValueName = child.split(':')[1].trim();
+            if (child.indexOf(":") > -1) {
+              const sFieldName = child.split(":")[0].trim() === "self" ? this.props.showConfig.sName : child.split(":")[0].trim();
+              const sValueName = child.split(":")[1].trim();
               const valueArr = [];
-              changeData.forEach((itemData) => {
+              changeData.forEach(itemData => {
                 valueArr.push(itemData[sValueName]);
               });
               returnValue[sFieldName] = valueArr.toString();
@@ -2414,9 +2748,9 @@ export default class CommonComponent extends Component {
         } else if (!this.props.showConfig.bCanInput) {
           // 下拉选择空时，需要，  bCanInput一定要为false不然印件名称输入时也被置空了
           for (const child of sAssignFieldObj) {
-            if (child.indexOf(':') > -1) {
-              const sFieldName = child.split(':')[0].trim() === 'self' ? this.props.showConfig.sName : child.split(':')[0].trim();
-              returnValue[sFieldName] = '';
+            if (child.indexOf(":") > -1) {
+              const sFieldName = child.split(":")[0].trim() === "self" ? this.props.showConfig.sName : child.split(":")[0].trim();
+              returnValue[sFieldName] = "";
             }
           }
         }
@@ -2426,15 +2760,25 @@ export default class CommonComponent extends Component {
       // 处理原因：如果已选数据不在下拉数据中时（比如懒加载模式），会过滤掉已选数据
       if (commonUtils.isNotEmptyArr(Object.keys(returnValue))) {
         const [returnValueKey0, returnValueValue0] = [Object.keys(returnValue)[0], Object.values(returnValue)[0]];
-        if (returnValueValue0.split(',').length !== value.split(',').length || (returnValueValue0 === '' && value !== '')) {
+        if (returnValueValue0.split(",").length !== value.split(",").length || (returnValueValue0 === "" && value !== "")) {
           returnValue[returnValueKey0] = value;
         }
       }
     }
  
-    if (this.state.searchPageNum !== 0 || this.state.searchTotalPageCount !== 1 || this.state.searchDropDownData !== [] || this.state.searchValue !== '' || this.state.spinState !== false) {
+    if (
+      this.state.searchPageNum !== 0 ||
+      this.state.searchTotalPageCount !== 1 ||
+      this.state.searchDropDownData !== [] ||
+      this.state.searchValue !== "" ||
+      this.state.spinState !== false
+    ) {
       this.setState({
-        searchPageNum: 0, searchTotalPageCount: 1, searchDropDownData: [], searchValue: '', spinState: false,
+        searchPageNum: 0,
+        searchTotalPageCount: 1,
+        searchDropDownData: [],
+        searchValue: "",
+        spinState: false,
       });
     }
     // /*   调用父组件的回带函数 */
@@ -2442,7 +2786,7 @@ export default class CommonComponent extends Component {
  
     clearTimeout(this.onChangeTimer);
     this.onChangeTimer = setTimeout(() => {
-      this.onExecInstructSet('change');
+      this.onExecInstructSet("change");
     }, 500);
   };
  
@@ -2489,22 +2833,31 @@ export default class CommonComponent extends Component {
     if (newValue === undefined) {
       return;
     }
-    if (newValue.target && newValue.target.type !== 'checkbox') {
+    if (newValue.target && newValue.target.type !== "checkbox") {
       newValue = newValue.target.value;
     }
     /*   下拉新增单独处理   */
-    const dMachine = ['dMachineLength', 'dMachineWidth'].includes(this.props.showConfig.sName);
+    const dMachine = ["dMachineLength", "dMachineWidth"].includes(this.props.showConfig.sName);
     if (dMachine) {
       if (!/^\d+(\.\d+)?(\*\d+(\.\d+)?)?$/.test(newValue)) {
-        newValue = '';
+        newValue = "";
         setTimeout(() => {
-          this.setState({ searchValue: '' });
+          this.setState({ searchValue: "" });
         }, 1200);
       }
     }
-    const dEmptyValue = this.props.showConfig.sName === 'dMachineLength' || this.props.showConfig.sName === 'dMachineWidth' ? newValue : 0; /* 设置数值型为空值时 数据置为0 或空值 */
-    let value = this.firstDataIndex === 's' && !this.props.textArea && commonUtils.isEmpty(newValue) ? newValue.replace('--', '') :
-      this.firstDataIndex === 't' ? dateString : (this.firstDataIndex === 'd' || this.firstDataIndex === 'i') && commonUtils.isEmpty(newValue) ? dEmptyValue : newValue;
+    const dEmptyValue =
+      this.props.showConfig.sName === "dMachineLength" || this.props.showConfig.sName === "dMachineWidth"
+        ? newValue
+        : 0; /* 设置数值型为空值时 数据置为0 或空值 */
+    let value =
+      this.firstDataIndex === "s" && !this.props.textArea && commonUtils.isEmpty(newValue)
+        ? newValue.replace("--", "")
+        : this.firstDataIndex === "t"
+        ? dateString
+        : (this.firstDataIndex === "d" || this.firstDataIndex === "i") && commonUtils.isEmpty(newValue)
+        ? dEmptyValue
+        : newValue;
     value = this.props.showConfig.bMultipleChoice ? value.toString() : value;
  
     // if (this.props.showConfig.sName === 'dMachineLength' || this.props.showConfig.sName === 'dMachineWidth') { /* 处理上机长宽 下拉数据 数据分割错误问题 */
@@ -2512,18 +2865,20 @@ export default class CommonComponent extends Component {
     // }
  
     this.isDropdownFilter = true;
-    if (this.props.showConfig.sDropDownType === 'sql' && value === '@#*000@') {
+    if (this.props.showConfig.sDropDownType === "sql" && value === "@#*000@") {
       this.props.handleSqlDropDownNewRecord(this.props.showConfig, this.props.name);
       if (this.mounted) {
-        this.setState({ dataValue: '' });
+        this.setState({ dataValue: "" });
       }
       return;
     }
-    if (this.props.showConfig.sDropDownType === 'sql' && value === '=+@') { /* 如果是选择空值，则将特殊字符过滤为空值 */
-      value = '';
+    if (this.props.showConfig.sDropDownType === "sql" && value === "=+@") {
+      /* 如果是选择空值，则将特殊字符过滤为空值 */
+      value = "";
     }
-    if (this.props.showConfig.sDropDownType === 'const' && value === '=+@') { /* 如果是选择空值，则将特殊字符过滤为空值 */
-      value = '';
+    if (this.props.showConfig.sDropDownType === "const" && value === "=+@") {
+      /* 如果是选择空值，则将特殊字符过滤为空值 */
+      value = "";
     }
  
     /*   回带值声明   */
@@ -2533,56 +2888,75 @@ export default class CommonComponent extends Component {
     /*   回带值赋值(sName:value)   */
     returnValue[this.props.showConfig.sName] =
       // this.firstDataIndex === 's' && this.props.textArea ? value.target.value :
-      this.firstDataIndex === 'i' ? commonUtils.isEmpty(value) ? undefined : this.props.showConfig.sName === 'iOrder' ? value : parseInt(value, 0) :
-        this.firstDataIndex === 'd' ? commonUtils.isEmpty(value) ? dMachine ? '' : undefined : value : // this.floatNumberCheck(value) :
-          this.firstDataIndex === 't' ? commonUtils.isEmpty(value) ? null : value :
-            this.firstDataIndex === 'b' ? value.target.checked : value === null ? undefined : value;
+      this.firstDataIndex === "i"
+        ? commonUtils.isEmpty(value)
+          ? undefined
+          : this.props.showConfig.sName === "iOrder"
+          ? value
+          : parseInt(value, 0)
+        : this.firstDataIndex === "d"
+        ? commonUtils.isEmpty(value)
+          ? dMachine
+            ? ""
+            : undefined
+          : value // this.floatNumberCheck(value) :
+        : this.firstDataIndex === "t"
+        ? commonUtils.isEmpty(value)
+          ? null
+          : value
+        : this.firstDataIndex === "b"
+        ? value.target.checked
+        : value === null
+        ? undefined
+        : value;
     if (!this.props.showConfig.bMultipleChoice) {
       const { sAssignField } = this.props.showConfig;
       // const [changeData] = dropDownDataNew.filter(item => (!commonUtils.isEmpty(item.sSlaveId) ? item.sSlaveId : item.sId) === newKey.toString());
-      let res = '';
+      let res = "";
       if (dropDownDataNew.length > 0) {
         if (commonUtils.isNotEmptyStr(this.props.showConfig.sVisColumnName)) {
           res = this.props.showConfig.sVisColumnName;
         } else {
-          res = Object.keys(dropDownDataNew[0]).length > 0 ? Object.keys(dropDownDataNew[0])[0] : '';
+          res = Object.keys(dropDownDataNew[0]).length > 0 ? Object.keys(dropDownDataNew[0])[0] : "";
         }
       }
       const [changeData] = dropDownDataNew.filter(item => (!commonUtils.isEmpty(res) ? item[res] : item.sId) === value.toString());
       if (!commonUtils.isEmpty(sAssignField)) {
         /* 赋值数组 */
-        const sAssignFieldObj = sAssignField.split(',');
+        const sAssignFieldObj = sAssignField.split(",");
         if (commonUtils.isNotEmptyObject(changeData)) {
           for (const child of sAssignFieldObj) {
-            if (child.indexOf(':') > -1) {
-              const sFieldName = child.split(':')[0].trim() === 'self' ? this.props.showConfig.sName : child.split(':')[0].trim();
-              const sValueName = child.split(':')[1].trim();
+            if (child.indexOf(":") > -1) {
+              const sFieldName = child.split(":")[0].trim() === "self" ? this.props.showConfig.sName : child.split(":")[0].trim();
+              const sValueName = child.split(":")[1].trim();
               returnValue[sFieldName] = changeData[sValueName] || changeData.value;
             }
           }
         } else if (!this.props.showConfig.bCanInput) {
           // 下拉选择空时，需要，  bCanInput一定要为false不然印件名称输入时也被置空了
           for (const child of sAssignFieldObj) {
-            if (child.indexOf(':') > -1) {
-              const sFieldName = child.split(':')[0].trim() === 'self' ? this.props.showConfig.sName : child.split(':')[0].trim();
-              returnValue[sFieldName] = '';
+            if (child.indexOf(":") > -1) {
+              const sFieldName = child.split(":")[0].trim() === "self" ? this.props.showConfig.sName : child.split(":")[0].trim();
+              returnValue[sFieldName] = "";
             }
           }
         }
       }
     } else {
       const { sAssignField } = this.props.showConfig;
-      const changeData = dropDownDataNew.filter(item => (`,${value.toString()},`).includes((!commonUtils.isEmpty(item.sSlaveId) ? `,${item.sSlaveId},` : `,${item.sId},`)));
+      const changeData = dropDownDataNew.filter(item =>
+        `,${value.toString()},`.includes(!commonUtils.isEmpty(item.sSlaveId) ? `,${item.sSlaveId},` : `,${item.sId},`)
+      );
       if (!commonUtils.isEmpty(sAssignField)) {
         /* 赋值数组 */
-        const sAssignFieldObj = sAssignField.split(',');
+        const sAssignFieldObj = sAssignField.split(",");
         if (commonUtils.isNotEmptyArr(changeData)) {
           for (const child of sAssignFieldObj) {
-            if (child.indexOf(':') > -1) {
-              const sFieldName = child.split(':')[0].trim() === 'self' ? this.props.showConfig.sName : child.split(':')[0].trim();
-              const sValueName = child.split(':')[1].trim();
+            if (child.indexOf(":") > -1) {
+              const sFieldName = child.split(":")[0].trim() === "self" ? this.props.showConfig.sName : child.split(":")[0].trim();
+              const sValueName = child.split(":")[1].trim();
               const valueArr = [];
-              changeData.forEach((itemData) => {
+              changeData.forEach(itemData => {
                 valueArr.push(itemData[sValueName]);
               });
               returnValue[sFieldName] = valueArr.toString();
@@ -2591,22 +2965,32 @@ export default class CommonComponent extends Component {
         } else if (!this.props.showConfig.bCanInput) {
           // 下拉选择空时，需要，  bCanInput一定要为false不然印件名称输入时也被置空了
           for (const child of sAssignFieldObj) {
-            if (child.indexOf(':') > -1) {
-              const sFieldName = child.split(':')[0].trim() === 'self' ? this.props.showConfig.sName : child.split(':')[0].trim();
-              returnValue[sFieldName] = '';
+            if (child.indexOf(":") > -1) {
+              const sFieldName = child.split(":")[0].trim() === "self" ? this.props.showConfig.sName : child.split(":")[0].trim();
+              returnValue[sFieldName] = "";
             }
           }
         }
       }
     }
-    if (this.state.searchPageNum !== 0 || this.state.searchTotalPageCount !== 1 || this.state.searchDropDownData !== [] || this.state.searchValue !== '' || this.state.spinState !== false) {
+    if (
+      this.state.searchPageNum !== 0 ||
+      this.state.searchTotalPageCount !== 1 ||
+      this.state.searchDropDownData !== [] ||
+      this.state.searchValue !== "" ||
+      this.state.spinState !== false
+    ) {
       this.setState({
-        searchPageNum: 0, searchTotalPageCount: 1, searchDropDownData: [], searchValue: '', spinState: false,
+        searchPageNum: 0,
+        searchTotalPageCount: 1,
+        searchDropDownData: [],
+        searchValue: "",
+        spinState: false,
       });
     }
     // /*   调用父组件的回带函数  */
     let bSpecial = true;
-    if (location.pathname && location.pathname.includes('ResearchTableTree')) {
+    if (location.pathname && location.pathname.includes("ResearchTableTree")) {
       bSpecial = false;
     }
     if (bSpecial && this.state.dataValue === returnValue[this.props.showConfig.sName]) {
@@ -2625,7 +3009,7 @@ export default class CommonComponent extends Component {
  
     clearTimeout(this.onChangeTimer);
     this.onChangeTimer = setTimeout(() => {
-      this.onExecInstructSet('change');
+      this.onExecInstructSet("change");
     }, 500);
   };
   // handleCompleteOptionEvent = (newValue, dateString) => {
@@ -2740,64 +3124,65 @@ export default class CommonComponent extends Component {
   filterOption = (input, option) => {
     const { pageNum, totalPageCount } = this.state;
     const newInput = input.toString().trim(); /* 下拉框默认为空 不需要替换'--’ */
-    if (pageNum <= totalPageCount && this.props.showConfig.sDropDownType === 'sql' && commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
+    if (pageNum <= totalPageCount && this.props.showConfig.sDropDownType === "sql" && commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
       return true;
     } else if (commonUtils.isNotEmptyObject(option.props.children)) {
       try {
-        return (!this.isDropdownFilter && this.props.showConfig.bCanInput) ? true : (option.props.children.toLowerCase().indexOf(newInput.toLowerCase()) >= 0);
+        return !this.isDropdownFilter && this.props.showConfig.bCanInput
+          ? true
+          : option.props.children.toLowerCase().indexOf(newInput.toLowerCase()) >= 0;
       } catch (error) {
         return false;
       }
     }
   };
  
-
   /**
    * 小数校验
    */
-  floatNumberCheck = (num) => {
+  floatNumberCheck = num => {
     const dNetPrice = this.props.app?.decimals?.dNetPrice;
-    const Maximum = commonFunc.showLocalMessage(this.props, 'Maximum', '最多输入${digit}位小数');
+    const Maximum = commonFunc.showLocalMessage(this.props, "Maximum", "最多输入${digit}位小数");
     const { showConfig } = this.props;
     const { sName, showName } = showConfig;
-    const digit = sName.includes('Price') && dNetPrice ? dNetPrice : 6;
-    const Maximun = Maximum.replace('${digit}', digit);
-    if (typeof num === 'string') {
-      num = num.replace('*', '');
+    const digit = sName.includes("Price") && dNetPrice ? dNetPrice : 6;
+    const Maximun = Maximum.replace("${digit}", digit);
+    if (typeof num === "string") {
+      num = num.replace("*", "");
     }
     const checkRule = new RegExp(`^(-?\\d+)(\\.?)(\\d{1,${digit}})?$`);
-    if (!checkRule.test(num) && num && num !== '-' && num !== '.') {
+    if (!checkRule.test(num) && num && num !== "-" && num !== ".") {
       message.warning(`【${showName}】【${sName}】${Maximun}`);
       return undefined;
     } else {
       return num;
     }
-  }
+  };
  
   /**   小数位控制  noinspection JSAnnotator控制 string | number */
-  limitDecimals = (values) => {
-    let reg = '';
+  limitDecimals = values => {
+    let reg = "";
     if (this.floatNum > 0) {
       reg = `^(\\d+).(${this.floatPrice})*$`;
     } else {
-      reg = '^(\\d+).(\\d\\d\\d\\d\\d\\d)*$';
+      reg = "^(\\d+).(\\d\\d\\d\\d\\d\\d)*$";
     }
-    if (typeof values === 'string') {
-      if (values !== undefined && values.indexOf('.') <= -1) {
-        reg = '^(\\d+)*$';
-        return !isNaN(Number(values)) ? values.replace(new RegExp(reg), '$1') : '';
+    if (typeof values === "string") {
+      if (values !== undefined && values.indexOf(".") <= -1) {
+        reg = "^(\\d+)*$";
+        return !isNaN(Number(values)) ? values.replace(new RegExp(reg), "$1") : "";
       } else {
-        return !isNaN(Number(values)) ? values.replace(new RegExp(reg), '$1.$2') : '';
+        return !isNaN(Number(values)) ? values.replace(new RegExp(reg), "$1.$2") : "";
       }
-    } else if (typeof values === 'number') {
-      if (values !== undefined && String(values).indexOf('.') <= -1) {
-        reg = '^(\\d+)*$';
-        return !isNaN(values) ? String(values).replace(new RegExp(reg), '$1') : '';
+    } else if (typeof values === "number") {
+      if (values !== undefined && String(values).indexOf(".") <= -1) {
+        reg = "^(\\d+)*$";
+        return !isNaN(values) ? String(values).replace(new RegExp(reg), "$1") : "";
       } else {
-        return !isNaN(values) ? String(values).replace(new RegExp(reg), '$1.$2') : '';
+        return !isNaN(values) ? String(values).replace(new RegExp(reg), "$1.$2") : "";
       }
     } else {
-      return '';
+      return "";
     }
   };
  
@@ -2806,46 +3191,59 @@ export default class CommonComponent extends Component {
     const { sControlName, sActiveKey } = showConfig; /* 弹出标志，弹出界面对应数据主字段 */
     if (commonUtils.isNotEmptyObject(sControlName) && commonUtils.isNotEmptyObject(sActiveKey)) {
       const printPdf = sControlName;
-      if (commonUtils.isNotEmptyObject(printPdf) && printPdf === 'printPdf' && commonUtils.isNotEmptyObject(sActiveKey)) {
+      if (commonUtils.isNotEmptyObject(printPdf) && printPdf === "printPdf" && commonUtils.isNotEmptyObject(sActiveKey)) {
         const { token } = app;
-        const sActiveId = this.props.showConfig.sActiveId === '1' ? commonUtils.isEmpty(record.sFormId) ? record.sSrcFormId : record.sFormId : this.props.showConfig.sActiveId;
+        const sActiveId =
+          this.props.showConfig.sActiveId === "1"
+            ? commonUtils.isEmpty(record.sFormId)
+              ? record.sSrcFormId
+              : record.sFormId
+            : this.props.showConfig.sActiveId;
         const printsId = record[sActiveKey];
-        const urlPrint = `${commonConfig.file_host}printReport/printPdfByFromDataId/${printsId}.pdf?sModelsId=${sActiveId}&sId=${printsId}&token=${encodeURIComponent(token)}`;
+        const urlPrint = `${
+          commonConfig.file_host
+        }printReport/printPdfByFromDataId/${printsId}.pdf?sModelsId=${sActiveId}&sId=${printsId}&token=${encodeURIComponent(token)}`;
         // const urlPrint = `${commonConfig.file_host}printReport/printPdfByFromDataId?sModelsId=${sActiveId}&sId=${printsId}&token=${encodeURIComponent(token)}`;
         window.open(urlPrint);
-      } else if (showConfig.sDropDownType && showConfig.sDropDownType.toLowerCase().includes('picarrmodal')) { /* 蓝色链接跳转用Modal呈现 */
+      } else if (showConfig.sDropDownType && showConfig.sDropDownType.toLowerCase().includes("picarrmodal")) {
+        /* 蓝色链接跳转用Modal呈现 */
         // this.props.onTabModalClick(name, sName, record, index, showConfig, configName);
         this.props.onTabModalClick(this.props.name, this.props.showConfig.sName, record, undefined, showConfig, this.props.sName);
       } else {
         this.props.onViewClick(this.props.name, this.props.showConfig.sName, this.props.record);
       }
-    } else if (showConfig.sDropDownType && showConfig.sDropDownType.toLowerCase().includes('picarrmodal')) { /* 蓝色链接跳转用Modal呈现 */
+    } else if (showConfig.sDropDownType && showConfig.sDropDownType.toLowerCase().includes("picarrmodal")) {
+      /* 蓝色链接跳转用Modal呈现 */
       // this.props.onTabModalClick(name, sName, record, index, showConfig, configName);
       this.props.onTabModalClick(this.props.name, this.props.showConfig.sName, record, undefined, showConfig, this.props.sName);
     } else {
       this.props.onViewClick(this.props.name, this.props.showConfig.sName, this.props.record);
     }
-  }
+  };
  
   /* 打开新窗口查看SQL编辑器 */
   handleOpenWin = () => {
     const { dataValue, showConfig, record } = this.props;
     // eslint-disable-next-line prefer-destructuring
     const sBtnName = showConfig.sName;
-    const sBtnContent = commonUtils.isNotEmptyObject(dataValue) ? encodeURIComponent(dataValue) : '';
-    const sBtnControlName = commonUtils.isNotEmptyObject(showConfig.sName) ? showConfig.sName : '';
+    const sBtnContent = commonUtils.isNotEmptyObject(dataValue) ? encodeURIComponent(dataValue) : "";
+    const sBtnControlName = commonUtils.isNotEmptyObject(showConfig.sName) ? showConfig.sName : "";
     if (commonUtils.isNotEmptyObject(sBtnContent) && commonUtils.isNotEmptyObject(record)) {
-      const sFormId = commonUtils.isNotEmptyObject(record.sParentId) ? record.sParentId : '';
+      const sFormId = commonUtils.isNotEmptyObject(record.sParentId) ? record.sParentId : "";
       const urlPrint = `${commonConfig.server_host}template/getSql/${sBtnName}/?sBtnContent=${sBtnContent}&sBtnControlName=${sBtnControlName}&sFormId=${sFormId}`;
       const w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
       const h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
       // const newWin = window.open('','_blank');
-      const features = `width=${w + 350},height=${h + 300}, top=0, left=0, toolbar=no, menubar=no,scrollbars=no,resizable=no, location =no, status=no`;
-      const newWin = window.open('', 'SQL查看器', features);
-      newWin.document.write(`<body scroll="no" style="margin: 0px;padding: 0px;border:0px;overflow:hidden;"><iframe style="margin: 0px;padding: 0px;border: 0px;width:100%;height:100%" src="${urlPrint}"></iframe></body>`);
+      const features = `width=${w + 350},height=${
+        h + 300
+      }, top=0, left=0, toolbar=no, menubar=no,scrollbars=no,resizable=no, location =no, status=no`;
+      const newWin = window.open("", "SQL查看器", features);
+      newWin.document.write(
+        `<body scroll="no" style="margin: 0px;padding: 0px;border:0px;overflow:hidden;"><iframe style="margin: 0px;padding: 0px;border: 0px;width:100%;height:100%" src="${urlPrint}"></iframe></body>`
+      );
       // window.open(urlPrint);
     } else {
-      message.error('未找到对应过程名');
+      message.error("未找到对应过程名");
     }
   };
  
@@ -2855,34 +3253,36 @@ export default class CommonComponent extends Component {
       const { name, record, showConfig } = this.props;
       this.props.onRightArrow(name, showConfig.sName, record, undefined, showConfig);
     }
-  }
+  };
  
   handlePreviewImage = (e, dataUrl) => {
     e.stopPropagation();
     this.props.onPreviewImage(e, dataUrl);
-  }
+  };
   handleViewChoose = () => {
-    const bGycs = this.props.showConfig?.showName?.includes('工艺参数');
+    const bGycs = this.props.showConfig?.showName?.includes("工艺参数");
     if (this.state.enabled || bGycs) this.props.onViewChoose(this.props.name, this.props.showConfig.sName, this.props.record);
-  }
-  handleMemoShow= () => {
+  };
+  handleMemoShow = () => {
     this.props.onMemoShow(this.props.name, this.props.showConfig.sName, this.props.record, 0, this.props.showConfig);
-  }
+  };
  
-  handlePreviewOffice = (dataUrl) => {
+  handlePreviewOffice = dataUrl => {
     this.props.onPreviewOffice(dataUrl);
-  }
+  };
  
-  handlePopupScroll = (e) => {
+  handlePopupScroll = e => {
     e.persist();
     const { target } = e;
-    if (Math.ceil(target.scrollTop + target.offsetHeight) >= target.scrollHeight && this.props.showConfig.sDropDownType === 'sql' && commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
-      const {
-        pageNum, searchPageNum, searchTotalPageCount, searchValue, totalPageCount,
-      } = this.state;
+    if (
+      Math.ceil(target.scrollTop + target.offsetHeight) >= target.scrollHeight &&
+      this.props.showConfig.sDropDownType === "sql" &&
+      commonUtils.isEmptyArr(this.props.showConfig.dropDownData)
+    ) {
+      const { pageNum, searchPageNum, searchTotalPageCount, searchValue, totalPageCount } = this.state;
       const nextPageNum = pageNum + 1;
       const nextSearchPageNum = searchPageNum + 1;
-      if (searchValue !== '') {
+      if (searchValue !== "") {
         this.getDropDownData(nextSearchPageNum, searchTotalPageCount, searchValue);
       } else {
         this.getDropDownData(nextPageNum, totalPageCount, searchValue);
@@ -2890,12 +3290,12 @@ export default class CommonComponent extends Component {
     }
   };
  
-  handleSearch = (value) => {
+  handleSearch = value => {
     if (this.dropDownTimer) {
       clearTimeout(this.dropDownTimer);
     }
     this.dropDownTimer = setTimeout(() => {
-      if (this.props.showConfig.sDropDownType === 'sql' && commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
+      if (this.props.showConfig.sDropDownType === "sql" && commonUtils.isEmptyArr(this.props.showConfig.dropDownData)) {
         this.setState({ spinState: true });
         this.getDropDownData(1, 1, value);
       }
@@ -2913,67 +3313,95 @@ export default class CommonComponent extends Component {
     const btCostomIndex = gdsconfigformslave.findIndex(item => item.sControlName === `BtnCustom.${sName}`);
  
     /*   获取innerinput控件   */
-    const innerInput = btPopIndex > -1 && btCostomIndex > -1 ? (
-      <Space className={styles.commonAntSpace} size={3}>
-        {this.getInnerInput(innerInputProps)}
-        {this.getInnerButton()}
-        {this.getInnerButtonCostom(gdsconfigformslave[btCostomIndex])}
-        <div />
-      </Space>
-    ) : btPopIndex !== -1 ? (
-      <Space className={styles.commonAntSpace} size={3}>
-        {this.getInnerInput(innerInputProps)}
-        {this.getInnerButton()}
-        <div />
-      </Space>
-    ) : btCostomIndex !== -1 ? (
-      <Space className={styles.commonAntSpace} size={3}>
-        {this.getInnerInput(innerInputProps)}
-        {this.getInnerButtonCostom(gdsconfigformslave[btCostomIndex])}
-        <div />
-      </Space>
-    ) : this.getInnerInput(innerInputProps);
-
-    let viewInfo = '';
-    if (this.props.showConfig.sDropDownType !== 'popup' && !commonUtils.isEmpty(this.props.showConfig.sActiveId) && !commonUtils.isEmpty(this.props.showConfig.sActiveKey) && (commonUtils.isNotEmptyObject(this.props.dataValue) || commonUtils.isNotEmptyNumber(this.props.dataValue))) {
+    const innerInput =
+      btPopIndex > -1 && btCostomIndex > -1 ? (
+        <Space className={styles.commonAntSpace} size={3}>
+          {this.getInnerInput(innerInputProps)}
+          {this.getInnerButton()}
+          {this.getInnerButtonCostom(gdsconfigformslave[btCostomIndex])}
+          <div />
+        </Space>
+      ) : btPopIndex !== -1 ? (
+        <Space className={styles.commonAntSpace} size={3}>
+          {this.getInnerInput(innerInputProps)}
+          {this.getInnerButton()}
+          <div />
+        </Space>
+      ) : btCostomIndex !== -1 ? (
+        <Space className={styles.commonAntSpace} size={3}>
+          {this.getInnerInput(innerInputProps)}
+          {this.getInnerButtonCostom(gdsconfigformslave[btCostomIndex])}
+          <div />
+        </Space>
+      ) : (
+        this.getInnerInput(innerInputProps)
+      );
+
+    let viewInfo = "";
+    if (
+      this.props.showConfig.sDropDownType !== "popup" &&
+      !commonUtils.isEmpty(this.props.showConfig.sActiveId) &&
+      !commonUtils.isEmpty(this.props.showConfig.sActiveKey) &&
+      (commonUtils.isNotEmptyObject(this.props.dataValue) || commonUtils.isNotEmptyNumber(this.props.dataValue))
+    ) {
       viewInfo = (
         <div
-          className={this.state.sActiveDisplay ? 'sActiveIdStyle sActiveIdStyleBlock' : 'sActiveIdStyle sActiveIdStyleNone'}
+          className={this.state.sActiveDisplay ? "sActiveIdStyle sActiveIdStyleBlock" : "sActiveIdStyle sActiveIdStyleNone"}
           title={this.props.dataValue}
           style={{
-            display: this.state.sActiveDisplay ? 'block' : 'none',
+            display: this.state.sActiveDisplay ? "block" : "none",
             // top: this.props.name === 'slaveInfo' ? '1px' : '',
             // left: this.props.name === 'slaveInfo' ? '2px' : this.props.name === 'master' ? '1px' : '',
-            position: 'absolute',
-            height: '100%',
-            overflow: 'hidden',
+            position: "absolute",
+            height: "100%",
+            overflow: "hidden",
           }}
         >
           <span
             onClick={this.handleViewClick}
             className="masterLinkSpan"
             style={{
-              transform: 'none',
+              transform: "none",
               top: 0,
             }}
           >
             {this.props.dataValue}
           </span>
-        </div>);
+        </div>
+      );
     }
-    const sModelsType = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : '';
-    const pleaseSelect = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'pleaseSelect') : '请选择' ;
-    const combinedInfo = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ?  commonFunc.showMessage(this.props.app.commonConst, 'CombinedInfo') : '合版信息' ;
+    const sModelsType =
+      commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : "";
+    const pleaseSelect =
+      commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app)
+        ? commonFunc.showMessage(this.props.app.commonConst, "pleaseSelect")
+        : "请选择";
+    const combinedInfo =
+      commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app)
+        ? commonFunc.showMessage(this.props.app.commonConst, "CombinedInfo")
+        : "合版信息";
     let bParamColor = false;
-    if (this.props && sName === 'sParamValue' && this.props.dataValue) {
-      if (this.props.dataValue === '选择色序' || this.props.record.sParamKey === 'sParam1001') {
+    if (this.props && sName === "sParamValue" && this.props.dataValue) {
+      if (this.props.dataValue === "选择色序" || this.props.record.sParamKey === "sParam1001") {
         bParamColor = true;
       }
     }
-    if (sName === 'sCombinedMemo' || sName === 'sColorSerialMemo' || bSColorSerialMemo || bParamColor || sName === 'sPositiveColor' || sName === 'sOppositeColor' || sName === 'sCombineProductNameNew' || sName === 'sParams' || sName === 'sParamsNew' || sName === 'sQuoParams' || (commonUtils.isNotEmptyObject(sModelsType) && !sModelsType.includes('Set') && sName === 'sCombinePartsNameNew')) {
-      let sValue = '';
+    if (
+      sName === "sCombinedMemo" ||
+      sName === "sColorSerialMemo" ||
+      bSColorSerialMemo ||
+      bParamColor ||
+      sName === "sPositiveColor" ||
+      sName === "sOppositeColor" ||
+      sName === "sCombineProductNameNew" ||
+      sName === "sParams" ||
+      sName === "sParamsNew" ||
+      sName === "sQuoParams" ||
+      (commonUtils.isNotEmptyObject(sModelsType) && !sModelsType.includes("Set") && sName === "sCombinePartsNameNew")
+    ) {
+      let sValue = "";
       /* 将合版信息json解析成需要的字符串形式 */
-      if (sName === 'sCombinedMemo') {
+      if (sName === "sCombinedMemo") {
         let JsonData = [];
         if (commonUtils.isNotEmptyObject(this.props.dataValue)) {
           try {
@@ -2983,10 +3411,10 @@ export default class CommonComponent extends Component {
           }
         }
         if (commonUtils.isNotEmptyArr(JsonData)) {
-          JsonData.forEach((item) => {
+          JsonData.forEach(item => {
             sValue += `${item.sProductNo}:排${item.dCombineQty}个,`;
           });
-          sValue = commonUtils.isNotEmptyObject(sValue) ? sValue.substr(0, sValue.length - 1) : '';
+          sValue = commonUtils.isNotEmptyObject(sValue) ? sValue.substr(0, sValue.length - 1) : "";
         }
       } else if (sName === "sColorSerialMemo" || bSColorSerialMemo || sName === "sPositiveColor" || sName === "sOppositeColor" || bParamColor) {
         let JsonData = [];
@@ -3034,8 +3462,8 @@ export default class CommonComponent extends Component {
           className="sActiveIdStyle sActiveIdStyle_viewChooseSpan"
           title={sValue}
           style={{
-            display: 'block',
-            position: 'relative',
+            display: "block",
+            position: "relative",
             // top: this.props.name === 'slaveInfo' ? '1px' : '',
             // left: this.props.name === 'slaveInfo' ? '2px' : this.props.name === 'master' ? '1px' : '',
           }}
@@ -3044,47 +3472,72 @@ export default class CommonComponent extends Component {
             onClick={this.handleViewChoose}
             className="viewChooseSpan"
             style={{
-              width: '100%', overflow: 'hidden', color: '#2f54eb', background: 'transparent',
+              width: "100%",
+              overflow: "hidden",
+              color: "#2f54eb",
+              background: "transparent",
             }}
-          > {commonUtils.isNotEmptyObject(sValue) ? sValue : sName === 'sCombinedMemo' ? combinedInfo : pleaseSelect}
+          >
+            {" "}
+            {commonUtils.isNotEmptyObject(sValue) ? sValue : sName === "sCombinedMemo" ? combinedInfo : pleaseSelect}
           </span>
-        </div>);
+        </div>
+      );
     }
     /* commonClassify 制单日期、制单人员新增时设置保存时自动生成 */
-    let speacilNote = '';
+    let speacilNote = "";
     const { record } = this.props;
-    const afterSave = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ?  commonFunc.showMessage(this.props.app.commonConst, 'afterSave') : '保存后自动生成';
-    if (commonUtils.isNotEmptyObject(record) && commonUtils.isEmptyObject(record[sName]) && commonUtils.isNotEmptyObject(sName) && (sName === 'tCreateDate' || sName === 'sMakePerson')) {
-      speacilNote = (<div className="speacialNote" style={{ position: 'absolute', padding: '0px 4px' }}> {afterSave}</div>);
+    const afterSave =
+      commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app)
+        ? commonFunc.showMessage(this.props.app.commonConst, "afterSave")
+        : "保存后自动生成";
+    if (
+      commonUtils.isNotEmptyObject(record) &&
+      commonUtils.isEmptyObject(record[sName]) &&
+      commonUtils.isNotEmptyObject(sName) &&
+      (sName === "tCreateDate" || sName === "sMakePerson")
+    ) {
+      speacilNote = (
+        <div className="speacialNote" style={{ position: "absolute", padding: "0px 4px" }}>
+          {" "}
+          {afterSave}
+        </div>
+      );
     }
  
-    const bShowMemo = false && commonUtils.isNotEmptyObject(sName) && sName.indexOf('sMemo') > -1 && !sName.includes('ProcessMemo'); /* 非编辑状态下 备注以蓝色链接呈现 */
+    const bShowMemo =
+      false &&
+      commonUtils.isNotEmptyObject(sName) &&
+      sName.indexOf("sMemo") > -1 &&
+      !sName.includes("ProcessMemo"); /* 非编辑状态下 备注以蓝色链接呈现 */
     /* 如果是图片类型 ，加载图片 */
-    let imgBox = '';
-    if (commonUtils.isNotEmptyObject(sName) && sName.indexOf('picture') > -1) {
-      const picAddr = commonUtils.isNotEmptyObject(record[sName]) ? record[sName].split(',') : '';
+    let imgBox = "";
+    if (commonUtils.isNotEmptyObject(sName) && sName.indexOf("picture") > -1) {
+      const picAddr = commonUtils.isNotEmptyObject(record[sName]) ? record[sName].split(",") : "";
       if (commonUtils.isNotEmptyObject(picAddr)) {
         const { token } = this.props.app;
-        const dataUrl = picAddr[0].includes('xlyerpfiles') ? `${commonConfig.file_host}file/download?savePathStr=${picAddr[0]}&scale=0.1&sModelsId=100&token=${token}` : picAddr[0]; /* 缩略图 */
+        const dataUrl = picAddr[0].includes("xlyerpfiles")
+          ? `${commonConfig.file_host}file/download?savePathStr=${picAddr[0]}&scale=0.1&sModelsId=100&token=${token}`
+          : picAddr[0]; /* 缩略图 */
         // const dataPriviewUrl = `${commonConfig.server_host}file/download?savePathStr=${picAddr}&width=800&&height=500&sModelsId=100&token=${token}`; /* 预览 */
-        const officeFileTypeList = ['PDF', 'DOCX', 'XLSX'];
-        const imgTypeList = ['PNG', 'SVG', 'JPG', 'JPEG', 'GIF', 'BMP', 'TIFF', 'ICO'];
-        const officeFileType = picAddr[0].split('.').pop().toUpperCase();
+        const officeFileTypeList = ["PDF", "DOCX", "XLSX"];
+        const imgTypeList = ["PNG", "SVG", "JPG", "JPEG", "GIF", "BMP", "TIFF", "ICO"];
+        const officeFileType = picAddr[0].split(".").pop().toUpperCase();
         let fileIcon = <FilePdfOutlined />;
-        if (officeFileType === 'DOCX') {
+        if (officeFileType === "DOCX") {
           fileIcon = <FileWordOutlined />;
-        } else if (officeFileType === 'XLSX') {
+        } else if (officeFileType === "XLSX") {
           fileIcon = <FileExcelOutlined />;
         }
-        let imgBox1 = '';
+        let imgBox1 = "";
         if (officeFileTypeList.includes(officeFileType)) {
           imgBox1 = (
             <span
               style={{
-                width: '100%',
-                overflow: 'hidden',
-                background: 'transparent',
-                cursor: 'pointer',
+                width: "100%",
+                overflow: "hidden",
+                background: "transparent",
+                cursor: "pointer",
                 paddingTop: 14,
               }}
               onClick={() => {
@@ -3098,28 +3551,23 @@ export default class CommonComponent extends Component {
           imgBox1 = (
             <span
               style={{
-                width: '100%',
-                overflow: 'hidden',
-                background: 'transparent',
-                cursor: 'pointer',
+                width: "100%",
+                overflow: "hidden",
+                background: "transparent",
+                cursor: "pointer",
               }}
               onClick={e => this.handlePreviewImage(e, picAddr)}
             >
-              <img
-                src={dataUrl}
-                alt="img"
-                onFocus={() => 0}
-                style={{ width: '30px', height: '20px' }}
-              />
+              <img src={dataUrl} alt="img" onFocus={() => 0} style={{ width: "30px", height: "20px" }} />
             </span>
           );
         } else {
           imgBox1 = (
             <span
               style={{
-                width: '100%',
-                overflow: 'hidden',
-                background: 'transparent',
+                width: "100%",
+                overflow: "hidden",
+                background: "transparent",
                 paddingTop: 14,
               }}
             >
@@ -3132,46 +3580,68 @@ export default class CommonComponent extends Component {
             className="sActiveIdStyle"
             title={this.props.dataValue}
             style={{
-              position: 'absolute',
-              padding: '0px 11px 0 4px',
-              width: '97%',
-              height: '93%',
-              fontSize: '12px',
-              zIndex: '10',
-              whiteSpace: 'nowrap',
-              textOverflow: 'ellipsis',
-              overflow: 'hidden',
-              backgroundColor: '#fff',
+              position: "absolute",
+              padding: "0px 11px 0 4px",
+              width: "97%",
+              height: "93%",
+              fontSize: "12px",
+              zIndex: "10",
+              whiteSpace: "nowrap",
+              textOverflow: "ellipsis",
+              overflow: "hidden",
+              backgroundColor: "#fff",
               marginTop: 1,
-              boxShadow: 'none',
+              boxShadow: "none",
             }}
           >
             {imgBox1}
-          </div>);
-      }
-    } else if (this.props.name === 'master' && sName !== 'sQualityRequirementsMemo' && !this.props.enabled && commonUtils.isNotEmptyObject(sName) && bShowMemo) { /* 所有备注非编辑状态下点击链接可以弹出备注窗体 */
+          </div>
+        );
+      }
+    } else if (
+      this.props.name === "master" &&
+      sName !== "sQualityRequirementsMemo" &&
+      !this.props.enabled &&
+      commonUtils.isNotEmptyObject(sName) &&
+      bShowMemo
+    ) {
+      /* 所有备注非编辑状态下点击链接可以弹出备注窗体 */
       imgBox = (
         <div
           className={`sActiveIdStyle sActiveIdStyle-${this.props.showConfig.sName} masterMemo`}
           title={this.props.dataValue}
           style={{
-            position: 'absolute', padding: '0px 4px', width: '100%', height: '100%', fontSize: '12px', zIndex: '10', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden',
+            position: "absolute",
+            padding: "0px 4px",
+            width: "100%",
+            height: "100%",
+            fontSize: "12px",
+            zIndex: "10",
+            whiteSpace: "nowrap",
+            textOverflow: "ellipsis",
+            overflow: "hidden",
           }}
         >
           <span
             onClick={this.handleMemoShow}
             style={{
-              width: '100%', overflow: 'hidden', color: '#2f54eb', background: 'transparent',
+              width: "100%",
+              overflow: "hidden",
+              color: "#2f54eb",
+              background: "transparent",
             }}
-          > <pre>{this.props.dataValue} </pre>
+          >
+            {" "}
+            <pre>{this.props.dataValue} </pre>
           </span>
-        </div>);
+        </div>
+      );
       // 富文本处理
       // if (this.props.showConfig.bEditor) {
       //   imgBox = (<></>);
       // }
-      if (this.props.showConfig.sName && this.props.showConfig.sName.toLowerCase().includes('fullmemo')) {
-        imgBox = (<></>);
+      if (this.props.showConfig.sName && this.props.showConfig.sName.toLowerCase().includes("fullmemo")) {
+        imgBox = <></>;
       }
     }
     /*   获取outformitem控件参数  */
@@ -3179,13 +3649,25 @@ export default class CommonComponent extends Component {
     /*   获取fieldDecorator参数   */
     const fieldDecoratorProps = this.getFieldDecoratorProps();
     /*   通用组件(主表存在getFieldDecorator表单验证,而从表则不需要)   */
-    const commonAssembly = (<FormItem {...outFormItemProps} required={this.props.showConfig.bNotEmpty}> {speacilNote}{imgBox}{!this.props.bTable ? this.getFieldDecorator(this.props.showConfig.sName, fieldDecoratorProps)(innerInput) : innerInput}{viewInfo} </FormItem>);
+    const commonAssembly = (
+      <FormItem {...outFormItemProps} required={this.props.showConfig.bNotEmpty}>
+        {" "}
+        {speacilNote}
+        {imgBox}
+        {!this.props.bTable ? this.getFieldDecorator(this.props.showConfig.sName, fieldDecoratorProps)(innerInput) : innerInput}
+        {viewInfo}{" "}
+      </FormItem>
+    );
     const { iColValue, showConfig } = this.props;
-    const readonlyStyle = showConfig.bReadonly || showConfig.iTag === 1 ? 'readonlyStyle' : '';
-    const costomStyle = showConfig.costomStyle || '';
+    const readonlyStyle = showConfig.bReadonly || showConfig.iTag === 1 ? "readonlyStyle" : "";
+    const costomStyle = showConfig.costomStyle || "";
     /*   页面输出   */
     return (
-      <div ref={this.myRef} className={iColValue === 24 ? 'input24' : iColValue === 18 ? 'input18' : iColValue === 12 ? 'input12' : 'changeClassName'} key={this.state.key}>
+      <div
+        ref={this.myRef}
+        className={iColValue === 24 ? "input24" : iColValue === 18 ? "input18" : iColValue === 12 ? "input12" : "changeClassName"}
+        key={this.state.key}
+      >
         <div className={`${this.props.className} ${readonlyStyle} ${costomStyle}`} onClick={this.props.onCostomClick?.bind(this, showConfig)}>
           {commonAssembly}
         </div>
@@ -915,9 +915,9 @@ const QuickQuoteEvent = props =&gt; {
  
       const result = await props.handleCalculation(
         false,
-        { ...masterProps, ...newState, manyqtysConfig: state.manyConfig, manyqtysData: state.manyData },
+        { ...masterProps, ...newState, manyqtysConfig: state.manyConfig, manyqtysData: state.manyData ,state},
         true,
-        props
+        {...props, state}
       );
  
       if (commonUtils.isEmptyObject(result)) {
@@ -1080,11 +1080,10 @@ const QuotationDetail = props =&gt; {
   if (!masterConfig) return "";
   const ableConfigs = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible);
   // 处理长宽样式
-  const viewConfigs =
-    selectedNode?.bBox && selectedNode.sTypeKey !== "kapai" && selectedNode?.bBox && selectedNode.sTypeKey !== "不干胶"
-      ? ableConfigs
-      : ableConfigs.filter(x => x.sName !== "dHeight");
-  if (selectedNode?.bBox && selectedNode.sTypeKey !== "kapai" && selectedNode?.bBox && selectedNode.sProductType !== "不干胶") {
+  const { sStripType = 0 } = selectedNode;
+  const viewConfigs = Number(sStripType) === 0 ? ableConfigs : ableConfigs.filter(x => x.sName !== "dHeight");
+  const lengthData = viewConfigs.find(x => x.sName === "dLength");
+  if (Number(sStripType) === 0) {
     viewConfigs.forEach(item => {
       if (item.sName === "dLength" || item.sName === "dWidth") {
         item.iColValue = 4;
@@ -1095,7 +1094,6 @@ const QuotationDetail = props =&gt; {
       item.iColValue = viewConfigs[0].iColValue;
     });
   }
-  const lengthData = viewConfigs.find(x => x.sName === "dLength");
   if (selectedNode.sTypeKey !== "danye") {
     if (lengthData) {
       lengthData.showName = "高(D)";
@@ -1573,6 +1571,9 @@ const BoxComponent = props =&gt; {
         if (selectedNode.bPartsDimension === false && (item.sName === "dPartsLength" || item.sName === "dPartsWidth")) {
           return false;
         }
+        if (!selectedNode.bBleed && item.sName === "dBleed") {
+          return false;
+        }
         return item.iTag === iTag;
       });
     let boxConfigList = [];
@@ -1634,7 +1635,7 @@ const filterConditions = {
       x.sName === "dRowGap" ||
       x.sName === "dColGap" ||
       x.sName === "sPaperDirection",
-    default: x => x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth" || x.sName === "dSumPQty",
+    default: x => x.sName === "dBleed" || x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth" || x.sName === "dSumPQty",
   };
   if (upViewProps12 && selectedNode.sProductType === "不干胶") {
     upViewProps12.viewConfigs = upViewProps12?.viewConfigs.filter(filterConditions.juantong);
@@ -1728,7 +1729,7 @@ const filterConditions = {
   const [materialLength, setMaterialLength] = useState(0);
   const [materialWidth, setMaterialWidth] = useState(0);
   // 使用 useCallback 确保回调函数的稳定性
-  const handleSaveState = (
+  const handleSaveState = 
     (
       length,
       width,
@@ -1815,9 +1816,8 @@ const filterConditions = {
  
       setMaterialLength(length);
       setMaterialWidth(width);
-    },
-    []
-  );
+    }
+  ;
   const onSaveDPartsLength = useCallback((innerWidth, innerHeight, slaveData) => {
     const { selectedNode } = props.state;
     const index = slaveData?.findIndex(x => x.sTreeNodeName === selectedNode.showName && x.sBoxModel === props.boxModel);
@@ -361,8 +361,8 @@ const handleCalculation = async (bSave, nextProps, isWait, props) =&gt; {
     packConfig,
     packDelData,
     manyDataCache = [],
-    dQuickQuoteProductQty,
   } = nextProps;
+  const { dQuickQuoteProductQty } = props.state;
   let { slaveData, controlData, materialsData, processData, masterData, manyqtysData, packData } = nextProps;
   const sMakePerson = masterData.sMakePerson;
   const data = [];
@@ -426,6 +426,12 @@ const handleCalculation = async (bSave, nextProps, isWait, props) =&gt; {
     slaveData = valueReturn[`${slaveConfig.sTbName.toLowerCase()}_tmp`].map(item => {
       item.handleType = dQuickQuoteProductQty ? "update" : item.handleType;
       item.sId = commonUtils.createSid();
+      if (dQuickQuoteProductQty) {
+        item.dProductQty = dQuickQuoteProductQty;
+      }
+      // 这里需要改变数量 看看是否是多数量报价dProductQty
+      console.log(props,nextProps, "dQuickQuoteProductQty");
+      
       return item;
     });