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

package/src/components/Solution/RuleComponent/index.js

@@ -31,6 +31,8 @@ import {
   getSpecialPropertyCode,
   getPropertyCode,
   isObj,
+  dateFormat,
+  fullDateFormat
 } from './util';
 import { getDictionarySource, uuid } from '../../../utils/utils';
 import {
@@ -42,6 +44,7 @@ import {
 import { request } from 'bssula';
 import Formula from './Formula';
 import RenderSpecificAction from './renderSpecificAction';
+import InnerSelect from './InnerSelect';
 
 const { RangePicker } = DatePicker;
 
@@ -655,7 +658,7 @@ class RuleObjectComponent extends Component {
                     this.handleLogicalTypeChange(itemDetail, 'or');
                   }}
                 >
-                  OR
+                  或者
                 </p>
                 <p
                   className={'choose_logical_type'}
@@ -663,7 +666,7 @@ class RuleObjectComponent extends Component {
                     this.handleLogicalTypeChange(itemDetail, 'and');
                   }}
                 >
-                  AND
+                  并且
                 </p>
               </div>
             }
@@ -674,7 +677,7 @@ class RuleObjectComponent extends Component {
               type="link"
               className={'logical_item_btn'}
             >
-              {itemDetail?.operationCode == 'or' ? 'OR' : 'AND'}
+              {itemDetail?.operationCode == 'or' ? '或者' : '并且'}
               <DownOutlined style={{ marginLeft: '6px' }} />
             </Button>
           </Popover>
@@ -1046,8 +1049,10 @@ class RuleObjectComponent extends Component {
           )) ||
           null}
         {/* 输入/日期  */}
