aldehyde 0.2.99 → 0.2.100

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

@@ -1,207 +1,231 @@
-import React from 'react'
-import {AddOrUpdate, LtmplConfigRes, RouterCompProps} from '../tmpl/interface';
+import React from "react";
+import {
+  AddOrUpdate,
+  LtmplConfigRes,
+  RouterCompProps,
+} from "../tmpl/interface";
 import Units from "../units";
-import ActTable from '../table/act-table'
+import ActTable from "../table/act-table";
 // import StatActTable from '../table/stat-act-table'
 import HCDataSource from "../tmpl/hc-data-source";
 import withRouter from "../routable/withroute";
-export interface LtmplRouteProps extends RouterCompProps {
-
-};
+export interface LtmplRouteProps extends RouterCompProps {}
 
 export interface LtmplRouteState {
-    ltmplConfigRes?: LtmplConfigRes,
-    pageNo?: number,
-    pageSize?: number,
-};
+  ltmplConfigRes?: LtmplConfigRes;
+  pageNo?: number;
+  pageSize?: number;
+}
 
 class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
-    static defaultProps = {
-        basePath: "",
-    }
-    state = {
-        ltmplConfigRes: undefined,
-        pageNo: undefined,
-        pageSize: undefined,
-    }
-
-    async componentDidMount() {
-        this.loadData();
-    }
-
-    onRoute = (path) => {
-        this.props.navigate(path);
-    }
-
-    getMenuId = () => {
-        const {searchParams} = this.props;
-        let menuId = searchParams.get('menuId');
-        return menuId;
-    }
-
-    loadData = async () => {
-        const {params} = this.props;
-        const {sourceId} = params;
-        let ltmplConfigRes:LtmplConfigRes = await HCDataSource.requestLtmplConfig(null,sourceId);
-        this.setState({
-            ltmplConfigRes:ltmplConfigRes,
-        })
-    }
-
-    async componentDidUpdate(prevProps) {
-        const {location,params} = this.props;
-        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)
-        ) {
-            return;
-        }
-        this.loadData();
-    }
-
-    showView = (code: string, toCustomPage: boolean = false) => {
-        const {basePath} = this.props;
-        const {sourceId} = this.props.params;
-        const {ltmplConfigRes} = this.state;
-        let path = `${basePath}/${sourceId}/detail-view?code=${code}&menuId=${this.getMenuId()}`;
-        if (toCustomPage && ltmplConfigRes.ltmplConfig.customViewPagePath) {
-            path = `${basePath}${ltmplConfigRes.ltmplConfig.customViewPagePath}?menuId=${this.getMenuId()}&sourceId=${sourceId}`;
-        }
-        this.onRoute(path);
-    }
-
-    doEdit = (code: string, mode: AddOrUpdate, toCustomPage: boolean = false) => {
-        const {basePath} = this.props;
-        const {sourceId} = this.props.params;
-        const {ltmplConfigRes} = this.state;
-        let mainCode = this.getMainCode();
-
-        let path = `${basePath}/${sourceId}/detail-edit?code=${code}&menuId=${this.getMenuId()}&mode=${mode}`;
-        if (toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
-            path = `${basePath}/page/${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?code=${code}&menuId=${this.getMenuId()}`;
-        }
-        if (mainCode) {
-            path = path + `&mainCode=${mainCode}`;
-        }
-        this.onRoute(path);
-    }
-
-    getMainCode = () => {
-        const {searchParams} = this.props;
-        let mainCode = undefined;
-       // let criteriaData = Units.transQueryStrToParams(search);
-        let mcode=searchParams.get('mainCode');
-        if (mcode) {
-            // criteriaData = Units.transQueryStrToParams(search);
-            mainCode = mcode;
-        }
-        return mainCode;
-    }
-
-    doCreate = (addTmplId:string,toCustomPage: boolean = false) => {
-        const {basePath} = this.props;
-        const {sourceId} = this.props.params;
-        const {ltmplConfigRes} = this.state;
-        let path = `${basePath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}&addTmplId=${addTmplId?addTmplId:""}`;
-        if (toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
-            path = `${basePath}/page/${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?menuId=${this.getMenuId()}`;
-        }
-        let mainCode = this.getMainCode();
-        if (mainCode) {
-            path = path + `&mainCode=${mainCode}`;
-        }
-        this.onRoute(path);
-    }
-
-    doRAction = (ractionId: string, mainCode: String) => {
-        const {basePath} = this.props;
-        let path = `${basePath}/${ractionId}/act-table?mainCode=${mainCode}&menuId=${this.getMenuId()}`;
-        this.onRoute(path);
-    }
-
-    doSearch = (params_) => {
-        const {basePath} = this.props;
-        const {sourceId} = this.props.params;
-        let params = {...params_}
-        //params['sourceId'] = sourceId;
-        const newfliter = Units.transQueryParamsToStr(params);
-        this.props.navigate(`${basePath}/${sourceId}/act-table?${newfliter}`,{replace:true})
-
-    }
-    onChangeSearch = (params_) => {
-        let params = {...params_}
-        //追加过滤条件，hiddenColIds，innerQueryKey
-        const {searchParams} = this.props;
-        let mcode=searchParams.get("mainCode");
-        if (mcode) {
-            params['mainCode'] = mcode;
-        }
-        const {pageSize,pageNo} = this.state;
-        if(pageSize){
-            params['pageNo'] = pageNo;
-        }
-       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 params = Units.transQueryStrToParams(search);
-        params['pageNo'] = pageNo;
-        params['pageSize'] = pageSize;
-        this.doSearch(params);
-
-        // this.setState({
-        //     pageNo,
-        //         pageSize
-        // })
-    }
-
-
-    render() {
-        const {ltmplConfigRes} = this.state;
-        const {location, params} = this.props;
-        const {sourceId} = params;
-        //let menuId = undefined;
-        let mainCode = undefined;
-
-        let search = location.search;
-        let criteriaData = Units.transQueryStrToParams(search);
-        // if (search.indexOf('menuId') > 0) {
-        //     menuId = criteriaData['menuId'];
-        //     criteriaData['menuId'] = undefined;
-        // } else {
-        //     menuId = sourceId;
-        // }
-        let pageSize = criteriaData['pageSize'];
-        let pageNo = criteriaData['pageNo'];
-
-        if (search.indexOf('mainCode') > 0) {
-            //criteriaData = Units.transQueryStrToParams(search);
-            mainCode = criteriaData['mainCode'];
-        }
-        if (!ltmplConfigRes) {
-            return <></>;
-        } else {
-            return <ActTable serverKey={null} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}
-                             menuId={this.getMenuId()} mainCode={mainCode} showView={this.showView}
-                             doSearch={this.onChangeSearch} doEdit={this.doEdit} doCreate={this.doCreate}
-                             sourceId={sourceId} criteriaData={criteriaData}
-                             ltmplConfig={ltmplConfigRes?ltmplConfigRes.ltmplConfig:null}
-                             doRAction={this.doRAction}
-            />
-        }
-
-    }
+  static defaultProps = {
+    basePath: "",
+  };
+  state = {
+    ltmplConfigRes: undefined,
+    pageNo: undefined,
+    pageSize: undefined,
+  };
+
+  async componentDidMount() {
+    this.loadData();
+  }
+
+  onRoute = (path) => {
+    this.props.navigate(path);
+  };
+
+  getMenuId = () => {
+    const { searchParams } = this.props;
+    let menuId = searchParams.get("menuId");
+    return menuId;
+  };
+
+  loadData = async () => {
+    const { params } = this.props;
+    const { sourceId } = params;
+    let ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(
+      null,
+      sourceId
+    );
+    this.setState({
+      ltmplConfigRes: ltmplConfigRes,
+    });
+  };
+
+  async componentDidUpdate(prevProps) {
+    const { location, params } = this.props;
+    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)
+    ) {
+      return;
+    }
+    this.loadData();
+  }
+
+  showView = (code: string, toCustomPage: boolean = false) => {
+    const { basePath } = this.props;
+    const { sourceId } = this.props.params;
+    const { ltmplConfigRes } = this.state;
+    let path = `${basePath}/${sourceId}/detail-view?code=${code}&menuId=${this.getMenuId()}`;
+    if (toCustomPage && ltmplConfigRes.ltmplConfig.customViewPagePath) {
+      path = `${basePath}${
+        ltmplConfigRes.ltmplConfig.customViewPagePath
+      }?menuId=${this.getMenuId()}&sourceId=${sourceId}`;
+    }
+    this.onRoute(path);
+  };
+
+  doEdit = (code: string, mode: AddOrUpdate, toCustomPage: boolean = false) => {
+    const { basePath } = this.props;
+    const { sourceId } = this.props.params;
+    const { ltmplConfigRes } = this.state;
+    let mainCode = this.getMainCode();
+
+    let path = `${basePath}/${sourceId}/detail-edit?code=${code}&menuId=${this.getMenuId()}&mode=${mode}`;
+    if (toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
+      path = `${basePath}/page/${sourceId}${
+        ltmplConfigRes.ltmplConfig.customEditPagePath
+      }?code=${code}&menuId=${this.getMenuId()}`;
+    }
+    if (mainCode) {
+      path = path + `&mainCode=${mainCode}`;
+    }
+    this.onRoute(path);
+  };
+
+  getMainCode = () => {
+    const { searchParams } = this.props;
+    let mainCode = undefined;
+    // let criteriaData = Units.transQueryStrToParams(search);
+    let mcode = searchParams.get("mainCode");
+    if (mcode) {
+      // criteriaData = Units.transQueryStrToParams(search);
+      mainCode = mcode;
+    }
+    return mainCode;
+  };
+
+  doCreate = (addTmplId: string, toCustomPage: boolean = false) => {
+    const { basePath } = this.props;
+    const { sourceId } = this.props.params;
+    const { ltmplConfigRes } = this.state;
+    let path = `${basePath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}&addTmplId=${
+      addTmplId ? addTmplId : ""
+    }`;
+    if (toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
+      path = `${basePath}/page/${sourceId}${
+        ltmplConfigRes.ltmplConfig.customEditPagePath
+      }?menuId=${this.getMenuId()}`;
+    }
+    let mainCode = this.getMainCode();
+    if (mainCode) {
+      path = path + `&mainCode=${mainCode}`;
+    }
+    this.onRoute(path);
+  };
+
+  doRAction = (ractionId: string, mainCode: String) => {
+    const { basePath } = this.props;
+    let path = `${basePath}/${ractionId}/act-table?mainCode=${mainCode}&menuId=${this.getMenuId()}`;
+    this.onRoute(path);
+  };
+
+  doSearch = (params_) => {
+    const { basePath } = this.props;
+    const { sourceId } = this.props.params;
+    let params = { ...params_ };
+    //params['sourceId'] = sourceId;
+    const newfliter = Units.transQueryParamsToStr(params);
+    this.props.navigate(`${basePath}/${sourceId}/act-table?${newfliter}`, {
+      replace: true,
+    });
+  };
+  onChangeSearch = (params_) => {
+    let params = { ...params_ };
+    //追加过滤条件，hiddenColIds，innerQueryKey
+    const { searchParams } = this.props;
+    let mcode = searchParams.get("mainCode");
+    if (mcode) {
+      params["mainCode"] = mcode;
+    }
+    const { pageSize, pageNo } = this.state;
+    if (pageSize) {
+      params["pageNo"] = pageNo;
+    }
+    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 params = Units.transQueryStrToParams(search);
+    params["pageNo"] = pageNo;
+    params["pageSize"] = pageSize;
+    this.doSearch(params);
+
+    // this.setState({
+    //     pageNo,
+    //         pageSize
+    // })
+  };
+
+  render() {
+    const { ltmplConfigRes } = this.state;
+    const { location, params } = this.props;
+    const { sourceId } = params;
+    //let menuId = undefined;
+    let mainCode = undefined;
+
+    let search = location.search;
+    let criteriaData = Units.transQueryStrToParams(search);
+    // if (search.indexOf('menuId') > 0) {
+    //     menuId = criteriaData['menuId'];
+    //     criteriaData['menuId'] = undefined;
+    // } else {
+    //     menuId = sourceId;
+    // }
+    let pageSize = criteriaData["pageSize"];
+    let pageNo = criteriaData["pageNo"];
+
+    if (search.indexOf("mainCode") > 0) {
+      //criteriaData = Units.transQueryStrToParams(search);
+      mainCode = criteriaData["mainCode"];
+    }
+    if (!ltmplConfigRes) {
+      return <></>;
+    } else {
+      return (
+        <ActTable
+          serverKey={null}
+          pageSize={pageSize}
+          pageNo={pageNo}
+          onChangePage={this.onChangePage}
+          menuId={this.getMenuId()}
+          mainCode={mainCode}
+          showView={this.showView}
+          doSearch={this.onChangeSearch}
+          doEdit={this.doEdit}
+          doCreate={this.doCreate}
+          sourceId={sourceId}
+          criteriaData={criteriaData}
+          ltmplConfig={ltmplConfigRes ? ltmplConfigRes.ltmplConfig : null}
+          doRAction={this.doRAction}
+        />
+      );
+    }
+  }
 }
 
 export default withRouter(LtmplRoute);
