@bit-sun/business-component 2.4.24 → 2.4.25

package/src/common/ENUM.ts

@@ -1,41 +1,41 @@
-const ENUM = {
-  /**
-   * 事件动作类型枚举
-   */
-  VALUE_TYPE: {
-    STATUS: 1, // 流转状态
-    TAG: 2, // 添加标签
-    TIMING: 3, // 定时器
-    EDIT_FIELD: 4, // 字段变更
-  },
-  /**
-   * 执行动作枚举
-   */
-  EXCUSE_ACTION: {
-    SEND_MESSAGE: 1, // 发送消息
-    PUSH_TODO_TASK: 2, // 推送任务
-  },
-  EXCUSE_ACTION_TEXT: {
-    SEND_MESSAGE: '发送一条消息',
-    PUSH_TODO_TASK: '推送一条待办任务',
-  },
-  /**
-   * 消息接收人分组类型枚举
-   */
-  RECEIVER_GROUP_TYPE: {
-    EMPLOYEES: 1, // 指定员工
-    ORGANIZATION: 2, // 指定组织
-    ROLE: 3, // 指定角色
-    PERSON_IN_DOCUMENT: 4, // 单据内人员
-    SEND_ALL: 5, // 所有人
-  },
-  /**
-   * 消息发送类型枚举
-   */
-  MESSAGE_SENDTIME_TYPE: {
-    IMMEDIATELY_SEND: 1, // 立即发送
-    REGULARLY_SEND: 2, // 定时发送
-  },
-};
-
-export default ENUM;
+const ENUM = {
+  /**
+   * 事件动作类型枚举
+   */
+  VALUE_TYPE: {
+    STATUS: 1, // 流转状态
+    TAG: 2, // 添加标签
+    TIMING: 3, // 定时器
+    EDIT_FIELD: 4, // 字段变更
+  },
+  /**
+   * 执行动作枚举
+   */
+  EXCUSE_ACTION: {
+    SEND_MESSAGE: 1, // 发送消息
+    PUSH_TODO_TASK: 2, // 推送任务
+  },
+  EXCUSE_ACTION_TEXT: {
+    SEND_MESSAGE: '发送一条消息',
+    PUSH_TODO_TASK: '推送一条待办任务',
+  },
+  /**
+   * 消息接收人分组类型枚举
+   */
+  RECEIVER_GROUP_TYPE: {
+    EMPLOYEES: 1, // 指定员工
+    ORGANIZATION: 2, // 指定组织
+    ROLE: 3, // 指定角色
+    PERSON_IN_DOCUMENT: 4, // 单据内人员
+    SEND_ALL: 5, // 所有人
+  },
+  /**
+   * 消息发送类型枚举
+   */
+  MESSAGE_SENDTIME_TYPE: {
+    IMMEDIATELY_SEND: 1, // 立即发送
+    REGULARLY_SEND: 2, // 定时发送
+  },
+};
+
+export default ENUM;

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

@@ -7,7 +7,7 @@
  */
 import React, { useState, useEffect } from 'react';
 import { Tooltip, Select, message } from 'antd';