-        {(ites?.inputType === 10 && ites?.valueType === 41 && (
+        {(ites?.inputType === 10 && (ites?.valueType === 41 || ites?.valueType === 32) && (
           <DatePicker
+            showTime={dataTypeCode == 32}
+            format={dataTypeCode == 41 ? dateFormat : fullDateFormat}
             disabled={disabled}
             defaultValue={ites.defaultValue}
             style={style2}
@@ -1115,26 +1120,17 @@ class RuleObjectComponent extends Component {
         {/* 单选/多选  数据字典  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 20 && (
-            <Select
+            <InnerSelect
               disabled={disabled}
-              {...(ites?.inputType === 30
-                ? {
-                    mode: 'multiple',
-                  }
-                : {})}
+              inputType={ites?.inputType}
               defaultValue={ites.defaultValue}
-              style={styleCommon}
+              styleCommon={styleCommon}
               value={showValue(ites.code)}
               onChange={(value) => {
                 handleEdit(ites.code, value);
               }}
-            >
-              {getDictionarySource(ites?.dictionaryCode).map((it) => (
-                <Select.Option key={it.value} value={it.value}>
-                  {it.text}
-                </Select.Option>
-              ))}
-            </Select>
+              dictionaryCode={ites.dictionaryCode}
+            />
           )) ||
           null}
         {/* 单选/多选  仓库选择器(物理仓)  */}
@@ -1525,6 +1521,23 @@ class RuleObjectComponent extends Component {
             />
           )) ||
           null}
+        {/* 单选/多选  结算组织选择器  */}
+        {((ites?.inputType === 20 || ites?.inputType === 30) &&
+          ites?.choiceType === 290 && (
+            <BusinessTreeSearchSelect
+              disabled={disabled}
+              treeCheckable={ites?.inputType === 30}
+              businessType="settle-organization"
+              labelInValue={true}
+              value={showValue(ites.code)}
+              style={styleCommon}
+              onChange={(value) => {
+                handleEdit(ites.code, value);
+              }}
+              getPopupContainer={() => document.body}
+            />
+          )) ||
+        null}
         {/* 单选/多选  配送方式选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
           ites?.choiceType === 310 && (
@@ -1553,6 +1566,34 @@ class RuleObjectComponent extends Component {
             />
           )) ||
           null}
+        {/* 单选/多选  角色选择器  */}
+        {((ites?.inputType === 20 || ites?.inputType === 30) &&
+          ites?.choiceType === 360 && (
+            <BusinessSearchSelect
+              selectBusinessType="role"
+              selectProps={{
+                style: styleCommon,
+                placeholder: '请选择角色',
+                ...(ites?.inputType === 30
+                  ? {
+                    mode: 'multiple',
+                    maxTagCount: 1,
+                  }
+                  : {}),
+              }}
+              disabled={disabled}
+              labelInValue={true}
+              value={showValue(ites.code)}
+              requestConfig={{
+                filterInit: 'qp-code-in',
+              }}
+              onChange={(value) => {
+                handleEdit(ites.code, value);
+              }}
+              getPopupContainer={() => document.body}
+            />
+          )) ||
+        null}
         {/* 表达式 */}
         {ites?.inputType === 40 && (
           <div style={{ display: 'flex' }}>

package/src/components/Solution/RuleComponent/ruleFiled.js

@@ -3,8 +3,9 @@ import { Select, Input, InputNumber, DatePicker, TimePicker } from 'antd';
 import styles from './index.less';
 import { getRegularThresholdRange } from './services';
 import moment from 'moment';
-import { handleError, judgeIsEmpty } from '../../../utils/utils';
-import { queryIdentityInfo, findChangedThresholdQuery, setParams } from './util';
+import { judgeIsEmpty } from '../../../utils/utils';
+import { handleError } from '../../../utils/requestUtils';
+import { queryIdentityInfo, findChangedThresholdQuery, setParams, dateFormat, fullDateFormat } from './util';
 import { request as SulaRequest } from 'bssula';
 import { stringify } from 'querystring';
 import {
@@ -212,28 +213,26 @@ export default class RuleField extends Component {
         url: extraRequestUrl,
         method: 'get',
         converter: (res) => {
-          if (handleError(res)) {
-            let handleData = res?.data || [];
-            if (queryIdentifyType === 'dictCodeIdentify') {
-              handleData = handleData?.length
-                ? handleData.map((i) => ({
-                  code: i.dictItemCode,
-                  name: i.dictItemName,
-                }))
-                : [];
-            }
-            if (queryIdentifyType === 'dynamicDictCodeIdentify') {
-              handleData = handleData?.length
-                ? handleData.map((i) => ({
-                  code: i.code.toString(),
-                  name: i.name,
-                }))
-                : [];
-            }
-            this.setState({
-              thresholdList: handleData,
-            });
+          let handleData = res?.data || [];
+          if (queryIdentifyType === 'dictCodeIdentify') {
+            handleData = handleData?.length
+              ? handleData.map((i) => ({
+                code: i.dictItemCode,
+                name: i.dictItemName,
+              }))
+              : [];
+          }
+          if (queryIdentifyType === 'dynamicDictCodeIdentify') {
+            handleData = handleData?.length
+              ? handleData.map((i) => ({
+                code: i.code.toString(),
+                name: i.name,
+              }))
+              : [];
           }
+          this.setState({
+            thresholdList: handleData,
+          });
           return handleData;
         },
       });
@@ -274,8 +273,6 @@ export default class RuleField extends Component {
       customerWidth,
     } = this.props;
     const { thresholdList } = this.state;
-    const dateFormat = 'YYYY-MM-DD';
-    const fullDateFormat = 'YYYY-MM-DD HH:mm:ss';
     const styleCommon = {
       width: customerWidth || '150px',
     };
@@ -1840,6 +1837,76 @@ export default class RuleField extends Component {
           );
         }
       }
+      // 结算组织选择器
+      if (dataChoiceBusinessType == 290) {
+        if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
+          return (
+            <>
+              <BusinessTreeSearchSelect
+                disabled={disabled}
+                treeCheckable={dataInputBusinessType === 12}
+                businessType="settle-organization"
+                labelInValue={true}
+                value={values[0]}
+                style={styleCommon}
+                onChange={(value) => {
+                  if (dataInputBusinessType === 12) {
+                    values[0] = value.map((i) => i.key);
+                    valueNames[0] = value.map((i) => i.label || '');
+                  } else {
+                    values[0] = [value.key];
+                    valueNames[0] = [value.label || ''];
+                  }
+                  callback(values, valueNames);
+                }}
+                getPopupContainer={() => document.body}
+              />
+              <span>~</span>
+              <BusinessTreeSearchSelect
+                disabled={disabled}
+                treeCheckable={dataInputBusinessType === 12}
+                businessType="settle-organization"
+                labelInValue={true}
+                value={values[0]}
+                style={styleCommon}
+                onChange={(value) => {
+                  if (dataInputBusinessType === 12) {
+                    values[1] = value.map((i) => i.key);
+                    valueNames[1] = value.map((i) => i.label || '');
+                  } else {
+                    values[1] = [value.key];
+                    valueNames[1] = [value.label || ''];
+                  }
+                  callback(values, valueNames);
+                }}
+                getPopupContainer={() => document.body}
+              />
+            </>
+          );
+        } else {
+          return (
+            <BusinessTreeSearchSelect
+              disabled={disabled}
+              treeCheckable={dataInputBusinessType === 12}
+              businessType="settle-organization"
+              labelInValue={true}
+              value={values[0]}
+              style={styleCommon}
+              onChange={(value) => {
+                if (dataInputBusinessType === 12) {
+                  values = value.map((i) => i.key)||[];
+                  valueNames = value.map((i) => i.label || '')||[];
+                } else {
+                  values = value?.key?[value.key]:[];
+                  valueNames = value?.label?[value.label]:[];
+                }
+                callback(values, valueNames);
+              }}
+              getPopupContainer={() => document.body}
+            />
+          );
+        }
+      }
       // 配送方式选择器
       if (dataChoiceBusinessType == 310) {
         if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
@@ -1946,6 +2013,112 @@ export default class RuleField extends Component {
           );
         }
       }
+      // 角色选择器
+      if (dataChoiceBusinessType == 360) {
+        if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
+          return (
+            <>
+              <BusinessSearchSelect
+                selectBusinessType="role"
+                selectProps={{
+                  style: styleCommon,
+                  placeholder: '请选择角色',
+                  ...(dataInputBusinessType === 12
+                    ? {
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
+                    : {}),
+                }}
+                disabled={disabled}
+                labelInValue={true}
+                value={values[0]}
+                requestConfig={{
+                  filterInit: 'qp-code-in',
+                }}
+                onChange={(value) => {
+                  if (dataInputBusinessType === 12) {
+                    values[0] = value.map((i) => i.key);
+                    valueNames[0] = value.map((i) => i.label || '');
+                  } else {
+                    values[0] = [value.key];
+                    valueNames[0] = [value.label || ''];
+                  }
+                  callback(values, valueNames);
+                }}
+                getPopupContainer={() => document.body}
+              />
+              <span>~</span>
+              <BusinessSearchSelect
+                selectBusinessType="role"
+                selectProps={{
+                  style: styleCommon,
+                  placeholder: '请选择角色',
+                  ...(dataInputBusinessType === 12
+                    ? {
+                      mode: 'multiple',
+                      maxTagCount: 1,
+                    }
+                    : {}),
+                }}
+                disabled={disabled}
+                labelInValue={true}
+                value={values[1]}
+                requestConfig={{
+                  filterInit: 'qp-code-in',
+                }}
+                onChange={(value) => {
+                  if (dataInputBusinessType === 12) {
+                    values[1] = value.map((i) => i.key);
+                    valueNames[1] = value.map((i) => i.label || '');
+                  } else {
+                    values[1] = [value.key];
+                    valueNames[1] = [value.label || ''];
+                  }
+                  callback(values, valueNames);
+                }}
+                getPopupContainer={() => document.body}
+              />
+            </>
+          );
+        } else {
+          const currentValue = dataInputBusinessType === 12 ?
+            values?.map((s,vIndex)=> ({key: s, label: valueNames[vIndex]}))||[]
+            : values[0]&&{key:values[0],label:valueNames[0]}||{}
+          return (
+            <BusinessSearchSelect
+              selectBusinessType="role"
+              selectProps={{
+                style: styleCommon,
+                placeholder: '请选择角色',
+                ...(dataInputBusinessType === 12
+                  ? {
+                    mode: 'multiple',
+                    maxTagCount: 1,
+                  }
+                  : {}),
+              }}
+              disabled={disabled}
+              labelInValue={true}
+              value={currentValue}
+              requestConfig={{
+                filterInit: 'qp-code-in',
+              }}
+              onChange={(value) => {
+                if (dataInputBusinessType === 12) {
+                  values = value.map((i) => i.key)||[];
+                  valueNames = value.map((i) => i.label || '')||[];
+                } else {
+                  values = value?.key?[value.key]:[];
+                  valueNames = value?.label?[value.label]:[];
+                }
+                callback(values, valueNames);
+              }}
+              getPopupContainer={() => document.body}
+            />
+          );
+        }
+      }
     } else {
       if (
         dataTypeCode == 22 ||
@@ -1994,12 +2167,12 @@ export default class RuleField extends Component {
             />
           );
         }
-      } else if (dataTypeCode == 41) {
-        // 日期41
+      } else if (dataTypeCode == 41 || dataTypeCode == 32) {
+        // 日期41 日期时间32
         if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
           return (
             <RangePicker
-              // showTime
+              showTime={dataTypeCode == 32}
               disabled={disabled}
               style={{ width: customerWidth || '300px' }}
               format={dataTypeCode == 41 ? dateFormat : fullDateFormat}
@@ -2035,6 +2208,7 @@ export default class RuleField extends Component {
           return (
             <>
               <DatePicker
+                showTime={dataTypeCode == 32}
                 format={dataTypeCode == 41 ? dateFormat : fullDateFormat}
                 disabled={disabled}
                 style={{ width: customerWidth || '300px' }}

package/src/components/Solution/RuleComponent/util.js

@@ -137,3 +137,7 @@ export const isObj = (object) => {
     Object.prototype.toString.call(object).toLowerCase() == '[object object]'
   );
 };
+
+
+export const dateFormat = 'YYYY-MM-DD';
+export const fullDateFormat = 'YYYY-MM-DD HH:mm:ss';

package/src/plugin/TableColumnSetting/index.tsx

@@ -19,6 +19,7 @@ import fixedLeftActive from '../../assets/fixed-left-active.svg';
 import fixedRight from '../../assets/fixed-right.svg';
 import fixedRightActive from '../../assets/fixed-right-active.svg';
 import './index.less';
+import { handleRequestUrl, judgeIsRequestSuccess } from '@/utils/requestUtils';
 
 interface TableColumnSettingProps {
   /** tableCode必填，做用户存储关键key，*/
@@ -54,7 +55,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
   };
 
   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,
@@ -65,14 +66,14 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
     }))
 
     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)) {
         setConfigTableColumns(configvalue, tableCode)
       } else {
         message.error('保存表头列自定义失败，请稍后尝试');

package/src/utils/CustomLoginInfo.ts

@@ -0,0 +1,55 @@
+import ENUM from '@/utils/enumConfig';
+import cookie from 'js-cookie'
+
+const resposne = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}');
+//--------赢家项目登录信息---------
+export function getEekaSessionId() {
+  return resposne?.sessionId || '';
+}
+export function getEekaAccountId() {
+  return resposne?.personDetailResDto?.accountId || -1;
+}
+export function getEekaEmployeeId() {
+  return resposne?.personDetailResDto?.employeeId || 2;
+}
+export function getEekaTenantId() {
+  return resposne?.personDetailResDto?.tenantId || 1;
+}
+export function getEekaToken() {
+  return resposne?.token;
+}
+//--------赢家项目登录信息---------
+
+
+//--------国药项目登录信息---------
+export function getLoginHeaderInfo(headerkey: string,storage='cookie') {
+  if (storage) {
+    if ('localStorage' === storage) {
+      return localStorage.getItem(headerkey)
+    } else if ('sessionStorage' === storage) {
+      return sessionStorage.getItem(headerkey)
+    } else if ('cookie' === storage) {
+      return cookie.get(headerkey)
+    } else {
+      return localStorage.getItem(headerkey)
+    }
+  } else {
+    return localStorage.getItem(headerkey)
+  }
+}
+export function getGuoyaoshukeCompanyId() {
+  return getLoginHeaderInfo('gksk-company-id');
+}
+export function getGuoyaoshukeTenantCode() {
+  return getLoginHeaderInfo('gksk-tenant-code');
+}
+export function getGuoyaoshukeTenantId() {
+  return getLoginHeaderInfo('gksk-tenant-id') || 1;
+}
+export function getGuoyaoshukeToken() {
+  return getLoginHeaderInfo('gksk-access-token');
+}
+export function getGuoyaoshukeUscCode() {
+  return getLoginHeaderInfo('gksk-usc-code');
+}
+//--------国药项目登录信息---------

package/src/utils/requestUtils.ts

@@ -1,6 +1,9 @@
 import axios from 'axios';
 import ENUM from './enumConfig';
 import { getCurrentTenantId, getEmployeeId, getSessionId, getAccountId } from './LocalstorageUtils';
+import { getEekaSessionId, getEekaAccountId, getEekaEmployeeId, getEekaTenantId, getEekaToken,
+  getGuoyaoshukeCompanyId, getGuoyaoshukeTenantId, getGuoyaoshukeTenantCode, getGuoyaoshukeToken, getGuoyaoshukeUscCode
+} from './CustomLoginInfo';
 
 export function handleRequestAuthHeader(config?: any) {
   // https://www.kdocs.cn/l/coNbPpjamr5v这个表格里面涉及的接口，接口请求头里需要添加参数：x-biz-code 值就是列表里的code
@@ -15,20 +18,149 @@ export function handleRequestAuthHeader(config?: any) {
   }
 }
 
-// 处理请求头
+
+/*
+* 获取当前组件服务项目
+*  */
+const getCurrentUseProject = () => {
+  let project = 'BitSun';
+  const hostname = window.location.hostname;
+  if(hostname?.indexOf('omni')>-1 || hostname?.indexOf('eeka')>-1 || hostname?.indexOf('koradior')>-1) {
+    project = 'YingJia'
+  }
+  if(hostname?.indexOf('guoyaoshuke')>-1 || hostname?.indexOf('10.31.249.136')>-1) {
+    project = 'GuoYao'
+  }
+  return project
+}
+
+/*
+* 处理一般请求头
+* @param {*} config        请求参数配置
+*  */
+const handleCommonHeader = () => {
+  let commonHeaders = {};
+  const defaultHeaders = {
+    'sso-sessionid': getSessionId(),
+    'x-account-id': getAccountId(),
+    'x-employee-id': getEmployeeId(),
+    'x-tenant-id': getCurrentTenantId()
+  };
+  const type = getCurrentUseProject()
+  switch (type) {
+    case 'YingJia':
+      commonHeaders = {
+        'x-sso-sessionid': getEekaSessionId(),
+        'x-account-id': getEekaAccountId(),
+        'x-employee-id': getEekaEmployeeId(),
+        'x-tenant-id': getEekaTenantId(),
+        'x-user-token': getEekaToken()
+      }
+      break;
+    case 'GuoYao':
+      commonHeaders = {
+        'gksk-company-id': getGuoyaoshukeCompanyId(),
+        'gksk-tenant-id': getGuoyaoshukeTenantId(),
+        'gksk-tenant-code': getGuoyaoshukeTenantCode(),
+        'gksk-access-token': getGuoyaoshukeToken(),
+        'gksk-usc-code': getGuoyaoshukeUscCode(),
+      }
+      break;
+    default:
+      commonHeaders = defaultHeaders
+      break;
+  }
+ return commonHeaders
+}
+
+
+/*
+* 处理请求头方法-包含一般请求头、权限请求头。组件默认统一处理一遍，若组件使用处需要可以单独在组件处传参进来处理
+* @param {*} config         请求参数配置
+*  */
 const handleRequestHeader = (config: any) => {
-  config.headers['sso-sessionid']  = getSessionId()
-  config.headers['x-account-id']  = getAccountId()
-  config.headers['x-employee-id']  = getEmployeeId()
-  config.headers['x-tenant-id']  =  getCurrentTenantId()
+
+  let commonHeaders = handleCommonHeader();
+
   if (localStorage.getItem('x-user-auth-context')) {
-    config.headers['x-user-auth-context'] = localStorage.getItem('x-user-auth-context');
+    // @ts-ignore
+    commonHeaders['x-user-auth-context'] = localStorage.getItem('x-user-auth-context');
+  }
+  !!!config.headers['x-biz-code'] && handleRequestAuthHeader(config)
+
+  config.headers = {
+    ...commonHeaders,
+    ...config.headers
   }
-  handleRequestAuthHeader(config)
 }
 
+
 // 拦截器
 axios.interceptors.request.use((config: any) => {
   handleRequestHeader(config)
   return config
 })
+
+
+
+
+/**
+ * 处理请求路径前缀/请求路径等使用不一的问题
+ * @param {*} defaultUrl         默认请求路径
+ * @param {*} defaultPreFix    默认请求路径的前缀
+ * @param {*} config    更改请求前缀/路径集合
+ *      示例：
+ *          appRequestConfig： {
+ *            '/appConfig/saveUserOrder': ['/api/user-manage'],
+ *            '/appConfig/saveQueryCriteria': ['/api/user-manage']
+ *          }
+ */
+export const handleRequestUrl = (defaultPreFix: string,defaultUrl: string, config: any) => {
+  let rUrl = `${defaultPreFix}${defaultUrl}`;
+  if(config && Object.keys((config||{}))?.length) {
+    const value = config[defaultUrl] || []
+    const newPreFix = value[0] || defaultPreFix;
+    const newUrl = value[1] || defaultUrl;
+    rUrl = `${newPreFix}${newUrl}`;
+  }
+  return rUrl
+}
+
+
+/**
+ * 处理错误请求
+ * @param {*} response         返回结果
+ * @param {*} needBackError    是否需要将错误回传到页面单独处理
+ */
+export function handleError(response: object, needBackError?: boolean) {
+  if (judgeIsRequestError(response)) {
+    if (response && !needBackError) {
+      // @ts-ignore
+      response.msg && message.error(response.msg);
+    }
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * 判断为请求错误
+ *  @param {*} res         响应体
+ * */
+export const judgeIsRequestError = (res: any) => {
+  if (!res || (res?.status && res.status !== '0') || (res?.code && (res.code !== '000000' && res.code !== '0'))) {
+    return true;
+  }
+  return false;
+};
+/**
+ * 判断为请求成功
+ * @param {*} res         响应体
+ * */
+export const judgeIsRequestSuccess = (res: any) => {
+  if (res?.status === '0' || res?.code === '000000'|| res?.code === '0') {
+    return true;
+  }
+  return false;
+};