@bit-sun/business-component 2.2.46 → 2.2.47

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { message, Menu, Space, Dropdown, Tooltip, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, Image, Popover, Card, Avatar, InputNumber, Typography, Alert, Anchor, Breadcrumb, Drawer as Drawer$1, List, Tree, Row, Col, Tabs, Affix } from 'antd';
+import { message, Menu, Space, Dropdown, Tooltip, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, Popover, Card, Avatar, Image, InputNumber, Typography, Alert, Anchor, Breadcrumb, Drawer as Drawer$1, List, Tree, Row, Col, Tabs, Affix } from 'antd';
 import _, { omit, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import React, { useState, useEffect, forwardRef, useImperativeHandle, useRef, useMemo, Component, useLayoutEffect, createRef } from 'react';
 import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
@@ -2075,8 +2075,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
     _props$getPopupContai = props.getPopupContainer,
     _getPopupContainer = _props$getPopupContai === void 0 ? undefined : _props$getPopupContai,
-    fieldComponent = props.fieldComponent,
-    selectBusinessType = props.selectBusinessType;
+    fieldComponent = props.fieldComponent;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -2482,13 +2481,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   useEffect(function () {
     makeUniqueValue();
   }, [resultSourceKey]);
-  useEffect(function () {
-    if (init) {
-      setItems([]);
-      setItemsTotal(0);
-      run('init');
-    }
-  }, [selectBusinessType]);
   var showModal = function showModal() {
     getData({
       pageSize: tableInitPageSize,
@@ -10680,8 +10672,8 @@ var AddSelect = function AddSelect(props) {
         pageSize: 5000,
         currentPage: 1
       })]).then(function (x) {
-        formatSource(x, 0, 3, tableSearchForm, ['id', 'name']);
-        formatTreeDataSource(x, 1, 4, tableSearchForm);
+        formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
+        formatTreeDataSource(x, 1, 3, tableSearchForm);
       });
     }
     if (businessType == 'skc') {
@@ -14231,7 +14223,7 @@ var BusinessSearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       needModalTable: needModalTable,
       modalTableProps: modalTableProps
     });
-  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled, props.selectBusinessType]);
+  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled]);
   useImperativeHandle(ref, function () {
     return {
       getRef: function getRef() {
@@ -14253,13 +14245,9 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React.memo(BusinessSearchSelect, funct
   if (props && props.disabled !== nextProps.disabled) {
     return false;
   }
-  if (props && props.selectBusinessType !== nextProps.selectBusinessType) {
-    return false;
-  }
   return true;
 });
 
-// import { getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 function handleSelectColumn(c, parentProps) {
   var result = c;
   var exceptColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptColumns) || [];
@@ -14271,7 +14259,7 @@ function handleSelectColumn(c, parentProps) {
       return !exceptColumns.includes(i.dataIndex);
     });
   }
-  // 追加(最好不用这个，当组件不固定时候会有影响)
+  // 追加
   if (additionColumns === null || additionColumns === void 0 ? void 0 : additionColumns.length) {
     additionColumns.forEach(function (i) {
       result.splice(i.position, 0, i.column);
@@ -14284,7 +14272,6 @@ function handleSelectColumn(c, parentProps) {
   return result;
 }
 var AddSkuSelect = function AddSkuSelect(parProps) {
-  var _parProps$requestConf, _parProps$requestConf2;
   var selectProps = {
     mode: 'multiple'
   };
@@ -14297,19 +14284,6 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     title: 'SKU编码',
     width: 150,
     dataIndex: 'skuCode'
-  }, {
-    title: '商品条码',
-    width: 100,
-    ellipsis: {
-      showTitle: false
-    },
-    dataIndex: 'itemEancode',
-    render: function render(text) {
-      return /*#__PURE__*/React.createElement(Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    }
   }, {
     title: 'SKU名称',
     width: 200,
@@ -14397,11 +14371,11 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/sku/pager/v2",
       filter: 'qp-name-like',
-      otherParams: _objectSpread2({
+      otherParams: {
         'qp-combination-eq': false,
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1
-      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf = parProps.requestConfig) === null || _parProps$requestConf === void 0 ? void 0 : _parProps$requestConf.addOtherParams) || {}),
+      },
       mappingTextField: 'name',
       mappingValueField: 'skuCode'
     }, parProps.requestConfig),
@@ -14423,13 +14397,6 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     }, {
       name: 'qp-skuName-like',
       label: 'SKU名称'
-    }, {
-      name: 'qp-code-in',
-      label: '商品条码',
-      field: {
-        type: 'multipleQueryInput',
-        props: _objectSpread2({}, ((_parProps$requestConf2 = parProps.requestConfig) === null || _parProps$requestConf2 === void 0 ? void 0 : _parProps$requestConf2.itemEancodeValueRequestConfig) || {})
-      }
     }, {
       name: 'qp-brandId-in',
       type: 'select',
@@ -14510,12 +14477,12 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
         }));
       }
     }, {
-      title: '商品条码',
+      title: '国际条码',
       width: 100,
       ellipsis: {
         showTitle: false
       },
-      dataIndex: 'itemEancode',
+      dataIndex: 'barCode',
       render: function render(text) {
         return /*#__PURE__*/React.createElement(Tooltip, {
           placement: "topLeft",
@@ -14621,7 +14588,6 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
   })));
 };
 var AddSkcSelect = function AddSkcSelect(parProps) {
-  var _parProps$requestConf3;
   var selectProps = {
     mode: 'multiple'
   };
@@ -14699,9 +14665,9 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/skc/skcSelect",
       filter: 'qp-name-like',
-      otherParams: _objectSpread2({
+      otherParams: {
         'qp-skcStatus-eq': 1
-      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf3 = parProps.requestConfig) === null || _parProps$requestConf3 === void 0 ? void 0 : _parProps$requestConf3.addOtherParams) || {}),
+      },
       mappingTextField: 'name',
       mappingValueField: 'code'
     }, parProps.requestConfig),