-

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

@@ -76,7 +76,7 @@ const { Panel } = Collapse;
 type Level = "l1" | "l2";
 
 const defaultDisabledColIds: string[] = ["20000", "10000"];
-
+let refresh=true;
 interface ActTableProps extends TmplBaseProps {
   criteriaData: object;
   pageNo: number;
@@ -284,7 +284,11 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         column["render"] = (text, record, index) => <label>{index + 1}</label>;
         item["sorter"] = undefined;
       } else if (item.id == "10000") {
-        column["title"] = <Tooltip title={"拖拽排序"}>{item.title}</Tooltip>;
+        column["title"] = (
+          <Tooltip title={translate("${拖拽排序}")}>
+            {translate("${" + item.title + "}")}
+          </Tooltip>
+        );
         column["width"] = 30;
         column["dataIndex"] = item.id;
         column["className"] = "drag-visible";
@@ -511,6 +515,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         );
       } else {
         column["className"] = "opsColumn";
+        column["title"] = translate("${" + item.title + "}");
         column["render"] = (text, record) => {
           return (
             <ViewControl
@@ -523,6 +528,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         };
       }
     });
+
     return tableColumns;
   };
 
@@ -540,6 +546,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     this.loadData(defaultDisabledColIds, [], sortedColConfigs);
   }
 
