@bit-sun/business-component 4.0.11-alpha.14 → 4.0.11-alpha.16

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

@@ -4,7 +4,7 @@
 
     .sort_table_column_wrapper {
       width: 560px;
-      margin-right: 10px;
+      margin-right: 8px;
     }
 
     .sort_table_content_wrapper {
@@ -16,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;
       }
     }
 
@@ -46,7 +46,7 @@
           text-align: center;
           font-family: PingFangSC-Regular;
           font-weight: 400;
-          font-size: 14px;
+          font-size: 12px;
           color: #848484;
         }
       }
@@ -57,13 +57,15 @@
         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;
       }
 
@@ -73,6 +75,7 @@
     }
 
     .sort_table_content {
+      height: 430px;
       margin-top: 10px;
       padding-top: 10px;
       padding-bottom: 10px;
@@ -90,28 +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;
@@ -127,7 +113,7 @@
   }
 
   input {
-    height: 32px;
+    height: 22px;
     padding: 6px 4px;
     border-radius: 5px;
   }
@@ -135,28 +121,25 @@
   .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;
@@ -179,13 +162,13 @@
     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;
 
@@ -197,8 +180,8 @@
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
-          height: 36px !important;
-          line-height: 36px !important;
+          height: 30px !important;
+          line-height: 30px !important;
         }
 
         img {
@@ -214,7 +197,7 @@
         &:last-child {
           padding-left: 0px !important;
           padding-right: 3px !important;
-          width: 34px !important;
+          width: 30px !important;
 
           img {
             // border: 1px dashed #d9d9d9;

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

@@ -711,9 +711,9 @@ class SortableTable extends React.Component {
       <div className={'sort_table_wrapper'}>
         {visible && (
           <Modal
-            title="设置表头内容"
+            title="筛选条件设置"
             wrapClassName={'sort_table_wrapper'}
-            width={820}
+            width={810}
             visible={visible}
             onOk={this.handleOk}
             onCancel={this.handleCancel}
@@ -748,7 +748,7 @@ class SortableTable extends React.Component {
             <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
@@ -756,7 +756,7 @@ class SortableTable extends React.Component {
                     placeholder="搜索"
                     allowClear
                     onChange={this.onSearch}
-                    style={{ width: 540 }}
+                    style={{ width: 540, height: 24 }}
                   />
                   <div>
                     {!searchDataSource && (
@@ -882,7 +882,7 @@ class SortableTable extends React.Component {
               </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' }}>

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

@@ -809,6 +809,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/physicalWarehouse`,
       filter: 'qp-physicalWarehouseName,physicalWarehouseCode-orGroup,like', // 过滤参数
       mappingTextField: 'physicalWarehouseName',
@@ -905,6 +906,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/realWarehouse`,
       filter: 'qp-realWarehouseName,realWarehouseCode-orGroup,like', // 过滤参数
       mappingTextField: 'realWarehouseName',
@@ -974,6 +976,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/ownerWarehouse`,
       filter: 'qp-name,operationWarehouseCode-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -1062,6 +1065,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/virtualWarehouse`,
       filter: 'qp-virtualWarehouseName,virtualWarehouseCode-orGroup,like', // 过滤参数
       mappingTextField: 'virtualWarehouseName',
@@ -1092,6 +1096,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/channelWarehouse`,
       filter: 'qp-channelWarehouseName,channelWarehouseCode-orGroup,like', // 过滤参数
       mappingTextField: 'channelWarehouseName',
@@ -1124,6 +1129,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/uc/customer/v2`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -1261,6 +1267,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     }
     // 版本2
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/customer`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
       mappingTextField: 'name',
@@ -2716,6 +2723,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     requestConfig = {
+      init: true,
       url: `${prefixUrl.selectPrefix}/orgViewNode/listNoPage`,
       filter: 'qp-code,name-orGroup,like', // 过滤参数
       mappingTextField: 'name',

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

@@ -774,6 +774,7 @@ export default () => {
       setValue(value)
     },
     // requestConfig: {
+    //       noOperate: true,
     //   url: `/bop/api/customer`,
     // filter: 'qp-name,code-orGroup,like', // 过滤参数
     // mappingTextField: 'name',

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

@@ -650,7 +650,7 @@ class SortableTable extends React.Component<SortTableProps> {
     return (
       <div className={'sort_table_wrapper'}>
         {visible && <Modal
-          title="设置表头内容"
+          title="筛选条件设置"
           wrapClassName={'sort_table_wrapper'}
           width={820}
           visible={visible}
@@ -687,15 +687,15 @@ class SortableTable extends React.Component<SortTableProps> {
           <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 && (
@@ -819,7 +819,7 @@ class SortableTable extends React.Component<SortTableProps> {
             </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' }}>

package/src/components/Business/columnSettingTable/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,14 +162,13 @@
     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;
 
@@ -199,8 +180,8 @@
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
-          height: 36px !important;
-          line-height: 36px !important;
+          height: 30px !important;
+          line-height: 30px !important;
         }
 
         img {
@@ -216,7 +197,7 @@
         &:last-child {
           padding-left: 0px !important;
           padding-right: 3px !important;
-          width: 34px !important;
+          width: 30px !important;
 
           img {
             // border: 1px dashed #d9d9d9;
@@ -227,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/components/Functional/SearchSelect/index.less

@@ -32,6 +32,11 @@
     background-color: @primary-color;
     color: #fff;
   }
+  &_expand_button_disabled:hover {
+    background-color: transparent;
+    color: rgba(0, 0, 0, 0.25);
+    cursor: not-allowed;
+  }
 
   &_dropdown_table {
     // padding: 4px 10px 6px;

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

@@ -46,6 +46,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     extralHeaders = {},// 额外请求头参数
     specialBracket = false,// 是否使用特殊括弧显示选项 【value】text
     noNeedSplit = false,// label显示不需要任何特殊化
+    noOperate, // 级联禁用按钮设置字段
+    viewShowValueStr, // 详情展示值,不传展示组件处理的默认值
   } = requestConfig || {};
   const resultSourceKey = handleSourceName(sourceName || requestConfig?.sourceName || ctx?.name || 'supplierCode')
 
@@ -69,6 +71,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }
   const initPagination = { showQuickJumper: true, showSizeChanger: false, showTotal: (total: any) => `共 ${total} 条`, pageSize: tableInitPageSize }
   const tableInitPagination = { ...initPagination, total: 0, current: 1 }
+  const disabled = noOperate || selectProps?.disabled || props?.disabled
 
   const [items, setItems] = useState([]);
   const [selectOpen, setSelectOpen] = useState(false);
@@ -434,6 +437,10 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     if (init) {
       run('init')
     }
+    // 编辑/详情页面回显
+    if(!init && !!value && ['edit','view'].includes(ctx?.mode)) {
+      run('init')
+    }
   }, [])
 
   useEffect(() => {
@@ -697,13 +704,13 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     },
     getCheckboxProps: selectProps?.getCheckboxProps ? selectProps?.getCheckboxProps : () => {
       return ({
-        disabled: selectProps?.disabled || props?.disabled || (!items.length && !tableData.length),
+        disabled: disabled || (!items.length && !tableData.length),
       })
     },
   };
 
   const onRowClickSelect = (e, record,type) => {
-    if (selectMode && !(selectProps?.disabled || props?.disabled || (!items.length && !tableData.length))) {
+    if (selectMode && !(disabled || (!items.length && !tableData.length))) {
       const oldSelect = selectedRows;
       const newSelect = [JSON.parse(JSON.stringify(record))];
       const srs = getRealStr(oldSelect,newSelect,record);
@@ -713,7 +720,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     }
   }
   const onDoubleClickSelect = (e, record,type) => {
-    if (!selectMode && !(selectProps?.disabled || props?.disabled || (!items.length && !tableData.length))) {
+    if (!selectMode && !(disabled || (!items.length && !tableData.length))) {
       const srs = [JSON.parse(JSON.stringify(record))]
       const sks = srs.map((i: any) => i.value)
       onChangeSelectedKeys(sks, srs)
@@ -869,8 +876,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const onDropdownVisibleChange = (visible) => {
     setSelectOpen(visible); 
-    // 关闭下拉框 如果没有选中数据-需要清空查询数据源
-    if (!visible && !value?.length) {
+    // 关闭下拉框 如果首次本身就不展示数据的 没有选中数据-需要清空查询数据源
+    if (!init && !visible && !value?.length) {
       setItems([]);
       setItemsTotal(0);
     }
@@ -885,17 +892,22 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             rowSelection: {
               type: 'checkbox',  
               columnWidth: '24px',
-              selectedRowKeys: labelInValue ? value.map(s=> (s?.value||s)) : value,
+              selectedRowKeys: labelInValue ? value?.map(s=> (s?.value||s)) : value,
               onChange: (sks, srs) => {
-                const oldSelect = labelInValue ? value : value.map(s => ({ value: s }));
-                const realSrs = getRealStr(oldSelect,srs,srs[0]);
+                const oldSelect = value?.map(s => ({ value: s?.value||s }))||[];
+                let tmpSelectedRows = oldSelect.concat(srs).filter(item => item != undefined);
+                let realSrs = sks.map(key => tmpSelectedRows.filter(item => item[mappingValueField] == key)[0]).filter(item => item != undefined)
                 onSelectClick(realSrs, dataSource,false)
               }
             },
             onRow: (record, rowKey) => ({
               onClick: event => {
-                const oldSelect = labelInValue ? value : value.map(s => ({ value: s }));
+                event.stopPropagation();
+                event.nativeEvent.stopImmediatePropagation();
+
+                const oldSelect = value?.map(s => ({ value: s?.value||s }))||[];
                 const newSelect = [JSON.parse(JSON.stringify(record))];
+                console.log('行选择：','oldSelect',oldSelect,'newSelect',newSelect,'record',record)
                 const srs = getRealStr(oldSelect,newSelect,record);
                 onSelectClick(srs,dataSource,false)
               }, // 点击行
@@ -973,6 +985,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     return (getSelectValueText(value) || kongValue) as string;
   }
   const getShowStr = () => {
+    // 优先使用业务使用传入的展示
+    if(viewShowValueStr) return viewShowValueStr;
+
     const kongValue = '无'
     // 先判断labelInValue与否，labelInValue可以直接去value中获取字段名称，否则去下拉框数据里面去拿；
     // 再判断是单选还是多选，数据类型不同取值方式也不同
@@ -982,7 +997,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     return getShowValueStr(kongValue);
   }
 
-  const isShouldShowStr = props.disabled && ctx
+  const isShouldShowStr = (disabled && ctx) || ctx?.mode == 'view'
   return (
     <div className={'search_select'}>
       {fieldComponent ? (
@@ -1008,7 +1023,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             value={value}
             onChange={onchange}
             onClear={onClear}
-            disabled={props.disabled}
+            disabled={disabled}
             dropdownStyle={{ borderRadius: '2px', padding: '10px 2px' }}
             open={selectOpen}
             onDropdownVisibleChange={onDropdownVisibleChange}
@@ -1028,7 +1043,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             maxTagPlaceholder={maxTagPlaceholder}
             onSearch={(v) => onSearchChange(v)}
             {...(needModalTable ? {
-              suffixIcon: <div className="search_select_expand_button" onClick={showModal}><SearchOutlined /></div>
+              suffixIcon: <div className={`search_select_expand_button ${(disabled)?'search_select_expand_button_disabled':''}`} onClick={showModal}><SearchOutlined /></div>
             } : {})}
             {...currentSelectProps}
             getPopupContainer={(triggerNode) => (getPopupContainer && getPopupContainer(triggerNode)) || triggerNode.parentElement}
@@ -1065,7 +1080,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                     type="primary"
                     loading={confirmLoading}
                     onClick={handleOk}
-                    disabled={selectProps?.disabled || props?.disabled}
+                    disabled={disabled}
                   >
                     确定
                   </Button>,