@bit-sun/business-component 4.0.11-alpha.1 → 4.0.11-alpha.10

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

@@ -1,3 +1,27 @@
 export const handleSourceName = (sName: any) => {
   return sName
 }
+
+export const getFormRowInfo = (list: any) => {
+  const columnsPerRow = 4; // 每行的列数
+  const totalRows = Math.ceil(list.length / columnsPerRow); // 计算总行数
+  const lastRowColumns = (list.length+1) % columnsPerRow; // 计算最后一行的实际列数
+  const emptySlots = lastRowColumns === 0 ? 0 : columnsPerRow - lastRowColumns; // 计算最后一行的空位数
+  const emptyArray = new Array(emptySlots).fill(null); // 生成长度为 emptySlots 的数组
+  return { totalRows, emptyArray }
+}
+
+export const defaultVisibleFieldsCount = 7;
+export const getVisibleFieldsCount = (modalTableProps: any) => {
+  const { visibleFieldsCount = defaultVisibleFieldsCount, tableSearchForm } = modalTableProps || {};
+  let count = visibleFieldsCount;
+  if (count === true) {
+    return tableSearchForm?.length;
+  }
+  return count!;
+}
+export const hasMoreQueryFields = (modalTableProps: any) => {
+  const { tableSearchForm } = modalTableProps || {}
+  const visibleFieldsCount = getVisibleFieldsCount(modalTableProps);
+  return visibleFieldsCount < tableSearchForm?.length;
+}

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

@@ -33,7 +33,7 @@ import {
   getPropertyCode,
   isObj,
 } from './util';
-import { getDictionarySource, uuid } from '../../../utils/utils';
+import { getDictionarySource, judgeIsEmpty, uuid } from '../../../utils/utils';
 import { coverToParallel } from '../../../utils/TreeUtils';
 import {
   BusinessSearchSelect,
@@ -1062,7 +1062,7 @@ class RuleObjectComponent extends Component {
       let defaultValue = configItem.defaultValue;
       const pCode = itemDetail.response?.find((i) => i.code == code)?.value;
       if (type === 'input') {
-        return pCode === undefined ? pCode : pCode || defaultValue;
+        return pCode === undefined ? pCode : judgeIsEmpty(pCode) ? defaultValue : pCode;
       }
       if(['date','dateTime','rangeTime'].includes(type)) {
         if(['date','dateTime'].includes(type)) return pCode ? moment(pCode) : pCode;
@@ -1075,7 +1075,8 @@ class RuleObjectComponent extends Component {
         const newPCode = Array.isArray(pCode) ? pCode?.map(s => isObj(s) ? s : ({ key: s, value: s })) : pCode?.split(',')?.map(s => ({ key: s, value: s }));
         return newPCode || pCode || defaultValue;
       }
-      return pCode || defaultValue;
+      // return pCode || defaultValue;
+      return judgeIsEmpty(pCode) ? defaultValue : pCode;
     };
     const handleEdit = (code, val, functionItem) => {
       let value = val;

package/src/components/Solution/RuleSetter/function.ts

@@ -48,6 +48,7 @@
 //         }
 //     ]
 // }
+import { judgeIsEmpty } from '@/utils';
 import { coverToParallel } from '@/utils/TreeUtils';
 export const formatOperationList = (data: any) => {
   let result = data||[];
@@ -105,7 +106,7 @@ export const handleRuleShowBack = (data: any, functionRuleList: any, ruleReturnL
         if (Item) {
           return {
             ...Item,
-            value: (isStringValue ? itemValue?.split(',') : itemValue) || defaultValue || '',
+            value: judgeIsEmpty(itemValue) ? (defaultValue || '') : (isStringValue ? itemValue?.split(',') : itemValue),
             formulaName: Item?.formulaName,
             enable: Item?.enable !== false
           };

package/src/styles/bsDefault.less

@@ -1256,13 +1256,6 @@ ol {
   }
 }
 
-.ant-tabs-tab + .ant-tabs-tab {
-  margin: 0;
-}
-.ant-tabs-tab {
-  margin: 0 20px 0 0 !important;
-}
-
 // 滚动条
 /* 滚动槽（轨道）宽高 */
 
@@ -1517,9 +1510,6 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
 
 .clomnsImg {
   :global {
-    .ant-image {
-      margin: 8px;
-    }
     .ant-image-mask-info {
       font-size: 12px !important;
       padding: 0;
@@ -1528,10 +1518,9 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
   }
 }
 .clomnsImg2 {
-  margin: 8px;
   img {
-    width: 28px;
-    height: 28px;
+    width: 16px;
+    height: 16px;
   }
 }
 

package/src/utils/TableUtils.tsx

@@ -339,7 +339,7 @@ const tableColumnsImage = (url?: string, paramsObj?: tableColumnsImageType) => {
     <>
       {url ? (
         <div className={`clomnsImg`}>
-          <Image src={url} width="44px" height="44px" {...paramsObj}></Image>
+          <Image src={url} width="16px" height="16px" {...paramsObj}></Image>
         </div>
       ) : (
         <img {...paramsObj} src={noImg}></img>