@bit-sun/business-component 2.0.1 → 2.0.4

package/package.json

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

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

@@ -0,0 +1,41 @@
+---
+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',
+    beforeShowModal: () => {
+      return Promise.resolve(true);
+      // return Promise.reject('校验有误');
+    },
+    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,297 @@
+/*
+ * @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)
+    },
+    beforeShowModal: parProps?.beforeShowModal,
+    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
+              record.selectedScale = base[0]?.baseUnitScale || 1
+            }
+          }
+
+          if (baseUnitCode) {
+            return <>
+              <Select defaultValue={baseUnitCode}  onChange={(value) => {record.selectUnitCode = value;record.selectedScale = record?.packingUnitList?.find((item: any) => item.unitCode === value)?.baseUnitScale || 1}} 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

@@ -0,0 +1,284 @@
+.add_select {
+  &_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%);
+    }
+  }
+
+  &_header {
+    border-bottom: 1px solid #D9D9D9;
+    height: 24px;
+    height: 40px;
+    font-family: PingFangSC-Medium;
+    font-weight: 500;
+    font-size: 18px;
+    color: #000000;
+    letter-spacing: 0;
+    line-height: 40px;
+    margin-bottom: 10px;
+    padding-left: 10px;
+
+    & > span {
+      margin-left: 20px;
+      font-weight: 400;
+      font-size: 12px;
+      color: #666666;
+      letter-spacing: 0;
+      line-height: 40px;
+
+      & > span {
+        color: #ff0000;
+      }
+    }
+
+    &_close {
+      span {
+        position: absolute;
+        color: black !important;
+        right: 10px;
+        top: 10px;
+      }
+    }
+  }
+
+  &_wrapper {
+    position: relative;
+    display: flex;
+    // min-height: 60vh;
+    max-height: 60vh;
+    overflow: hidden;
+    font-size: 14px;
+    margin: 5px 10px;
+
+      
+    .ant-table-pagination.ant-pagination {
+      margin: 5px;
+      padding-right: 5px;
+    }
+
+    .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 {
+        height: 20px !important;
+        padding: 0px 8px !important;
+        font-size: 12px !important;
+        font-weight: 600 !important;
+        line-height: 20px !important;
+      }
+    }
+
+    .ant-modal-body {
+      padding: 10px;
+    }
+
+    .ant-table-wrapper {
+      padding: 0px !important;
+    }
+
+    .row-class {
+      height: 24px;
+
+      td {
+        font-size: 12px !important;
+        height: 24px !important;
+        padding: 0px 8px !important;
+        line-height: 20px !important;
+      }
+    }
+
+    .ant-table-body {
+      height: 240px;
+      overflow-y: auto !important;
+    }
+
+    .ant-row.ant-form-item {
+      margin-bottom: 10px;
+    }
+
+    &_click_flag {
+      position: absolute;
+      z-index: 10;
+      &_arrow {
+        transform: rotate(0deg);
+        transition: transform 0.5s;
+      }
+      &_arrow_1 {
+        transform: rotate(-180deg);
+        transition: transform 0.5s;
+      }
+    }
+
+    &_left {
+      flex-basis: 298px;
+      width: 298px;
+      overflow-y: hidden;
+      //background-color: yellow;
+      transition: all 0.3s;
+      margin-right: 10px;
+      border: 1px solid #D9D9D9;
+      border-radius: 5px;
+    }
+
+    &_left1 {
+      width: 0;
+      height: 0;
+      transition: all 0.3s;
+      display: none;
+    }
+
+    &_right {
+      width: 872px;
+      //background-color: pink;
+      border: 1px solid #D9D9D9;
+      border-radius: 5px;
+    }
+
+    &_right1 {
+      width: 100%;
+      margin-left: 10px;
+      //background-color: green;
+    }
+
+    &_right, &_right1 {
+      overflow-x: auto;
+    }
+
+    .select_list_columns {
+      height: 272px;
+      overflow-y: auto;
+      border-bottom: 1px solid #D9D9D9;
+
+      &_tips {
+        background: #eee;
+        padding: 6px 20px;
+        margin-bottom: 10px;
+      }
+      &_formItems {
+        padding: 7px 10px;
+      }
+    }
+    .select_list_searchButton {
+      display: flex;
+      margin: 10px;
+      justify-content: flex-end;
+    }
+
+    .select_list_button_space {
+      margin-right: 10px;
+    }
+
+    .select_list_selectTips {
+      display: flex;
+      justify-content: space-between;
+      height: 24px;
+      font-size: 12px;
+      line-height: 24px;
+      background: #F7F8FB;
+      padding: 0 5px;
+      border-bottom: 1px solid #D9D9D9;
+    }
+
+    .select_list_selectAll {
+      position: relative;
+      top: -40px;
+      left: 20px;
+      width: 160px;
+    }
+  }
+
+  &_wrapper_select {
+    margin-top: 4px;
+    border: 1px solid #D9D9D9;
+    border-radius: 5px;
+    margin: 5px 10px;
+
+
+    .ant-table-pagination.ant-pagination {
+      margin: 9px;
+      padding-right: 5px;
+    }
+
+    .ant-modal-body {
+      padding: 10px;
+    }
+
+    .ant-table-wrapper {
+      padding: 0px !important;
+    }
+
+    .ant-table-thead {
+      th {
+        height: 23px !important;
+        padding: 0px 8px !important;
+        font-size: 12px !important;
+        font-weight: 600 !important;
+        line-height: 23px !important;
+      }
+    }
+
+    .ant-modal-close-x {
+      height: 30px;
+    }
+
+    .row-class {
+      height: 30px;
+
+      td {
+        font-size: 12px !important;
+        height: 30px !important;
+        padding: 4px 8px !important;
+      }
+    }
+
+    .ant-table-body {
+      height: 200px;
+      overflow-y: auto !important;
+    }
+
+    .ant-row.ant-form-item {
+      margin-bottom: 10px;
+    }
+
+    .ant-input-number-input {
+      height: auto;
+    }
+
+    .select_list_selectTips {
+      display: flex;
+      justify-content: space-between;
+      height: 24px;
+      font-size: 12px;
+      line-height: 24px;
+      background: #F7F8FB;
+      padding: 0 3px;
+
+      border-bottom: 1px solid #D9D9D9;
+    }
+  }
+}