@bit-sun/business-component 2.0.7 → 2.0.8

package/dist/utils/CheckOneUser/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (storageKeyString: string, seconds?: number, tipsCallFunction?: (() => {}) | undefined) => void;
+declare const _default: (storageKeyString: string, seconds?: number, tipsCallFunction?: () => {}) => void;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -234,11 +234,11 @@ const InputElement = ({
               message.success('删除当前行')
               e.stopPropagation();
               e.preventDefault();
-              let dom = e.nativeEvent.path[3].children[index - 1]?.getElementsByTagName('input')[currentIndex]
+              let dom = e.nativeEvent.path[3].children[index]?.getElementsByTagName('input')[currentIndex]
               if (dom) {
                 dom.select();
                 dom.focus();
-                dom.scrollIntoView(false)
+                dom.scrollIntoViewIfNeeded(false)
               }
               dom = null
               setData(data.filter((item, innerIndex) => innerIndex !== index))
@@ -256,39 +256,40 @@ const InputElement = ({
             if (e.keyCode === 37 && e.shiftKey) {   // 左滑动
               e.stopPropagation();
               e.preventDefault();
-              let dom = e.nativeEvent.path[3].children[index]?.getElementsByTagName('input')[currentIndex - 1]
+              let dom = e.nativeEvent.path[3].children[index + 1]?.getElementsByTagName('input')[currentIndex - 1]
               if (dom) {
                 dom.select();
                 dom.focus();
-                dom.scrollIntoView(false)
+                dom.scrollIntoViewIfNeeded(false)
               }
               dom = null
             }
             if (e.keyCode === 39 && e.shiftKey) {  //  右滑
               e.stopPropagation();
               e.preventDefault();
-              let dom = e.nativeEvent.path[3].children[index]?.getElementsByTagName('input')[currentIndex + 1]
+              let dom = e.nativeEvent.path[3].children[index + 1]?.getElementsByTagName('input')[currentIndex + 1]
               if (dom) {
                 dom.select();
                 dom.focus();
-                dom.scrollIntoView(false)
+                dom.scrollIntoViewIfNeeded(false)
               }
               dom = null
             }
             if (e.keyCode === 40) {  // 向下
+              debugger
               e.stopPropagation();
               e.preventDefault();
-              let dom = e.nativeEvent.path[3].children[index + 1]?.getElementsByTagName('input')[currentIndex]
+              let dom = e.nativeEvent.path[3].children[index + 2]?.getElementsByTagName('input')[currentIndex]
               if (dom) {
                 dom.select();
                 dom.focus();
-                dom.scrollIntoView(false)
+                dom.scrollIntoViewIfNeeded(false)
               }
               dom = null
             } else if (e.keyCode === 38) {
               e.stopPropagation();
               e.preventDefault();
-              let dom1 = e.nativeEvent.path[3].children[index - 1]?.getElementsByTagName('input')[currentIndex]
+              let dom1 = e.nativeEvent.path[3].children[index]?.getElementsByTagName('input')[currentIndex]
               if (dom1) {
                 // dom1.value=""
                 // dom1.setSelectionRange(100, 0);
@@ -321,11 +322,11 @@ const InputElement = ({
               message.success('删除当前行')
               e.stopPropagation();
               e.preventDefault();
-              let dom = e.nativeEvent.path[5].children[index - 1]?.getElementsByTagName('input')[currentIndex]
+              let dom = e.nativeEvent.path[5].children[index]?.getElementsByTagName('input')[currentIndex]
               if (dom) {
                 dom.select();
                 dom.focus();
-                dom.scrollIntoView(false)
+                dom.scrollIntoViewIfNeeded(false)
               }
               dom = null
               setData(data.filter((item, innerIndex) => innerIndex !== index))
@@ -333,39 +334,39 @@ const InputElement = ({
             if (e.keyCode === 37 && e.shiftKey) {   // 左滑动
               e.stopPropagation();
               e.preventDefault();
-              let dom = e.nativeEvent.path[5].children[index]?.getElementsByTagName('input')[currentIndex - 1]
+              let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex - 1]
               if (dom) {
                 dom.select();
                 dom.focus();
-                dom.scrollIntoView(false)
+                dom.scrollIntoViewIfNeeded(false)
               }
               dom = null
             }
             if (e.keyCode === 39 && e.shiftKey) {  //  右滑
               e.stopPropagation();
               e.preventDefault();
-              let dom = e.nativeEvent.path[5].children[index]?.getElementsByTagName('input')[currentIndex + 1]
+              let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex + 1]
               if (dom) {
                 dom.select();
                 dom.focus();
-                dom.scrollIntoView(false)
+                dom.scrollIntoViewIfNeeded(false)
               }
               dom = null
             }
             if (e.keyCode === 40) {  // 向下
               e.stopPropagation();
               e.preventDefault();
-              let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex]
+              let dom = e.nativeEvent.path[5].children[index + 2]?.getElementsByTagName('input')[currentIndex]
               if (dom) {
                 dom.select();
                 dom.focus();
-                dom.scrollIntoView(false)
+                dom.scrollIntoViewIfNeeded(false)
               }
               dom = null
             } else if (e.keyCode === 38) {
               e.stopPropagation();
               e.preventDefault();
-              let dom1 = e.nativeEvent.path[5].children[index - 1]?.getElementsByTagName('input')[currentIndex]
+              let dom1 = e.nativeEvent.path[5].children[index]?.getElementsByTagName('input')[currentIndex]
               if (dom1) {
                 // dom1.value=""
                 // dom1.setSelectionRange(100, 0);
@@ -418,23 +419,27 @@ const BillEntry: React.FC = ({ onSaveCallback }) => {
       isSelectItem: true,
       render: (text: any, record: any) => {
         let baseUnitCode = '';
-        if (record?.packingUnitList) {
-          let base = record.packingUnitList.filter((item: any) => item.unitCode)
-          if (base.length) {
-            baseUnitCode = base[0].unitCode
-            record.selectUnitCode = base[0].unitCode
+          if (record?.packingUnitList) {
+            let base = record.packingUnitList.filter((item: any) => item.unitCode)
+            if (base.length) {
+              baseUnitCode = base[0].unitCode
+              record.selectUnitCode = base[0].unitCode
+              record.selectedScale = base[0]?.baseUnitScale || 1
+            }
           }
-        }
-
-        record.packingUnitList = record.packingUnitList || []
 
-        return <>
-          <Select value={record.selectUnitCode} onChange={(value) => { record.selectUnitCode = value }} style={{ width: '60px', height: '22px', lineHight: '22px' }}>
-            {record.packingUnitList && record.packingUnitList.map((item: any) => {
-              return <Select.Option value={item.unitCode}>{item.name}</Select.Option>
-            })}
-          </Select>
-        </>
+          if (baseUnitCode) {
+            return <>
+              <Select defaultValue={baseUnitCode}  onChange={(value) => {
+                record.selectUnitCode = value;record.selectedScale = record?.packingUnitList?.find((item: any) => item.unitCode === value)?.baseUnitScale || 1}
+              } style={{width: '60px'}}>
+                  {record.packingUnitList && record.packingUnitList.map((item: any) => {
+                    return <Select.Option value={item.unitCode}>{item.name}</Select.Option>
+                  })}
+                </Select>
+              </>
+          }
+          return <></>
       },
     },
     {
@@ -515,7 +520,6 @@ const BillEntry: React.FC = ({ onSaveCallback }) => {
   }), {
     title: '操作',
     width: 50,
-    fixed: 'right',
     render: (text, record, index) => {
       if (index !== 0) {
         return (
@@ -531,7 +535,9 @@ const BillEntry: React.FC = ({ onSaveCallback }) => {
   return (
       <div className='add_select'>
         <div className='add_select_quick_header'>
-          <div className='add_select_quick_header_title'><div>快速录入</div><Button type="primary" onClick={() => { onSaveCallback(data) }}>提交</Button></div>
+          <div className='add_select_quick_header_title'><div>快速录入</div><Button type="primary" onClick={() => { 
+            onSaveCallback(data)
+           }}>提交</Button></div>
           <span><span>*</span> &nbsp;快捷键：【Tab】-跳格切换；【Shift+←、→】-当前行左、右移动；【  ↑、↓】-当前列上、下移动；【ctrl+Delete】-删除当前行；</span>
         </div>
         <div className={'add_select_wrapper_select add_select_wrapper_select_quick'}>

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

@@ -26,7 +26,8 @@ const TreeSearchSelect = (props: any) => {
     allowClear = true,
     showCheckedStrategy = TreeSelect.SHOW_PARENT,
     style = { width: '100%' },
-    getTreeData
+    getTreeData,
+    disabled
   } = props;
 
   const {
@@ -137,7 +138,7 @@ const TreeSearchSelect = (props: any) => {
         multiple={multiple} // 	支持多选（当设置 treeCheckable 时自动变为 true）
         maxTagPlaceholder={maxTagPlaceholder}
         onChange={handleChange}
-        disabled={mode==='view' || ctx?.mode === 'view'}
+        disabled={disabled || mode==='view' || ctx?.mode === 'view'}
         getPopupContainer={() => (getPopupContainer && getPopupContainer()) || document.body}
       >
       </TreeSelect>