@bit-sun/business-component 3.1.9 → 3.2.0-alpha.1

package/dist/utils/requestUtils.d.ts

@@ -1,4 +1,5 @@
 export declare function handleRequestAuthHeader(config?: any): void;
+export declare const handleRequestHeader: (url?: any, options?: any) => any;
 /**
  * 处理请求路径前缀/请求路径等使用不一的问题
  * @param {*} defaultUrl         默认请求路径

package/dist/utils/utils.d.ts

@@ -29,3 +29,5 @@ export declare const noEmptyArr: (obj: any) => boolean;
  */
 export declare const randomString: (len?: any) => string;
 export declare const createUniqID: (length: any) => string;
+export declare const handleConvertResponse: (items: any, total: number) => object;
+export declare const noEmptyArray: (targetObj: any) => boolean;

package/package.json

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

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

@@ -2,7 +2,7 @@
 // @ts-nocheck
 import { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status, employeeType, orgType, nodeType, personDataSourceType } from './common';
 import { getDictionarySource, getDictionaryTextByValue, loadSelectSource, handleHiddenFields, handleHiddenFieldsRequest, getFieldIndex } from './utils';
-import { handleTextOverflow, tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
+import { handleTextOverflow, tableColumnsImage, handleTooltip } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
 import { getEmployeeCode } from '@/utils/LocalstorageUtils';
 import { Image } from 'antd';
@@ -2158,5 +2158,50 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
   }
 
+   // 价格项选择器
+  if(type === 'priceItem') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/priceType`,
+      filter: 'qp-code,name-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        'qp-enabled-eq': true, // true启用 false禁用
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'priceCode',
+      ...requestConfigProp,
+    }
+    tableSearchForm = [
+      { name: 'qp-code-like', label: '代码' },
+      { name: 'qp-name-like', label: '名称' },
+    ]
+    modalTableProps = {
+      modalTableTitle: '选择价格项',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '代码',
+          dataIndex: 'code',
+        },
+        {
+          title: '名称',
+          dataIndex: 'name',
+        },
+        {
+          title: '创建时间',
+          dataIndex: 'createTime',
+          render: (text: any) =>  handleTooltip(text, true),
+        },
+        {
+          title: '创建人',
+          dataIndex: 'createUserName',
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
+
   return { modalTableProps, requestConfig, needModalTable };
 }

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

@@ -1509,4 +1509,62 @@ export default () => {
 ```
 
 
+## 价格项选择器 Select-PRCICE_ITEM-001
+
+```tsx
+import React, { useState } from 'react';
+import { Tabs } from 'antd';
+import {BusinessSearchSelect} from '../../../index.ts';
+
+const { TabPane } = Tabs;
+
+export default () => {
+  const selectProps = {
+    // mode: 'multiple',
+    // maxTagCount: 1,
+    // disabled: true
+  }
+  const selectPropsMultiple = {
+    mode: 'multiple',
+    maxTagCount: 1,
+  }
+
+  const [ tabKey, setTabKey ] = useState('single')
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  
+  const props = {
+    value,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    selectProps,
+    selectBusinessType: 'priceItem',
+  };
+
+  const onTabChange = (key) => {
+    setTabKey(key)
+    setValue(key === 'single' ? null: [])
+  }
+  
+  return (
+    <div>
+      <Tabs onChange={onTabChange} activeKey={tabKey}>
+        <TabPane tab='单选' key='single'>
+          {tabKey === 'single' && (
+            <BusinessSearchSelect {...props} />
+          )}
+        </TabPane>
+        <TabPane tab='多选' key='multiple'>
+          {tabKey === 'multiple' && (
+            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+          )}
+        </TabPane>
+      </Tabs>
+    </div>
+  );
+};
+```
+
+
 More skills for writing demo: https://d.umijs.org/guide/demo-principle

package/src/components/Business/SearchSelect/utils.ts