+
+
   async componentDidUpdate(prevProps) {
     const { sourceId, criteriaData, ltmplConfig } = this.props;
     const { translate } = this.context;
@@ -550,7 +558,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     } = prevProps;
 
     let { hiddenColIds, sortedColConfigs } = this.state;
-    if (
+
+    if (refresh ||
       (sourceId && preSourceId != sourceId) ||
       (ltmplConfig &&
         (!preLtmplConfig || ltmplConfig.id != preLtmplConfig.id)) ||
@@ -563,8 +572,11 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           "pageNo",
         ])
     ) {
+      //5秒后允许再次请求数据
+      refresh=false;
+
       if (ltmplConfig.id == preLtmplConfig.id) {
-        this.loadData(hiddenColIds, [], sortedColConfigs);
+        await this.loadData(hiddenColIds, [], sortedColConfigs);
       } else {
         let sColConfigs = undefined;
         if (ltmplConfig) {
@@ -577,8 +589,11 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         this.setState({
           viewModels: ["table"],
         });
-        this.loadData(defaultDisabledColIds, [], sColConfigs);
+        await this.loadData(defaultDisabledColIds, [], sColConfigs);
       }
+      setTimeout( function() {
+        refresh=true;
+      },2000);
     }
   }
 
@@ -930,7 +945,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 <ExportFrame //导出组件
                   serverKey={serverKey}
                   queryKey={queryKey}
