@bit-sun/business-component 4.0.13-alpha.8 → 4.2.0-alpha.0

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

@@ -48,9 +48,10 @@ class SortableTable extends React.Component {
     bsTableCode: '', //设置table 列的标识
   };
 
-  patchUserColumnConfig = (config) => {
+  patchUserColumnConfig = (config: any, tableCode: any) => {
     const { appRequestConfig } = this.props;
     let that = this;
+    const newTableCode = tableCode || that.state.bsTableCode;
     let configvalue = config
       ? config.map((item) => ({
           key: item.key,
@@ -65,12 +66,12 @@ class SortableTable extends React.Component {
         url: handleRequestUrl('/user','/appConfig/saveUserOrder', appRequestConfig),
         method: 'POST',
         data: {
-          code: that.state.bsTableCode,
+          code: newTableCode,
           detail: configvalue ? JSON.stringify(configvalue) : '',
         },
       }).then((res:any) => {
         if (judgeIsRequestSuccess(res?.data)) {
-          this.patchConfigToLocalstorage(configvalue);
+          this.patchConfigToLocalstorage(configvalue, newTableCode, config);
           resolve({ status: '0' });
         } else {
           message.error('保存表头列自定义失败，请稍后尝试');
@@ -93,20 +94,22 @@ class SortableTable extends React.Component {
     return [];
   };
 
-  patchConfigToLocalstorage = (configvalue) => {
+  patchConfigToLocalstorage = (configvalue, tableCode: any, newDataSource: any) => {
     const { setShowColumns, datasource = [] } = this.props;
     const { sortDataSource, bsTableCode } = 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) => item.code === bsTableCode,
+      (item) => item.code === tableCode,
     );
     if (currentSetting.length) {
       currentSetting[0].detail = JSON.stringify(configvalue);
     } else {
       configArray.push({
-        code: bsTableCode,
+        code: tableCode,
         detail: JSON.stringify(configvalue),
       });
     }
@@ -119,7 +122,7 @@ class SortableTable extends React.Component {
       visible: false,
     });
     if (configvalue) {
-      setShowColumns([...sortDataSource]);
+      setShowColumns([...sourceList]);
     } else {
       this.setState({
         isDefaultValue: true,
@@ -140,6 +143,30 @@ class SortableTable extends React.Component {
     }
   };
 
+  isColumnsChange = (pre=[], next=[]) => {
+    const preKeyStr = pre.map(item => item.key || item.dataIndex).join(',');
+    const nextKeyStr = next.map(item => item.key || item.dataIndex).join(',');
+    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?.bsTableCode);
+    }
+  }
+
   setInitValue = (isClick = false) => {
     const { datasource, showColumn }: any = this.props;
     let config = this.getConfigFromlocalstorage();
@@ -188,6 +215,8 @@ class SortableTable extends React.Component {
     const { datasource, showColumn, bsTableCode }: any = this.props;
     let config = this.getConfigFromlocalstorage();
 
+    this.validateLocalStorageConfig(datasource, bsTableCode);
+
     this.setState({
       dataSource: datasource.map((item) => {
         let innerItem = config.filter((inneritem) => {
@@ -544,7 +573,7 @@ class SortableTable extends React.Component {
   DraggableContainer = (props) => (
     <SortableBody
       useDragHandle
-      disableAutoscroll
+      lockAxis='y'
       helperClass="row-dragging"
       onSortEnd={this.onSortEnd}
       {...props}
@@ -555,9 +584,9 @@ class SortableTable extends React.Component {
     const { sortDataSource } = this.state;
     // function findIndex base on Table rowKey props and should always be a right array index
     const index = sortDataSource.findIndex(
-      (x) => 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} />;
   };
 
 
@@ -918,6 +947,7 @@ class SortableTable extends React.Component {
                         row: this.DraggableBodyRow,
                       },
                     }}
+                    scroll={{ y: 364 }}
                   />
                 </div>
               </div>

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

@@ -242,24 +242,27 @@ export const tableColumnsImage = (
   url?: string,
   paramsObj?: tableColumnsImageType,
 ) => {
-  // 测试使用 测试类型缩小 随时可删除 start
-  const imgHtml = document.querySelector('.ant-image-mask-info')!;
-  if (imgHtml) {
-    let str = imgHtml?.innerHTML;
-    str = str?.replace('预览', '');
-    imgHtml.innerHTML = str;
-  }
-  // 测试使用 测试类型缩小  end
+  // 默认预览配置（修复失真问题）
+  const defaultPreview = {
+    width: "40%",        // 基于视窗宽度
+    objectFit: 'cover'
+  };
 
   return (
     <>
       {url ? (
-        <div className={`clomnsImg`}>
-          <Image src={url} width="16px" height="16px" {...paramsObj}></Image>
+        <div className="clomnsImg">
+          <Image
+            src={url}
+            width="16px"
+            height="16px"
+            preview={defaultPreview} // 直接使用配置，避免展开运算符
+            {...paramsObj}
+          />
         </div>
       ) : (
-        <div className={`clomnsImg2`}>
-          <img {...paramsObj} src={noImg}></img>
+        <div className="clomnsImg2">
+          <img {...paramsObj} src={noImg} alt="无图片" />
         </div>
       )}
     </>

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

@@ -28,7 +28,7 @@ export default () => {
     console.log('确定操作，可获取到成功录入的商品，做一系列操作')
     console.log(resultData)
     // 一般拿到导入数据是做请求接口操作
-    // import {request} from "bssula";
+    // import {request} from 'bssula';
     // request({
     //   url: `/bop/api/sku/import/save`,
     //   method: "POST",

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

@@ -34,16 +34,18 @@ const CommodityEntry = (props: any) => {
 
   const handleOk = () => {
     // 方法获取当前组件内部的数据，然后进行自身的业务操作
-    const resultData = dataValidationRef.current?.getValidateData();
+    let resultData = props?.notValid ? dataValidationRef.current?.getData() : dataValidationRef.current?.getValidateData();
 
-    if (!resultData.successData.length) {
-      message.error("无校验通过数据，请校验数据");
-      return;
-    }
-
-    if (resultData.failData.length) {
-      message.error(`有${resultData.failData.length}条校验失败数据`);
-      return;
+    if(!(!!props?.notValid)) {
+      if (!resultData.successData.length) {
+        message.error("无校验通过数据，请校验数据");
+        return;
+      }
+  
+      if (resultData.failData.length) {
+        message.error(`有${resultData.failData.length}条校验失败数据`);
+        return;
+      }
     }
 
     callbackHandleOk(resultData, () => {

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

@@ -94,7 +94,7 @@
     align-items: center;
     gap: 2px;
     border-radius: 3px;
-    padding: 0 10px;
+    padding: 0 2px;
   }
   .ant-btn-dangerous {
     background-color: #EC5246 !important;

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

@@ -12,6 +12,12 @@ import editIcon from '../../../assets/btn-edit.svg';
 import submitIcon from '../../../assets/btn-submit.svg';
 import deleteIcon from '../../../assets/btn-delete.svg';
 import moreIcon from '../../../assets/btn-more.svg';
+import hangUpIcon from '../../../assets/btn-hangUp.svg';
+import unhookIcon from '../../../assets/btn-unhook.svg';
+import refreshIcon from '../../../assets/btn-refresh.svg';
+import printIcon from '../../../assets/btn-print.svg';
+import copyIcon from '../../../assets/btn-copy.svg';
+import cancelIcon from '../../../assets/btn-cancel.svg';
 import { useLocation, formatMessage } from 'umi';
 import CommonAlert from '../CommonAlert';
 import ENUM from '@/utils/enumConfig';
@@ -30,11 +36,21 @@ interface actionItem {
   action: object;
 }
 
+const iconStyle = {
+  width: 16,
+  height: 16,
+};
 export const iconMap = {
-  edit: <img src={editIcon} />,
-  delete: <img src={deleteIcon} />,
-  submit: <img src={submitIcon} />,
-  more: <img src={moreIcon} />,
+  edit: <img src={editIcon} {...iconStyle} />,
+  delete: <img src={deleteIcon} {...iconStyle} />,
+  submit: <img src={submitIcon} {...iconStyle} />,
+  more: <img src={moreIcon} {...iconStyle} />,
+  hangUp: <img src={hangUpIcon} {...iconStyle} />,
+  unhook: <img src={unhookIcon} {...iconStyle} />,
+  refresh: <img src={refreshIcon} {...iconStyle} />,
+  print: <img src={printIcon} {...iconStyle} />,
+  copy: <img src={copyIcon} {...iconStyle} />,
+  cancel: <img src={cancelIcon} {...iconStyle} />,
 };
 
 export default (props: any) => {
@@ -194,6 +210,7 @@ const DetailWrapper = React.memo(
           <Button
             type={type || 'primary'}
             icon={item.icon ? iconMap[item.icon] : ''}
+            style={item.icon ? {} : {}}
             danger={item.name === '删除' ? true : false}
             disabled={item.disabled}
             onClick={() => {
@@ -203,13 +220,15 @@ const DetailWrapper = React.memo(
                 doDetailPageAction(item.action);
               }
             }}
+            {...item?.buttomProps}
           >
             {item.name}
           </Button>
         );
       };
 
-      if (visibleActions.length <= 3) {
+      // 可在actionList第一项设置visibleActionCount，控制按钮几个开始显示更多，默认为3个
+      if (visibleActions.length <= (actionLists?.[0]?.visibleActionCount || 3)) {
         return visibleActions.map((item) => {
           return renderButton(item);
         });

package/src/components/Business/DetailPageWrapper/utils.tsx

@@ -85,7 +85,12 @@ export const getMainCrumbNameMap = (menuData) => {
 
   const flattenMenuData = (data, parent) => {
     let pNameMap = parent.nameMap ? [...parent.nameMap] : [];
-    data.forEach((menuItem) => {
+    data.forEach((menuItem) => { 
+      // 面包屑路径，增加显示一级导航路径显示
+      if(parent.isMenuRoot) {
+        const newList = (window.top||window)?.applicationList?.filter?.((app: any) => app.code === menuItem.belongAppCode) || [];
+        pNameMap = newList.length > 0 ? [newList[0].name] : [];
+      }
       let newMenuItem = {
         ...menuItem,
         nameMap: [...pNameMap, menuItem.name]
@@ -100,7 +105,7 @@ export const getMainCrumbNameMap = (menuData) => {
       };
     });
   };
-  flattenMenuData(menuData, {});
+  flattenMenuData(menuData,{ isMenuRoot: true });
   return routerMap;
 }
 

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

@@ -1,5 +1,5 @@
 .bs_home_page_head_wrapper{
-  height: 32px;
+  // 如果设置高度 需要考虑列表页引用有传提示参数alertProps情况，写死固定高度会导致提示遮挡筛选条件
   position: sticky;
   background: #fff;
   width: 100%;

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

@@ -0,0 +1,88 @@
+// @ts-nocheck
+
+import React, { useState, useEffect } from 'react';
+import { Input, Select } from 'antd';
+import { request } from 'bssula';
+
+const ItemPropertySelector = ({
+    onChange,
+    value,
+    propertyCode,
+    name,
+    ...restProps
+}: any) => {
+
+    const [source, setSource] = useState([]);
+
+    useEffect(() => {
+        // FIXME: 目前只能通过固定属性编码先获取属性id，再通过属性id去查属性值 @林军
+        if (propertyCode) {
+            request({
+                url: `/items/item/propertyValue/getPropertyValueNoPagerByCode?qp-propertyCode-eq=${propertyCode}&pageSize=5000`,
+                method: 'GET',
+                converter: ({ data }: any) => {
+                    const source = (data?.items || []).map(item => ({
+                        text: item.value,
+                        value: item.value
+                    }))
+                    setSource(source);
+                }
+            })
+            return;
+            request({
+                url: `/items/item/property?qp-propertyCode-eq=${propertyCode}`,
+                metod: 'GET',
+                converter: ({ data }: any) => {
+                    let propInfo = data?.items?.[0] || {};
+                    if (propInfo?.dictIs) {
+                        request({
+                            url: `/items/bscDict/detailAndFilter/${propInfo?.dictCode}`,
+                            method: 'GET',
+                            converter: ({ data }: any) => {
+                                const source = (data?.dictItemResVoList || []).map(item => ({
+                                    text: item.dictItemName,
+                                    value: item.dictItemName
+                                }))
+                                setSource(source);
+                            }
+                        })
+                        return;
+                    }
+
+                    if (propInfo?.id) {
+                        request({
+                            url: `/items/item/propertyValue?qp-propertyId-eq=${propInfo?.id}`,
+                            method: 'GET',
+                            converter: ({ data }: any) => {
+                                const source = (data?.items || []).map(item => ({
+                                    text: item.value,
+                                    value: item.value
+                                }))
+                                setSource(source);
+                            }
+                        })
+                    }
+                }
+            })
+        }
+    }, [propertyCode]);
+
+
+    return (
+        <Select
+            {...restProps}
+            value={value}
+            allowClear
+            style={{width: '100%'}}
+            onChange={(v: any) => {
+                onChange(v);
+            }}
+        >
+            {source.map((res) => {
+                return <Select.Option value={res.value}>{res.text}</Select.Option>;
+            })}
+        </Select>
+    );
+};
+
+export default ItemPropertySelector;

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

@@ -1,4 +1,4 @@
-import {request} from "bssula";
+import {request} from 'bssula';
 
 export const convertActionList = (obj:any, detail:any) => {
   return {

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

@@ -0,0 +1,45 @@
+import { Modal } from 'antd';
+
+const ModalUtils = {
+    success: (content: any) => {
+        Modal.success({
+            title: '成功提示',
+            content: content,
+            width: '30%',
+            maskClosable: true,
+            okText: "确定",
+        });
+    },
+    error: (content: any) => {
+        Modal.error({
+            title: '错误提示',
+            content: content,
+            width: '30%',
+            maskClosable: true,
+            okText: "确定",
+        });
+    },
+    warning: (content: any) => {
+        Modal.warning({
+            title: '警告提示',
+            content: content,
+            width: '30%',
+            maskClosable: true,
+            okText: "确定",
+        });
+    },
+    confirm: (title: any, content: any, width: any, onOk: any, onCancel: any) => {
+        Modal.confirm({
+            title: title,
+            content: content,
+            width: width,
+            onOk: onOk,
+            onCancel: onCancel
+        });
+    },
+    custom: (config: any) => {
+        Modal.info(config);
+    }
+};
+
+export default ModalUtils;