@@ -14901,7 +14867,6 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
   })));
 };
 var AddSpuSelect = function AddSpuSelect(parProps) {
-  var _parProps$requestConf4;
   var selectProps = {
     mode: 'multiple'
   };
@@ -14988,11 +14953,11 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/item",
       filter: 'qp-itemCode,name-orGroup,like',
-      otherParams: _objectSpread2({
+      otherParams: {
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1,
         sorter: 'desc-id'
-      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf4 = parProps.requestConfig) === null || _parProps$requestConf4 === void 0 ? void 0 : _parProps$requestConf4.addOtherParams) || {}),
+      },
       mappingTextField: 'name',
       mappingValueField: 'itemCode'
     }, parProps.requestConfig),

package/dist/index.js

@@ -2093,8 +2093,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
     _props$getPopupContai = props.getPopupContainer,
     _getPopupContainer = _props$getPopupContai === void 0 ? undefined : _props$getPopupContai,
-    fieldComponent = props.fieldComponent,
-    selectBusinessType = props.selectBusinessType;
+    fieldComponent = props.fieldComponent;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -2500,13 +2499,6 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   React.useEffect(function () {
     makeUniqueValue();
   }, [resultSourceKey]);
-  React.useEffect(function () {
-    if (init) {
-      setItems([]);
-      setItemsTotal(0);
-      run('init');
-    }
-  }, [selectBusinessType]);
   var showModal = function showModal() {
     getData({
       pageSize: tableInitPageSize,
@@ -10698,8 +10690,8 @@ var AddSelect = function AddSelect(props) {
         pageSize: 5000,
         currentPage: 1
       })]).then(function (x) {
-        formatSource(x, 0, 3, tableSearchForm, ['id', 'name']);
-        formatTreeDataSource(x, 1, 4, tableSearchForm);
+        formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
+        formatTreeDataSource(x, 1, 3, tableSearchForm);
       });
     }
     if (businessType == 'skc') {
@@ -14249,7 +14241,7 @@ var BusinessSearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       needModalTable: needModalTable,
       modalTableProps: modalTableProps
     });
-  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled, props.selectBusinessType]);
+  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled]);
   React.useImperativeHandle(ref, function () {
     return {
       getRef: function getRef() {
@@ -14271,13 +14263,9 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React__default['default'].memo(Busines
   if (props && props.disabled !== nextProps.disabled) {
     return false;
   }
-  if (props && props.selectBusinessType !== nextProps.selectBusinessType) {
-    return false;
-  }
   return true;
 });
 
-// import { getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 function handleSelectColumn(c, parentProps) {
   var result = c;
   var exceptColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptColumns) || [];
@@ -14289,7 +14277,7 @@ function handleSelectColumn(c, parentProps) {
       return !exceptColumns.includes(i.dataIndex);
     });
   }
