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

package/dist/plugin/TableColumnSetting/index.d.ts

@@ -0,0 +1,64 @@
+import React from 'react';
+import './index.less';
+interface TableColumnSettingProps {
+    /** tableCode必填，做用户存储关键key，*/
+    tableCode: string;
+    /** datasource必填，为要操作的表头（即原始表头），*/
+    datasource: any;
+    /** showColumns必填，为当前用户设置的表头，*/
+    showColumns: any;
+    /** setShowColumns必填，设置当前表头的方法，*/
+    setShowColumns: void;
+    /** settingImgAttribute非必填，设置当前设置img样式，*/
+    settingImgAttribute: {
+        [propName: string]: any;
+    };
+    [propName: string]: any;
+}
+declare class TableColumnSetting extends React.Component<TableColumnSettingProps> {
+    state: {
+        dataSource: never[];
+        columns: never[];
+        selectedRowKeys: never[];
+        sortDataSource: never[];
+        setVisible: boolean;
+        searchDataSource: boolean;
+        onSearchSort: boolean;
+    };
+    patchUserColumnConfig: (config: any) => void;
+    setInitValue: (datasource: any[]) => void;
+    componentWillReceiveProps(nextProps: any): void;
+    componentDidMount(): void;
+    columns: ({
+        title: string;
+        dataIndex: string;
+        className: string;
+        width: number;
+        render?: undefined;
+    } | {
+        title: string;
+        dataIndex: string;
+        render: (text: any, record: any) => React.JSX.Element;
+        className?: undefined;
+        width?: undefined;
+    } | {
+        title: string;
+        dataIndex: string;
+        className: string;
+        render: () => React.JSX.Element;
+        width?: undefined;
+    })[];
+    showModal: () => void;
+    handleOk: (e?: React.MouseEvent<HTMLElement>) => void;
+    handleCancel: (e: React.MouseEvent<HTMLElement>) => void;
+    handleTableHeadHidden: (title: string) => void;
+    onSortEnd: ({ oldIndex, newIndex }: any) => void;
+    DraggableContainer: (props: any) => React.JSX.Element;
+    DraggableBodyRow: ({ className, style, ...restProps }: any) => React.JSX.Element;
+    onChange: (e: any, title: any) => void;
+    handleReset: () => void;
+    onSearch: (e: any) => void;
+    onSearchSort: (e: any) => void;
+    render(): React.JSX.Element;
+}
+export default TableColumnSetting;

package/dist/plugin/TableColumnSetting/utils.d.ts

@@ -0,0 +1 @@
+export declare const setInitialShowColumn: (tableCode: string, columns: any[], callback: any) => void;

package/dist/utils/CheckOneUser/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (storageKeyString: string, seconds?: number, tipsCallFunction?: () => {}) => void;
+export default _default;

package/dist/utils/CustomLoginInfo.d.ts

@@ -0,0 +1,11 @@
+export declare function getEekaSessionId(): any;
+export declare function getEekaAccountId(): any;
+export declare function getEekaEmployeeId(): any;
+export declare function getEekaTenantId(): any;
+export declare function getEekaToken(): any;
+export declare function getLoginHeaderInfo(headerkey: string, storage?: string): string | null | undefined;
+export declare function getGuoyaoshukeCompanyId(): string | null | undefined;
+export declare function getGuoyaoshukeTenantCode(): string | null | undefined;
+export declare function getGuoyaoshukeTenantId(): string | 1;
+export declare function getGuoyaoshukeToken(): string | null | undefined;
+export declare function getGuoyaoshukeUscCode(): string | null | undefined;

package/dist/utils/LocalstorageUtils.d.ts

@@ -0,0 +1,17 @@
+export declare const setConfigTableColumns: (configvalue: any, tableCode: string) => void;
+export declare const getConfigTableColumns: (tableCode: string) => any;
+export declare const saveTenantList: (data: any) => void;
+export declare const getTenantList: () => any;
+export declare const removeTenantList: () => void;
+export declare const saveCurrentTenantId: (item: string) => void;
+export declare const getCurrentTenantId: () => string | 1;
+export declare const removeCurrentTenantId: () => void;
+export declare function getEmployeeId(): any;
+export declare function getEmployeeCode(): any;
+export declare function getSessionId(): any;
+export declare function getAccountId(): any;
+export declare function getUserId(): any;
+export declare function getAccountID(): any;
+export declare function getUserName(): any;
+export declare function handleUserPhone(): any;
+export declare function getCurrentTargetBgId(): string | null;

package/dist/utils/TableUtils.d.ts

