@bit-sun/business-component 4.0.12-alpha.19 → 4.0.12-alpha.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.0.12-alpha.19",
+  "version": "4.0.12-alpha.20",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -15,6 +15,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
   
   // 默认type === 'supplier' 供应商选择器
   let requestConfig = {
+    init: true,
     url: `${prefixUrl.selectPrefix}/supplier`,
     filter: 'qp-name,code-orGroup,like', // 过滤参数
     otherParams: {
@@ -295,7 +296,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
   // 商品选择器sku
   if(type === 'skuCommodity') {
     requestConfig = {
-      url: `${prefixUrl.selectPrefix}/sku/doPageBySelect/v4`,
+      url: `${prefixUrl.selectPrefix}/sku/doPageBySelect/v3`,
       filter: 'skuCodeAndSkuName', // 过滤参数
       searchStartLength: 4,
       mappingTextField: 'name',
@@ -365,9 +366,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
           },
         } },
-      { name: 'UNIQUE_SPEC', label: '属性', field: {
-          type: 'proppertySelector',
-        } },
     ]
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
@@ -787,6 +785,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/skuPropertyValue/list`,
       filter: 'qp-value-like', // 过滤参数
       mappingTextField: 'value',
@@ -1697,6 +1696,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/inventoryOrg`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -1729,6 +1729,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/company`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -1761,6 +1762,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/platCompany`,
       filter: 'qp-name,socialCreditCode-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -1793,6 +1795,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/employee/v2`,
       filter: 'qp-employeeNumber,name-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -1890,6 +1893,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/employee/pageList/v2`,
       filter: 'qp-username,name-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -2011,6 +2015,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     const isLogisCompanyCodeSingleSearch = requestConfigProp?.fixedparameter?.some((i: any) => i == 'qp-logisCompanyCode-eq');
     const logisCompanyCodeSingleSearchName = isLogisCompanyCodeSingleSearch ? 'qp-logisCompanyCode-eq' : 'qp-logisCompanyCode-in';
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/deliveryMode`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -2138,6 +2143,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/ruleTemplate`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -2213,6 +2219,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/role`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -2311,6 +2318,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/channelInfo`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -2401,6 +2409,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/orgViewNode/common/pageList`,
       filter: 'qp-name-like', // 过滤参数
       mappingTextField: 'name',
@@ -2534,6 +2543,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/person`,
       filter: 'qp-code,name-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -2690,6 +2700,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/priceType`,
       filter: 'qp-code,name-orGroup,like', // 过滤参数
       mappingTextField: 'name',

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

@@ -11,7 +11,6 @@ import { BusinessSearchSelect, QueryMutipleInput } from '@/index';
 import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, ColSpan, getTableHeigth, getCurrentSRKs, getRenderSource }  from './utils';
 import { judgeIsRequestError } from '@/utils/requestUtils';
 import zhankaitiaojian from '../../../assets/zhankaitiaojian-icon.svg';
-import PropertySelector from '@/components/Business/PropertyModal';
 
 const { Option } = Select;
 
@@ -181,7 +180,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }))
 
   // 获取数据源 （type: 1下拉框 2/3弹框  不传值默认为下拉框）
