@bit-sun/business-component 4.2.0-alpha.0 → 4.2.0-alpha.1

package/dist/plugin/TableColumnSetting/index.d.ts

@@ -57,6 +57,7 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     DraggableBodyRow: ({ className, style, ...restProps }: any) => React.JSX.Element;
     onChange: (e: any, title: any) => void;
     handleReset: () => void;
+    handleResetSetting: () => Promise<unknown>;
     onSearch: (e: any) => void;
     onSearchSort: (e: any) => void;
     render(): React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.0-alpha.0",
+  "version": "4.2.0-alpha.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -27,13 +27,13 @@
     ]
   },
   "peerDependencies": {
-    "antd": "^4.17.2",
-    "bssula": "^4.1.16",
-    "umi-plugin-bssula": "^4.3.9-alpha.0",
-    "umi": "3.5.20",
     "@ant-design/pro-layout": "^6.5.0",
+    "antd": "^4.17.2",
+    "bssula": "4.4.3-alpha.1",
     "react-dnd": "^16.0.1",
-    "react-dnd-html5-backend": "^16.0.1"
+    "react-dnd-html5-backend": "^16.0.1",
+    "umi": "^3.5.20",
+    "umi-plugin-bssula": "4.4.3-alpha.1"
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -51,7 +51,7 @@
     "moment": "^2.25.3",
     "qs": "^6.11.2",
     "querystring": "^0.2.1",
-    "react": "^16.12.0",
+    "react": "17.0.2",
     "react-beautiful-dnd": "10.0.0",
     "react-dom": "^16.12.0",
     "react-resizable": "^3.0.4",
@@ -59,14 +59,14 @@
     "serialize-javascript": "^6.0.0",
     "umi-request": "^1.4.0",
     "warning": "^4.0.3",
-    "xlsx": "^0.18.5"
+    "xlsx": "0.18.5"
   },
   "devDependencies": {
-    "@ant-design/pro-layout": "^7.1.3",
+    "@ant-design/pro-layout": "7.1.3",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash": "^4.14.185",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
+    "@types/react": "17.0.2",
+    "@types/react-dom": "17.0.2",
     "@umijs/test": "^3.0.5",
     "acorn": "^7.2.0",
     "acorn-walk": "^7.1.1",

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

@@ -54,7 +54,12 @@ export default () => {
       console.log('save call', rows);
       return Promise.resolve(true);
       // return Promise.reject('FAILE')
-    }
+    },
+    // 批量个格式化,回调函数
+    batchFormatCallback: (rows) => {
+      return rows; // 返回格式化之后的数据
+    },
+    batchFormatBtnTitle: '批量格式化',
   }
   return (
     <div>
@@ -272,7 +277,8 @@ export default () => {
         dataIndex: 'skuQuantity',
         isInputItem: true,
         inputProps: {
-          
+          max: (record: any) => record?.availableStock, // 支持传入函数
+          max: 5, // 直接传入数值
         }
       },
       {

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

@@ -378,6 +378,7 @@ export const AddSkuSelect = (parProps: any) => {
     {
       name: 'qp-skuCode-like', label: 'SKU编码',type:'multipleQueryInput'
     },
+    { name: 'qp-itemCode-like', label: '款号(SPU)', type: 'multipleQueryInput', },
     { name: 'qp-skuName-like', label: 'SKU名称' },
     { name: 'qp-externalCode-like', label: '外部SPU编码' },
     ...(isNoUseItemBarcode ? []: [
@@ -476,6 +477,8 @@ export const AddSkuSelect = (parProps: any) => {
     onSaveCallback: parProps.onSaveCallback,
     businessType: 'sku',
     isAllowRepeatedSelect: !!parProps?.isAllowRepeatedSelect,
+    batchFormatCallback: parProps?.batchFormatCallback, // 批量格式-已选数据回调函数
+    batchFormatBtnTitle: parProps?.batchFormatBtnTitle, // 批量格式-按钮名称
   };
   const modalTableProps = {
     modalTableTitle: parProps.modalTableTitle || '选择商品',

package/src/components/Business/BsLayouts/Components/GlobalHeader/index.less

@@ -55,7 +55,7 @@
 }
 
 .themeColor {
-  color: #005cff;
+  color: #005CFF;
 }
 
 .itemPath {

package/src/components/Business/BsLayouts/Components/RightContent/home.less

@@ -44,7 +44,7 @@
   .account {
     .avatar {
       margin-right: 8px;
-      color: #005cff;
+      color: #005CFF;
       vertical-align: top;
       background: rgba(255, 255, 255, 0.85);
     }

package/src/components/Business/BsLayouts/Components/SearchFunc/index.less

@@ -44,7 +44,7 @@
   .account {
     .avatar {
       margin-right: 8px;
-      color: #005cff;
+      color: #005CFF;
       vertical-align: top;
       background: rgba(255, 255, 255, 0.85);
     }
@@ -117,7 +117,7 @@
   left: -1px;
   width: 92px;
   height: 40px;
-  background: #005cff;
+  background: #005CFF;
   border-radius: 0px 4px 4px 0px;
 }
 

package/src/components/Business/BsSulaQueryTable/SearchItemSetting.tsx

@@ -20,6 +20,7 @@ import { arrayMoveImmutable } from 'array-move';
 import close from '../../../assets/close.svg';
 import drag from '../../../assets/drag.svg';
 import shezhi from '../../../assets/icon-shezhi.svg';
+import shezhi from '../../../assets/icon-shezhi.svg';
 import './index.less';
 import ENUM from '@/utils/enumConfig';
 import { handleRequestUrl, judgeIsRequestSuccess } from '@/utils/requestUtils';
@@ -587,7 +588,7 @@ class SearchItemTable extends React.Component {
             </div>
           </Modal>
         )}
-        <div onClick={this.showModal} style={{fontSize:14, textAlign: 'center', border: '0.67px solid #D9D9D9', width: '24px', height: '24px', lineHeight: '20px'}}><img style={{width: '20px', height: '20px'}} src={shezhi} /></div>
+        <div onClick={this.showModal} style={{fontSize:14, cursor: 'pointer', textAlign: 'center', border: '0.67px solid #D9D9D9', width: '24px', height: '24px', lineHeight: '20px'}}><img style={{width: '20px', height: '20px'}} src={shezhi} /></div>
       </div>
     );
   }

package/src/components/Business/BsSulaQueryTable/utils.less

@@ -52,7 +52,7 @@
   margin: 0 0 5px !important;
 }
 .card_department {
-  color: #005cff !important;
+  color: #005CFF !important;
 }
 
 .user_info_card {

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

@@ -87,7 +87,9 @@ const AddSelect = (props: any) => {
     tableCodeList = [], // 非必填 默认取组件定义code,如需自定义----数组第一位为供选择商品的table的code,第二位为已选择商品的table的code
     businessType = 'sku',
     isAllowRepeatedSelect = false,
-    clearTitle
+    clearTitle,
+    batchFormatCallback,
+    batchFormatBtnTitle,
   } = props;
   const { url, method = 'get', sourceKey, otherParams, isMap, mappingValueField = 'code', extralHeaders = {} } = requestConfig || {};
   const realButtonProps = {type: "primary", ...buttonProps};
@@ -214,9 +216,16 @@ const AddSelect = (props: any) => {
                 // precision: unitAccuracy
               }
             }
+            // 如果属性为函数时,则执行该函数
+            const inputProps = Object.keys(item?.inputProps || {})?.reduce((acc, key) => {
+              const value = item?.inputProps?.[key];
+              acc[key] = typeof value === 'function' ? value?.(record) : value;
+              return acc;
+            }, {});
+            
             return (
               <InputNumber
-                {...item.inputProps}
+                {...inputProps}
                 value={text || ''}
                 min={0}
                 autoFocus={record.needFocus}
@@ -615,6 +624,11 @@ const AddSelect = (props: any) => {
     }, 50)
   };
 
+  // 将格式化完的数据回显到 表格中
+  const batchFormatCallbackHandler = () => {
+    setPopValue([...batchFormatCallback?.(popvalue)]);
+  }
+
   const handleShowModal = () => {
     if(beforeShowModal) {
       beforeShowModal(popvalue).then(res => {
@@ -1049,7 +1063,10 @@ const AddSelect = (props: any) => {
                       settingImgAttribute={{ width: 20, style: { marginTop: -2 } }}
                     />
                   </span>
-                  <div style={{ marginRight: 8 }}><span onClick={deleteSelectRows} style={{ ...themeColor, cursor: 'pointer' }}>{clearTitle??'清空所选商品'}</span></div>
+                  <div style={{ marginRight: 8, display: 'flex', gap: '5px' }}>
+                    <span hidden={!batchFormatCallback} onClick={batchFormatCallbackHandler} style={{ cursor: 'pointer' }}>{batchFormatBtnTitle ?? '一键填充'}</span>
+                    <span onClick={deleteSelectRows} style={{ ...themeColor, cursor: 'pointer' }}>{clearTitle ?? '清空所选商品'}</span>
+                  </div>
                 </div>
               </div>
               <Table

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

@@ -11,9 +11,9 @@ import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal, ConfigProvider } from 'antd';
 import './index.less';
 
-const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
+const QueryMutipleInput = ({ onValueChange,onPressEnter, value: initialValue }) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
-  const [value, setValue] = useState('');
+  const [value, setValue] = useState(initialValue);
   const [popvalue, setPopValue] = useState('');
   const { run } = useDebounceFn(
     () => {
@@ -24,6 +24,14 @@ const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
     },
   );
 
+  /**
+   * 初始化参数
+   * 处理参数不展示和清空不同步的问题
+  */
+  useEffect(() => {
+    setValue(initialValue);
+  }, [initialValue]);
+
   useEffect(() => {
     setPopValue(value);
     onValueChange(value);
@@ -67,6 +75,7 @@ const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
         <Input
           value={value}
           onChange={outerChange}
+          allowClear
           onBlur={(e) => {
             formaData(e.target.value);
           }}

package/src/components/Solution/RuleComponent/InnerSelect.tsx

@@ -57,6 +57,7 @@ export default (props: Iprops) => {
         // handleEdit(ites.code, value);
       }}
       options={dataSource}
+      filterOption ={(input: any, option: any) => option?.label?.toLowerCase()?.indexOf(input?.toLowerCase()) >= 0}
     />
   );
 };

package/src/components/Solution/RuleComponent/RenderCompItem.tsx

@@ -155,6 +155,7 @@ export default function RenderCompItem(props:any){
               onChange={(value) => {
                 handleEdit(ites.code, value);
               }}
+              filterOption ={(input: any, option: any) => option?.text?.toLowerCase()?.indexOf(input?.toLowerCase()) >= 0}
             >
               {Object.keys(ites.enumeration).map((it) => (
                 <Select.Option key={it} value={it}>
@@ -170,7 +171,7 @@ export default function RenderCompItem(props:any){
             <InnerSelect
               disabled={disabled}
               inputType={ites?.inputType}
-              defaultValue={ites.defaultValue}
+              defaultValue={ites?.defaultValue}
               styleCommon={styleCommon}
               value={showValue(ites.code)}
               onChange={(value) => {

package/src/components/Solution/RuleComponent/index.js

@@ -1140,7 +1140,12 @@ class RuleObjectComponent extends Component {
       let value = val;
       if (isObj(code)) {
         Object.keys(code).forEach((ite) => {
-          this.handleEditExtraInfoResponse(ite, code[ite], parentDetail,classDataIndex);
+          this.handleEditExtraInfoResponse(
+            ite,
+            code[ite],
+            parentDetail,
+            classDataIndex,
+          );
         });
         return;
       }
@@ -1148,9 +1153,16 @@ class RuleObjectComponent extends Component {
         value = val.map((m) => m.value || m).join(',');
       }
       if (isObj(val)) {
-        value = val.value || val.PCDCode?.join('/');
+        value = val?.value || val.PCDCode?.join('/') || val;
       }
-      this.handleEditExtraInfoResponse('value', value, parentDetail,classDataIndex,code);
+  
+      this.handleEditExtraInfoResponse(
+        'value',
+        value,
+        parentDetail,
+        classDataIndex,
+        code,
+      );
     };
 
     return (

package/src/plugin/TableColumnSetting/index.tsx

@@ -495,6 +495,56 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
     this.setInitValue(datasource);
   };
 
+  handleResetSetting = () => {
+    const { setShowColumns, datasource = [], setInitialTableInfo, appRequestConfig }: any = this.props;
+    let that = this;
+    let { bsTableCode } = this.state;
+
+    return new Promise((resolve: any, reject: any) => {
+      request({
+        url: handleRequestUrl('/user','/appConfig/saveUserOrder', appRequestConfig),
+        method: 'POST',
+        data: {
+          code: that.state.bsTableCode,
+          detail: '',
+        },
+      }).then((res:any) => {
+        if (judgeIsRequestSuccess(res?.data)) {
+          let config =
+          localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
+          let configArray = JSON.parse(config);
+          let currentSetting = configArray.filter(
+            (item) => item.code === bsTableCode,
+          );
+          if (currentSetting.length) {
+            currentSetting[0].detail = JSON.stringify([]);
+          } else {
+            configArray.push({
+              code: bsTableCode,
+              detail: JSON.stringify([]),
+            });
+          }
+
+          localStorage.setItem(
+            ENUM.BROWSER_CACHE.COLUMN_CONDITION,
+            JSON.stringify(configArray),
+          );
+
+          message.success('重置表头列成功！');
+
+          setInitialTableInfo(true);
+          this.setState({
+            visible: false,
+          });
+        } else {
+          message.error('重置表头列自定义失败，请稍后尝试');
+          reject('');
+        }
+      });
+    })
+  };
+
+
   onSearch = (e: any) => {
     this.setState({
       searchDataSource: e.target.value,
@@ -532,15 +582,31 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
           onOk={this.handleOk}
           onCancel={this.handleCancel}
           footer={[
-            <Button key="back" onClick={this.handleReset}>
-              恢复默认
-            </Button>,
-            <Button key="submit" onClick={this.handleOk}>
-              取消
-            </Button>,
-            <Button key="submit" type="primary" onClick={this.handleOk}>
-              确认
-            </Button>,
+            <div>
+              <Button
+                key="back"
+                onClick={this.handleReset}
+                style={{ marginRight: 0 }}
+              >
+                恢复默认
+              </Button>
+              <Button key="back" onClick={this.handleResetSetting}>
+                重置设置
+              </Button>
+              <span style={{fontSize: '12px', color: '8A8F8D'}}>（列表字段变更会影响列设置功能，变更后请点击重置然后重新设置）</span>
+            </div>,
+            <div>
+              <Button
+                key="submit"
+                onClick={this.handleCancel}
+                style={{ marginRight: 0 }}
+              >
+                取消
+              </Button>
+              <Button key="submit" type="primary" onClick={this.handleOk}>
+                确认
+              </Button>
+            </div>,
           ]}
         >
           <div className={'sort_table'}>

package/src/utils/TableUtils.less

@@ -48,5 +48,5 @@
 }
 
 .card_department {
-  color: #005cff !important;
+  color: #005CFF !important;
 }