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

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

@@ -688,6 +688,7 @@ class RuleObjectComponent extends Component {
       initialThresholdQuery = {},
       disabled,
       systemVariableList,
+      needShowInsertSQL,
     } = this.props;
     let thresholdQuery = {
       ...initialThresholdQuery,
@@ -825,6 +826,9 @@ class RuleObjectComponent extends Component {
                   itemDetail.metaObjectCode =
                     nodeInfo.triggerNode.props.metaObjectCode;
                   itemDetail.isInsertParam = false;
+                  if(needShowInsertSQL) {
+                    itemDetail.isInsertSQL = false;
+                  }
                   this.setState(
                     {
                       ruleClassData,
@@ -862,7 +866,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 +930,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 +1013,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 +1140,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 +1153,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']; //集合类型 （数字为 兼容用户管理子应用使用规则组件）

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';

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

@@ -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 {

package/src/utils/TableUtils.less

@@ -48,5 +48,5 @@
 }
 
 .card_department {
-  color: #005cff !important;
+  color: #005CFF !important;
 }

package/src/utils/request.ts

@@ -7,27 +7,31 @@ const get = (url, params?: any) => {
   }).then(handleResponseData);
 };
 
-const post = (url, data?: any) => {
+const post = (url, data?: any, params?: any) => {
   return request.post(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 
-const patch = (url, data?: any) => {
+const patch = (url, data?: any, params?: any) => {
   return request.patch(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 
-const put = (url, data?: any) => {
+const put = (url, data?: any, params?: any) => {
   return request.put(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 
-const deleteS = (url, data?: any) => {
+const deleteS = (url, data?: any, params?: any) => {
   return request.delete(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 

package/src/utils/utils.ts

@@ -87,16 +87,13 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
   } else if (col.timeRender) {
     // 处理不显示 时分秒的时间
     col.render = ({ text }: any) => handleTooltip(text, col.timeRender);
-  }
-  // 处理有问题，弃用
-  // else if (col.textOverflow) {
-  //   // 处理文字太长
-  //   const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width));
-  //   const originalRender = col?.render;
-  //   const renderText = (params) => originalRender ? originalRender(params) : params.text;
-  //   col.render = (params) => handleTextOverflowNoTooltip(renderText(params), colWidth);
-  // } 
-  else if (col.images) {
+  } else if (col.textOverflow) {
+    // 处理文字太长
+    const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width));
+    const originalRender = col?.render;
+    const renderText = (params) => originalRender ? originalRender(params) : params.text;
+    col.render = (params) => handleTextOverflowNoTooltip(renderText(params), colWidth);
+  } else if (col.images) {
     col.render = ({ text }: any) => tableColumnsImage(text);
   } else if (col.double) {
     col.render = ({ record }: any) =>
@@ -127,12 +124,11 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
   if (col.timeRender) {
     col.render = (text: any) => handleTooltip(text, col.timeRender);
   }
-  // 处理有问题，弃用
   // 处理文字太长
-  // if (col.textOverflow) {
-  //   const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width))
-  //   col.render = (text: any) => handleTextOverflow(text,colWidth);
-  // }
+  if (col.textOverflow) {
+    const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width))
+    col.render = (text: any) => handleTextOverflow(text,colWidth);
+  }
   if (col.images) {
     col.render = (text: any) => tableColumnsImage(text);
   }