@bit-sun/business-component 1.2.4-alpha.1 → 1.2.4

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

@@ -2,22 +2,20 @@
  * @Description:
  * @Author: rodchen
  * @Date: 2022-05-07 15:17:28
- * @LastEditTime: 2022-09-09 16:17:36
- * @LastEditors: Sirius-kk
+ * @LastEditTime: 2022-05-08 21:01:21
+ * @LastEditors: rodchen
  */
-import React, { useMemo, useRef, forwardRef, useImperativeHandle } from 'react';
+import React, { useMemo } from 'react';
 import { commonFun } from './BusinessUtils';
-import { handleDefaultPrefixUrl } from './utils';
 import SearchSelect from '@/components/Functional/SearchSelect';
 
 const MemoSearchSelect = React.memo(SearchSelect)
 
-const BusinessSearchSelect = forwardRef((props: any, ref: any) => {
+const  BusinessSearchSelect = (props: any) => {
   const businessType = props?.selectBusinessType || 'supplier';
-  const prefixUrl = props?.prefixUrl || { selectPrefix: handleDefaultPrefixUrl(businessType), formSelectFix: handleDefaultPrefixUrl(businessType) };
-  const innerRef = useRef();
+  const prefixUrl = props?.prefixUrl || { selectPrefix: '/bop/api', formSelectFix: '/bop/api' };
 
-  const { requestConfig, modalTableProps, needModalTable } = commonFun(businessType, prefixUrl, props?.requestConfig || {}, props?.modalTableProps || {});
+  const { requestConfig, modalTableProps, needModalTable } = commonFun(businessType, prefixUrl,props?.requestConfig || {}, props?.modalTableProps || {});
   const currentProps = useMemo(() => {
     return {
       ...props,
@@ -25,28 +23,21 @@ const BusinessSearchSelect = forwardRef((props: any, ref: any) => {
       needModalTable,
       modalTableProps
     }
-  }, [props?.value, props.disabled]);
-
-  useImperativeHandle(ref, () => ({
-    getRef: () => innerRef,
-  }))
+  }, [props?.value])
 
   return (
     <div>
-      <MemoSearchSelect {...currentProps} ref={innerRef} />
+      <MemoSearchSelect {...currentProps} />
     </div>
   );
-});
+};
 
 export default React.memo(BusinessSearchSelect, (props, nextProps) => {
-  if (props && props.labelInValue && props.value && JSON.stringify(props.value) !== JSON.stringify(nextProps.value)) {
+  if(props && props.labelInValue && props.value && JSON.stringify(props.value) !== JSON.stringify(nextProps.value)) {
     return false
   }
-  if (props && props.value !== nextProps.value) {
-    return false
-  }
-  if (props && props.disabled !== nextProps.disabled) {
+  if(props && props.value !== nextProps.value) {
     return false
   }
   return true
-});
+});

package/src/components/Business/SearchSelect/utils.ts

@@ -1,14 +1,13 @@
 import axios from 'axios';
 import { message } from 'antd';
 import { stringify } from 'querystring';
-import ENUM from '@/utils/enumConfig';
 
 const getDicData = (dicCode: string) => {
   let dicData = {};
   let dictionaryData;
   if (!dictionaryData) {
-    let storageDic = localStorage.getItem(ENUM.BROWSER_CACHE.DICT_CODES)
-      ? JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.DICT_CODES) || '{}')
+    let storageDic = localStorage.getItem('dicData')
+      ? JSON.parse(localStorage.getItem('dicData') || '{}')
       : {};
     dicData = storageDic[dicCode];
   } else {
@@ -60,7 +59,7 @@ const loadSelectSource = (url: string, params?: any) => {
       .get(`${url}?${stringify(params)}`)
       .then((result: any) => {
         result = result.data;
-        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+        if ((result.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
           message.error(result.msg);
           return;
         }
@@ -72,29 +71,4 @@ const loadSelectSource = (url: string, params?: any) => {
   })
 };
 
-const handleDefaultPrefixUrl = (type: string) => {
-  let result;
-  switch (type){
-    case 'supplier2': case 'customer2': case 'shopFile2':
-      result =  '/channel-manage';
-      break;
-    case 'skuCommodity': case 'skuPropertyValue': case 'spuCommodity':
-      result =  '/items';
-      break;
-    case 'physicalWarehouse': case 'realWarehouse': case 'virtualWarehouse': case 'channelWarehouse':
-      result =  '/stock';
-      break;
-    case 'inventoryOrg2': case 'purchaseOrg': case 'salesOrg': case 'employee2':
-      result =  '/user';
-      break;
-    case 'deliveryMode':
-      result =  '/basic';
-      break;
-    default:
-      result = '/bop/api';
-      break
-  }
-  return result;
-};
-
-export { getDictionarySource, getDictionaryTextByValue, loadSelectSource, handleDefaultPrefixUrl }
+export { getDictionarySource, getDictionaryTextByValue, loadSelectSource }

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

@@ -27,7 +27,7 @@ import {
 } from '@ant-design/icons';
 import axios from 'axios';
 import './index.less';
-import _ from "lodash"
+import _ from "loadsh"
 
 // const luckysheet = window.luckysheet;
 
@@ -407,6 +407,7 @@ class DataImport extends React.Component {
     let sheetData = luckysheet.getSheetData();
     let data = JSON.parse(JSON.stringify(sheetData))
       .filter((item) => {
+        debugger
         return item[0]
       })
       .map((item) => {

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

@@ -27,7 +27,7 @@ import {
 } from '@ant-design/icons';
 import axios from 'axios';
 import './index.less';
-import _ from "lodash"
+import _ from "loadsh"
 
 // const luckysheet = window.luckysheet;