-import request from '@/utils/request';
+import axios from 'axios';
 import { AddSelect } from '../../../index';
 import { tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
@@ -22,28 +22,24 @@ function handleSelectColumn(c: any, parentProps: any) {
   const coverColumns = parentProps?.coverColumns || [];
   const additionColumns = parentProps?.additionColumns || [];
   // 仅展示内容
-  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
-  if (showColumns?.length) {
-    result = result.filter((i: any) => showColumns.includes(i.dataIndex));
+  if(showColumns?.length) {
+    result = result.filter((i: any) => showColumns.includes(i.dataIndex))
   }
   // 过滤不需要展示内容
-  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
-  if (exceptColumns?.length) {
-    result = result.filter((i: any) => !exceptColumns.includes(i.dataIndex));
+  if(exceptColumns?.length) {
+    result = result.filter((i: any) => !exceptColumns.includes(i.dataIndex))
   }
   // 追加(最好不用这个，当组件不固定时候会有影响)
-  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
-  if (additionColumns?.length) {
+  if(additionColumns?.length) {
     additionColumns.forEach((i: any) => {
-      result.splice(i.position, 0, i.column);
-    });
+      result.splice(i.position,0,i.column)
+    })
   }
   // 覆盖内容
-  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
-  if (coverColumns?.length) {
+  if(coverColumns?.length) {
     result = coverColumns;
   }
-  return result;
+  return result
 }
 function handleSearchForm(c: any, parentProps: any) {
   let result = c;
@@ -51,17 +47,14 @@ function handleSearchForm(c: any, parentProps: any) {
   const exceptTableSearchForm= parentProps?.exceptTableSearchForm|| [];
   const coverTableSearchForm = parentProps?.coverTableSearchForm || [];
   // 仅展示内容
-  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(showTableSearchForm?.length) {
     result = result.filter((i: any) => showTableSearchForm.includes(i.name))
   }
   // 过滤不需要展示内容
-  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(exceptTableSearchForm?.length) {
     result = result.filter((i: any) => !exceptTableSearchForm.includes(i.name))
   }
   // 覆盖内容
-  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(coverTableSearchForm?.length) {
     result = coverTableSearchForm;
   }
@@ -74,17 +67,14 @@ function handleFormSearchSourceLoad(c: any, parentProps: any) {
   const coverTableFormSearchSourceLoad = parentProps?.coverTableFormSearchSourceLoad || [];
   const noNeedTableFormSearchSourceLoad = parentProps?.noNeedTableFormSearchSourceLoad
   // 仅展示内容
-  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(showTableFormSearchSourceLoad?.length) {
     result = result.filter((i: any) => showTableFormSearchSourceLoad.includes(i.url))
   }
   // 过滤不需要展示内容
-  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(exceptTableFormSearchSourceLoad?.length) {
     result = result.filter((i: any) => !exceptTableFormSearchSourceLoad.includes(i.url))
   }
   // 覆盖内容
-  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(coverTableFormSearchSourceLoad?.length) {
     result = coverTableFormSearchSourceLoad;
   }
@@ -116,7 +106,6 @@ export const AddSkuSelect = (parProps: any) => {
           showTitle: false,
         },
         dataIndex: 'itemEancode',
-        // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115627
         render: (text: any) => (
           <Tooltip placement="topLeft" title={text}>
             {text}
@@ -164,7 +153,6 @@ export const AddSkuSelect = (parProps: any) => {
         showTitle: false,
       },
       render: (text: any, record: any) => {
-        // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115636
         if (record?.packingUnitList?.length) {
           const basePackUnit = record?.packingUnitList[0]
           record.selectUnitCode = basePackUnit.unitCode
@@ -250,11 +238,6 @@ export const AddSkuSelect = (parProps: any) => {
         ),
       }
     ]),
-    {
-      title: 'SKC编码',
-      width: 150,
-      dataIndex: 'skcCode',
-    },
     {
       title: '所属SPU名称',
       width: 100,
@@ -350,11 +333,10 @@ export const AddSkuSelect = (parProps: any) => {
   const mTpTableColumn = handleSelectColumn(initialTableColumn, parProps);
   const initialTableSearchForm = [
     {
-      name: 'qp-skuCode-like', label: 'SKU编码',type:'multipleQueryInput'
+      name: 'qp-skuCode-like', label: 'SKU编码'
     },
     { name: 'qp-skuName-like', label: 'SKU名称' },
-    { name: 'qp-skcCode-like', label: 'SKC编码',type:'multipleQueryInput' },
-    { name: 'qp-itemCode-like', label: 'SPU编码',type:'multipleQueryInput' },
+    { name: 'qp-externalCode-like', label: '外部SPU编码' },
     ...(isNoUseItemBarcode ? []: [
       { name: 'qp-code-in', label: '商品条码', field: {
           type: 'multipleQueryInput',
@@ -374,7 +356,7 @@ export const AddSkuSelect = (parProps: any) => {
           maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: (input: string, option: { props: { children: string } }) =>
-            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
         },
       } },
     { name: 'qp-categoryId-in', type: 'treeSelect', label: '类目', field: {
@@ -407,7 +389,7 @@ export const AddSkuSelect = (parProps: any) => {
         'ctl-withAuth': true
       },
       resType: 'list',
-      resPosition: isNoUseItemBarcode ? 4 : 5,
+      resPosition: isNoUseItemBarcode ? 2 : 3,
       resKeyValue: ['id','name']
     },
     {
@@ -417,7 +399,7 @@ export const AddSkuSelect = (parProps: any) => {
         currentPage: 1,
       },
       resType: 'treeList',
-      resPosition: isNoUseItemBarcode ? 5 : 6
+      resPosition: isNoUseItemBarcode ? 3 : 4
     },
   ]
   const mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
@@ -478,7 +460,7 @@ export const AddSkcSelect = (parProps: any) => {
 
   useEffect(() => {
     // type: 1 尺码组; 2 配码组
-    request.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1`).then((result: any) => {
+    axios.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1`).then((result: any) => {
       result = result.data;
       if (judgeIsRequestError(result)) {
         message.error(result.msg);
@@ -486,7 +468,7 @@ export const AddSkcSelect = (parProps: any) => {
       }
       const data = result.data || [];
       setPropertyList(data)
-    }).catch((err:any) => {});
+    }).catch((err) => {});
   },[])
 
   //注⚠️：自定义过表头的请记得传tableCodeList参数
@@ -541,7 +523,7 @@ export const AddSkcSelect = (parProps: any) => {
     {
       url: `/items/item/propertyValue/sizeBySkcConfig`,
       params: {
-        pageSize: 50,
+        pageSize: 10000,
         currentPage: 1,
         type: 2, // 类型：1尺码；2颜色
       },
@@ -552,7 +534,7 @@ export const AddSkcSelect = (parProps: any) => {
     {
       url: `/items/category/queryCategoryTree`,
       params: {
-        pageSize: 50,
+        pageSize: 5000,
         currentPage: 1,
       },
       resType: 'treeList',
@@ -783,7 +765,7 @@ export const AddSpuSelect = (parProps: any) => {
   useEffect(() => {
     if(parProps?.isSingleColor) {
       // type: 1 尺码组; 2 配码组
-      request.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1`).then((result: any) => {
+      axios.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1`).then((result: any) => {
         result = result.data;
         if (judgeIsRequestError(result)) {
           message.error(result.msg);
@@ -791,7 +773,7 @@ export const AddSpuSelect = (parProps: any) => {
         }
         const data = result.data || [];
         setPropertyList(data)
-      }).catch((err: any) => {});
+      }).catch((err) => {});
     }
   },[])
 
@@ -881,7 +863,7 @@ export const AddSpuSelect = (parProps: any) => {
     {
       url: `/items/category/queryCategoryTree`,
       params: {
-        pageSize: 50,
+        pageSize: 5000,
         currentPage: 1,
       },
       resType: 'treeList',

package/src/components/Business/BsLayouts/Components/AllFunc/index.less

@@ -1,153 +1,153 @@
-
-
-.menu {
-  .anticon {
-    margin-right: 8px;
-  }
-  .ant-dropdown-menu-item {
-    min-width: 160px;
-  }
-}
-
-.right {
-  display: flex;
-  float: right;
-  height: 48px;
-  margin-left: auto;
-  overflow: hidden;
-  .action {
-    display: flex;
-    align-items: center;
-    height: 48px;
-    padding: 0 12px;
-    cursor: pointer;
-    transition: all 0.3s;
-    > span {
-      vertical-align: middle;
-    }
-    &:hover {
-      background: rgba(0, 0, 0, 0.025);
-    }
-    .opened {
-      background: rgba(0, 0, 0, 0.025);
-    }
-  }
-  .search {
-    padding: 0 12px;
-    &:hover {
-      background: transparent;
-    }
-  }
-  .account {
-    .avatar {
-      margin-right: 8px;
-      color: #1890ff;
-      vertical-align: top;
-      background: rgba(255, 255, 255, 0.85);
-    }
-  }
-}
-
-.dark {
-  .action {
-    &:hover {
-      background: #252a3d;
-    }
-    .opened {
-      background: #252a3d;
-    }
-  }
-}
-
-.warp_allfunc {
-  z-index: 100;
-  
-  
-  .drawerWarp {
-    column-count: 4;
-  }
-  
-  .drawer_header_warp {
-    .ant-list-header {
-      padding: 0 0 0 10px !important;
-      line-height: 40px;
-      border: 0px !important;
-      b {
-        width: 100%;
-        display: inline-block;
-        border-bottom: 1px solid #f0f0f0;
-      }
-    }
-    .ant-list-item {
-      padding: 0 0 0 10px !important;
-      line-height: 30px !important;
-    }
-  
-    .ant-drawer-close {
-      position: absolute;
-      right: 0;
-    }
-  }
-  
-  
-  
-  .p {
-    color: #b1bad4;
-    font-weight: 400;
-    font-size: 12px;
-    margin-bottom: 10px;
-    font-family: PingFangSC, PingFangSC-Regular;
-    line-height: 16px;
-    text-align: left;
-    opacity: 0.8;
-    user-select: none;
-    text-align: center;
-    margin-left: 8px;
-  }
-  
-  .btn {
-    display: flex;
-    align-items: center;
-    height: 44px;
-    color: #b1bad4;
-    background: #10234c;
-    border-radius: 8px;
-    width: 130px;
-    user-select: none;
-  }
-  .btn:hover,
-  .btnSpan1:hover,
-  .btnSpan2:hover {
-    cursor: pointer;
-    color: #b1bad4;
-  }
-
-  .btnSpan1 {
-    margin: 0 7px;
-  }
-}
-
-.allfunc_drawcontent {
-  .allFunsList {
-    margin-bottom: 10px;
-  }
-  
-  .allFunsListWarp {
-    width: 200px;
-    margin-right: 10px;
-    border-radius: 4px;
-  
-    break-inside: avoid;
-  }
-  
-  .drawerWarp_p {
-    color: #8c8c8c;
-    font-weight: 400;
-    font-size: 14px;
-    font-family: PingFangSC, PingFangSC-Regular;
-    line-height: 20px;
-    text-align: left;
-  }
-}
-
-
+
+
+.menu {
+  .anticon {
+    margin-right: 8px;
+  }
+  .ant-dropdown-menu-item {
+    min-width: 160px;
+  }
+}
+
+.right {
+  display: flex;
+  float: right;
+  height: 48px;
+  margin-left: auto;
+  overflow: hidden;
+  .action {
+    display: flex;
+    align-items: center;
+    height: 48px;
+    padding: 0 12px;
+    cursor: pointer;
+    transition: all 0.3s;
+    > span {
+      vertical-align: middle;
+    }
+    &:hover {
+      background: rgba(0, 0, 0, 0.025);
+    }
+    .opened {
+      background: rgba(0, 0, 0, 0.025);
+    }
+  }
+  .search {
+    padding: 0 12px;
+    &:hover {
+      background: transparent;
+    }
+  }
+  .account {
+    .avatar {
+      margin-right: 8px;
+      color: #1890ff;
+      vertical-align: top;
+      background: rgba(255, 255, 255, 0.85);
+    }
+  }
+}
+
+.dark {
+  .action {
+    &:hover {
+      background: #252a3d;
+    }
+    .opened {
+      background: #252a3d;
+    }
+  }
+}
+
+.warp_allfunc {
+  z-index: 100;
+  
+  
+  .drawerWarp {
+    column-count: 4;
+  }
+  
+  .drawer_header_warp {
+    .ant-list-header {
+      padding: 0 0 0 10px !important;
+      line-height: 40px;
+      border: 0px !important;
+      b {
+        width: 100%;
+        display: inline-block;
+        border-bottom: 1px solid #f0f0f0;
+      }
+    }
+    .ant-list-item {
+      padding: 0 0 0 10px !important;
+      line-height: 30px !important;
+    }
+  
+    .ant-drawer-close {
+      position: absolute;
+      right: 0;
+    }
+  }
+  
+  
+  
+  .p {
+    color: #b1bad4;
+    font-weight: 400;
+    font-size: 12px;
+    margin-bottom: 10px;
+    font-family: PingFangSC, PingFangSC-Regular;
+    line-height: 16px;
+    text-align: left;
+    opacity: 0.8;
+    user-select: none;
+    text-align: center;
+    margin-left: 8px;
+  }
+  
+  .btn {
+    display: flex;
+    align-items: center;
+    height: 44px;
+    color: #b1bad4;
+    background: #10234c;
+    border-radius: 8px;
+    width: 130px;
+    user-select: none;
+  }
+  .btn:hover,
+  .btnSpan1:hover,
+  .btnSpan2:hover {
+    cursor: pointer;
+    color: #b1bad4;
+  }
+
+  .btnSpan1 {
+    margin: 0 7px;
+  }
+}
+
+.allfunc_drawcontent {
+  .allFunsList {
+    margin-bottom: 10px;
+  }
+  
+  .allFunsListWarp {
+    width: 200px;
+    margin-right: 10px;
+    border-radius: 4px;
+  
+    break-inside: avoid;
+  }
+  
+  .drawerWarp_p {
+    color: #8c8c8c;
+    font-weight: 400;
+    font-size: 14px;
+    font-family: PingFangSC, PingFangSC-Regular;
+    line-height: 20px;
+    text-align: left;
+  }
+}
+
+