@bit-sun/business-component 4.0.13-alpha.9 → 4.2.0-aiwei-alpha.1

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

@@ -150,7 +150,7 @@ export default () => {
     // },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
-    selectBusinessType: 'skuCommodity',
+    selectBusinessType: 'shopFile2',
   };
 
   const onTabChange = (key) => {
@@ -297,7 +297,7 @@ import {BusinessSearchSelect} from '../../../index.ts';
 const { TabPane } = Tabs;
 export default () => {
   const selectProps = {
-    // mode: 'multiple',
+    mode: 'multiple',
     // maxTagCount: 1,
     // disabled: true
   }
@@ -317,7 +317,7 @@ export default () => {
     },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
-    selectBusinessType: 'spuCommodity',
+    selectBusinessType: 'spuCommodityWithProperty',
   };
 
   const onTabChange = (key) => {
@@ -520,7 +520,7 @@ export default () => {
     //   needStatusSearch: true
     // },
     selectProps,
-    selectBusinessType: 'brand',
+    selectBusinessType: 'realWarehouse',
   };
 
   const onTabChange = (key) => {

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

@@ -1,5 +1,6 @@
-import request from '@/utils/request';
+import request from '@/utils/cachedRequest';
 import { message } from 'antd';
+import { uniqBy } from 'lodash';
 import { stringify } from 'querystring';
 import ENUM from '@/utils/enumConfig';
 import { judgeIsRequestError } from '@/utils/requestUtils';
@@ -55,10 +56,11 @@ const getDictionaryTextByValue = (dicCode: string, value: string | number) => {
   return dicItemArray[0].text;
 };
 
-const loadSelectSource = (url: string, params?: any) => {
+const loadSelectSource = (url: string, params?: any,options?:any) => {
+  const realOptions = options || {};
   return new Promise((resolve, reject) => {
     request
-      .get(`${url}?${stringify(params)}`)
+      .get(`${url}?${stringify(params)}`, realOptions)
       .then((result: any) => {
         result = result.data;
         if (judgeIsRequestError(result)) {
@@ -79,7 +81,7 @@ const handleDefaultPrefixUrl = (type: string) => {
     case 'supplier2': case 'customer2': case 'shopFile2': case 'platCompany': case 'market-channel':
       result =  '/channel-manage';
       break;
-    case 'skuCommodity': case 'skuPropertyValue': case 'spuCommodity': case 'skcCommodity': case 'brand':
+    case 'skuCommodity': case 'skuPropertyValue': case 'spuCommodity': case 'skcCommodity': case 'brand': case 'spuCommodityWithProperty':
       result =  '/items';
       break;
     case 'physicalWarehouse': case 'realWarehouse': case 'virtualWarehouse': case 'channelWarehouse': case 'ownerWarehouse':
@@ -125,4 +127,24 @@ const getFieldIndex = (tableSearchForm: any, name: string) =>{
   return tableSearchForm.findIndex((i: any) => i.name.includes(name));
 }
 
-export { getDictionarySource, getDictionaryTextByValue, loadSelectSource, handleDefaultPrefixUrl, handleHiddenFields, handleHiddenFieldsRequest, getFieldIndex }
+// 获取选择器-弹窗中-下拉框查询接口-头部的请求头
+const getQueryHeadersList = (params: any) => {
+  const { defaultQSHL = [], querySelectHeadersList = [], extralHeaders = {} } = params;
+
+  const realQSHL = uniqBy([...querySelectHeadersList, ...defaultQSHL],'queryKey')||[]; // 去重,保留最先出现的元素，故defaultQSHL需要放在后面
+
+
+  let result: any = {};
+  realQSHL.forEach((item: any) => {
+    const { queryKey, isOpen, extralHeaders:QSH } = item;
+    if (isOpen && queryKey) {
+      result[queryKey] = { headers: { ...extralHeaders, ...(QSH || {}) } };
+    }
+  });
+
+  return result;
+}
+
+const getQueryHeadersItem = (queryHeaders: any, queryKey: any) => queryHeaders?.[queryKey] || {};
+
+export { getDictionarySource, getDictionaryTextByValue, loadSelectSource, handleDefaultPrefixUrl, handleHiddenFields, handleHiddenFieldsRequest, getFieldIndex, getQueryHeadersList, getQueryHeadersItem }

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

@@ -0,0 +1,37 @@
+---
+nav:
+  title: '组件'
+  order: 1
+group:
+  title: 业务组件
+  order: 1
+title: 日志组件
+order: 1
+---
+
+# SystemLog
+
+
+## 日志业务组件
+
+```tsx
+import React, { useState } from 'react';
+import { SystemLog } from '../../../index.ts';
+
+export default () => {
+  const [modeType, setModeType] = useState('view');
+  const renderLogRef = useRef<any>();
+
+  return {
+   fields: [
+      SystemLog({
+        modeType,
+        code: '123',
+        containerName: 'Test_Log_Info',
+        renderLogRef,
+        extraParams: {},
+      })
+    ],
+  };
+};
+```

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

@@ -0,0 +1,87 @@
+import { handleCommonTimeRender } from '@/utils/TableUtils';
+import { formContainerAndItemLayout, handleConvertResponse } from '@/utils/utils';
+import { Table as BsTable } from 'bssula';
+import React from 'react';
+
+//操作日志
+const SystemLog = ({
+  modeType,
+  code,
+  containerName,
+  renderLogRef = {},
+  extraParams = {},
+}: {
+  modeType: string,
+  code: any
+  containerName: string,
+  renderLogRef: object,
+  extraParams?: object,
+}) => {
+  return {
+    ...formContainerAndItemLayout('table', '操作日志', containerName),
+    initialVisible: modeType != 'create',
+    fields: [
+      {
+        name: 'table',
+        label: false,
+        itemLayout: {
+          span: 24,
+          labelCol: {
+            span: 0,
+          },
+          wrapperCol: {
+            span: 24,
+          },
+        },
+        field: (ctx: any) => {
+          return code && <BsTable
+            remoteDataSource={{
+              url: `/oms-ops/logInfo?qp-businessCode-eq=${code}`,
+              convertParams: ({ params }: any) => {
+                return {
+                  pageSize: params.pageSize,
+                  currentPage: params.current,
+                  ...extraParams,
+                };
+              },
+              converter: ({ data }: any) => {
+                return {
+                  ...handleConvertResponse(data.list, data.total || data.totalCount),
+                };
+              },
+            }}
+            columns={[
+              {
+                title: '操作人',
+                dataIndex: 'handlerName',
+              },
+              {
+                title: '操作名称',
+                dataIndex: 'handlerType',
+              },
+              {
+                title: '操作时间',
+                dataIndex: 'handlerTime',
+                render: ({ text }: { text: any }) => handleCommonTimeRender(text)
+              },
+              {
+                title: '操作内容',
+                dataIndex: 'logcontent',
+              },
+            ]}
+            style={{ width: '100%', marginTop: '-16px', padding: '0px' }}
+            rowKey="id"
+            scroll={{ x: 'max-content' }}
+            pagination={{
+              showTotal: (total: any) => `共 ${total} 条`,
+              showQuickJumper: true,
+              hideOnSinglePage: true,
+            }}
+            ref={renderLogRef}
+          />
+        },
+      },
+    ],
+  }
+}
+export default SystemLog

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

@@ -15,7 +15,7 @@ import fixedLeft from '../../../assets/fixed-left.svg';
 import fixedLeftActive from '../../../assets/fixed-left-active.svg';
 import fixedRight from '../../../assets/fixed-right.svg';
 import fixedRightActive from '../../../assets/fixed-right-active.svg';
-import request from '@/utils/request';
+import request from '@/utils/cachedRequest';
 // import { request } from 'umi';
 import './index.less';
 import ENUM from '@/utils/enumConfig';
@@ -67,9 +67,10 @@ class SortableTable extends React.Component<SortTableProps> {
     onSearchSort: false,
   };
 
-  patchUserColumnConfig = (config: any) => {
+  patchUserColumnConfig = (config: any, tableCodes: any) => {
     const { tableCode, appRequestConfig }: any = this.props;
-    if (!tableCode) return;
+    const newTableCode = tableCodes || tableCode;
+    if (!newTableCode) return;
     let configvalue = config ? config.map((item:any) => ({
       key: item.key || item.dataIndex,
       dataIndex: item.dataIndex || item.key,
@@ -82,21 +83,22 @@ class SortableTable extends React.Component<SortTableProps> {
       url: handleRequestUrl('/user','/appConfig/saveUserOrder',appRequestConfig),
       method:'POST',
       data: {
-        "code": tableCode,
+        "code": newTableCode,
         "detail": configvalue ? JSON.stringify(configvalue) : ''
       },
     }).then((res:any) => {
       if (judgeIsRequestSuccess(res?.data)) {
-        this.patchConfigToLocalstorage(configvalue, tableCode)
+        this.patchConfigToLocalstorage(configvalue, newTableCode, config)
       } else {
         message.error('保存表头列自定义失败，请稍后尝试');
       }
     })
   }
 
-  patchConfigToLocalstorage = (configvalue:any, tableCode:string) => {
+  patchConfigToLocalstorage = (configvalue:any, tableCode:string, newDataSource: any) => {
     const { setShowColumns, datasource = [] }: any = this.props;
     const { sortDataSource } = this.state;
+    const sourceList = newDataSource || sortDataSource;
     let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]'
     let configArray = JSON.parse(config)
     let currentSetting = configArray.filter((item:any) => item.code === tableCode)
@@ -114,7 +116,7 @@ class SortableTable extends React.Component<SortTableProps> {
       visible: false,
     });
     if (configvalue) {
-      setShowColumns([...sortDataSource]);
+      setShowColumns([...sourceList]);
     } else {
       this.setState({
         dataSource: [
@@ -175,15 +177,28 @@ class SortableTable extends React.Component<SortTableProps> {
     return preKeyStr !== nextKeyStr;
   }
 
+  // 提取逻辑到单独的方法
+  validateLocalStorageConfig = (datasource: any, tableCode: string) => {
+    let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
+    let configArray = JSON.parse(config);
+    let currentSetting = configArray.filter((item:any) => item.code === tableCode);
+    let configvalue = currentSetting?.[0]?.detail ? JSON.parse(currentSetting[0].detail) : [];
+    if (currentSetting.length === 0 || configvalue.length === 0 ) {
+      this.patchUserColumnConfig(datasource || [], tableCode);
+    }
+  }
+
   componentWillReceiveProps(nextProps: any) {
     if (this.isColumnsChange(this.props?.datasource, nextProps?.datasource)) {
       this.setInitValue(nextProps?.datasource || []);
+      this.validateLocalStorageConfig(nextProps?.datasource, nextProps?.tableCode);
     }
   }
 
   componentDidMount() {
-    const { datasource = [] }: any = this.props;
+    const { datasource = [], tableCode }: any = this.props;
     this.setInitValue(datasource);
+    this.validateLocalStorageConfig(datasource, tableCode);
   }
 
   columns = [
@@ -415,7 +430,7 @@ class SortableTable extends React.Component<SortTableProps> {
       visible: false,
     });
     setShowColumns([...sortDataSource]);
-    this.patchUserColumnConfig(sortDataSource)
+    this.patchUserColumnConfig(sortDataSource, null)
   };
 
   handleCancel = (e: React.MouseEvent<HTMLElement>) => {
@@ -476,7 +491,7 @@ class SortableTable extends React.Component<SortTableProps> {
   DraggableContainer = (props: any) => (
     <SortableBody
       useDragHandle
-      disableAutoscroll
+      lockAxis='y'
       helperClass="row-dragging"
       onSortEnd={this.onSortEnd}
       {...props}
@@ -487,9 +502,9 @@ class SortableTable extends React.Component<SortTableProps> {
     const { sortDataSource } = this.state;
     // function findIndex base on Table rowKey props and should always be a right array index
     const index = sortDataSource.findIndex(
-      (x:any) => x.key === restProps['data-row-key'],
+      (x) => (x.key||x.dataIndex) == restProps['data-row-key'],
     );
-    return <SortableItem index={index} {...restProps} />;
+    return <SortableItem key={restProps['data-row-key']} index={index} {...restProps} />;
   };
 
   onChange = (e: any, title: any) => {
@@ -854,6 +869,7 @@ class SortableTable extends React.Component<SortTableProps> {
                       row: this.DraggableBodyRow,
                     },
                   }}
+                  scroll={{ y: 364 }}
                 />
               </div>
             </div>

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

@@ -151,16 +151,18 @@
     }
   }
 
-  .ant-table-wrapper::-webkit-scrollbar {
+  .ant-table-tbody::-webkit-scrollbar {
     display: none;
   }
 
   .ant-table-wrapper {
     margin-top: 10px;
-    height: 364px;
-    overflow: scroll;
     padding-bottom: 50px;
 
+    tbody tr:first-child {
+      display: none;
+    }
+
     tr {
       height: 30px;
       td {