@bit-sun/business-component 4.0.12-alpha.2 → 4.0.12-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.0.12-alpha.2",
+  "version": "4.0.12-alpha.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/SearchSelect/BusinessUtils.tsx

@@ -326,7 +326,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     tableSearchForm =  [
       { name: 'qp-skuCode-in', label: 'SKU编码',type:'multipleQueryInput' },
       { name: 'qp-skuName-like', label: 'SKU名称' },
-      { name: 'qp-spuCode-like', label: '外部SPU编码' },
+      { name: 'qp-itemCode-like', label: '外部SPU编码' },
       { name: 'qp-eancode-in', label: '商品条码', field: {
         type: 'multipleQueryInput',
         props: {

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

@@ -212,4 +212,4 @@
   .ant-dropdown-link {
     cursor: pointer;
   }
-}
+}

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

@@ -159,7 +159,7 @@ export default class ColumnSettingTable extends React.Component {
       ...restProps,
     };
     let showSummary = null;
-    if (this.state.showColumns.length) {
+    if (this.state.showColumns.length && !Array.isArray(summary)) {
       if (summary && summary().diy) {
         showSummary = this.getTableSummaryInfo();
       } else {
@@ -201,7 +201,9 @@ export default class ColumnSettingTable extends React.Component {
         ...scroll,
         x: restProps.overScrollX || this.getTableScrollXWidth(showCol)
       },
-      summary: showSummary,
+      ...(
+        showSummary ? { summary: showSummary } : {}
+      )
     }
     return (
       <div style={{ position: 'relative' }}>
@@ -227,6 +229,35 @@ export default class ColumnSettingTable extends React.Component {
           ...otherTableInfo
           }
         />
+        {Array.isArray(summary) && (
+          <>
+            <div 
+              className='table-bssula-summary' 
+              style={{
+                right: '20%',
+                bottom: 0,
+                whiteSpace: 'nowrap',
+                overflowX: 'auto',
+              }}
+            >
+              {summary.map(item => (
+                <Text type='danger'>
+                  {item.label}: <span className='table-bssula-summary-count'>{item.count || 0}</span>
+                </Text>
+              ))}
+            </div>
+            <div style={{
+              width: '16px',
+              height: '26px',
+              opacity: 0.32,
+              transform: 'scaleX(-1)',
+              backgroundImage:'linear-gradient(270deg, #ffffff00 0%, #A4A4A4 100%)',
+              right: '20%',
+              position: 'absolute',
+              bottom: 0,
+            }}></div>
+          </>
+       )}
       </div >
     )
   }

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

@@ -156,7 +156,7 @@ export default class ColumnSettingSulaTable extends React.Component {
       ...restProps,
     };
     let showSummary = null;
-    if (this.state.showColumns.length) {
+    if (this.state.showColumns.length && !Array.isArray(summary)) {
       if (summary && summary().diy) {
         showSummary = this.getTableSummaryInfo();
       } else {
@@ -197,7 +197,9 @@ export default class ColumnSettingSulaTable extends React.Component {
         ...scroll,
         x: restProps.overScrollX || this.getTableScrollXWidth(showCol)
       },
-      summary: showSummary,
+      ...(
+        showSummary ? { summary: showSummary } : {}
+      )
     }
     return (
       <div style={{ position: 'relative' }}>
@@ -223,6 +225,35 @@ export default class ColumnSettingSulaTable extends React.Component {
           ...otherTableInfo
           }
         />
+       {Array.isArray(summary) && (
+        <>
+          <div 
+            className='table-bssula-summary' 
+            style={{
+              right: '20%',
+              bottom: 0,
+              whiteSpace: 'nowrap',
+              overflowX: 'auto',
+            }}
+          >
+            {summary.map(item => (
+              <Text type='danger'>
+                {item.label}: <span className='table-bssula-summary-count'>{item.count || 0}</span>
+              </Text>
+            ))}
+          </div>
+           <div style={{
+            width: '16px',
+            height: '26px',
+            opacity: 0.32,
+            transform: 'scaleX(-1)',
+            backgroundImage:'linear-gradient(270deg, #ffffff00 0%, #A4A4A4 100%)',
+            right: '20%',
+            position: 'absolute',
+            bottom: 0,
+          }}></div>
+        </>
+       )}
       </div >
     )
   }

package/src/components/Functional/SearchSelect/index.tsx

@@ -834,9 +834,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const renderShowTable =  (tableList, type) => {
     const tableBoxHeighth = getTableHeigth(modalTableProps?.tableSearchForm);
-    const oSY = `calc(100vh - 391px - 82px)`;  // 分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
+    const oSY = `calc(100vh - ${tableBoxHeighth}px - 82px)`;  // 分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
     return (
-      <div style={{ height: `calc(100vh - 391px)` }}> 
+      <div style={{ height: `calc(100vh - ${tableBoxHeighth}px)` }}> 
         <Table
           bordered
           size="middle"
@@ -889,7 +889,12 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }
 
   const onClear = () => {
+    // 执行父组件 onClear 事件
+    props?.onClear?.();
+    // 清空下拉框 / 弹窗 选中数据
     formaData([], items);
+    onChangeSelectedKeys([], [])
+    // 重置下拉框数据源
     resetSelectDataSource();
   }
 

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

@@ -33,6 +33,6 @@ export const getRealStr = (oldSelect: any,newSelect: any, record: any) => {
 
 export const getTableHeigth = (list: any) => {
   const totalRows = Math.ceil((list?.length+1) / 4);
-  if(totalRows == 1) return 502;  // modal弹窗760 调整为700 适应小屏     
-  return 488 - totalRows*10
+  if(totalRows == 1) return 358;  // modal弹窗760 调整为700 适应小屏     
+  return 411 - totalRows*10  
 }