@@ -0,0 +1,11 @@
+type mediaListType = {
+    type: number;
+    url: string;
+    [key: string]: any;
+};
+type recordType = {
+    mediaList?: mediaListType;
+    [key: string]: any;
+};
+export declare const getSkuImg: (record: recordType) => any;
+export {};

package/dist/utils/checkUtils.d.ts

@@ -0,0 +1,3 @@
+declare const checkQuantityAccuracy: (value: any, accuracy: any, errorInfo?: any) => boolean;
+declare const precisionQuantity: (num: any, accuracy: any) => number | "";
+export { checkQuantityAccuracy, precisionQuantity };

package/dist/utils/enumConfig.d.ts

@@ -0,0 +1,12 @@
+declare const _default: {
+    BROWSER_CACHE: {
+        COLUMN_CONDITION: string;
+        MAIN_AUTH_CODES: string;
+        LIMIT_MENU_DATA: string;
+        USER_INFO: string;
+        DICT_CODES: string;
+        CHILD_APP_BACK: string;
+        SEARCH_FIELDS_CONDITION: string;
+    };
+};
+export default _default;

package/dist/utils/index.d.ts

@@ -0,0 +1,4 @@
+import './requestUtils';
+import './checkUtils';
+import './LocalstorageUtils';
+import './utils';

package/dist/utils/requestUtils.d.ts

@@ -0,0 +1,29 @@
+export declare function handleRequestAuthHeader(config?: any): void;
+/**
+ * 处理请求路径前缀/请求路径等使用不一的问题
+ * @param {*} defaultUrl         默认请求路径
+ * @param {*} defaultPreFix    默认请求路径的前缀
+ * @param {*} config    更改请求前缀/路径集合
+ *      示例：
+ *          appRequestConfig： {
+ *            '/appConfig/saveUserOrder': ['/api/user-manage'],
+ *            '/appConfig/saveQueryCriteria': ['/api/user-manage']
+ *          }
+ */
+export declare const handleRequestUrl: (defaultPreFix: string, defaultUrl: string, config: any) => string;
+/**
+ * 处理错误请求
+ * @param {*} response         返回结果
+ * @param {*} needBackError    是否需要将错误回传到页面单独处理
+ */
+export declare function handleError(response: object, needBackError?: boolean): boolean;
+/**
+ * 判断为请求错误
+ *  @param {*} res         响应体
+ * */
+export declare const judgeIsRequestError: (res: any) => boolean;
+/**
+ * 判断为请求成功
+ * @param {*} res         响应体
+ * */
+export declare const judgeIsRequestSuccess: (res: any) => boolean;

package/dist/utils/utils.d.ts

@@ -0,0 +1,17 @@
+export declare function downloadExcel(data: any, fileName?: any, isResUrl?: boolean): void;
+export declare const formatter: (data: any, parentAuthority: any, parentName: any) => any;
+export declare const memoizeOneFormatter: any;
+export declare const go2BackAndClose: () => void;
+/**
+ * 处理bssulaTable的公共回显样式
+ * @param col 每一具体行
+ */
+export declare const handleBssulaColumnsSpecialParams: (col: any) => void;
+/**
+ * 处理antdTable的公共回显样式
+ * @param col 每一具体行
+ */
+export declare const handleAntdColumnsSpecialParams: (col: any) => void;
+export declare const getDictionarySource: (dicCode: string, needConvertInterger?: boolean) => any;
+export declare function uuid(): string;
+export declare const judgeIsEmpty: (value: any) => boolean;

package/dist 2/components/Business/BsLayouts/Components/CustomerMenu/MenuSetting/index.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+import './index.less';
+declare const MenuSetting: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+export default MenuSetting;

package/dist 2/components/Business/BsLayouts/Components/CustomerMenu/globalMenu/DrawContent.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import './drawContent.less';
+declare const DrawContent: ({ onClose, originRoutes, itemPath }: any) => React.JSX.Element;
+export default DrawContent;

package/dist 2/components/Business/BsLayouts/Components/CustomerMenu/globalMenu/customMenuHeader.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+declare const CustomerMenuHeader: ({ collapsed, handleClose, originRoutes, itemPath }: any) => React.JSX.Element;
+export default CustomerMenuHeader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.3.22",
+  "version": "2.3.23-beta02",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -53,7 +53,8 @@
     "react-resizable": "^3.0.4",
     "react-sortable-hoc": "^2.0.0",
     "warning": "^4.0.3",
