@bit-sun/business-component 4.0.13-alpha.9 → 4.2.0-aiwei-alpha.1

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

@@ -17,12 +17,13 @@ export const handleSourceName = (sName: any) => {
 }
 
 // ------------------------------------------处理样式相关--开始----------------------------------------
-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; // 计算最后一行的空位数
+export const getFormRowInfo = (list: any, tableSearchColSpan: number) => {
+  const lastColumnsPerRow = tableSearchColSpan == 6 ? columnsPerRow : 3;
+  const totalRows = Math.ceil(list.length / lastColumnsPerRow); // 计算总行数
+  const lastRowColumns = (list.length+1) % lastColumnsPerRow; // 计算最后一行的实际列数
+  const emptySlots = lastRowColumns === 0 ? 0 : lastColumnsPerRow - lastRowColumns; // 计算最后一行的空位数
   const emptyArray = new Array(emptySlots).fill(null); // 生成长度为 emptySlots 的数组
-  return { totalRows, emptyArray }
+  return { totalRows, emptyArray, ColSpan: tableSearchColSpan ??  ColSpan}
 }
 
 export const defaultVisibleFieldsCount = 7;
@@ -60,11 +61,11 @@ 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 getCurrentSRKs = (selectMode: any,labelInValue:boolean,value: any) => {
-  return selectMode ? (labelInValue ? value?.map((s: any)=> (s?.value||s)) : value) : (labelInValue ? value?.value&&[value?.value]||[] : value&&[value]||[])
+  return selectMode ? (labelInValue ? value?.map((s: any)=> (s?.value||s)) : (value||[])) : (labelInValue ? value?.value&&[value?.value]||[] : value&&[value]||[])
 }
 export const getRenderSource = (currentSRKs: any, items: any) => {
   // 判空处理
-  if(!currentSRKs?.length) return items||[];
+  if(!currentSRKs || !currentSRKs?.length) return items||[];
 
   // 创建映射对象 用于记录原始选中顺序
   const orderMap = new Map<number, number>();
@@ -157,12 +158,14 @@ export const handleParams = (params: any) => {
         delete params[key];
       } else if (element && key.indexOf('*multiInput') >= 0) {
       let name = '',
-        value = element['value'];
+        value = (element?.['value']||element)?.trim?.();
+        const searchKey = element?.['name']||key?.split('*multiInput')?.[0]
       if (value.indexOf(',') >= 0) {
-        name = `qp-${element['name']}-in`;
+        name = `qp-${searchKey}-in`;
       } else {
-        name = `qp-${element['name']}-like`;
+        name = `qp-${searchKey}-like`;
       }
+      value = value?.trim?.();
       params[name] = value;
       delete params[key];
     }
@@ -400,7 +403,10 @@ export const maxTagPlaceholder = (selectedValues: any, { selectProps, onChange,
 // 弹窗数据表头处理
 export const handleTableColumns = (tableColumns: any) => {
   // 按照默认设置排序 > 没有排序字段的展示所有列表头 > 没有表头列不展示
-  const showTableColumns = tableColumns?.filter((s: any) => typeof s.defaultSort == 'number')||tableColumns||[];
+  let showTableColumns = tableColumns?.filter((s: any) => typeof s.defaultSort == 'number') || tableColumns || [];
+
+  showTableColumns = showTableColumns?.length ? showTableColumns : tableColumns; 
+
   return showTableColumns?.sort((a: any,b: any)=> a.defaultSort-b.defaultSort)||[]
 };
 

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

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { TreeSelect, Tooltip, Tag } from 'antd';
-import request from '@/utils/request';
+import request from '@/utils/cachedRequest';
 import { stringify } from 'querystring';
 import _ from "lodash"
 import { judgeIsRequestSuccess } from '@/utils/requestUtils';
@@ -53,6 +53,7 @@ const TreeSearchSelect = (props: any) => {
         : treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
       value: treeDataItem[resKeyValue[0]],
+      label: `${treeDataItem[resKeyValue[0]]}${treeDataItem[resKeyValue[1]]}`,
       parentId: treeDataItem.parent,
       data: { ...treeDataItem },
       isLeaf: !haveChildren,
@@ -207,7 +208,7 @@ const TreeSearchSelect = (props: any) => {
           labelInValue={labelInValue}
           showArrow={showArrow}
           showCheckedStrategy={showCheckedStrategy}
-          treeNodeFilterProp={'title'}
+          filterTreeNode={(inputValue, treeNode) => treeNode.props.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1}
           treeDefaultExpandAll
           multiple={multiple} // 	支持多选（当设置 treeCheckable 时自动变为 true）
           maxTagPlaceholder={maxTagPlaceholder}

package/src/components/Solution/RuleComponent/InnerSelect.tsx

@@ -57,6 +57,7 @@ export default (props: Iprops) => {
         // handleEdit(ites.code, value);
       }}
       options={dataSource}
+      filterOption ={(input: any, option: any) => option?.label?.toLowerCase()?.indexOf(input?.toLowerCase()) >= 0}
     />
   );
 };

package/src/components/Solution/RuleComponent/RenderCompItem.tsx

@@ -155,6 +155,7 @@ export default function RenderCompItem(props:any){
               onChange={(value) => {
                 handleEdit(ites.code, value);
               }}
+              filterOption ={(input: any, option: any) => option?.text?.toLowerCase()?.indexOf(input?.toLowerCase()) >= 0}
             >
               {Object.keys(ites.enumeration).map((it) => (
                 <Select.Option key={it} value={it}>
@@ -170,7 +171,7 @@ export default function RenderCompItem(props:any){
             <InnerSelect
               disabled={disabled}
               inputType={ites?.inputType}
-              defaultValue={ites.defaultValue}
+              defaultValue={ites?.defaultValue}
               styleCommon={styleCommon}
               value={showValue(ites.code)}
               onChange={(value) => {
@@ -588,7 +589,7 @@ export default function RenderCompItem(props:any){
           null}
         {/* 单选/多选  配送方式选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 310 && (
+          (ites?.choiceType === 310 || ites?.choiceType === 311)&& (
             <BusinessSearchSelect
               selectBusinessType="deliveryMode"
               selectProps={{
@@ -605,6 +606,14 @@ export default function RenderCompItem(props:any){
               labelInValue={true}
               value={showValue(ites.code)}
               requestConfig={{
+                ...(ites?.choiceType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                 filterInit: 'qp-code-in',
               }}
               onChange={(value) => {

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

@@ -688,6 +688,7 @@ class RuleObjectComponent extends Component {
       initialThresholdQuery = {},
       disabled,
       systemVariableList,
+      needShowInsertSQL,
     } = this.props;
     let thresholdQuery = {
       ...initialThresholdQuery,
@@ -747,6 +748,7 @@ class RuleObjectComponent extends Component {
       <div
         className={'rule_line_content'}
         style={{ display: 'flex', marginBottom: '0px', padding: '10px 0px' }}
+        key={itemDetail.elementId}
       >
         <div
           className={'logical_operate_content'}
@@ -825,6 +827,9 @@ class RuleObjectComponent extends Component {
                   itemDetail.metaObjectCode =
                     nodeInfo.triggerNode.props.metaObjectCode;
                   itemDetail.isInsertParam = false;
+                  if(needShowInsertSQL) {
+                    itemDetail.isInsertSQL = false;
+                  }
                   this.setState(
                     {
                       ruleClassData,
@@ -862,7 +867,7 @@ class RuleObjectComponent extends Component {
                   ),
                 )}
               </Select>
-              {!itemDetail?.isInsertParam ? (
+              {(needShowInsertSQL ? (!itemDetail?.isInsertParam&&!itemDetail?.isInsertSQL): !itemDetail?.isInsertParam) ? (
                 <RuleField
                   customerWidth={this.props.customerWidth}
                   selectOperation={itemDetail?.operationCode || ''}
@@ -926,6 +931,30 @@ class RuleObjectComponent extends Component {
                     ))
                   : null}
               </Select>
+              <Input
+                disabled={disabled}
+                value={itemDetail?.params?.[0]||''}
+                style={{
+                  width: '150px',
+                  marginLeft: '10px',
+                  display: needShowInsertSQL && itemDetail?.isInsertSQL ? '' : 'none',
+                }}
+                onChange={(e) => {
+                  const value = e.target.value;
+                  const { ruleClassData } = this.state;
+                  itemDetail.params = [value || ''];
+                  itemDetail.paramNames = [''];
+                  this.setState(
+                    {
+                      ruleClassData,
+                    },
+                    () => {
+                      callBack(ruleClassData);
+                    },
+                  );
+                }}
+              >
+              </Input>
               <PlusCircleOutlined
                 className={'icon_btn_style'}
                 onClick={() => {
@@ -985,6 +1014,36 @@ class RuleObjectComponent extends Component {
               >
                 {itemDetail?.isInsertParam ? '取消插入参数' : '插入参数'}
               </Button>
+              <Button
+                type="link"
+                disabled={
+                  disabled ||
+                  (itemDetail.operationCode === '' || !itemDetail.operationCode
+                    ? true
+                    : false)
+                }
+                style={needShowInsertSQL?{}:{ display: 'none'}}
+                onClick={() => {
+                  const { ruleClassData } = this.state;
+                  itemDetail.isInsertSQL = !itemDetail.isInsertSQL;
+                  if (itemDetail.isInsertSQL) {
+                    itemDetail.type = 30;
+                    itemDetail.paramNames = [];
+                    itemDetail.params = [];
+                  }
+
+                  this.setState(
+                    {
+                      ruleClassData,
+                    },
+                    () => {
+                      callBack(ruleClassData);
+                    },
+                  );
+                }}
+              >
+                {itemDetail?.isInsertSQL ? '取消插入SQL' : '插入SQL'}
+              </Button>
             </div>
           )}
           <div
@@ -1082,7 +1141,12 @@ class RuleObjectComponent extends Component {
       let value = val;
       if (isObj(code)) {
         Object.keys(code).forEach((ite) => {
-          this.handleEditExtraInfoResponse(ite, code[ite], parentDetail,classDataIndex);
+          this.handleEditExtraInfoResponse(
+            ite,
+            code[ite],
+            parentDetail,
+            classDataIndex,
+          );
         });
         return;
       }
@@ -1090,9 +1154,16 @@ class RuleObjectComponent extends Component {
         value = val.map((m) => m.value || m).join(',');
       }
       if (isObj(val)) {
-        value = val.value || val.PCDCode?.join('/');
+        value = val?.value || val.PCDCode?.join('/') || val;
       }
-      this.handleEditExtraInfoResponse('value', value, parentDetail,classDataIndex,code);
+  
+      this.handleEditExtraInfoResponse(
+        'value',
+        value,
+        parentDetail,
+        classDataIndex,
+        code,
+      );
     };
 
     return (

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

@@ -286,7 +286,7 @@ export default class RuleField extends Component {
     } = this.props;
     const { thresholdList } = this.state;
     const styleCommon = {
-      width: customerWidth || '150px',
+      width: customerWidth || '180px',
     };
     if (!selectOperation) return <Input disabled style={styleCommon}></Input>;
     const SET_TYPE = ['in', 'nin', 'cn', 'ncn','5']; //集合类型 （数字为 兼容用户管理子应用使用规则组件）
@@ -1932,7 +1932,7 @@ export default class RuleField extends Component {
         }
       }
       // 配送方式选择器
-      if (dataChoiceBusinessType == 310) {
+      if (dataChoiceBusinessType == 310 || dataChoiceBusinessType == 311) {
         if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
           return (
             <>
@@ -1952,6 +1952,14 @@ export default class RuleField extends Component {
                 labelInValue={true}
                 value={values[0]}
                 requestConfig={{
+                  ...(dataChoiceBusinessType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                   filterInit: 'qp-code-in',
                 }}
                 onChange={(value) => {
@@ -1983,6 +1991,14 @@ export default class RuleField extends Component {
                 labelInValue={true}
                 value={values[1]}
                 requestConfig={{
+                  ...(dataChoiceBusinessType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                   filterInit: 'qp-code-in',
                 }}
                 onChange={(value) => {
@@ -2020,6 +2036,14 @@ export default class RuleField extends Component {
               labelInValue={true}
               value={currentValue}
               requestConfig={{
+                ...(dataChoiceBusinessType === 311
+                ? {
+                    otherParams: {
+                      // 配送方式只选择标准配送方式
+                      'qp-recordChannnelCode-eq': 80,
+                    },
+                  }
+                : {}),
                 filterInit: 'qp-code-in',
               }}
               onChange={(value) => {

package/src/components/Solution/RuleComponent/services.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '@/utils/cachedRequest';
 
 // 查询规则对象属性thresholdList
 export async function getRegularThresholdRange(params: any) {

package/src/components/Solution/RuleSetter/service.js

@@ -1,5 +1,5 @@
 import { stringify } from 'qs';
-import request from '@/utils/request';
+import request from '@/utils/cachedRequest';
 
 // 仓库新增
 export async function addOneOnlineStoreRoom(params) {

package/src/index.ts

@@ -37,6 +37,7 @@ export { default as TableColumnSetting} from './plugin/TableColumnSetting';
 export { default as AuthButton } from './components/Functional/AuthButton';
 export { default as CustomSelector } from './components/Solution/RuleComponent/CustomPlugin/CustomSelector';
 export { default as PropertySelector} from './components/Business/PropertyModal';
+export { default as ModalUtils } from './components/Business/ModalUtils';
 
 export { default as EllipsisTooltip} from './components/Functional/EllipsisTooltip';
 export * from './components/Functional/BsAntdSula/index';
@@ -47,3 +48,5 @@ export { default as RuleSetter} from './components/Solution/RuleSetter';
 export { default as ExtendedCollapse } from './components/Common/ExtendedCollapse';
 export { default as Section } from './components/Common/Section';
 export { default as ParagraphCopier } from './components/Common/ParagraphCopier';
+
+export { default as SystemLog } from './components/Business/SystemLog';

package/src/plugin/TableColumnSetting/index.less

@@ -151,16 +151,18 @@
     }
   }
 
-  .ant-table-wrapper::-webkit-scrollbar {
+  .ant-table-tbody::-webkit-scrollbar {
     display: none;
   }
 
   .ant-table-wrapper {
     margin-top: 10px;
-    height: 364px;
-    overflow: scroll;
     padding-bottom: 50px;
 
+    tbody tr:first-child {
+      display: none;
+    }
+
     tr {
       height: 30px;
       td {

package/src/plugin/TableColumnSetting/index.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React from 'react';
 import { Table, message, Checkbox, Modal, Input, Button, Tooltip } from 'antd';
-import request from '@/utils/request';
+import request from '@/utils/cachedRequest';
 // import { request } from 'umi';
 import {
   SortableContainer,
@@ -411,7 +411,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
   DraggableContainer = (props: any) => (
     <SortableBody
       useDragHandle
-      disableAutoscroll
+      lockAxis='y'
       helperClass="row-dragging"
       onSortEnd={this.onSortEnd}
       {...props}
@@ -422,9 +422,9 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
     const { sortDataSource } = this.state;
     // function findIndex base on Table rowKey props and should always be a right array index
     const index = sortDataSource.findIndex(
-      (x:any) => x.key === restProps['data-row-key'],
+      (x:any) => (x.key||x.dataIndex) == restProps['data-row-key'],
     );
-    return <SortableItem index={index} {...restProps} />;
+    return <SortableItem key={restProps['data-row-key']} index={index} {...restProps} />;
   };
 
   onChange = (e: any, title: any) => {
@@ -495,6 +495,56 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
     this.setInitValue(datasource);
   };
 
+  handleResetSetting = () => {
+    const { setShowColumns, datasource = [], setInitialTableInfo, appRequestConfig }: any = this.props;
+    let that = this;
+    let { bsTableCode } = this.state;
+
+    return new Promise((resolve: any, reject: any) => {
+      request({
+        url: handleRequestUrl('/user','/appConfig/saveUserOrder', appRequestConfig),
+        method: 'POST',
+        data: {
+          code: that.state.bsTableCode,
+          detail: '',
+        },
+      }).then((res:any) => {
+        if (judgeIsRequestSuccess(res?.data)) {
+          let config =
+          localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
+          let configArray = JSON.parse(config);
+          let currentSetting = configArray.filter(
+            (item) => item.code === bsTableCode,
+          );
+          if (currentSetting.length) {
+            currentSetting[0].detail = JSON.stringify([]);
+          } else {
+            configArray.push({
+              code: bsTableCode,
+              detail: JSON.stringify([]),
+            });
+          }
+
+          localStorage.setItem(
+            ENUM.BROWSER_CACHE.COLUMN_CONDITION,
+            JSON.stringify(configArray),
+          );
+
+          message.success('重置表头列成功！');
+
+          setInitialTableInfo(true);
+          this.setState({
+            visible: false,
+          });
+        } else {
+          message.error('重置表头列自定义失败，请稍后尝试');
+          reject('');
+        }
+      });
+    })
+  };
+
+
   onSearch = (e: any) => {
     this.setState({
       searchDataSource: e.target.value,
@@ -532,15 +582,31 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
           onOk={this.handleOk}
           onCancel={this.handleCancel}
           footer={[
-            <Button key="back" onClick={this.handleReset}>
-              恢复默认
-            </Button>,
-            <Button key="submit" onClick={this.handleOk}>
-              取消
-            </Button>,
-            <Button key="submit" type="primary" onClick={this.handleOk}>
-              确认
-            </Button>,
+            <div>
+              <Button
+                key="back"
+                onClick={this.handleReset}
+                style={{ marginRight: 0 }}
+              >
+                恢复默认
+              </Button>
+              <Button key="back" onClick={this.handleResetSetting}>
+                重置设置
+              </Button>
+              <span style={{fontSize: '12px', color: '8A8F8D'}}>（列表字段变更会影响列设置功能，变更后请点击重置然后重新设置）</span>
+            </div>,
+            <div>
+              <Button
+                key="submit"
+                onClick={this.handleCancel}
+                style={{ marginRight: 0 }}
+              >
+                取消
+              </Button>
+              <Button key="submit" type="primary" onClick={this.handleOk}>
+                确认
+              </Button>
+            </div>,
           ]}
         >
           <div className={'sort_table'}>
@@ -709,6 +775,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
                       row: this.DraggableBodyRow,
                     },
                   }}
+                  scroll={{ y: 364 }}
                 />
               </div>
             </div>

package/src/styles/bsDefault.less

@@ -1469,8 +1469,12 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
 .table_odd {
   background: #f7f8fb;
 }
+.table_gray {
+  background: #D3D3D3;
+}
 // 浮起的列 设置斑马
 .table_base,
+.table_gray,
 .table_odd {
 
   .ant-table-cell-fix-left,
@@ -1908,16 +1912,18 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
     }
   }
 
-  .ant-table-wrapper::-webkit-scrollbar {
+  .ant-table-tbody::-webkit-scrollbar {
     display: none;
   }
 
   .ant-table-wrapper {
     margin-top: 10px;
-    height: 364px;
-    overflow: scroll;
     padding-bottom: 50px;
 
+    tbody tr:first-child {
+      display: none;
+    }
+
     tr {
       height: 30px;
       td {