-  // 追加(最好不用这个，当组件不固定时候会有影响)
+  // 追加
   if (additionColumns === null || additionColumns === void 0 ? void 0 : additionColumns.length) {
     additionColumns.forEach(function (i) {
       result.splice(i.position, 0, i.column);
@@ -14302,7 +14290,6 @@ function handleSelectColumn(c, parentProps) {
   return result;
 }
 var AddSkuSelect = function AddSkuSelect(parProps) {
-  var _parProps$requestConf, _parProps$requestConf2;
   var selectProps = {
     mode: 'multiple'
   };
@@ -14315,19 +14302,6 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     title: 'SKU编码',
     width: 150,
     dataIndex: 'skuCode'
-  }, {
-    title: '商品条码',
-    width: 100,
-    ellipsis: {
-      showTitle: false
-    },
-    dataIndex: 'itemEancode',
-    render: function render(text) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-        placement: "topLeft",
-        title: text
-      }, text);
-    }
   }, {
     title: 'SKU名称',
     width: 200,
@@ -14415,11 +14389,11 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/sku/pager/v2",
       filter: 'qp-name-like',
-      otherParams: _objectSpread2({
+      otherParams: {
         'qp-combination-eq': false,
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1
-      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf = parProps.requestConfig) === null || _parProps$requestConf === void 0 ? void 0 : _parProps$requestConf.addOtherParams) || {}),
+      },
       mappingTextField: 'name',
       mappingValueField: 'skuCode'
     }, parProps.requestConfig),
@@ -14441,13 +14415,6 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     }, {
       name: 'qp-skuName-like',
       label: 'SKU名称'
-    }, {
-      name: 'qp-code-in',
-      label: '商品条码',
-      field: {
-        type: 'multipleQueryInput',
-        props: _objectSpread2({}, ((_parProps$requestConf2 = parProps.requestConfig) === null || _parProps$requestConf2 === void 0 ? void 0 : _parProps$requestConf2.itemEancodeValueRequestConfig) || {})
-      }
     }, {
       name: 'qp-brandId-in',
       type: 'select',
@@ -14528,12 +14495,12 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
         }));
       }
     }, {
-      title: '商品条码',
+      title: '国际条码',
       width: 100,
       ellipsis: {
         showTitle: false
       },
-      dataIndex: 'itemEancode',
+      dataIndex: 'barCode',
       render: function render(text) {
         return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
           placement: "topLeft",
@@ -14639,7 +14606,6 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
   })));
 };
 var AddSkcSelect = function AddSkcSelect(parProps) {
-  var _parProps$requestConf3;
   var selectProps = {
     mode: 'multiple'
   };
@@ -14717,9 +14683,9 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/skc/skcSelect",
       filter: 'qp-name-like',
-      otherParams: _objectSpread2({
+      otherParams: {
         'qp-skcStatus-eq': 1
-      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf3 = parProps.requestConfig) === null || _parProps$requestConf3 === void 0 ? void 0 : _parProps$requestConf3.addOtherParams) || {}),
+      },
       mappingTextField: 'name',
       mappingValueField: 'code'
     }, parProps.requestConfig),
@@ -14919,7 +14885,6 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
   })));
 };
 var AddSpuSelect = function AddSpuSelect(parProps) {
-  var _parProps$requestConf4;
   var selectProps = {
     mode: 'multiple'
   };
@@ -15006,11 +14971,11 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/item",
       filter: 'qp-itemCode,name-orGroup,like',
-      otherParams: _objectSpread2({
+      otherParams: {
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1,
         sorter: 'desc-id'
-      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf4 = parProps.requestConfig) === null || _parProps$requestConf4 === void 0 ? void 0 : _parProps$requestConf4.addOtherParams) || {}),
+      },
       mappingTextField: 'name',
       mappingValueField: 'itemCode'
     }, parProps.requestConfig),

package/dist/utils/LocalstorageUtils.d.ts

@@ -14,4 +14,3 @@ export declare function getUserId(): any;
 export declare function getAccountID(): any;
 export declare function getUserName(): any;
 export declare function handleUserPhone(): any;
-export declare function getCurrentTargetBgId(): string | null;

package/package.json

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

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