-  const getData = (params = {}, type = 1,callback?: any, bodyParams?: any) => {
+  const getData = (params = {}, type = 1,callback?: any) => {
     if (!requestConfig) return;
 
     setFetching(true)
@@ -328,12 +327,12 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     if (isNil(queryParams[selectParamsKey])) {
       queryParams[selectParamsKey] = searchValue;
     }
-
-    
     request
-      .post(
+      .get(
         `${url}?${stringify(queryParams)}`,
-        bodyParams || null,)
+        {
+          headers: { ...extralHeaders }
+        })
       .then((result: any) => {
         setFetching(false)
         result = result.data;
@@ -633,18 +632,12 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const onSearchTable = () => {
     const params = form.getFieldsValue();
-    console.log('dddd', params);
 
     // const isHaveParams = params && Object.keys(params).filter(item => params[item]).length > 0;
     setModalSearched(true);
-    
-    let unique_params = null;
-    if (params['UNIQUE_SPEC']) {
-      unique_params = params['UNIQUE_SPEC']?.propertyList || [];
-    }
 
     setTableFormParams(params);
-    getData({ ...params, pageSize: tableInitPageSize }, 2, null, unique_params);
+    getData({ ...params, pageSize: tableInitPageSize }, 2)
   }
 
   const onResetTable = () => {
@@ -824,16 +817,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             </Col>
           );
         }
-        if (i?.field?.type === 'proppertySelector') {
-          return (
-            <Col span={ColSpan} key={i.name}>
-              <Form.Item name={i.name} label={i.label} key={i.name}>
-                <PropertySelector 
-                />
-              </Form.Item>
-            </Col>
-          );
-        }
 
         // 默认type是input
         return (

package/src/index.ts

@@ -35,7 +35,6 @@ export { default as JsonQueryTable } from './components/Business/JsonQueryTable'
 export { default as TableColumnSetting} from './plugin/TableColumnSetting';
 export { default as AuthButton } from './components/Functional/AuthButton';
 export { default as CustomSelector } from './components/Solution/RuleComponent/CustomPlugin/CustomSelector';
-export { default as PropertySelector} from './components/Business/PropertyModal';
 
 export { default as EllipsisTooltip} from './components/Functional/EllipsisTooltip';
 export * from './components/Functional/BsAntdSula/index';

package/dist/components/Business/PropertyModal/index.d.ts

@@ -1,23 +0,0 @@
-import React from "react";
-import "./index.less";
-interface propertyValueType {
-    propertyName: string;
-    propertyCode: string;
-    isCommonUse?: Boolean | String;
-    detailList: Array<{
-        name: string;
-        value: string;
-        isCommonUse?: Boolean | String;
-    }>;
-}
-interface valueType {
-    classifyCode: string;
-    classifyName: string;
-    propertyList: propertyValueType[];
-}
-declare const PropertySelector: ({ value, onChange, width, ...restProps }: {
-    value: valueType;
-    onChange: any;
-    width: string;
-}) => React.JSX.Element;
-export default PropertySelector;

package/dist/components/Business/PropertyModal/mockData.d.ts

@@ -1,10 +0,0 @@
-export declare const MockPropertyList: {
-    propertyCode: string;
-    propertyName: string;
-    isCommonUse: boolean;
-    detailList: {
-        name: string;
-        value: string;
-        isCommonUse: boolean;
-    }[];
-}[];

package/dist/components/Business/PropertyModal/propertyGroup.d.ts

@@ -1,4 +0,0 @@
-import React from "react";
-import './index.less';
-declare const _default: React.MemoExoticComponent<(props: any) => React.JSX.Element>;
-export default _default;

package/src/components/Business/PropertyModal/index.less

@@ -1,58 +0,0 @@
-.property_classify_content {
-    margin-bottom: 15px;
-}
-
-.property_classify_content1 {
-    max-height: 350px;
-    overflow-y: scroll;
-    overflow-x: hidden;
-}
-//滚动条  
-/* 滚动槽（轨道）宽高 */
-.property_classify_content1::-webkit-scrollbar {
-width: 5px; /*对垂直流动条有效*/
-height: 5px; /*对水平流动条有效*/
-}
-/* 滚动槽（轨道）样式 */
-.property_classify_content1::-webkit-scrollbar-track {
-background-color: #ffffff;
-border-radius: 8px;
-}
-
-/*定义滑块颜色、内阴影及圆角*/
-.property_classify_content1::-webkit-scrollbar-thumb {
-border-radius: 7px;
-background-color: #CECECE;
-}
-
-/*定义两端按钮的样式*/
-.property_classify_content1::-webkit-scrollbar-button {
-display: none;
-}
-
-.propertyGroup_container {
-    display: flex;
-    margin-bottom: 16px;
-    .propertyGroup_container_left {
-        width: 100px;
-        flex-shrink: 0;
-        flex-grow: 0;
-    }
-    .propertyGroup_container_right {
-        width: 560px;
-        flex-shrink: 0;
-        flex-grow: 0;
-        display: flex;
-        flex-wrap: wrap;
-    }
-    .ant-checkbox-wrapper + .ant-checkbox-wrapper {
-        margin-left: 0px;
-    }
-}
-
-.propertyGroup_checkbox_container {
-    width: 80px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}

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

@@ -1,33 +0,0 @@
----
-nav:
-  title: '组件'
-  order: 1
-group:
-  title: 业务组件
-  order: 1
-title: PropertySelector 属性选择器
-order: 1
----
-
-# PropertySelector
-
-## 属性选择器
-
-```tsx
-import React, { useState } from 'react';
-import PropertySelector from './index.tsx';
-
-export default () => {
-
-  const [value, setValue] = useState({});
-  
-  return (
-    <div style={{ width: '200px' }}>
-        <PropertySelector 
-            value={value}
-            onChange={(value) => setValue(value)}
-        />
-    </div>
-  );
-};
-```

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

@@ -1,266 +0,0 @@
-import React, { useEffect, useState, useRef } from "react";
-import { Modal, Select, Tag } from "antd";
-import "./index.less";
-import { MockPropertyList } from "./mockData";
-import PropertyGroup from "./propertyGroup";
-import { CaretUpOutlined, CaretDownOutlined, CaretUpFilled, CaretDownFilled } from '@ant-design/icons';
-import request from '@/utils/request';
-import { judgeIsRequestError } from "@/utils";
-
-interface propertyValueType {
-    propertyName: string;
-    propertyCode: string;
-    isCommonUse?: Boolean | String;
-    detailList: Array<{
-        name: string;
-        value: string;
-        isCommonUse?: Boolean | String;
-    }>;
-}
-
-interface valueType {
-    classifyCode: string;
-    classifyName: string;
-    propertyList: propertyValueType[];
-}
-
-interface PropertyGroupValueType {
-    propertyCode: string;
-    propertyName: string;
-    detailList: Array<{
-        name: string;
-        value: string;
-    }>;
-}
-const PropertySelector = ({
-    value,
-    onChange,
-    width,
-    ...restProps
-}: { value: valueType, onChange: any, width: string }
-) => {
-    const settingValue = useRef<valueType>({
-        classifyCode: '',
-        classifyName: '',
-        propertyList: []
-    });
-    const [choosedValues, setChoosedValues] = useState<any[]>([]);
-    const [choosedClassify, setChoosedClassify] = useState('');
-    const [commonProperty, setCommonUseProperty] = useState<any[]>([]);
-    const [notCommonProperty, setNotCommonProperty] = useState<any[]>([]);
-
-    const [visible, setVisible] = useState(false);
-    const [showNotCommon, setShowNotCommon] = useState(false); // 是否展示非常用属性
-    const [classifyOptionList, setClassifyOptionList] = useState<any[]>([]);
-    const [listKey, setListKey] = useState('1');
-    
-    useEffect(() => {
-        request({
-            url: '/items/class/withProperty?pageSize=500&currentPage=1',
-            method: 'GET',
-        })
-        .then(({data}: any) => {
-            if (judgeIsRequestError(data)) {
-                return
-            }
-            const items = data.data?.items || [];
-            setClassifyOptionList(items.map((item: any) => ({
-                label: item.name,
-                value: item.id,
-            })))
-        })
-    }, [])
-
-    useEffect(() => {
-        if (!choosedClassify) return;
-        request({
-            url: `/items/classProperty/${choosedClassify}`,
-            method: 'GET',
-        })
-        .then(({data}: any) => {
-            if (judgeIsRequestError(data)) {
-                return
-            }
-
-            const newArr = (data?.data || []).map((item: any) => {
-                return {
-                    propertyCode: item.property.propertyCode,
-                    propertyName: item.property.name,
-                    propertyId: item.property.id,
-                    isCommonUse: item.property.isCommonUse === 'commonUse',
-                    detailList: item.propertyValueList.map((detail: any) => ({
-                        name: detail.value,
-                        value: detail.value,
-                        isCommonUse: detail.isCommonUse === 'commonUse',
-                    }))
-                }
-            })
-
-            setCommonUseProperty(newArr.filter((item: any) => item.isCommonUse))
-            setNotCommonProperty(newArr.filter((item: any) => !item.isCommonUse))
-            setListKey(listKey === '1' ? '2' : '1');
-        })
-    }, [choosedClassify])
-
-
-    useEffect(() => {
-        // 获取选中品类信息
-        setChoosedClassify(value?.classifyCode);
-
-        // 获取选中属性值展示
-        const choosedPropertyList = (value?.propertyList || []).map(item => (item.detailList || []).map(detail => detail.name)).flat();
-        if ((value?.propertyList || []).some(item => !item.isCommonUse)) {
-            setShowNotCommon(true);
-        }
-        setChoosedValues(choosedPropertyList);
-        settingValue.current = {...value};
-    }, [value])
-
-    // 关闭弹窗回传组件值
-    const handleConfirm = () => {
-        setVisible(false);
-        onChange(settingValue.current);
-    }
-    const onCancel = () => {
-        setVisible(false);
-    }
-
-    // 获取选中属性值信息
-    const handleProperyItemChange = (value: PropertyGroupValueType) => {
-        const newDetailList = settingValue.current?.propertyList || [];
-        const itemIndex = newDetailList.findIndex((item: any) => item.propertyCode === value.propertyCode);
-        if (itemIndex !== -1) {
-            newDetailList[itemIndex] = value;
-        } else {
-            newDetailList.push(value);
-        }
-        settingValue.current = {
-            ...settingValue.current,
-            propertyList: newDetailList.filter(item => item.detailList && item.detailList.length),
-        };
-    }
-
-    //修改品类值
-    const onClassifyChange = (value: string, option: any) => {
-        setChoosedClassify(value);
-        settingValue.current = {
-            classifyCode: value,
-            classifyName: option.children,
-            propertyList: [],
-        };
-    };
-
-    const tagRender = (props: any) => {
-        const { label, value, closable, onClose } = props;
-        const onPreventMouseDown = (event: any) => {
-          event.preventDefault();
-          event.stopPropagation();
-        };
-        return (
-          <Tag
-            closable={false}
-            style={{ marginRight: 3, height: '20px', fontSize: '12px' }}
-          >
-            {label}
-          </Tag>
-        );
-      };
-
-    return (
-        <div>
-            <Select
-                maxTagCount={1}
-                tagRender={tagRender}
-                {...restProps}
-                mode="multiple"
-                value={choosedValues}
-                onClick={() => {
-                    setVisible(true)
-                }}
-                style={{ width: width || '100%' }}
-                open={false}
-            />
-            <Modal
-                title="属性设置"
-                width={700}
-                open={visible}
-                onOk={handleConfirm}
-                destroyOnClose
-                onCancel={onCancel}
-                cancelText={'取消'}
-                okText={'确定'}
-            >
-                <div>
-                    <div className={'property_classify_content'}>
-                        <span style={{ marginRight: '10px' }}>品类模板</span>
-                        <Select
-                            style={{ width: '200px' }}
-                            value={choosedClassify}
-                            options={classifyOptionList}
-                            onChange={(value, option) => {
-                                onClassifyChange(value, option);
-                            }}
-                        />
-                    </div>
-                    <div className={'property_classify_content1'} key={listKey}>
-                        <div>
-                            {
-                                commonProperty.map(item => (
-                                    <PropertyGroup
-                                        modalVisilbe={visible}
-                                        itemValue={settingValue.current}
-                                        propertyData={item}
-                                        handleProperyItemChange={handleProperyItemChange}
-                                    />
-                                ))
-                            }
-                        </div>
-                        <div>
-                            {
-                                showNotCommon && notCommonProperty.map(item => (
-                                    <PropertyGroup
-                                        modalVisilbe={visible}
-                                        itemValue={settingValue.current}
-                                        propertyData={item}
-                                        handleProperyItemChange={handleProperyItemChange}
-                                    />
-                                ))
-                            }
-                        </div>
-                    </div>
-                    {
-                        !!notCommonProperty.length && (
-                            <div>
-                                <div
-                                    style={{ width: '50px', cursor: 'pointer', color: '#005cff', fontSize: '10px' }}
-                                    onClick={() => setShowNotCommon(!showNotCommon)}
-                                >
-                                    {
-                                        showNotCommon && (
-                                            <>
-                                                <CaretUpOutlined />
-                                                收起
-                                            </>
-                                        )
-                                    }
-                                    {
-                                        !showNotCommon && (
-                                            <>
-                                                <CaretDownOutlined  />
-                                                展开
-                                            </>
-                                        )
-                                    }
-                                </div>
-                            </div>
-                        )
-                    }
-                </div>
-
-            </Modal>
-        </div>
-    )
-}
-
-export default PropertySelector;
-