-    "ast-types": "^0.13.3"
+    "ast-types": "^0.13.3",
+    "js-cookie": "^3.0.1"
   },
   "devDependencies": {
     "@ant-design/pro-layout": "^7.1.3",

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

@@ -11,6 +11,7 @@ import axios from 'axios';
 import { AddSelect } from '../../../index';
 import { tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
+import { judgeIsRequestError } from '@/utils/requestUtils';
 import { getEmployeeId } from '@/utils/LocalstorageUtils';
 // import { getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 
@@ -460,7 +461,7 @@ export const AddSkcSelect = (parProps: any) => {
     // type: 1 尺码组; 2 配码组
     axios.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1`).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;
       }
@@ -765,7 +766,7 @@ export const AddSpuSelect = (parProps: any) => {
       // type: 1 尺码组; 2 配码组
       axios.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1`).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;
         }

package/src/components/Business/BsSulaQueryTable/SearchItemSetting.tsx

@@ -21,6 +21,7 @@ import close from '../../../assets/close.svg';
 import drag from '../../../assets/drag.svg';
 import './index.less';
 import ENUM from '@/utils/enumConfig';
+import { handleRequestUrl, judgeIsRequestSuccess } from '@/utils/requestUtils';
 
 const DragHandle = SortableHandle(() => <img width={25} src={drag} />);
 const SortableItem = SortableElement((props) => <tr {...props} />);
@@ -41,6 +42,7 @@ class SearchItemTable extends React.Component {
   };
 
   patchUserSearchFieldsConfig = (config) => {
+    const { appRequestConfig } = this.props;
     let that = this;
     let configvalue = config
       ? config.map((item) => ({
@@ -50,14 +52,14 @@ class SearchItemTable extends React.Component {
       : '';
 
     axios({
-      url: '/user/appConfig/saveQueryCriteria',
+      url: handleRequestUrl('/user','/appConfig/saveQueryCriteria', appRequestConfig),
       method: 'POST',
       data: {
         code: that.state.bsTableCode,
         detail: configvalue ? JSON.stringify(configvalue) : '',
       },
     }).then((res:any) => {
-      if (res?.data?.status === '0') {
+      if (judgeIsRequestSuccess(res?.data)) {
         this.patchConfigToLocalstorage(configvalue)
       } else {
         message.error('保存搜索项自定义失败，请稍后尝试');
@@ -92,7 +94,7 @@ class SearchItemTable extends React.Component {
         "detail": JSON.stringify(configvalue)
       })
     }
-     
+
     localStorage.setItem(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION, JSON.stringify(configArray));
     this.setState({
       visible: false,
@@ -152,10 +154,10 @@ class SearchItemTable extends React.Component {
   };
 
   componentDidMount() {
-    const { 
-      datasource, 
-      showSearchFields, 
-      bsTableCode 
+    const {
+      datasource,
+      showSearchFields,
+      bsTableCode
     }: any = this.props;
 
     let config = this.getConfigFromlocalstorage();

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

@@ -56,7 +56,7 @@ export default (props: any) => {
   const [value, setValue]: any = useState(props);
   const [showColumn, setShowColumns] = useState([]); // 列字段
   const [showSearchFields, setShowSearchFields] = useState(props.fields || []); //搜索项字段
-  const { isPage = true, pagination, tableCode } = props;
+  const { isPage = true, pagination, tableCode, appRequestConfig } = props;
 
   const [height, setHeight]: any = useState('100vh');
   const sortTableRef = useRef(null);
@@ -71,12 +71,12 @@ export default (props: any) => {
       window.top.document.fullScreen ||
       window.top.document.webkitIsFullScreen ||
       window.top.document.mozFullScreen;
-      
+
       // wujie子应用iframe首次加载获取不到client以及dom元素高度兼容处理
       let realIframeClientHeight = document.body.clientHeight ? document.body.clientHeight : window.top?.document.body.clientHeight - 76;
-      let summaryHeight = document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`) ? 
-          (document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`)?.clientHeight || 22) : 0; 
-      let listTabHeight = document.querySelector(`.ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav`) ? 
+      let summaryHeight = document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`) ?
+          (document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`)?.clientHeight || 22) : 0;
+      let listTabHeight = document.querySelector(`.ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav`) ?
           (document.querySelector(`.ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav`)?.clientHeight || 48) : 0;
 
 
@@ -371,8 +371,8 @@ export default (props: any) => {
                 <Dropdown overlay={
                   <Menu>
                     <Menu.Item>
-                      <div 
-                        onClick={sortTableRef?.current?.showModal} 
+                      <div
+                        onClick={sortTableRef?.current?.showModal}
                         style={{fontSize:14, textAlign: 'center'}}
                       >列设置</div>
                     </Menu.Item>
@@ -383,9 +383,10 @@ export default (props: any) => {
                         showSearchFields={showSearchFields}
                         datasource={value?.fields || []}
                         bsTableCode={bsTableCode}
+                        appRequestConfig={appRequestConfig}
                       />
                     </Menu.Item>
-                  </Menu> 
+                  </Menu>
                 } placement="bottomRight" >
                   <span className="ant-dropdown-link">
                     <img width={32}  src={shezhi} />
@@ -518,6 +519,7 @@ export default (props: any) => {
       ...config,
       summary: props.summary,
       statusMapping: props.statusMapping,
+      appRequestConfig: props.appRequestConfig
     }),
     [value, checkedList, showColumn, props.statusMapping, showSearchFields],
   );
@@ -529,6 +531,7 @@ export default (props: any) => {
       showColumn={showColumn}
       datasource={value?.columns || []}
       bsTableCode={bsTableCode}
+      appRequestConfig={appRequestConfig}
       onlyModal
     />
   </>;

package/src/components/Business/BsSulaQueryTable/setting.tsx

@@ -27,6 +27,7 @@ import fixedRight from '../../../assets/fixed-right.svg';
 import fixedRightActive from '../../../assets/fixed-right-active.svg';
 import './index.less';
 import ENUM from '@/utils/enumConfig';
+import { handleRequestUrl, judgeIsRequestSuccess } from '@/utils/requestUtils';
 
 const DragHandle = SortableHandle(() => <img width={25} src={drag} />);
 
@@ -47,6 +48,7 @@ class SortableTable extends React.Component {
   };
 
   patchUserColumnConfig = (config) => {
+    const { appRequestConfig } = this.props;
     let that = this;
     let configvalue = config
       ? config.map((item) => ({
@@ -59,14 +61,14 @@ class SortableTable extends React.Component {
       : '';
     return new Promise((resolve: any, reject: any) => {
       axios({
-        url: '/user/appConfig/saveUserOrder',
+        url: handleRequestUrl('/user','/appConfig/saveUserOrder', appRequestConfig),
         method: 'POST',
         data: {
           code: that.state.bsTableCode,
           detail: configvalue ? JSON.stringify(configvalue) : '',
         },
       }).then((res:any) => {
-        if (res?.data?.status === '0') {
+        if (judgeIsRequestSuccess(res?.data)) {
           this.patchConfigToLocalstorage(configvalue);
           resolve({ status: '0' });
         } else {
@@ -104,7 +106,7 @@ class SortableTable extends React.Component {
         "detail": JSON.stringify(configvalue)
       })
     }
-     
+
     localStorage.setItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION, JSON.stringify(configArray));
     this.setState({
       visible: false,
@@ -485,7 +487,7 @@ class SortableTable extends React.Component {
       () => {
         this.handleOk()
          .then((res: any) => {
-            if (res.status === '0') {
+            if (judgeIsRequestSuccess(res)) {
               message.success(<span>
                 字段已隐藏，如需重新显示请前往<Typography.Link
                   underline
@@ -840,7 +842,7 @@ class SortableTable extends React.Component {
           </Modal>
         )}
         {
-          !onlyModal 
+          !onlyModal
             ? <div onClick={this.showModal} style={{fontSize:14}}>列设置</div>
             : ''
         }

package/src/components/Business/JsonQueryTable/components/Formula.tsx

@@ -8,6 +8,7 @@ import {
 } from 'react-sortable-hoc';
 import { arrayMoveImmutable } from 'array-move';
 import { ModalForm, request } from 'bssula';
+import { judgeIsRequestSuccess } from '@/utils/requestUtils';
 
 
 const App = ({
@@ -31,7 +32,7 @@ const App = ({
         'qp-fieldGroup-eq': record.fieldGroup,
       },
       converter: ({ response, data }:any) => {
-        if (response.code === '000000') {
+        if (judgeIsRequestSuccess(response)) {
           // UpdateFiedList(data.filter(item => item.valueType == 20 || item.valueType == 21 || item.valueType == 22))
           const resData = data.filter((item:any) => item.inputType != 40 && (item.valueType == 20 || item.valueType == 21 || item.valueType == 22)).map((item:any) => ({value: item.code, name: item.name}))
           UpdateFiedList(resData)
@@ -97,7 +98,7 @@ const App = ({
       deleteItem(value, sortIndex)
     }} /></span>
   });
-  
+
   const SortableList = SortableContainer(({ items }:any) => {
     return (
       <div style={{ display: 'flex', flexWrap: 'wrap' }}>

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

@@ -9,6 +9,7 @@ import FieldsSettingsTable from './components/FieldsSettingsTable';
 import { isEmpty } from "lodash"
 import './index.less';
 import { getUserId } from '@/utils/LocalstorageUtils';
+import { judgeIsRequestSuccess } from '@/utils/requestUtils';
 
 function iterFileds (fields) {
   let filedsValue = [];
@@ -90,14 +91,14 @@ function convertFileds (fields, falltValue, faltFieldRange, containerName) {
     } else  {
       const returnField = field.isStaticCode ? falltValue[containerName ? (containerName + field.name) : field.name] : faltFieldRange[field.name];
       if (returnField) {
-        returnField.label = field?.label; 
+        returnField.label = field?.label;
         if(field?.disabled){ // 字段设置只读属性
           returnField.field.props.disabled = true;
         }
         if(field?.invisible){ // 字段设置不可见属性
           returnField.initialVisible = false;
         }
-        
+
         if(Array.isArray(returnField.name)&&returnField.name?.includes("extensionFields")){
           returnField.notShowLabel = true;
         }
@@ -300,8 +301,9 @@ const JsonQueryTable = React.memo(props => {
     Promise.all([
       axios.get(`/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=${pageType}`),
     ]).then(([res] )=> {
-      const { code, data } = res?.data || {};
-      if (code === '000000') {
+      const resD = res?.data || {}
+      const { data } = resD;
+      if (judgeIsRequestSuccess(resD)) {
         if(data){
           const { businessType, code:fieldGroup, moduleType, moduleRelationId } = data;
           setModuleParams({
@@ -377,7 +379,7 @@ const JsonQueryTable = React.memo(props => {
       saveTableCallBack(lastRes, false);
     }
   },[detailTablesSetting.length]);
-  
+
   const onClickRun = (value, isSave) => {
     setJsonEditorVal(value);
 
@@ -420,7 +422,7 @@ const JsonQueryTable = React.memo(props => {
       message.error(e);
     }
   }
-  
+
   React.useEffect(() => {
     localStorage.setItem('jsonEditorVal',JSON.stringify(jsonEditorVal||{}))
   }, [jsonEditorVal]);

package/src/components/Business/JsonQueryTable/static.ts

@@ -139,6 +139,14 @@ export const inputTypes:any = {
         ...normalSingleSelectProps,
       },
     },
+    290: {
+      // 库存组织
+      type: 'bs-settleOrgSelect',
+      props: {
+        treeCheckable: false,
+        ...normalSingleSelectProps,
+      },
+    },
     310: {
       type: 'bs-deliveryModeSearchSelect',
       props: {
@@ -161,6 +169,26 @@ export const inputTypes:any = {
         ...normalSingleSelectProps,
       },
     },
+    360: {
+      type: 'bs-roleSelect',
+      props: {
+        ...normalSingleSelectProps,
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in',
+        },
+      },
+    },
+    370: {
+      type: 'bs-marketChannelSelect',
+      props: {
+        treeCheckable: false,
+        requestConfig: { 
+          treeChildrenRoom: 'channelInfoSon', 
+          initialParams: { 'qp-isMain-eq': 1, 'qp-type-eq': 1 },
+        },
+        ...normalSingleSelectProps,
+      },
+    },
   },
   30: {
     10: {
@@ -302,6 +330,14 @@ export const inputTypes:any = {
         ...normalMultipleSelectProps,
       },
     },
+    290: {
+      // 结算组织
+      type: 'bs-settleOrgSelect',
+      props: {
+        treeCheckable: true,
+        ...normalMultipleSelectProps,
+      },
+    },
     310: {
       type: 'bs-deliveryModeSearchSelect',
       props: {
@@ -327,6 +363,27 @@ export const inputTypes:any = {
         ...normalSingleSelectProps,
       },
     },
+    360: {
+      type: 'bs-roleSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in',
+        },
+      },
+    },
+    370: {
+      type: 'bs-marketChannelSelect',
+      props: {
+        treeCheckable: true,
+        treeCheckStrictly: true,
+        requestConfig: { 
+          treeChildrenRoom: 'channelInfoSon', 
+          initialParams: { 'qp-isMain-eq': 1, 'qp-type-eq': 1 } 
+        },
+        ...normalSingleSelectProps,
+      },
+    },
   },
 };
 
@@ -362,11 +419,14 @@ export const choiceType = Object.freeze({
   260: '店铺选择器',
   270: '员工选择器',
   280: '库存组织选择器',
+  290: '结算组织选择器',
 
   310: '配送方式选择器',
   330: '变量',
   340: '规则模板选择器',
   350: '营销区域选择器',
+  360: '角色选择器',
+  370: '销售渠道选择器',
 });
 export const inputType:any ={
   10: '输入',