@bit-sun/business-component 2.0.2 → 2.0.3

package/package.json

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

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

@@ -0,0 +1,37 @@
+---
+nav:
+  title: '组件'
+  order: 1
+group:
+  title: 业务组件
+  order: 1
+title: 业务档录入器
+order: 1
+---
+
+# BusinessSearchSelect
+
+
+## 商品选择录入器
+
+```tsx
+import React, { useState } from 'react';
+import { Tabs } from 'antd';
+import { AddSkuSelect } from '../../../index.ts';
+
+export default () => {
+  const config = {
+    buttonText: 'context',
+    onSaveCallback: (rows) => {
+      console.log('save call', rows);
+      return Promise.resolve(true);
+      // return Promise.reject('FAILE')
+    }
+  }
+  return (
+    <div>
+      <AddSkuSelect {...config}  />
+    </div>
+  );
+};
+```

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

@@ -0,0 +1,295 @@
+/*
+ * @Description:
+ * @Author: rodchen
+ * @Date: 2022-05-07 15:17:28
+ * @LastEditTime: 2022-05-08 21:01:21
+ * @LastEditors: rodchen
+ */
+import React, { useState } from 'react';
+import { Tooltip, Select } from 'antd';
+import { AddSelect } from '../../../index';
+
+export const AddSkuSelect = (parProps: any) => {
+  const selectProps = {
+    mode: 'multiple',
+  }
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  const props = {
+    buttonText: parProps.buttonText || '新增',
+    value,
+    // labelInValue: true, // 非必填 默认为false
+    requestConfig: {
+      url: `/items/sku/pager/v2`,
+      filter: 'qp-name-like', // 过滤参数 支持'qp-name-like'和['qp-name-like', 'qp-code-like']两种结构
+      otherParams: {}, // 默认参数
+      mappingTextField: 'name',
+      mappingValueField: 'skuCode',
+    },
+    selectProps,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    onSaveCallback: parProps.onSaveCallback
+    // onSaveCallback: (rows) => {
+    //   console.log('save call', rows);
+    //   // return Promise.resolve(true);
+    //   // return Promise.reject('FAILE')
+    // }
+  };
+  const modalTableProps = {
+    modalTableTitle: '选择商品',
+    tableSearchForm: [
+      {
+        name: 'qp-skuCode-like', label: 'SKU编码'
+      },
+      { name: 'qp-skuName-like', label: 'SKU名称' },
+      { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+        },
+      } },
+      { name: 'qp-categoryId-in', type: 'treeSelect', label: '类目', field: {
+        type: 'treeSelect',
+        props: {
+          treeData: [],
+          treeCheckable: true,
+          showSearch: true,
+          allowClear: true,
+          showArrow: true,
+          treeNodeFilterProp: 'title',
+          treeDefaultExpandAll: true,
+          maxTagCount: 1,
+          placeholder: '请选择',
+          style: {
+            width: '100%',
+          },
+          dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
+        },
+      } }
+    ],
+    tableColumns: [
+      {
+        title: 'SKU编码',
+        width: 150,
+        dataIndex: 'skuCode',
+      },
+      {
+        title: 'SKU名称',
+        width: 200,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'name',
+      },
+      {
+        title: '国际条码',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        dataIndex: 'barCode',
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: '所属SPU名称',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        dataIndex: 'itemName',
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: '所属SPU编码',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        dataIndex: 'itemCode',
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: '外部编码',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'externalCode',
+      },
+      {
+        title: '规格',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'propertyNameAndValue',
+      },
+      {
+        title: '类目',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'categoryName',
+      },
+      {
+        title: '品类',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'className',
+      },
+      {
+        title: '品牌',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'brandName',
+      },
+    ],
+    selectColumn: [
+      {
+        title: 'SKU编码',
+        width: 150,
+        dataIndex: 'skuCode',
+      },
+      {
+        title: 'SKU名称',
+        width: 200,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'name',
+      },
+      {
+        title: '数量',
+        width: 100,
+        isInputItem: true,
+        dataIndex: 'count',
+      },
+      {
+        title: '单位',
+        dataIndex: 'selectUnitCode',
+        width: 80,
+        ellipsis: {
+          showTitle: false,
+        },
+        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 (baseUnitCode) {
+            return <>
+              <Select defaultValue={baseUnitCode}  onChange={(value) => {record.selectUnitCode = value}} style={{width: '60px'}}>
+                  {record.packingUnitList && record.packingUnitList.map((item: any) => {
+                    return <Select.Option value={item.unitCode}>{item.name}</Select.Option>
+                  })}
+                </Select>
+              </>
+          }
+          return <></>
+        },
+      },
+      {
+        title: '所属SPU编码',
+        width: 150,
+        ellipsis: {
+          showTitle: false,
+        },
+        dataIndex: 'itemCode',
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: '规格',
+        width: 200,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'propertyNameAndValue',
+      }
+    ]
+  }
+
+  return (
+    <div>
+      <AddSelect
+        {...props}
+        modalTableProps={modalTableProps}
+      />
+    </div>
+  );
+};

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

