@bit-sun/business-component 2.1.0 → 2.1.1-alpha.0

package/src/components/Functional/AddSelect/index.tsx

@@ -9,6 +9,8 @@ import _ from "lodash"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput } from '@/index';
 import { Resizable } from 'react-resizable';
+import { checkQuantityAccuracy, precisionQuantity } from '@/utils/checkUtils';
+import { getModalContainer } from '@/utils/utils';
 
 const loadSelectSource = (url: string, params?: any) => {
   return new Promise((resolve, reject) => {
@@ -715,15 +717,44 @@ const AddSelect = (props: any) => {
           // let
           if(record.needFocus === true && currentIndex === 0) {
 
+          }
+          let precisionObj={};
+          const unitAccuracy = record.packingUnitList?.[0]?.unitAccuracy
+          const isCountUnitAccuracyCheck = item.dataIndex =='count' && unitAccuracy !== undefined
+          if(isCountUnitAccuracyCheck) {
+            precisionObj = {
+              onBlur: (e: any) => {
+                const { target: { value } } = e;
+                if(!checkQuantityAccuracy(value,Number(unitAccuracy))) {
+                  record[item.dataIndex] = precisionQuantity(value,Number(unitAccuracy))
+                  const newPopValue = popvalue.map((i: any, innerIndex: number) => {
+                    if(innerIndex == index) {
+                      i[item.dataIndex] =  record[item.dataIndex]
+                    }
+                    return i
+                  })
+                  setPopValue(newPopValue)
+                }
+              }
+              // precision: unitAccuracy
+            }
           }
           return (
             <InputNumber
-              defaultValue={text || ''}
+              value={text || ''}
               min={0}
               autoFocus={record.needFocus}
               keyboard={false}
+              {...precisionObj}
               onChange={(value) => {
                 record[item.dataIndex] = value
+                const newPopValue = popvalue.map((i: any, innerIndex: number) => {
+                  if(innerIndex == index) {
+                    i[item.dataIndex] =  record[item.dataIndex]
+                  }
+                  return i
+                })
+                setPopValue(newPopValue)
               }}
               // onFocus={(e)=> {
               //   let dom1 = e.currentTarget;
@@ -845,6 +876,7 @@ const AddSelect = (props: any) => {
           bodyStyle={{ padding: '0px' }}
           // title={modalTableProps?.modalTableTitle}
           visible={isModalVisible}
+          getContainer={getModalContainer}
           closable={false}
           onCancel={handleCancel}
           footer={selectMode ? [

package/src/components/Functional/BillEntry/index.tsx

@@ -5,6 +5,7 @@ import { SearchOutlined, CopyOutlined, CloseCircleOutlined } from '@ant-design/i
 import { stringify } from 'querystring';
 import './index.less';
 import axios from 'axios';
+import { checkQuantityAccuracy, precisionQuantity } from '@/utils/checkUtils';
 
 const InputElement = ({
   record, text, currentIndex, inputLength, index, setData, data, item, callSelectItem
@@ -212,6 +213,27 @@ const InputElement = ({
     </div>
   }
 
+  let precisionObj={};
+  const unitAccuracy = record.packingUnitList?.[0]?.unitAccuracy
+  const isCountUnitAccuracyCheck = item.dataIndex =='count' && unitAccuracy !== undefined
+  if(isCountUnitAccuracyCheck) {
+    precisionObj = {
+      onBlur: (e: any) => {
+        const { target: { value } } = e;
+        if(!checkQuantityAccuracy(value,Number(unitAccuracy))) {
+          record[item.dataIndex] = precisionQuantity(value,Number(unitAccuracy))
+          const newData = data.map((i: any, innerIndex: number) => {
+            if(innerIndex == index) {
+              i[item.dataIndex] =  record[item.dataIndex]
+            }
+            return i
+          })
+          setData(newData)
+        }
+      }
+      // precision: unitAccuracy
+    }
+  }
 
   return (
     <Popover placement="bottomLeft" destroyTooltipOnHide={{ keepParent: false }} title="" trigger="" content={SearchDataTable(hoverVisibled)} visible={hoverVisibled} onVisibleChange={(disabled) => { updateHoverVisibled(disabled) }}>
@@ -313,11 +335,19 @@ const InputElement = ({
         :
         <InputNumber
           // onBlur={() => {updateHoverVisibled(false)}}
-          defaultValue={text || ''}
+          value={text || ''}
           min={0}
           keyboard={false}
+          {...precisionObj}
           onChange={(value) => {
             record[item.dataIndex] = value
+            const newData = data.map((i: any, innerIndex: number) => {
+              if(innerIndex == index) {
+                i[item.dataIndex] =  record[item.dataIndex]
+              }
+              return i
+            })
+            setData(newData)
           }}
           onKeyDown={(e) => {
             // if (e.keyCode === 13 && e.ctrlKey) {

package/src/components/Functional/QueryMutipleInput/index.tsx

@@ -10,6 +10,7 @@ import React, { useState, useEffect } from 'react';
 import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal } from 'antd';
 import './index.less';
+import { getModalContainer } from '@/utils/utils';
 
 const QueryMutipleInput = ({ onValueChange }) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
@@ -79,6 +80,7 @@ const QueryMutipleInput = ({ onValueChange }) => {
       </div>
       <Modal
         width={600}
+        getContainer={getModalContainer}
         title="多值录入"
         visible={isModalVisible}
         onOk={handleOk}

package/src/components/Functional/SearchSelect/index.tsx

@@ -8,6 +8,7 @@ import { stringify } from 'querystring';
 import _ from "lodash"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput } from '@/index';
+import { getModalContainer } from '@/utils/utils';
 
 const { Option } = Select;
 
@@ -743,6 +744,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
         <Modal
           width='80%'
           title={modalTableProps?.modalTableTitle}
+          getContainer={getModalContainer}
           visible={isModalVisible}
           onOk={handleOk}
           onCancel={handleCancel}

package/src/index.ts

@@ -6,7 +6,7 @@
  * @LastEditors: rodchen
  */
 // import 'antd/dist/antd.css';
-import './utils/requestUtils';
+import './utils/index';
 
 export { default as DataValidation } from './components/Functional/DataValidation';
 export { default as DataImport } from './components/Functional/DataImport';
@@ -28,4 +28,4 @@ export { default as ColumnSettingTable} from './components/Business/columnSettin
 export { default as DetailPageWrapper } from './components/Business/DetailPageWrapper';
 export { default as HomePageWrapper } from './components/Business/HomePageWrapper';
 export { default as BsSulaQueryTable } from './components/Business/BsSulaQueryTable';
-export { default as BsLayout } from './components/Business/BsLayouts';
+export { default as BsLayout } from './components/Business/BsLayouts'

package/src/utils/checkUtils.ts

@@ -0,0 +1,39 @@
+import { message } from 'antd';
+import _ from 'lodash';
+
+const checkQuantityAccuracy = (value: any, accuracy: any, errorInfo?: any) => {
+  let errorMessage= {showTips: true, tipsMessage: null,...errorInfo}
+  if (_.trim(value)) {
+    const target = `${value}`;
+    if (target.includes(".")) {
+      if (target.split(".")[1].length > accuracy) {
+        if(errorMessage?.showTips) {
+          message.warning(errorMessage?.tipsMessage || `系统设置数量最大精度为${accuracy}位`)
+        }
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+const precisionQuantity = (num: any, accuracy: any) => {
+  if (_.trim(num)) {
+    const target = `${num}`;
+    if (target.includes(".")) {
+      if (target.split(".")[1].length > accuracy) {
+        const beforeDot = target.split(".")[0];
+        const afterDot = target.split(".")[1]?.slice(0,accuracy)
+        const result = accuracy == 0 ? Number(`${beforeDot}`) : Number(`${beforeDot}.${afterDot}`)
+        return result
+      } else if (target.split(".")[1].length < accuracy) {
+        return Number(Number(num).toFixed(Math.abs(accuracy)))
+      } else {
+        return  Number(num)
+      }
+    }
+  }
+  return ''
+}
+
+export { checkQuantityAccuracy, precisionQuantity }

package/src/utils/enumConfig.ts

@@ -6,5 +6,6 @@ export default {
     LIMIT_MENU_DATA: 'limitedMenuData', //权限过滤后的菜单数据
     USER_INFO: 'userInfo', //用户信息
     DICT_CODES: 'dicData', //数据字典数据
+    CHILD_APP_BACK: 'child_app_back', //标记子应用goback事件
   }
 }

package/src/utils/index.ts

@@ -0,0 +1,2 @@
+import './requestUtils';
+import './checkUtils';

package/src/utils/utils.ts

@@ -1,7 +1,8 @@
 // @ts-nocheck
 import memoizeOne from 'memoize-one';
-import { formatMessage } from 'umi';
+import { formatMessage, history } from 'umi';
 import isEqual from 'lodash/isEqual';
+import ENUM from './enumConfig';
 
 export function downloadExcel(data: any, fileName?: any, isResUrl?: boolean) {
 	const resUrl = isResUrl
@@ -49,4 +50,20 @@ export const formatter = (data, parentAuthority, parentName) => {
     .filter((item) => item);
 };
 
-export const memoizeOneFormatter = memoizeOne(formatter, isEqual);
+export const memoizeOneFormatter = memoizeOne(formatter, isEqual);
+
+export const go2BackAndClose = () => {
+  localStorage.setItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK, 1);
+  history.goBack();
+}
+
+export const getModalContainer = () => {
+  try {
+    if (window.top != window && window.parent.document) {
+      return window.parent.document.body
+    }
+  } catch (error) {
+    console.log(error)
+  }
+  return document.body
+}