@@ -11,7 +11,6 @@ import axios from 'axios';
 import { AddSelect } from '../../../index';
 import { tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
-// import { getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 
 function handleSelectColumn(c: any, parentProps: any) {
   let result = c;
@@ -22,7 +21,7 @@ function handleSelectColumn(c: any, parentProps: any) {
   if(exceptColumns?.length) {
     result = result.filter((i: any) => !exceptColumns.includes(i.dataIndex))
   }
-  // 追加(最好不用这个，当组件不固定时候会有影响)
+  // 追加
   if(additionColumns?.length) {
     additionColumns.forEach((i: any) => {
       result.splice(i.position,0,i.column)
@@ -47,19 +46,6 @@ export const AddSkuSelect = (parProps: any) => {
       width: 150,
       dataIndex: 'skuCode',
     },
-    {
-      title: '商品条码',
-      width: 100,
-      ellipsis: {
-        showTitle: false,
-      },
-      dataIndex: 'itemEancode',
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-    },
     {
       title: 'SKU名称',
       width: 200,
@@ -151,8 +137,6 @@ export const AddSkuSelect = (parProps: any) => {
         'qp-combination-eq': false,
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1,
-        // 'useOrgSign': getCurrentTargetBgId(), // 根据品牌、账号授权的组织+商品授权使用组织做权限过滤  这个交给业务使用的地方去做,传addOtherParams:{useOrgSign:单据中所选组织}
-        ...(parProps?.requestConfig?.addOtherParams || {}), // 允许在默认参数基础上，追加/覆盖已有 参数
       }, // 默认参数
       mappingTextField: 'name',
       mappingValueField: 'skuCode',
@@ -175,12 +159,6 @@ export const AddSkuSelect = (parProps: any) => {
         name: 'qp-skuCode-like', label: 'SKU编码'
       },
       { name: 'qp-skuName-like', label: 'SKU名称' },
-      { name: 'qp-code-in', label: '商品条码', field: {
-          type: 'multipleQueryInput',
-          props: {
-            ...(parProps.requestConfig?.itemEancodeValueRequestConfig || {}),
-          },
-        }},
       { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
         type: 'select',
         props: {
@@ -247,12 +225,12 @@ export const AddSkuSelect = (parProps: any) => {
         ),
       },
       {
-        title: '商品条码',
+        title: '国际条码',
         width: 100,
         ellipsis: {
           showTitle: false,
         },
-        dataIndex: 'itemEancode',
+        dataIndex: 'barCode',
         render: (text: any) => (
           <Tooltip placement="topLeft" title={text}>
             {text}
@@ -441,10 +419,7 @@ export const AddSkcSelect = (parProps: any) => {
     requestConfig: {
       url: `/items/skc/skcSelect`,
       filter: 'qp-name-like', // 过滤参数 支持'qp-name-like'和['qp-name-like', 'qp-code-like']两种结构
-      otherParams: {
-        'qp-skcStatus-eq': 1,
-        ...(parProps?.requestConfig?.addOtherParams || {}), // 允许在默认参数基础上，追加/覆盖已有 参数
-      }, // 默认参数
+      otherParams: { 'qp-skcStatus-eq': 1, }, // 默认参数
       mappingTextField: 'name',
       mappingValueField: 'code',
       ...parProps.requestConfig
@@ -718,8 +693,7 @@ export const AddSpuSelect = (parProps: any) => {
       otherParams: {
         'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
         'qp-status-eq': 1,
-        sorter: 'desc-id',
-        ...(parProps?.requestConfig?.addOtherParams || {}), // 允许在默认参数基础上，追加/覆盖已有 参数
+        sorter: 'desc-id'
       }, // 默认参数
       mappingTextField: 'name',
       mappingValueField: 'itemCode',

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

@@ -25,7 +25,7 @@ const BusinessSearchSelect = forwardRef((props: any, ref: any) => {
       needModalTable,
       modalTableProps
     }
-  }, [props?.value, props.disabled, props.selectBusinessType]);
+  }, [props?.value, props.disabled]);
 
   useImperativeHandle(ref, () => ({
     getRef: () => innerRef,
@@ -48,8 +48,5 @@ export default React.memo(BusinessSearchSelect, (props, nextProps) => {
   if (props && props.disabled !== nextProps.disabled) {
     return false
   }
-  if (props && props.selectBusinessType !== nextProps.selectBusinessType) {
-    return false
-  }
   return true
-});
+});

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

@@ -677,8 +677,8 @@ const AddSelect = (props: any) => {
           currentPage: 1,
         }),
       ]).then((x: any)=>{
-        formatSource(x,0, 3, tableSearchForm,['id','name'])
-        formatTreeDataSource(x,1, 4, tableSearchForm)
+        formatSource(x,0, 2, tableSearchForm,['id','name'])
+        formatTreeDataSource(x,1, 3, tableSearchForm)
       })
     }
     if(businessType == 'skc') {

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

@@ -25,7 +25,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     needModalTable = true,
     getPopupContainer = undefined,
     fieldComponent,
-    selectBusinessType,
   } = props;
   const {
     url,
@@ -389,14 +388,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     makeUniqueValue();
   }, [resultSourceKey])
 
-  useEffect(() => {
-    if (init) {
-      setItems([]);
-      setItemsTotal(0);
-      run('init')
-    }
-  },[selectBusinessType])
-
   const showModal = () => {
     getData({ pageSize: tableInitPageSize, currentPage: 1 }, 3)
     setIsModalVisible(true);

package/src/utils/LocalstorageUtils.ts

@@ -88,8 +88,3 @@ export function handleUserPhone() {
   const enStr = str && str.slice(0, 3) + '****' + str.slice(str.length - 4);
   return enStr;
 }
-
-// 获取当前所选组织
-export function getCurrentTargetBgId() {
-  return localStorage.getItem('target_bg_id');
-}