@@ -9,10 +9,12 @@ const CommodityEntry = (props: any) => {
   const {
     buttonName=' + 录入商品',
     modalTitle = '录入商品',
+    buttonProps = {},
     callbackHideModal,
     callbackHandleOk,
     columns=["skuCode", "quantity", "price"],
-    validDataUrl="/items/api/recordDetailImport/check"
+    validDataUrl="/items/sku/import/check",
+    isBrandAuth = true // 默认做品牌过滤
   } = props;
 
   const [modalProps, setModalProps]: any = useState({
@@ -58,13 +60,14 @@ const CommodityEntry = (props: any) => {
 
   return (
     <div>
-      <Button onClick={handleShowModal}>{buttonName}</Button>
+      <Button onClick={handleShowModal} {...buttonProps}>{buttonName}</Button>
       {modalProps.visible && (
         <Modal {...modalProps} onOk={handleOk} onCancel={handleCancel} destroyOnClose={true} zIndex={15}>
           <DataValidation
             onRef={(ref) => { dataValidationRef = ref }}
             columns={columns}
             validDataUrl={validDataUrl}
+            isBrandAuth={isBrandAuth}
           />
         </Modal>
       ) || ''}

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

@@ -73,6 +73,15 @@
     .ant-checkbox-wrapper {
       justify-content: center;
     }
+    
+    .ant-form-item-label {
+      padding: 0PX;
+      line-height: 23px !important;
+    }
+
+    .ant-form-item-label > label {
+      font-size: 12px;
+    }
 
     .ant-table-thead {
       th {
@@ -171,7 +180,7 @@
         margin-bottom: 10px;
       }
       &_formItems {
-        padding: 10px;
+        padding: 7px 10px;
       }
     }
     .select_list_searchButton {

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

@@ -9,6 +9,54 @@ import _ from "loadsh"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput } from '@/index';
 
+const loadSelectSource = (url: string, params?: any) => {
+  return new Promise((resolve, reject) => {
+    axios
+      .get(`${url}?${stringify(params)}`)
+      .then((result: any) => {
+        result = result.data;
+        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+          message.error(result.msg);
+          return;
+        }
+        resolve(result);
+      })
+      .catch((err) => {
+        reject(err);
+      });
+  })
+};
+
+const formatSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['code', 'name']) => {
+  const data = reData && reData[position]?.data;
+  const list = Array.isArray(data) ? data :(data?.items || data?.list || data?.children || []);
+  const formatData = list?.length ? list.map((v: any) => ({ text: v[resKeyValue[1]], value: v[resKeyValue[0]] })) : [];
+  changeSearchForm[changePosition] = {...changeSearchForm[changePosition], initialSource: formatData}
+}
+
+// 格式化树选择器数据源
+const mapSearchTree = (treeDataItem: any, resKeyValue: any) => {
+  const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+  return {
+    title: treeDataItem[resKeyValue[1]],
+    value: treeDataItem[resKeyValue[0]],
+    parentId: treeDataItem.parent,
+    data: { ...treeDataItem },
+    isLeaf: !haveChildren,
+    disabled: haveChildren,
+    children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i, resKeyValue)) : [],
+  };
+};
+const formatTreeDataSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['id', 'name']) => {
+  const data = reData && reData[position]?.data;
+  const formatData = (data &&
+    Array.isArray(data) &&
+    data.length &&
+    data.map((ites: any) => mapSearchTree(ites, resKeyValue))) ||
+  []
+  changeSearchForm[changePosition].field.props.treeData = formatData;
+}
+
 const { Option } = Select;
 
 const AddSelect = (props: any) => {
@@ -23,7 +71,8 @@ const AddSelect = (props: any) => {
     sourceName,
     needModalTable = true,
     getPopupContainer = undefined,
-    onSaveCallback
+    onSaveCallback,
+    buttonText = '添加'
   } = props;
   const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField = 'name', mappingTextShowKeyField, mappingValueField = 'code', mappingTextShowTextField } = requestConfig || {};
   const resultSourceKey = sourceName || requestConfig?.sourceName || 'supplierCode'
