1.处理放大镜新增报错

2.处理数字去掉小数点格式化

1.处理放大镜新增报错
2.处理数字去掉小数点格式化
Min
1 parent 3bea7e76
Showing 2 changed files with 40 additions and 2 deletions
src/components/Common/CommonComponent/index.js
src/components/Common/CommonHooks/useCommonBase.js
@@ -1516,8 +1516,7 @@ export default class CommonComponent extends Component {
         this.handleSelectOptionEvent(value);
       }, /*   数据改变回带到父组件   */
       parser: (oldValue) => {
-        const value = this.handleCheckNumberInnerInput(oldValue);
-        return value?.replace(/\$\s?|(,*)/g, '');
+        return oldValue;
       },
       formatter: (value) => {
         if (value === '' || value === undefined || value === null || location.pathname.includes("indexPad")) {
@@ -2991,6 +2991,45 @@ const useCommonBase = props =&gt; {
     );
   };
+
+  const handleTableAdd = (name, isWait) => {
+    /*   外置处理业务   */
+    const {
+      [`${name}Config`]: tableConfig, masterData, slaveData, slaveSelectedRowKeys,
+    } = state;
+    let { [`${name}Data`]: tableData } = state;
+    tableData = commonUtils.isEmptyObject(tableData) ? [] : tableData;
+    const allTableData = {};
+    allTableData.master = masterData;
+    if (commonUtils.isNotEmptyArr(slaveSelectedRowKeys)) {
+      const iSlaveIndex = slaveData.findIndex(item => item.sId === slaveSelectedRowKeys.toString());
+      allTableData.slave = slaveData[iSlaveIndex];
+    }
+    const iOrderArr = [];
+    tableData.forEach((item) => {
+      const iOrder = commonUtils.isNotEmptyNumber(item.iOrder) ? item.iOrder : 0; /* 获取tableData中iOrder最大值 */
+      iOrderArr.push(iOrder);
+    });
+    const iOrderMax = Math.max(...iOrderArr);
+    const tableDataRow = commonFunc.getDefaultData(tableConfig, allTableData);
+    tableDataRow.handleType = 'add';
+    tableDataRow.sId = commonUtils.createSid();
+    tableDataRow.sParentId = masterData && masterData.sId ? masterData.sId : null;
+    tableDataRow.key = tableDataRow.sId;
+    tableDataRow.bDefault = false;
+    tableDataRow.iOrder = commonUtils.isNotEmptyArr(tableData) ? iOrderMax + 1 : 1;
+    tableDataRow.defaultAdded = tableData.length === 0;
+    if (isWait) {
+      return tableDataRow;
+    } else {
+      // tableData.splice(index, 1, tableDataRow);  /* 该处会导致新增时删除首行 */
+      tableData.push(tableDataRow);
+      if (this.mounted) {
+        handleSaveState({ [`${name}Data`]: tableData, [`${name}SelectedRowKeys`]: [tableDataRow.sId] });
+      }
+    }
+  };
+
   // 表格行删除
   const handleMesTableLineDel = ({
     tableName,