@bit-sun/business-component 2.4.24 → 2.4.26-beta01

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

@@ -4,7 +4,7 @@ import React, { useState, useRef, useEffect } from 'react';
 import { SearchOutlined, CopyOutlined, CloseCircleOutlined } from '@ant-design/icons';
 import { stringify } from 'querystring';
 import './index.less';
-import request from '@/utils/request';
+import axios from 'axios';
 import { Resizable } from 'react-resizable';
 import { checkQuantityAccuracy, precisionQuantity } from '@/utils/checkUtils';
 import { tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
@@ -27,7 +27,7 @@ const InputElement = ({
   const inputRef = useRef(false);
 
   const onSerchdata = (name: any) => {
-    request
+    axios
       .get(`/items/sku/pager/v2?${stringify({ 'skuCodeAndSkuName': name, 'pageSize': 100, 'qp-combination-eq': false, 'qp-approveStatus-eq': 1, 'qp-status-eq': 1 })}`)
       .then(({ data, status }: any) => {
         if (status === 200) {
@@ -624,7 +624,7 @@ const BillEntry: React.FC = ({ onSaveCallback, validDataUrl="/items/sku/import/c
     if(isBrandAuth){
       otherParams = { brandAuth: 'ctl-withAuth' }
     }
-    return request
+    return axios
       .post(validDataUrl, {
         ...otherParams,
         columns: ["skuCode", "quantity"],

package/src/components/Functional/BsAntdSula/index.ts

@@ -1,2 +1,2 @@
-
-export { default as BsCascader } from './BsCascader'
+
+export { default as BsCascader } from './BsCascader'

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

@@ -1,63 +1,63 @@
-.luckysheet {
-  overflow: hidden;
-  .luckysheet-work-area.luckysheet-noselected-text {
-    display: none;
-
-    // .luckysheet_info_detail {
-    //   display: none !important;
-    // }
-
-    // .luckysheet-wa-editor.toolbar {
-    //   overflow: hidden;
-    // }
-  }
-}
-
-.sheet_table_top {
-  height: 50px;
-  background: #f2f2f2;
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0 20px;
-  border: 1px solid #d8d8d8;
-
-  .menu_item_text {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-}
-
-.sheet_table_footer {
-  height: 50px;
-  background: #f2f2f2;
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0 20px;
-  border: 1px solid #d8d8d8;
-
-  .sheet_table_footer_l {
-  }
-  .sheet_table_footer_r {
-  }
-}
-
-.sheet_table_text {
-  color: #8f8f8f;
-}
-
-.sheet_table_dnd_text {
-  background: #f2f2f2;
-  border: 1px solid #d8d8d8;
-  display: inline-block;
-  width: 100px;
-  height: 30px;
-
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+.luckysheet {
+  overflow: hidden;
+  .luckysheet-work-area.luckysheet-noselected-text {
+    display: none;
+
+    // .luckysheet_info_detail {
+    //   display: none !important;
+    // }
+
+    // .luckysheet-wa-editor.toolbar {
+    //   overflow: hidden;
+    // }
+  }
+}
+
+.sheet_table_top {
+  height: 50px;
+  background: #f2f2f2;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 20px;
+  border: 1px solid #d8d8d8;
+
+  .menu_item_text {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+
+.sheet_table_footer {
+  height: 50px;
+  background: #f2f2f2;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 20px;
+  border: 1px solid #d8d8d8;
+
+  .sheet_table_footer_l {
+  }
+  .sheet_table_footer_r {
+  }
+}
+
+.sheet_table_text {
+  color: #8f8f8f;
+}
+
+.sheet_table_dnd_text {
+  background: #f2f2f2;
+  border: 1px solid #d8d8d8;
+  display: inline-block;
+  width: 100px;
+  height: 30px;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}

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

@@ -25,7 +25,7 @@ import {
   ProfileTwoTone,
   UnorderedListOutlined,
 } from '@ant-design/icons';
-import request from '@/utils/request';
+import axios from 'axios';
 import './index.less';
 import _ from "lodash"
 import { judgeIsRequestError } from '@/utils/requestUtils';
@@ -429,7 +429,7 @@ class DataImport extends React.Component {
       return _.compact(Object.values(d)).length
     })
 
-    request
+    axios
       .post(validDataUrl, {
         columns: columns,
         data: resultData,
@@ -489,7 +489,7 @@ class DataImport extends React.Component {
         console.log(setExportData);
         setExportData([123123]);
       })
-      .catch((err: any) => { });
+      .catch((err) => { });
   };
 
   filterData = (type: string) => {

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

@@ -1,63 +1,63 @@
-.luckysheet {
-  overflow: hidden;
-  .luckysheet-work-area.luckysheet-noselected-text {
-    display: none;
-
-    // .luckysheet_info_detail {
-    //   display: none !important;
-    // }
-
-    // .luckysheet-wa-editor.toolbar {
-    //   overflow: hidden;
-    // }
-  }
-}
-
-.sheet_table_top {
-  height: 50px;
-  background: #f2f2f2;
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0 20px;
-  border: 1px solid #d8d8d8;
-
-  .menu_item_text {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-}
-
-.sheet_table_footer {
-  height: 50px;
-  background: #f2f2f2;
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0 20px;
-  border: 1px solid #d8d8d8;
-
-  .sheet_table_footer_l {
-  }
-  .sheet_table_footer_r {
-  }
-}
-
-.sheet_table_text {
-  color: #8f8f8f;
-}
-
-.sheet_table_dnd_text {
-  background: #f2f2f2;
-  border: 1px solid #d8d8d8;
-  display: inline-block;
-  width: 100px;
-  height: 30px;
-
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+.luckysheet {
+  overflow: hidden;
+  .luckysheet-work-area.luckysheet-noselected-text {
+    display: none;
+
+    // .luckysheet_info_detail {
+    //   display: none !important;
+    // }
+
+    // .luckysheet-wa-editor.toolbar {
+    //   overflow: hidden;
+    // }
+  }
+}
+
+.sheet_table_top {
+  height: 50px;
+  background: #f2f2f2;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 20px;
+  border: 1px solid #d8d8d8;
+
+  .menu_item_text {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+
+.sheet_table_footer {
+  height: 50px;
+  background: #f2f2f2;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 20px;
+  border: 1px solid #d8d8d8;
+
+  .sheet_table_footer_l {
+  }
+  .sheet_table_footer_r {
+  }
+}
+
+.sheet_table_text {
+  color: #8f8f8f;
+}
+
+.sheet_table_dnd_text {
+  background: #f2f2f2;
+  border: 1px solid #d8d8d8;
+  display: inline-block;
+  width: 100px;
+  height: 30px;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}

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

@@ -25,7 +25,7 @@ import {
   ProfileTwoTone,
   UnorderedListOutlined,
 } from '@ant-design/icons';
-import request from '@/utils/request';
+import axios from 'axios';
 import './index.less';
 import _ from "lodash"
 import { judgeIsRequestError } from '@/utils/requestUtils';
@@ -418,7 +418,7 @@ class DataValidation extends React.Component {
       otherParams = { brandAuth: 'ctl-withAuth' }
     }
 
-    request
+    axios
       .post(validDataUrl, {
         ...otherParams,
         ...validDataParams,
@@ -481,7 +481,7 @@ class DataValidation extends React.Component {
         console.log(setExportData);
         setExportData([123123]);
       })
-      .catch((err:any) => { });
+      .catch((err) => { });
   };
 
   filterData = (type: string) => {

package/src/components/Functional/EllipsisTooltip/index.d.ts

@@ -1,5 +1,5 @@
-export class EllipsisTooltip {
-  maxLength: number;
-  title: string;
-  style?: any
-}
+export class EllipsisTooltip {
+  maxLength: number;
+  title: string;
+  style?: any
+}

package/src/components/Functional/EllipsisTooltip/index.js

@@ -1,36 +1,36 @@
-import React from 'react';
-import { Tooltip } from 'antd';
-
-class EllipsisTooltip extends React.Component {
-  state = {
-    visible: false,
-  };
-
-  handleVisibleChange = (visible) => {
-    if (this.props.title.length > this.props.maxLength) {
-      this.setState({
-        visible,
-      });
-    }
-  };
-
-  render() {
-    const style = {
-      ...this.props.style,
-    };
-
-    return (
-      <Tooltip
-        visible={this.state.visible}
-        onVisibleChange={this.handleVisibleChange}
-        title={this.props.title}
-      >
-        <div className="customEllipse" style={style}>
-          {this.props.showInfo && this.props.showInfo ||
-          (this.props.title.length > this.props.maxLength ? `${this.props.title.substring(0, this.props.maxLength)}...` : this.props.title)}
-        </div>
-      </Tooltip>
-    );
-  }
-}
-export default EllipsisTooltip;
+import React from 'react';
+import { Tooltip } from 'antd';
+
+class EllipsisTooltip extends React.Component {
+  state = {
+    visible: false,
+  };
+
+  handleVisibleChange = (visible) => {
+    if (this.props.title.length > this.props.maxLength) {
+      this.setState({
+        visible,
+      });
+    }
+  };
+
+  render() {
+    const style = {
+      ...this.props.style,
+    };
+
+    return (
+      <Tooltip
+        visible={this.state.visible}
+        onVisibleChange={this.handleVisibleChange}
+        title={this.props.title}
+      >
+        <div className="customEllipse" style={style}>
+          {this.props.showInfo && this.props.showInfo ||
+          (this.props.title.length > this.props.maxLength ? `${this.props.title.substring(0, this.props.maxLength)}...` : this.props.title)}
+        </div>
+      </Tooltip>
+    );
+  }
+}
+export default EllipsisTooltip;

package/src/components/Functional/ExportFunctions/ExportIcon/index.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React, {Ref} from 'react'
 import {message, Popconfirm, Tooltip} from "antd";
-import request from '@/utils/request';
+import axios from 'axios'
 import exportlogo from '../../../../assets/exportlogo.png'
 import {omit} from 'lodash'
 import { judgeIsRequestError } from '@/utils/requestUtils';
@@ -16,8 +16,8 @@ interface exportIconType{
 	tableRef: any,
 }
 
-const ExportIcon = ({request:exportRequest, tableRef, allowSelect, columnsRowKey}: exportIconType) => {
-	const {url, params, others} = exportRequest
+const ExportIcon = ({request, tableRef}: exportIconType) => {
+	const {url, params, others} = request
 
 	return (
 		<div style={{ cursor: 'pointer' }}>
@@ -28,21 +28,16 @@ const ExportIcon = ({request:exportRequest, tableRef, allowSelect, columnsRowKey
 
 						if(typeof params === 'function'){
 							requestData = {...omit(params(convertedParams),'selectedRows')}
-              requestData.pageSize=100000
 						}else if(typeof params === 'object'){
 							requestData = {...params}
 						}
 						if(!params){
 							requestData = omit(convertedParams, 'selectedRows')
-              requestData.pageSize=100000
 						}
 
-            if (allowSelect) {
-              let selectKey = allowSelect?.key || columnsRowKey;
-              requestData[`qp-${selectKey}-in`] = convertedParams?.selectedRows?.map((d: any) => d[selectKey])?.join(',')
-            }
+						requestData['qp-id-in'] = convertedParams?.selectedRows?.map((d: any) => d.id)?.join(',')
 
-						request({
+						axios({
 							url,
 							method:'POST',
 							data:requestData,

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

@@ -1,37 +1,37 @@
-.query_input {
-  &_show {
-    display: flex;
-  }
-
-  &_expand_button {
-    position: relative;
-    width: 30px;
-    color: #ffffff;
-    cursor: pointer;
-
-    span {
-      position: absolute;
-      height: 20px;
-      line-height: 14px;
-      left: 50%;
-      top: 50%;
-      transform: translate(-50%, -50%);
-    }
-  }
-
-  &_wrapper {
-    display: flex;
-
-    &_left {
-      width: 100px;
-    }
-
-    &_right {
-      color: #9e9e9e;
-    }
-  }
-
-  &_textArea {
-    margin-top: 15px;
-  }
-}
+.query_input {
+  &_show {
+    display: flex;
+  }
+
+  &_expand_button {
+    position: relative;
+    width: 30px;
+    color: #ffffff;
+    cursor: pointer;
+
+    span {
+      position: absolute;
+      height: 20px;
+      line-height: 14px;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+    }
+  }
+
+  &_wrapper {
+    display: flex;
+
+    &_left {
+      width: 100px;
+    }
+
+    &_right {
+      color: #9e9e9e;
+    }
+  }
+
+  &_textArea {
+    margin-top: 15px;
+  }
+}

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

@@ -11,7 +11,7 @@ import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal } from 'antd';
 import './index.less';
 
-const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
+const QueryMutipleInput = ({ onValueChange }) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [value, setValue] = useState('');
   const [popvalue, setPopValue] = useState('');
@@ -74,7 +74,6 @@ const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
           }}
           style={{ width: 'calc(100% - 30px)' }}
           placeholder="请输入（查询多个值请用 ; 或 , 分割）"
-          onPressEnter={()=>onPressEnter?.()}
         />
         <Button style={{width: '30px', padding: '2px', height: 'auto'}} onClick={showModal} type="primary">...</Button>
       </div>

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

@@ -113,9 +113,3 @@
     }
   }
 }
-
-.searchSelectSpin{
-  &>div{
-    height: 300px !important;
-  }
-}