@@ -74,6 +123,7 @@ const AddSelect = (props: any) => {
   );
 
   const [form] = Form.useForm();
+  const [tableSearchForm, setTableSearchForm] = useState(modalTableProps?.tableSearchForm)
   const [caretLeftFlag, setCaretLeftFlag] = useState(true);
   const [tableData, setTableData] = useState([]);
   const [tablePagination, setTablePagination] = useState({ total: 0, size: "small", current: 1, pageSize: tableInitPageSize })
@@ -303,7 +353,21 @@ const AddSelect = (props: any) => {
   }
 
   useEffect(() => {
-    run('init')
+    // run('init')
+    Promise.all([
+      loadSelectSource(`/items/brand/queryBrandList`, {
+        pageSize: 5000,
+        currentPage: 1,
+        'ctl-withAuth': true
+      }),
+      loadSelectSource(`/items/category/queryCategoryTree`, {
+        pageSize: 5000,
+        currentPage: 1,
+      }),
+    ]).then((x: any)=>{
+      formatSource(x,0, 2, tableSearchForm,['id','name'])
+      formatTreeDataSource(x,1, 3, tableSearchForm)
+    })
   }, [])
 
   useEffect(() => {
@@ -317,7 +381,7 @@ const AddSelect = (props: any) => {
   }, [sourceName])
 
   const showModal = () => {
-    getData({ pageSize: tableInitPageSize, currentPage: 1 }, 2)
+    // getData({ pageSize: tableInitPageSize, currentPage: 1 }, 2)
     setIsModalVisible(true);
     // 回显
     if (value) {
@@ -335,6 +399,10 @@ const AddSelect = (props: any) => {
         setPopValue(labelInValue ? [{ value: value.key, text: value.label }] : [{ value: value }]);
       }
     }
+
+    setTimeout(() => {
+      document.getElementById("first-query")?.focus()
+    }, 50)
   };
 
   const handleSelectOver = (selectedValue: any) => {
@@ -358,6 +426,7 @@ const AddSelect = (props: any) => {
         if(true) {
           message.success('保存成功')
           deleteSelectRows();
+          document.getElementById('first-query')?.focus()
         !isContinue && handleCancel();
         } else {
           message.error(res)
@@ -384,9 +453,10 @@ const AddSelect = (props: any) => {
     form.resetFields();
     setTableFormParams({});
     setIsModalVisible(false);
-    if (selectMode) {
-      run();
-    }
+    setTableData([])
+    // if (selectMode) {
+    //   run();
+    // }
   };
 
   const onSearchChange = (e) => {
@@ -435,6 +505,13 @@ const AddSelect = (props: any) => {
   };
 
   const onChangeSelectedKeys = (selectKeys, selectRows) => {
+    if(selectKeys.length - selectedRowKeys.length > 0) {
+      if (selectKeys.length - selectedRowKeys.length === 1) {
+        selectRows[selectRows.length -1]['needFocus'] = true;
+      } else {
+        selectRows[selectedRowKeys.length]['needFocus'] = true;
+      }
+    }
     setPopValue(selectRows);
     setSelectedRowKeys(selectKeys)
     // setIndeterminate(!!filterRows.length && filterRows.length < tablePagination?.total);
@@ -520,7 +597,11 @@ const AddSelect = (props: any) => {
         // 默认type是input
         return (
           <Form.Item name={i.name} label={i.label} key={i.name}>
-            <Input id={index === 0 ? "2345234242342" : 'index'} style={{ width: '100%' }} placeholder='请输入' allowClear maxLength={100}  {...i?.field?.props} />
+            <Input id={index === 0 ? "first-query" : 'index'} style={{ width: '100%' }} onKeyDown={(e) => {
+              if (e.keyCode === 13) {
+                onSearchTable()
+              }
+            }} placeholder='请输入' allowClear maxLength={100}  {...i?.field?.props} />
           </Form.Item>
         )
       })
@@ -563,19 +644,25 @@ const AddSelect = (props: any) => {
   let inputIndex = 0;
   let selectColumns = [... modalTableProps.selectColumn.map(item => {
     const inputLength = modalTableProps.selectColumn.filter(item => item.isInputItem).length
-    const currentIndex = inputIndex;
+    const currentIndex = inputIndex
+
     if (item.isInputItem) {
       inputIndex++;
       return {
         ...item,
         render: (text, record, index) => {
+          // let
+          if(record.needFocus === true && currentIndex === 0) {
+
+          }
           return (
             <InputNumber
               defaultValue={text || 0}
               min={0}
+              autoFocus={record.needFocus}
               keyboard={false}
               onChange={(value) => {
-                record['count'] = value
+                record[item.dataIndex] = value
               }}
               // onFocus={(e)=> {
               //   let dom1 = e.currentTarget;
@@ -585,7 +672,7 @@ const AddSelect = (props: any) => {
               onKeyDown={(e) => {
                 if(e.keyCode === 13 && e.ctrlKey) {
                   handleOk(true)
-                  document.getElementById("2345234242342")?.focus()
+                  document.getElementById("first-query")?.focus()
                 }
                 if(e.keyCode === 8 && e.ctrlKey) {
                   message.success('删除当前行')
@@ -659,13 +746,13 @@ const AddSelect = (props: any) => {
     return item
   }), {
     title: '操作',
-    width: 150,
+    width: 50,
     fixed: 'right',
     render: (text, record, index) => {
       return (
-        <Button onClick={() => {
+        <span style={{cursor: 'pointer', color: '#005CFF' }} onClick={() => {
           deleteRecord(record)
-        }} type={"link"}>删除</Button>
+        }} type={"text"}>删除</span>
       )
     }
   },]
@@ -674,7 +761,7 @@ const AddSelect = (props: any) => {
     <div className={'add_select'}>
       <div className="add_select_show" id={`add_select_div_${uniqueValue}`}>
         <Button onClick={showModal} type="primary">
-          添加
+          {buttonText}
         </Button>
       </div>
       {needModalTable && isModalVisible && (
@@ -720,7 +807,7 @@ const AddSelect = (props: any) => {
                 <div className={'select_list_columns'}>
                   <div className={'select_list_columns_formItems'}>
                     <Form form={form} layout='vertical' key='modalForm'>
-                      {formItem(modalTableProps?.tableSearchForm)}
+                      {formItem(tableSearchForm)}
                     </Form>
                   </div>
                 </div>

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

@@ -401,7 +401,6 @@ 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

@@ -400,13 +400,20 @@ class DataValidation extends React.Component {
   };
 
   resetData = () => {
-    const { validDataUrl, updateData, columns } = this.props;
+    const { validDataUrl, updateData, columns, isBrandAuth } = this.props;
     const resultData = this.getData().filter(d => {
       return _.compact(Object.values(d)).length
     })
 
+    // 处理业务参数
+    let otherParams={}
+    if(isBrandAuth){
+      otherParams = { brandAuth: 'ctl-withAuth' }
+    }
+
     axios
       .post(validDataUrl, {
+        ...otherParams,
         columns: columns,
         data: resultData,
       })

package/src/index.ts

@@ -24,6 +24,7 @@ export { default as QueryMutipleInput } from './components/Functional/QueryMutip
 export { default as SearchSelect } from './components/Functional/SearchSelect';
 export { default as AddSelect } from './components/Functional/AddSelect';
 export { default as BusinessSearchSelect } from './components/Business/SearchSelect';
+export * from './components/Business/AddSelectBusiness';
 export { default as CommodityEntry } from './components/Business/CommodityEntry';
 export { default as CheckOneUser } from './utils/CheckOneUser';
 export { default as TreeSearchSelect } from './components/Functional/TreeSearchSelect';