aldehyde 0.2.23 → 0.2.25

package/src/aldehyde/routable/ltmpl-route.tsx

@@ -53,7 +53,6 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         const {sourceId} = params;
         let {sourceId: preSourceId} = prevProps.params;
         let {location: preLocation} = prevProps;
-
         if (!sourceId ||
             (!preSourceId && this.state.ltmplConfigRes)
             || (location.pathname == preLocation.pathname && location.search == preLocation.search)
@@ -127,17 +126,15 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         const {basePath} = this.props;
         const {sourceId} = this.props.params;
         let params = {...params_}
-        params['sourceId'] = sourceId;
+        //params['sourceId'] = sourceId;
         const newfliter = Units.transQueryParamsToStr(params);
-        this.props.navigate(`${basePath}/${sourceId}/act-table?menuId=${this.getMenuId()}&${newfliter}`,{replace:true})
+        this.props.navigate(`${basePath}/${sourceId}/act-table?${newfliter}`,{replace:true})
 
     }
     onChangeSearch = (params_) => {
         let params = {...params_}
         //追加过滤条件，hiddenColIds，innerQueryKey
-        const {location,searchParams} = this.props;
-        let mainCode = undefined;
-        let criteriaData=searchParams;
+        const {searchParams} = this.props;
         let mcode=searchParams.get("mainCode");
         if (mcode) {
             params['mainCode'] = mcode;
@@ -149,14 +146,14 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
        if(pageNo){
            params['pageSize'] = pageSize;
        }
-
+        params['menuId']=this.getMenuId();
+        params['sourceId']=this.getMenuId();
         this.doSearch(params);
     }
 
     onChangePage = (pageNo: number, pageSize: number) => {
         const {location} = this.props;
         let search = location.search;
-        let mainCode = undefined;
         let params = Units.transQueryStrToParams(search);
         params['pageNo'] = pageNo;
         params['pageSize'] = pageSize;
@@ -177,7 +174,6 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         let mainCode = undefined;
 
         let search = location.search;
-        debugger
         let criteriaData = Units.transQueryStrToParams(search);
         // if (search.indexOf('menuId') > 0) {
         //     menuId = criteriaData['menuId'];
@@ -199,7 +195,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                              menuId={this.getMenuId()} mainCode={mainCode} showView={this.showView}
                              doSearch={this.onChangeSearch} doEdit={this.doEdit} doCreate={this.doCreate}
                              sourceId={sourceId} criteriaData={criteriaData}
-                             ltmplConfig={ltmplConfigRes.ltmplConfig}
+                             ltmplConfig={ltmplConfigRes?ltmplConfigRes.ltmplConfig:null}
                              doRAction={this.doRAction}
             />
         }

package/src/aldehyde/table/act-table.tsx

@@ -44,7 +44,7 @@ import ColumnSelector from './column/column-selector';
 import ExportFrame from '../exportor/export-frame';
 import {SortableHandle} from 'react-sortable-hoc';
 import L2ActTable from "./l2-act-table";
-//import StatViewL2Chart from '../chart/statview-l2-chart'
+
 import Action from '../controls/action'
 import Restat from "./stat/restat"
 import ActionUtils from '../controls/action/utils'
@@ -125,8 +125,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         if (!ltmplConfig) {
             return;
         }
-        // console.log('acttable location criteriaData:', criteriaData);
-        // console.log('acttable ltmplConfig:', ltmplConfig);
+
         this.setState({
             loading: true,
         })
@@ -358,10 +357,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         let {ltmplConfig: preLtmplConfig, criteriaData: preCriteriaData,sourceId:preSourceId} = prevProps;
 
         let {hiddenColIds, sortedColConfigs} = this.state;
-
-        if ((sourceId && preSourceId!=sourceId) ||
+        if ((sourceId && preSourceId != sourceId) ||
             (ltmplConfig && (!preLtmplConfig || ltmplConfig.id != preLtmplConfig.id)) ||
-            (Units.transQueryParamsToStr(criteriaData) != Units.transQueryParamsToStr(preCriteriaData))) {
+            (Units.transQueryParamsToStr(criteriaData,false,['pageSize','pageNo']) != Units.transQueryParamsToStr(preCriteriaData,false,['pageSize','pageNo']))) {
 
             if (ltmplConfig.id == preLtmplConfig.id) {
                 this.loadData(hiddenColIds, [], sortedColConfigs);
@@ -625,7 +623,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
     criteriaFormUseful = () => {
         const {ltmplConfig} = this.props;
-        let {buttons, criterias, jumps, actions} = ltmplConfig;
+        let {buttons, criterias, } = ltmplConfig;
         if ((buttons.includes('query') && ((criterias && criterias.length > 0) || buttons.includes('drilling'))) ||
             this.checkBoxUseful()) {
             return true;
@@ -657,7 +655,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                              doSearch={doSearch}/>
     }
 
-    renderContent() {
+    renderContent=()=> {
         let {queryKey, tableColumns, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable} = this.state;
         let {sourceId, ltmplConfig, funcMode, title, collapsible,pageSize,pageNo,onChangePage} = this.props;
 
@@ -712,17 +710,14 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                     {displayCriteriaCard ?
                         this.renderCriteriaForm() : null
                     }
-                    {
-                        loading ? "" :
-                            <QueryTable onChangePage={onChangePage} viewModels={viewModels} columnConfigs={columnConfigs}
+                    {loading?"":<QueryTable  onChangePage={onChangePage} viewModels={viewModels} columnConfigs={columnConfigs}
                                         maxSelectedRows={this.checkBoxUseful() ? 10000 : -1}
                                         selectedRows={selectedRows}
                                         columns={tableColumns}
                                         hiddenRowCodes={hiddenRowCodes}
                                         pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:ltmplConfig.defaultPageSize}}
                                         queryKey={queryKey}
-                                        onChangeRowSelection={this.changeRowSelection}/>
-                    }
+                                        onChangeRowSelection={this.changeRowSelection}/>}
                 </div>
             </>
         );
@@ -740,7 +735,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 </Table>
             </>
         }
-
         return <> {
             collapsible ?
                 <CollapseCard

package/src/aldehyde/table/query-table.tsx

@@ -96,6 +96,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     async componentDidUpdate(prevProps) {
         const {queryKey: preQueryKey, pageInfo: prePageInfo} = prevProps;
         const {queryKey, pageInfo} = this.props;
+        const {total}=this.state;
         if (queryKey) {
             if (preQueryKey?.key != queryKey.key) {
                 await this.loadData(queryKey.key, pageInfo, true);
@@ -294,7 +295,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     }
 
     render() {
-        const {pageInfo, columns, viewModels, onChangePage} = this.props;
+        const {pageInfo, columns, viewModels} = this.props;
         const {touchEnd, total, loading, virtualEndPageNo} = this.state;
         return (
             <>

package/src/aldehyde/units/index.tsx

@@ -404,13 +404,16 @@ export default {
         return token;
 
     },
-    transQueryParamsToStr(data, isPrefix = false) {
+    transQueryParamsToStr(data, isPrefix = false,excudekeys=[]) {
         let prefix = isPrefix ? '?' : '';
         let _result = [];
 
         let paramKeys = [];
         //寻找参数
         for (let key in data) {
+            if(excudekeys.indexOf(key)>=0){
+                continue
+            }
             let value = data[key]
             // 去掉为空的参数
             if ([undefined, null].includes(value)) {