@bit-sun/business-component 2.3.22 → 2.3.23-beta02

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

@@ -1758,5 +1758,79 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
   }
 
+  // 角色选择器
+  if(type === 'role') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/role`,
+      filter: 'qp-name,code-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        'qp-status-eq': 10, // 10启用 20禁用
+        sorter: 'desc-id',
+      }, // 默认参数
+      sourceName: 'roleCode',
+      ...requestConfigProp
+    }
+    tableSearchForm = [
+      { name: 'qp-name-like', label: '角色名称' },
+      { name: 'qp-code-like', label: '角色编码' },
+      { name: 'qp-categoryCode-eq', type: 'select', label: '角色分类', field: {
+          type: 'select',
+          props: {
+            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,
+          },
+        }
+      },
+    ]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/permissionCategory`, {
+        pageSize: 5000,
+        currentPage: 1,
+      }),
+    ]).then((x: any)=>{
+      formatSource(x,0, 2, tableSearchForm);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择角色',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '角色编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '角色名称',
+          dataIndex: 'name',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          title: '角色分类',
+          dataIndex: 'categoryName',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          dataIndex: 'remark',
+          title: '角色描述',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          dataIndex: 'applicationName',
+          title: '应用',
+          render: (text: any) => handleTextOverflow(text),
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
+
   return { modalTableProps, requestConfig, needModalTable };
 }

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

@@ -1157,6 +1157,7 @@ export default () => {
   const props2 = {
     ...props,
     // prefixUrl: { selectPrefix: '/user/api', formSelectFix: '/user/api' },
+    // prefixUrl: { selectPrefix: '/api/user-manage/', formSelectFix: '/api/user-manage/' },
     modalTableProps: {
       needTypeSearch: true
     },
@@ -1326,4 +1327,61 @@ export default () => {
 };
 ```
 
+# 角色选择器 Select-ROLE-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: 'role',
+  };
+
+  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

@@ -2,6 +2,7 @@ import axios from 'axios';
 import { message } from 'antd';
 import { stringify } from 'querystring';
 import ENUM from '@/utils/enumConfig';
+import { judgeIsRequestError } from '@/utils/requestUtils';
 
 const getDicData = (dicCode: string) => {
   let dicData = {};
@@ -60,7 +61,7 @@ const loadSelectSource = (url: string, params?: any) => {
       .get(`${url}?${stringify(params)}`)
       .then((result: any) => {
         result = result.data;
-        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+        if (judgeIsRequestError(result)) {
           message.error(result.msg);
           return;
         }
@@ -84,7 +85,7 @@ const handleDefaultPrefixUrl = (type: string) => {
     case 'physicalWarehouse': case 'realWarehouse': case 'virtualWarehouse': case 'channelWarehouse': case 'ownerWarehouse':
       result =  '/stock';
       break;
-    case 'inventoryOrg2': case 'purchaseOrg': case 'salesOrg': case 'employee2':
+    case 'inventoryOrg2': case 'purchaseOrg': case 'salesOrg': case 'employee2': case 'role':
       result =  '/user';
       break;
     case 'deliveryMode': case 'ruleTemplate':

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

@@ -126,6 +126,35 @@ export default () => {
 ```
 
 
+结算组织选择器:
+
+```tsx
+import React, { useState } from 'react';
+import { BusinessTreeSearchSelect } from '../../../index';
+
+export default () => {
+
+  const [value, setValue] = useState();
+  
+  const props = {
+    mode: 'create',
+    value,
+    isChoose: false, // 控制是否父节点可选中，默认不可选中
+    onChange: (v) => {
+      setValue(v)
+    },
+    businessType: 'settle-organization'
+  };
+
+  return (
+    <div>
+      <BusinessTreeSearchSelect {...props} />
+    </div>
+  );
+};
+```
+
+
 营销区域选择器:
 
 ```tsx

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

@@ -10,6 +10,7 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           headers: otherRequestConfig?.extralHeaders,
           initialParams: { 'orgViewCode': 'administrative-organization-view' },
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break;
@@ -21,6 +22,7 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           headers: otherRequestConfig?.extralHeaders,
           initialParams: { 'orgViewCode': 'sales-organizational-view', 'qp-status-eq': 10 }, // status: 10启用 20禁用
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break;
@@ -32,6 +34,7 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           headers: otherRequestConfig?.extralHeaders,
           initialParams: { 'orgViewCode': 'purchase-organizational-view', 'qp-status-eq': 10 },
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break;
@@ -43,6 +46,19 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           headers: otherRequestConfig?.extralHeaders,
           initialParams: { 'orgViewCode': 'stock-organizational-view', 'qp-status-eq': 10 },
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
+        },
+      };
+      break;
+    case 'settle-organization':
+      result =  {
+        isChoose: true,
+        remoteSource: {
+          url: `/user/orgViewNode/common/getTreeForOrgViewAndTenant`,
+          headers: otherRequestConfig?.extralHeaders,
+          initialParams: { 'orgViewCode': 'settlement-organizational-view', 'qp-status-eq': 10 },
+          resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break;
@@ -53,6 +69,18 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           url: `/channel-manage/tagNode/getTree/10`,
           headers: otherRequestConfig?.extralHeaders,
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
+        },
+      };
+      break;
+    case 'market-channel':
+      result =  {
+        isChoose: true,
+        remoteSource: {
+          url: `/channel-manage/channelInfo/tree`,
+          headers: otherRequestConfig?.extralHeaders,
+          resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break;
@@ -65,6 +93,7 @@ const handleDefaultProps = (type: string, otherRequestConfig: {extralHeaders?: s
           headers: otherRequestConfig?.extralHeaders,
           initialParams: { 'orgViewCode': 'administrative-organization-view' },
           resKeyValue: ['code', 'name'],
+          ...otherRequestConfig,
         },
       };
       break

package/src/components/Business/columnSettingTable/columnSetting.tsx

@@ -19,6 +19,7 @@ import axios from 'axios';
 // import { request } from 'umi';
 import './index.less';
 import ENUM from '@/utils/enumConfig';
+import { handleRequestUrl, judgeIsRequestSuccess } from '@/utils/requestUtils';
 
 interface SortTableProps {
   [propName: string]: any;
@@ -66,7 +67,7 @@ class SortableTable extends React.Component<SortTableProps> {
   };
 
   patchUserColumnConfig = (config: any) => {
-    const { tableCode }: any = this.props;
+    const { tableCode, appRequestConfig }: any = this.props;
     if (!tableCode) return;
     let configvalue = config.map((item:any) => ({
       key: item.key,
@@ -77,14 +78,14 @@ class SortableTable extends React.Component<SortTableProps> {
     }))
 
     axios({
-      url: '/user/appConfig/saveUserOrder',
+      url: handleRequestUrl('/user','/appConfig/saveUserOrder',appRequestConfig),
       method:'POST',
       data: {
         "code": tableCode,
         "detail": JSON.stringify(configvalue)
       },
     }).then((res:any) => {
-      if (res?.data?.status === '0') {
+      if (judgeIsRequestSuccess(res?.data)) {
         this.patchConfigToLocalstorage(configvalue, tableCode)
       } else {
         message.error('保存表头列自定义失败，请稍后尝试');
@@ -762,4 +763,4 @@ class SortableTable extends React.Component<SortTableProps> {
   }
 }
 
-export default SortableTable;
+export default SortableTable;

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

@@ -154,7 +154,7 @@ export default class ColumnSettingTable extends React.Component {
   };
 
   render() {
-    const { columns, tableCode, summary = undefined, dynamicColumns = [], scroll={}, ...restProps }: any = this.props;
+    const { columns, tableCode, appRequestConfig, summary = undefined, dynamicColumns = [], scroll={}, ...restProps }: any = this.props;
     let otherTableInfo = {
       ...restProps,
     };
@@ -212,6 +212,7 @@ export default class ColumnSettingTable extends React.Component {
               showColumns={this.state.showColumns}
               datasource={columns || []}
               tableCode={tableCode}
+              appRequestConfig={appRequestConfig}
             />
           </span>
         </div>
@@ -230,4 +231,4 @@ export default class ColumnSettingTable extends React.Component {
     )
   }
 
-}
+}

package/src/components/Business/columnSettingTable/sulaSettingTable.tsx

@@ -160,7 +160,7 @@ export default class ColumnSettingSulaTable extends React.Component {
   };
 
   render() {
-    const { style=null, columns, tableCode, summary = undefined, dynamicColumns = [], scroll={}, ...restProps }: any = this.props;
+    const { style=null, columns, tableCode, appRequestConfig, summary = undefined, dynamicColumns = [], scroll={}, ...restProps }: any = this.props;
     let otherTableInfo = {
       ...restProps,
     };
@@ -218,6 +218,7 @@ export default class ColumnSettingSulaTable extends React.Component {
               showColumns={this.state.showColumns}
               datasource={columns || []}
               tableCode={tableCode}
+              appRequestConfig={appRequestConfig}
             />
           </span>
         </div>
@@ -238,4 +239,4 @@ export default class ColumnSettingSulaTable extends React.Component {
     )
   }
 
-}
+}

package/src/components/Functional/AddSelect/helps.ts

@@ -1,6 +1,7 @@
 import axios from 'axios';
 import { stringify } from 'querystring';
 import { message } from 'antd';
+import { judgeIsRequestError } from '@/utils/requestUtils';
 
 // 下拉框数据源
 // 情况①：每条记录下拉框数据不同----查询接口每条记录返回字段，前后端约定好，用dataSourceCode记录
@@ -23,7 +24,7 @@ export const loadSelectSource = (url: string, params?: any) => {
       .get(`${url}?${stringify(params)}`)
       .then((result: any) => {
         result = result.data;
-        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+        if (judgeIsRequestError(result)) {
           message.error(result.msg);
           resolve(result);
           return;

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

@@ -13,6 +13,7 @@ import { checkQuantityAccuracy, precisionQuantity } from '@/utils/checkUtils';
 import TableColumnSetting from '@/plugin/TableColumnSetting';
 import { setInitialShowColumn } from '@/plugin/TableColumnSetting/utils';
 import { handleAntdColumnsSpecialParams, uuid } from '@/utils/utils';
+import { judgeIsRequestError } from '@/utils/requestUtils';
 import { getItemDefaultWidth, noEmptyArray } from '@/components/Business/columnSettingTable/utils';
 import { getEmployeeId } from '@/utils/LocalstorageUtils';
 import { getSelectDataList, loadSelectSource, formatFormSourceList } from './helps';
@@ -22,7 +23,7 @@ const checkSpuMatchCode = (data: any) => {
       axios.post(`/stock/rwFrontRecordSkcDetail/checkSpuMatchCode`,data)
         .then((result: any) => {
           result = result.data;
-          if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+          if (judgeIsRequestError(result)) {
             message.error(result.msg);
             reject(false);
             return;
@@ -517,7 +518,7 @@ const AddSelect = (props: any) => {
       .then((result: any) => {
         setFetching(false)
         result = result.data;
-        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+        if (judgeIsRequestError(result)) {
           message.error(result.msg);
           return;
         }

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

@@ -13,6 +13,7 @@ import TableColumnSetting from '@/plugin/TableColumnSetting';
 import { setInitialShowColumn } from '@/plugin/TableColumnSetting/utils';
 import { getItemDefaultWidth, noEmptyArray } from '@/components/Business/columnSettingTable/utils';
 import { handleAntdColumnsSpecialParams } from '@/utils/utils';
+import { judgeIsRequestSuccess, judgeIsRequestError } from '@/utils/requestUtils';
 
 const InputElement = ({
   record, text, currentIndex, inputLength, index, setData, data, item, callSelectItem
@@ -30,7 +31,7 @@ const InputElement = ({
       .get(`/items/sku/pager/v2?${stringify({ 'skuCodeAndSkuName': name, 'pageSize': 100, 'qp-combination-eq': false, 'qp-approveStatus-eq': 1, 'qp-status-eq': 1 })}`)
       .then(({ data, status }: any) => {
         if (status === 200) {
-          if (data.status === '0') {
+          if (judgeIsRequestSuccess(data)) {
             const resultData = data.data.items.map((item: any, index: any) => ({
               ...item,
               index
@@ -632,7 +633,7 @@ const BillEntry: React.FC = ({ onSaveCallback, validDataUrl="/items/sku/import/c
       })
       .then((result) => {
         result = result.data;
-        if (result.status !== '0') {
+        if (judgeIsRequestError(result)) {
           message.error(result.msg);
           return { flag: false }
         } else {

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

@@ -28,6 +28,7 @@ import {
 import axios from 'axios';
 import './index.less';
 import _ from "lodash"
+import { judgeIsRequestError } from '@/utils/requestUtils';
 
 // const luckysheet = window.luckysheet;
 
@@ -435,7 +436,7 @@ class DataImport extends React.Component {
       })
       .then((result) => {
         result = result.data;
-        if (result.status !== '0') {
+        if (judgeIsRequestError(result)) {
           message.error(result.msg);
           return;
         }

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

@@ -28,6 +28,7 @@ import {
 import axios from 'axios';
 import './index.less';
 import _ from "lodash"
+import { judgeIsRequestError } from '@/utils/requestUtils';
 
 // const luckysheet = window.luckysheet;
 
@@ -427,7 +428,7 @@ class DataValidation extends React.Component {
       })
       .then((result) => {
         result = result.data;
-        if (result.status !== '0') {
+        if (judgeIsRequestError(result)) {
           message.error(result.msg);
           return;
         }

package/src/components/Functional/ExportFunctions/ExportIcon/index.tsx

@@ -4,6 +4,7 @@ import {message, Popconfirm, Tooltip} from "antd";
 import axios from 'axios'
 import exportlogo from '../../../../assets/exportlogo.png'
 import {omit} from 'lodash'
+import { judgeIsRequestError } from '@/utils/requestUtils';
 interface exportIconType{
 	/** others选填，使用axios发请求，*/
 	request:{
@@ -44,7 +45,7 @@ const ExportIcon = ({request, tableRef}: exportIconType) => {
 						})
 							.then((result: any) => {
 								result = result.data;
-								if (result.code !== '000000') {
+								if (judgeIsRequestError(result)) {
 									message.error(result?.msg);
 									return;
 								}

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

@@ -9,6 +9,7 @@ import _ from "lodash"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput } from '@/index';
 import { handleSourceName }  from './utils';
+import { judgeIsRequestError } from '@/utils/requestUtils';
 
 const { Option } = Select;
 
@@ -41,6 +42,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     init = true,// 是否初始请求
     extralHeaders = {},// 额外请求头参数
     specialBracket = false,// 是否使用特殊括弧显示选项 【value】text
+    noNeedSplit = false,// label显示不需要任何特殊化
   } = requestConfig || {};
   const resultSourceKey = handleSourceName(sourceName || requestConfig?.sourceName || 'supplierCode')
 
@@ -282,7 +284,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
       .then((result: any) => {
         setFetching(false)
         result = result.data;
-        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+        if (judgeIsRequestError(result)) {
           message.error(result.msg);
           return;
         }
@@ -313,8 +315,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                 }
                 return {
                   ...item,
-                  text: specialBracket 
-                    ? `【${item[mappingValueField]}】${item[mappingTextField]}` 
+                  text: specialBracket
+                    ? `【${item[mappingValueField]}】${item[mappingTextField]}`
                     : item[mappingTextField],
                   textShowText,
                   textShowKey: item[mappingTextShowKeyField || mappingValueField],
@@ -336,8 +338,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                 }
                 return {
                   ...item,
-                  text: specialBracket 
-                    ? `【${item[mappingValueField]}】${item[mappingTextField]}` 
+                  text: specialBracket
+                    ? `【${item[mappingValueField]}】${item[mappingTextField]}`
                     : item[mappingTextField],
                   textShowText,
                   textShowKey: item[mappingTextShowKeyField || mappingValueField],
@@ -735,12 +737,16 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     )
   }
 
-  const handleSelectOptionsShowValue = (specialBracket: boolean, item: object) => {
+  const handleSelectOptionsShowValue = (specialBracket: boolean, noNeedSplit: boolean, item: object) => {
     let showText = Array.isArray(item.textShowText) &&
       item.textShowText.join('    ') || item.textShowText;
-    return specialBracket 
-      ? `【${item.textShowKey}】${showText}`
-      : `${item.textShowKey}       ${showText}`
+    if (noNeedSplit) {
+      return item.text;
+    } else {
+      return specialBracket
+        ? `【${item.textShowKey}】${showText}`
+        : `${item.textShowKey}       ${showText}`
+    }
   };
 
   return (
@@ -792,9 +798,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           >
             {items.map(item => (
               <Option key={item.value} label={item.text}>
-                {LightHeightOption({ 
-                  text: handleSelectOptionsShowValue(specialBracket, item), 
-                  filterTxt: searchValue 
+                {LightHeightOption({
+                  text: handleSelectOptionsShowValue(specialBracket, noNeedSplit, item),
+                  filterTxt: searchValue
                 })}
               </Option>
             ))}

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

@@ -3,6 +3,7 @@ import { TreeSelect, Tooltip, Tag } from 'antd';
 import axios from 'axios';
 import { stringify } from 'querystring';
 import _ from "lodash"
+import { judgeIsRequestSuccess } from '@/utils/requestUtils';
 
 const TreeSearchSelect = (props: any) => {
   const [treeData, setTreeData] = useState([]);
@@ -39,10 +40,11 @@ const TreeSearchSelect = (props: any) => {
     paramsKey = 'qp-name-like',
     resKeyValue = ['id', 'name'],
     initialParams = {},
+    treeChildrenRoom = 'children',// 树状结构的子集容器 默认为 'children'
   } = remoteSource;
 
   const mapSearchTree = (treeDataItem: any) => {
-    const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0; // 盘算是否为父节点
+    const haveChildren = Array.isArray(treeDataItem[treeChildrenRoom]) && treeDataItem[treeChildrenRoom].length > 0; // 盘算是否为父节点
     const isRoot = treeDataItem?.id == '0'; // 判断是否为根节点
     return {
       title: treeDataItem[resKeyValue[1]],
@@ -52,7 +54,7 @@ const TreeSearchSelect = (props: any) => {
       data: { ...treeDataItem },
       isLeaf: !haveChildren,
       disabled: isDisabled(haveChildren,isRoot),
-      children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i)) : [],
+      children: haveChildren ? treeDataItem[treeChildrenRoom].map((i: any) => mapSearchTree(i)) : [],
     };
   };
 
@@ -76,7 +78,7 @@ const TreeSearchSelect = (props: any) => {
       const resData = res?.data || [];
       let coverData;
 
-      if(resData.status === '0' || resData.code === '000000') {
+      if(judgeIsRequestSuccess(resData)) {
         const { data } = resData;
         if (remoteSource.converter) {
           coverData = await remoteSource.converter({ data: [data] })
@@ -105,8 +107,8 @@ const TreeSearchSelect = (props: any) => {
   const parallelData = (data: any,result: any) => {
     data.forEach((i: any) => {
       result.push(i);
-      if (i.children) {
-        parallelData(i.children, result);
+      if (i[treeChildrenRoom]) {
+        parallelData(i[treeChildrenRoom], result);
       }
     });
     return result;