@@ -88,7 +88,7 @@ const handleDefaultPrefixUrl = (type: string) => {
     case 'inventoryOrg2': case 'purchaseOrg': case 'salesOrg': case 'employee2': case 'role': case 'person':
       result =  '/user';
       break;
-    case 'deliveryMode': case 'ruleTemplate':
+    case 'deliveryMode': case 'ruleTemplate': case 'priceItem':
       result =  '/basic';
       break;
     default:

package/src/components/Solution/RuleComponent/CustomPlugin/CustomSelector/CustomSelectorModal.tsx

@@ -0,0 +1,358 @@
+import { useEffect, useMemo, useRef, useState, forwardRef, useImperativeHandle } from 'react';
+import { Button, Modal, Row } from 'antd';
+import { QueryTable, request } from 'bssula';
+// @ts-ignore
+import { assembleRequest, getMetaData, remoteFetch, convertProp } from './function';
+import { getColumnItem } from './helps';
+import React from 'react';
+
+export default forwardRef((props: any, ref) => {
+  useImperativeHandle(ref, () => {
+    return {
+      handleOk,
+      refreshSelectSource,
+    };
+  });
+
+  const prop = convertProp(props?.ctx?.name, props.isSearchForm);
+  const newFormData = props?.ctx?.form?.getFieldsValue() || {};
+  const newestFormData =
+    newFormData && Object.keys(newFormData)?.length
+      ? newFormData
+      : props?.formData || {}; // 最新的formData，用来下面监听最新值的改变，做级联效果
+  const searchFormData =
+    newFormData && Object.keys(newFormData)?.length
+      ? newFormData
+      : props?.formData || {}; // 如果是表格上面的查询表单情况
+  const isView = props?.ctx?.mode == 'view'
+
+  const queryTableRef = useRef(null);
+
+  const [requestConfig, setRequestConfig] = useState({} as any);
+  const [tableState, setTableState] = useState({
+    pages: {
+      page: 1,
+      limit: 20,
+      total: 0,
+    },
+    columns: [],
+    fields: [],
+    dataList: [],
+    currentQuery: {},
+    selectedLine: {},
+  });
+
+  const handleOpen = async () => {
+    const requestConfigNew = assembleRequest(props.customSelectorConfig, {
+      isSearchForm: props.isSearchForm,
+      newestFormData,
+      searchFormData,
+    });
+    if (!requestConfigNew) return;
+    const metaDataId = props.customSelectorConfig?.targetMetaData?.id;
+    const metaData = await getMetaData(metaDataId);
+    const realMetaData = metaData?.filter((item: any) => item?.inputType != 1)||[]
+    const columns = realMetaData.map((item: any) => getColumnItem({ item, props }));
+
+    // tableState.columns = columns
+    const fields = realMetaData?.filter((item: any) => item.infoVo?.isQuery)
+      .map((item: any) => {
+        let name = `qp-${item.code}-eq`;
+        try {
+          if (JSON.parse(item.info).isLikeQuery) {
+            name = `qp-${item.code}-like`;
+          }
+        } catch (e) {
+          console.log('error', e);
+        }
+
+        return {
+          name,
+          label: item.name,
+          field: 'input',
+        };
+      });
+    setTableState({
+      ...tableState,
+      columns,
+      fields,
+    });
+    setRequestConfig(requestConfigNew);
+
+    const initValue = (!props?.ctx?.form && props?.value?.map?.((v: any) => (v.key || v))) || props?.ctx?.form?.getFieldValue(props.id);
+    if(props?.selectProps?.multipleForQuery && !isView && initValue) {
+      // @ts-ignore
+      queryTableRef?.current?.tableRef?.current?.bsSetSelectInfo(initValue);
+    }
+  };
+
+  const fieldMapping = props.customSelectorConfig?.fieldMapping || [];
+  const fieldMappingItem = fieldMapping.find(
+    (item: any) => item.codeMappingTo === prop,
+  );
+  const echoLabel = props.customSelectorConfig?.extraData?.echoLabel;
+  //初始获取下拉列表
+  const fetchFieldSource = (obj: any, init: any) => {
+    const { url, method, convertParams, converter } = obj;
+    const params = convertParams({ params: { pageSize: 20, currentPage: 1, ...init } });
+
+    // 容错处理
+    if (!params?.path || params?.path?.indexOf('undefined') > -1) return;
+
+    request({ url, method, params }).then((res: any) => {
+      const { list } = converter({ data: res });
+
+      const currentField = fieldMappingItem;
+      const sourceList: any[] = [];
+      const codeList: string[] = [];
+      const options = list.map((item: any) => {
+        if (currentField && echoLabel) {
+          return {
+            label: item[echoLabel],
+            value: item[currentField.codeMappingFrom],
+          };
+        }
+        if (echoLabel && !currentField) {
+          return {
+            label: item[echoLabel],
+            value: item[echoLabel],
+          };
+        }
+        return {
+          label: item[currentField.codeMappingTo],
+          value: item[currentField.codeMappingTo],
+        };
+      });
+      options.forEach((item: any) => {
+        if (!codeList.includes(item.value)) {
+          codeList.push(item.value);
+          sourceList.push(item);
+        }
+      });
+      props.setFieldSource(sourceList);
+      props.setAllListData(list || []);
+    });
+  };
+
+  useEffect(() => {
+    if (props.visible) {
+      handleOpen();
+    }
+  }, [props.visible]);
+
+  const refreshSelectSource = (reset: any = false, init={}) => {
+    const requestConfigNew = assembleRequest(props.customSelectorConfig, {
+      isSearchForm: props.isSearchForm,
+      newestFormData,
+      searchFormData,
+    });
+    const obj = remoteFetch(requestConfigNew);
+    //初始化请求下拉列表
+    fetchFieldSource(obj, init);
+  };
+
+  useEffect(() => {
+    const isNeedBack = props?.ctx?.mode != 'create' || props.disabled;
+    const initValue = props?.ctx?.form?.getFieldValue(props.id);
+    const formCodeKey = `${fieldMappingItem?.codeMappingFrom}`
+    const initKey = Array.isArray(initValue) && initValue?.length>1 ? `qp-${formCodeKey}-in` : `qp-${formCodeKey}-eq`;    
+    const initParams = isNeedBack&&formCodeKey&&initValue ? { [initKey]: Array.isArray(initValue)? initValue.join(',') : initValue } : {};    
+    refreshSelectSource(null, initParams);
+  }, []);
+
+  const remoteDataSource = useMemo(() => {
+    if (Object.keys(requestConfig).length) {
+      const obj = remoteFetch(requestConfig,tableState.columns);
+      return obj;
+    } else {
+      return {};
+    }
+  }, [requestConfig,tableState.columns]);
+
+  const rowKey = fieldMappingItem?.codeMappingFrom ?? 'id' ?? 'code'
+  const handleOk = (rowData?: any, setSource = true) => {
+    //多选数据处理
+    if (props?.selectProps?.multipleForQuery) {
+      // @ts-ignore
+      const selectedKesys = queryTableRef?.current?.tableRef?.current?.getSelectedRowKeys()||[];
+      // @ts-ignore
+      const selectedRows = queryTableRef?.current?.tableRef?.current?.getSelectedRows()||[];
+      let realSelectedRows = selectedRows
+      if(!rowData && selectedKesys?.length!==selectedRows?.length) {
+        // @ts-ignore
+        const dataSource = queryTableRef?.current?.tableRef?.current?.getDataSource()||[]
+        realSelectedRows = dataSource?.filter((s: any)=> selectedKesys.includes(s[rowKey]));
+      } 
+      //@ts-ignore
+      const rowDataList = rowData
+        ? rowData
+        : realSelectedRows;
+
+      let rowDataTemp: any = {};
+      rowDataList.forEach((item: any, index: Number) => {
+        Object.keys(item).forEach((key) => {
+          if (!Reflect.has(rowDataTemp, key)) {
+            rowDataTemp[key] = [item[key]];
+          } else {
+            rowDataTemp[key].push(item[key]);
+            //数组去重
+            rowDataTemp[key] = [...new Set(rowDataTemp[key])];
+          }
+        });
+      });
+      rowData = rowDataTemp;
+    }
+
+    let mappings = props.customSelectorConfig.fieldMapping;
+    const values: any = {};
+    //没有映射且有echoLabel的话，默认塞入一条
+    if (
+      (!mappings || (Array.isArray(mappings) && !mappings.length)) &&
+      props.customSelectorConfig?.extraData?.echoLabel
+    ) {
+      mappings.push({
+        codeMappingFrom: props.customSelectorConfig?.extraData?.echoLabel,
+        codeMappingTo: prop,
+        uuid: '',
+      });
+    }
+
+    mappings.map((item: any) => {
+      if (
+        props.customSelectorConfig?.extraData?.echoLabel &&
+        item.codeMappingTo === prop &&
+        rowData[props.customSelectorConfig?.extraData?.echoLabel]
+      ) {
+        values[`${item.codeMappingTo}Name`] =
+          rowData[props.customSelectorConfig?.extraData?.echoLabel];
+      }
+      values[item.codeMappingTo] = rowData[item.codeMappingFrom];
+    });
+    // 表单查询项就不给其他字段赋值
+    if (!props.isSearchForm) {
+      Object.keys(values).map((key, index, list) => {
+        if (key.includes('Name')) {
+          const valueKey = key.replace('Name', '');
+          if (setSource) {
+            if (Array.isArray(values[valueKey])) {
+              const valueList: any[] = [];
+              values[valueKey].forEach((item: any, index: number) => {
+                valueList.push({
+                  label: values[key][index],
+                  value: values[valueKey][index],
+                });
+              });
+              props.setFieldSource(valueList);
+            } else {
+              props.setFieldSource([
+                {
+                  label: values[key],
+                  value: values[valueKey],
+                },
+              ]);
+            }
+          }
+        } else {
+          props?.setFieldValue?.(key, values[key]);
+        }
+      });
+    } else {
+      if (setSource) {
+        if (Array.isArray(values[prop])) {
+          const valueList: any[] = [];
+          values[prop].forEach((item: any, index: number) => {
+            valueList.push({
+              label: values[`${prop}Name`][index],
+              value: values[prop][index],
+            });
+          });
+          props.setFieldSource(valueList);
+        } else {
+          props.setFieldSource([
+            {
+              label: values[`${prop}Name`],
+              value: values[prop],
+            },
+          ]);
+        }
+      }
+      const fieldKey = props?.ctx?.name || prop
+      props.setFieldValue(fieldKey, values[prop],props.fieldSource);
+    }
+
+    props.onCancel();
+    //@ts-ignore
+    queryTableRef?.current?.tableRef?.current?.clearRowSelection();
+  };
+
+
+  const config = useMemo(() => {
+    let returnConfig: any = {
+      size: 'small',
+      needPageHeader: false,
+      tableWrapperStyle: {},
+      isHorizontally: false,
+      rowSelection: (props?.selectProps?.multipleForQuery && !isView) ? {
+        selectedRowKeys: (!props?.ctx?.form && props?.value?.map((v: any) => (v.key || v))) || props?.ctx?.form?.getFieldValue(props.id),
+      } : false,
+      remoteDataSource,
+      fields: tableState.fields,
+      columns: tableState.columns,
+      rowKey,
+      tableProps: !isView && {
+        rowClassName: (record: any) => {
+          return record[rowKey] == ((!props?.ctx?.form && (props?.value?.key|| props?.value)) || props?.ctx?.form?.getFieldValue(props.id)) ? 'tableSelectedRow': ''
+        },
+        onRow: (record: any) => {
+          return {
+            onDoubleClick: () => {
+              handleOk(record);
+            }, //双击
+          };
+        },
+      } || {},
+    };
+    if (Object.keys(remoteDataSource).length) {
+      return returnConfig;
+    } else {
+      return false;
+    }
+  }, [tableState, remoteDataSource]);
+
+  return (
+    <Modal
+      title=""
+      width={1300}
+      open={props.visible}
+      footer={null}
+      onCancel={() => {
+        props.onCancel();
+      }}
+      destroyOnClose
+    >
+      {config && <QueryTable ref={queryTableRef} {...config} />}
+
+      {props?.selectProps?.multipleForQuery && !isView && (
+        <Row justify="center" style={{ marginBottom: 30, marginTop: 10 }}>
+          <Button
+            type="primary"
+            style={{ marginRight: 20 }}
+            onClick={() => handleOk()}
+          >
+            提交
+          </Button>
+          <Button
+            type="default"
+            onClick={() => {
+              props.onCancel();
+              //@ts-ignore
+              queryTableRef?.current?.tableRef?.current?.clearRowSelection();
+            }}
+          >
+            取消
+          </Button>
+        </Row>
+      )}
+    </Modal>
+  );
+});