-                  title={ltmplConfig.title}
+                  title={translate("${" + ltmplConfig.title + "}")}
                 />
               }
               title={translate("${导出}")}
@@ -1006,7 +1021,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                   </Col>
                   <Col span={24}>
                     <Checkbox value={"verticalList"}>
-                      {translate("纵向列表")}
+                      {translate("${纵向列表}")}
                     </Checkbox>
                   </Col>
                   {/*<Col span={24}><Checkbox value={'horizontalList'}>横向列表</Checkbox></Col>*/}
@@ -1132,6 +1147,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       onChangePage,
       serverKey,
     } = this.props;
+    const { translate } = this.context;
 
     if (!ltmplConfig || !sourceId) {
       return (
@@ -1202,7 +1218,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 ) : null}
                 <h3>
                   {" "}
-                  {title ? title : ltmplConfig.title}
+                  {translate("${" + (title ? title : ltmplConfig.title) + "}")}
                   <p className="fr">{this.renderHeaderButtons()}</p>
                 </h3>
               </span>
@@ -1252,6 +1268,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       initCollapse,
       tip,
     } = this.props;
+    const { translate } = this.context;
 
     if (!ltmplConfig || !sourceId) {
       return (
@@ -1270,7 +1287,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             initCollapse={initCollapse}
             title={
               <>
-                {title ? title : ltmplConfig.title}
+                {translate("${" + (title ? title : ltmplConfig.title) + "}")}
                 <ToolTipBar
                   content={tip ? tip : ltmplConfig ? ltmplConfig.tip : null}
                 />