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

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

@@ -1,3 +1,38 @@
+export const columnsPerRow = 4; // 每行的列数
+export const ColSpan = 6; // 查询条件 每行col = 24 /columnsPerRow
 export const handleSourceName = (sName: any) => {
   return sName
 }
+
+export const getFormRowInfo = (list: any) => {
+  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;
+}
+
+export const getRealStr = (oldSelect: any,newSelect: any, record: any) => {
+  return oldSelect?.length ? oldSelect.some((o: any) => o.value == record?.value) ? oldSelect.filter((s: any) => s.value != record?.value) : [...oldSelect,...newSelect] : newSelect;
+}
+
+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
+}

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

@@ -18,7 +18,7 @@ const TreeSearchSelect = (props: any) => {
     initialValue,
     treeCheckable = false,
     showSearch = true,
-    maxTagCount = 1,
+    maxTagCount = 4,
     multiple = false,
     isChoose = false, // 默认父节点不可选；传true则不限制
     rootDisabled = false, // 默认根节点可选

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/plugin/TableColumnSetting/index.less

@@ -1,11 +1,10 @@
-// 列自定义
 .sort_table_wrapper {
   .sort_table {
     display: flex;
 
     .sort_table_column_wrapper {
       width: 560px;
-      margin-right: 10px;
+      margin-right: 8px;
     }
 
     .sort_table_content_wrapper {
@@ -17,12 +16,12 @@
       height: 20px;
       font-family: PingFangSC-Regular;
       font-weight: 400;
-      font-size: 14px;
+      font-size: 12px;
       color: #000000;
       letter-spacing: 0;
 
       span {
-        color: #848484;
+        color: #8E8E8E;
       }
     }
 
@@ -47,7 +46,7 @@
           text-align: center;
           font-family: PingFangSC-Regular;
           font-weight: 400;
-          font-size: 14px;
+          font-size: 12px;
           color: #848484;
         }
       }
@@ -58,22 +57,25 @@
         height: 20px;
         font-family: PingFangSC-Regular;
         font-weight: 400;
-        font-size: 14px;
+        font-size: 12px;
         color: #848484;
         letter-spacing: 0;
       }
 
       .ant-checkbox-wrapper {
         width: 144px;
+        height: 16px;
+        line-height: 16px;
         margin-top: 16px;
       }
 
-      .ant-checkbox-wrapper+.ant-checkbox-wrapper {
+      .ant-checkbox-wrapper + .ant-checkbox-wrapper {
         margin-left: 0px;
       }
     }
 
     .sort_table_content {
+      height: 430px;
       margin-top: 10px;
       padding-top: 10px;
       padding-bottom: 10px;
@@ -83,7 +85,6 @@
       .ant-table-wrapper {
         padding: 0px !important;
       }
-
       .sort_table_title {
         height: 32px;
         line-height: 32px;
@@ -92,29 +93,11 @@
       }
     }
   }
-
-  div.ant-modal-header {
-    width: 820px;
-    height: 64px;
-    background: #ffffff;
-    padding: 20px;
-    border: 0px;
-
-    div.ant-modal-title {
-      height: 24px;
-      font-family: PingFangSC-Medium;
-      font-weight: 500;
-      font-size: 18px;
-      color: #000000;
-      letter-spacing: 0;
-      line-height: 24px;
-    }
-  }
+  
 
   .ant-modal-body {
-    padding: 0 20px !important;
+    padding: 10px 16px;
   }
-
   .ant-modal-close-x {
     height: 24px;
     font-family: PingFangSC-Medium;
@@ -130,7 +113,7 @@
   }
 
   input {
-    height: 32px;
+    height: 22px;
     padding: 6px 4px;
     border-radius: 5px;
   }
@@ -138,34 +121,33 @@
   .ant-input-prefix {
     width: 24px;
     height: 24px;
-    margin: 4px;
+    margin: 0 4px;
     // border: 1px dashed #d9d9d9;
     display: flex;
     justify-content: center;
   }
 
   .ant-modal-footer {
-    height: 70px;
-    border: 0;
-    padding: 20px;
-
+    padding: 8px 16px;
+    display: flex;
+    justify-content: space-between;
+    
     .ant-btn {
       width: 80px;
-      height: 34px;
-      border-radius: 5px;
+      height: 28px;
 
       span {
         font-family: PingFangSC-Medium;
         font-weight: 600;
-        font-size: 14px;
+        font-size: 12px;
         letter-spacing: 0;
         text-align: center;
         line-height: 20px;
       }
 
-      &:first-child {
-        margin-right: 524px;
-      }
+      // &:first-child {
+      //   margin-right: 524px;
+      // }
     }
   }
 
@@ -180,21 +162,26 @@
     padding-bottom: 50px;
 
     tr {
-      height: 36px;
-
+      height: 30px;
       td {
         width: 24px !important;
-        height: 36px !important;
+        height: 30px !important;
         font-family: PingFangSC-Regular;
         font-weight: 400;
-        font-size: 14px;
+        font-size: 12px;
         color: #000000;
         letter-spacing: 0;
 
         &:first-child {
           padding-left: 10px !important;
           padding-right: 0px !important;
-          width: 115px !important;
+          width: 108px !important;
+          display: inline-block;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          height: 30px !important;
+          line-height: 30px !important;
         }
 
         img {
@@ -210,7 +197,7 @@
         &:last-child {
           padding-left: 0px !important;
           padding-right: 3px !important;
-          width: 34px !important;
+          width: 30px !important;
 
           img {
             // border: 1px dashed #d9d9d9;
@@ -221,27 +208,8 @@
       }
     }
   }
-}
-
-.global_tab_nav_style {
-  top: 2px !important;
-}
-
-.row-dragging {
-  background: #fafafa;
-  border: 1px solid #ccc;
-  z-index: 10000;
-}
-
-.row-dragging td {
-  padding: 7px 16px;
-  display: none;
-
-}
-.row-dragging td:first-child {
-  display: inline-block;
-}
-
-.row-dragging .drag-visible {
-  visibility: visible;
-}
+
+  .ant-dropdown-link {
+    cursor: pointer;
+  }
+}

package/src/plugin/TableColumnSetting/index.tsx

@@ -525,7 +525,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
     return (
       <div className={'sort_table_wrapper'}>
         <Modal
-          title="设置表头内容"
+          title="筛选条件设置"
           wrapClassName={'sort_table_wrapper'}
           width={820}
           visible={visible}
@@ -546,15 +546,15 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
           <div className={'sort_table'}>
             <div className={'sort_table_column_wrapper'}>
               <span className={'sort_table_column_count'}>
-                可选字段 <span>（共{dataSource.length}个）</span>
+                <span>勾选你想使用的筛选条件</span>
               </span>
               <div className={'sort_table_column'}>
                 <Input
                   prefix={<SearchOutlined className="site-form-item-icon" />}
-                  placeholder="搜索"
+                  placeholder="输入筛选条件名称搜索"
                   allowClear
                   onChange={this.onSearch}
-                  style={{ width: 540 }}
+                  style={{ width: 525 }}
                 />
                 <div>
                   {!searchDataSource && (
@@ -678,7 +678,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
             </div>
             <div className={'sort_table_content_wrapper'}>
               <span className={'sort_table_content_count'}>
-                已选字段 <span>（共{sortDataSource.length}个）</span>
+                <span>已选择的搜索条件排序</span>
               </span>
               <div className={'sort_table_content'}>
                 <span style={{ paddingLeft: '10px' }}>