aldehyde 0.2.333 → 0.2.335

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

@@ -1,10 +1,10 @@
-import React, { ReactNode} from "react";
+import React, { ReactNode } from "react";
 import {
-  Button, Card, Checkbox, Col, Divider, Popover, Row, Space, Drawer, Modal, Tooltip,
-  message, Layout,Table
+  Button, Card, Checkbox, Col, Divider, Popover, Row, Space, Drawer, Tooltip,
+  message, Layout, Table, Form as AntdForm, FormInstance
 } from "antd";
 import {
-  ExportOutlined,SettingOutlined, FundOutlined, LineChartOutlined,
+  ExportOutlined, FundOutlined, LineChartOutlined,
   PlusCircleOutlined, PlusOutlined, ReloadOutlined, RetweetOutlined, SearchOutlined,
   TableOutlined, ImportOutlined,
 } from "@ant-design/icons";
@@ -20,7 +20,7 @@ import QueryTable from "./query-table";
 import CriteriaForm from "./../form/criteria-form";
 import ProgramConfig from "../units";
 import ColumnSelector from "./column/column-selector";
-import ExportFrame, { ExportType,ExportMode } from "../export/export-frame";
+import ExportFrame, { ExportType, ExportMode } from "../export/export-frame";
 import L2ActTable from "./l2-act-table";
 
 import Restat from "./stat/restat";
@@ -61,8 +61,8 @@ interface ActTableProps extends TmplBaseProps {
   collapsible?: boolean;
   initCollapse?: boolean;
   readOnly?: boolean;
-  tableType?:"common"|"report";
-  operatable?:boolean;
+  tableType?: "common" | "report";
+  operatable?: boolean;
 }
 
 interface ActTableStat {
@@ -89,9 +89,10 @@ interface ActTableStat {
   pageInfo?: object;
   ltreeData?: object;
   userCriteriaData: object;
+  editings: string[]; // 行内编辑code
 }
 let serial_number = new Date().getTime();
-let busyReminderTime=0;
+let busyReminderTime = 0;
 class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   state = {
     //tableColumns: undefined,
@@ -116,13 +117,15 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     showRatmplSelector: false,
     aggregateVO: undefined,
     restatParams: undefined,
-    pageInfo:{pageNo:1,pageSize:10},
-    ltreeData:{},
-    userCriteriaData:undefined,
+    pageInfo: { pageNo: 1, pageSize: 10 },
+    ltreeData: {},
+    userCriteriaData: undefined,
+    editings: [], // 行内编辑code
   };
 
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
+  formRef = React.createRef<FormInstance>(); // 可编辑表格的form Ref
 
   static defaultProps = {
     criteriaData: {},
@@ -130,7 +133,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     collapsible: false,
     initCollapse: false,
     readOnly: false,
-    operatable:true,
+    operatable: true,
   };
 
 
@@ -145,7 +148,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       mainCode, level, pageNo, pageSize, serverKey,
     } = this.props;
 
-    if(!this.isSameSourceQuery(sourceId,criteriaData)){
+    if (!this.isSameSourceQuery(sourceId, criteriaData)) {
       return
     }
 
@@ -156,7 +159,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
     this.setState({
       loading: true,
-      userCriteriaData:criteriaData,
+      userCriteriaData: criteriaData,
     });
     let disabledColIds: string[] = [];
     let hiddenColIds_ = [...hiddenColIds];
@@ -215,7 +218,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     if (!queryKey.sourceId || queryKey.sourceId == this.props.sourceId) {
-      this.setState({pageInfo,
+      this.setState({
+        pageInfo,
         disabledColIds, hiddenColIds: hiddenColIds_, hiddenRowCodes,
         sortedColConfigs, queryKey, showL2Chart: false, selectedRows: [], selectedDatas: [],
         viewModels:
@@ -227,39 +231,39 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     });
   };
 
-  doCustomButton =async (customButton: CustomButton, records: DtmplData[]) => {
-    if(!this.buttonClickable()){
+  doCustomButton = async (customButton: CustomButton, records: DtmplData[]) => {
+    if (!this.buttonClickable()) {
       return;
     }
-    const {serverKey, sourceId} = this.props;
-    let doType=customButton.doType;
-    let config:CustomButtonConfig = ProgramConfig.getCustomButtonConfig(customButton.id);
-    if("request_refresh" == doType){
-      if(config && config.doAction){
-       await config.doAction(customButton,records);
-      }else if(config && config.getRequestUrl){
-        let url=await  config.getRequestUrl(customButton,records);
-        await HcserviceV3.doPostRequest(serverKey,url);
-      }else if(customButton.path){
-        let codes=[];
-        if(records!=null){
-          records.forEach(item=>{
+    const { serverKey, sourceId } = this.props;
+    let doType = customButton.doType;
+    let config: CustomButtonConfig = ProgramConfig.getCustomButtonConfig(customButton.id);
+    if ("request_refresh" == doType) {
+      if (config && config.doAction) {
+        await config.doAction(customButton, records);
+      } else if (config && config.getRequestUrl) {
+        let url = await config.getRequestUrl(customButton, records);
+        await HcserviceV3.doPostRequest(serverKey, url);
+      } else if (customButton.path) {
+        let codes = [];
+        if (records != null) {
+          records.forEach(item => {
             codes.push(item.code)
           })
         }
-        await HcserviceV3.doPostRequest(serverKey,customButton.path,{codes});
-      }else{
+        await HcserviceV3.doPostRequest(serverKey, customButton.path, { codes });
+      } else {
         message.error("Button Config Error");
         return;
       }
       this.doSearchDirect(null);
-    }else if("show_window"==doType){
-        this.setState({
-          showCustomCard: true,
-          customButton,
-          customButtonData: records,
-        });
-    }else {
+    } else if ("show_window" == doType) {
+      this.setState({
+        showCustomCard: true,
+        customButton,
+        customButtonData: records,
+      });
+    } else {
       message.error("Unsuport Button dotype " + doType);
     }
   };
@@ -297,29 +301,30 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       return "";
     }
 
-    let customProps = { customButton: customButton, data: customButtonData,
-      onOk:()=>{this.actTableDoSearch(null)}
-          ,onclose: () => {
+    let customProps = {
+      customButton: customButton, data: customButtonData,
+      onOk: () => { this.actTableDoSearch(null) }
+      , onclose: () => {
         this.setState({ customButton: undefined });
       }
     };
 
-   let config:CustomButtonConfig= ProgramConfig.getCustomButtonConfig(customButton.id);
-   let page;
-   if(config && config.getCurrentPage){
-     page=config.getCurrentPage(customButton,customButtonData);
-   }
-   if(!page){
+    let config: CustomButtonConfig = ProgramConfig.getCustomButtonConfig(customButton.id);
+    let page;
+    if (config && config.getCurrentPage) {
+      page = config.getCurrentPage(customButton, customButtonData);
+    }
+    if (!page) {
       page = ProgramConfig.getCustomPage(customButton.id);
-   }
+    }
 
-   if(!page){
-     message.error("Not found CustomButton Page");
-     this.setState({
-       customButton:undefined
-     })
-     return;
-   }
+    if (!page) {
+      message.error("Not found CustomButton Page");
+      this.setState({
+        customButton: undefined
+      })
+      return;
+    }
 
     let customElement = React.createElement(page, customProps);
     if (
@@ -385,53 +390,53 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
 
   async componentDidMount() {
-    const { ltmplConfig,tableType } = this.props;
+    const { ltmplConfig, tableType } = this.props;
     const { translate } = this.context;
     let sortedColConfigs = undefined;
     if (ltmplConfig) {
-      sortedColConfigs =tableType=='report'?ltmplConfig.columns: [
-        { id: "10000", title: translate("${排序}") ,originalId:"10000"},
-        { id: "20000", title: translate("${隐藏}"),originalId:"20000" },
+      sortedColConfigs = tableType == 'report' ? ltmplConfig.columns : [
+        { id: "10000", title: translate("${排序}"), originalId: "10000" },
+        { id: "20000", title: translate("${隐藏}"), originalId: "20000" },
         ...ltmplConfig.columns,
       ];
     }
     this.loadData(defaultDisabledColIds, [], sortedColConfigs);
   }
 
-  async componentDidUpdate(prevProps,prevState) {
-    const { sourceId, criteriaData, ltmplConfig ,tableType,pageSize,pageNo} = this.props;
-   // const {userCriteriaData:preUserCriteriaData}=prevState;
-    const {userCriteriaData}=this.state;
+  async componentDidUpdate(prevProps, prevState) {
+    const { sourceId, criteriaData, ltmplConfig, tableType, pageSize, pageNo } = this.props;
+    // const {userCriteriaData:preUserCriteriaData}=prevState;
+    const { userCriteriaData } = this.state;
     const { translate } = this.context;
     let {
       ltmplConfig: preLtmplConfig,
       criteriaData: preCriteriaData,
-      sourceId: preSourceId,pageSize: prePageSize,pageNo: prePageNo,
+      sourceId: preSourceId, pageSize: prePageSize, pageNo: prePageNo,
     } = prevProps;
-    if(!this.isSameSourceQuery(sourceId,criteriaData)){
+    if (!this.isSameSourceQuery(sourceId, criteriaData)) {
       return false;
     }
 
-    if(prePageSize!=pageSize || pageNo!=prePageNo){
+    if (prePageSize != pageSize || pageNo != prePageNo) {
       this.setState({
-        pageInfo:{pageNo, pageSize},
-        userCriteriaData:criteriaData,
+        pageInfo: { pageNo, pageSize },
+        userCriteriaData: criteriaData,
       })
     }
     let { hiddenColIds, sortedColConfigs } = this.state;
-   let currentQueryParams= ProgramConfig.transQueryParamsToStr(criteriaData, false, [
+    let currentQueryParams = ProgramConfig.transQueryParamsToStr(criteriaData, false, [
+      "pageSize",
+      "pageNo",
+    ]);
+    let preCurrentQueryParams = ProgramConfig.transQueryParamsToStr(userCriteriaData, false, [
       "pageSize",
       "pageNo",
     ]);
-   let preCurrentQueryParams=ProgramConfig.transQueryParamsToStr(userCriteriaData, false, [
-     "pageSize",
-     "pageNo",
-   ]);
     if ((sourceId && preSourceId != sourceId) ||
       (ltmplConfig &&
         (!preLtmplConfig || ltmplConfig.id != preLtmplConfig.id)) ||
-        ((currentQueryParams != preCurrentQueryParams ) &&
-            (!criteriaData['menuId'] || preCriteriaData.menuId==criteriaData['menuId']))
+      ((currentQueryParams != preCurrentQueryParams) &&
+        (!criteriaData['menuId'] || preCriteriaData.menuId == criteriaData['menuId']))
     ) {
       //5秒后允许再次请求数据
       //refresh=false;
@@ -440,9 +445,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       } else {
         let sColConfigs = undefined;
         if (ltmplConfig) {
-          sColConfigs =tableType=="report"?ltmplConfig.columns: [
-            { id: "10000", title: translate("${排序}") ,originalId:"10000"},
-            { id: "20000", title: translate("${隐藏}"),originalId:"20000" },
+          sColConfigs = tableType == "report" ? ltmplConfig.columns : [
+            { id: "10000", title: translate("${排序}"), originalId: "10000" },
+            { id: "20000", title: translate("${隐藏}"), originalId: "20000" },
             ...ltmplConfig.columns,
 
           ];
@@ -453,16 +458,16 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         await this.loadData(defaultDisabledColIds, [], sColConfigs);
       }
 
-    }else{
+    } else {
       return false;
     }
   }
 
-  isSameSourceQuery=(sourceId, criteriaData)=>{
-    if(sourceId && criteriaData && (criteriaData['sourceId'] && criteriaData['sourceId'] != sourceId )
-    || (criteriaData['menuId'] && criteriaData['menuId'] != sourceId )) {
+  isSameSourceQuery = (sourceId, criteriaData) => {
+    if (sourceId && criteriaData && (criteriaData['sourceId'] && criteriaData['sourceId'] != sourceId)
+      || (criteriaData['menuId'] && criteriaData['menuId'] != sourceId)) {
       return false;
-    }else{
+    } else {
       return true;
     }
   };
@@ -588,7 +593,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
   };
 
-  doSelectedCQuery = async (cqueryId: string) => {};
+  doSelectedCQuery = async (cqueryId: string) => { };
 
   doJump = async (jump: JumpConfig, record_: DtmplData) => {
     let record = record_.fieldMap ? record_.fieldMap : record_;
@@ -663,13 +668,13 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       }
       url = url + searchs.join("&");
     }
-    if(jump.linkTarget == '_self'){
+    if (jump.linkTarget == '_self') {
       window.location.hash = url.substring(url.indexOf("#") + 1);
-    }else{
+    } else {
       debugger
-      if(url.indexOf("/#")==0){
-       // url=window.location.href.split("#/")[0]+url;
-        url=window.location.href.split("#/")[0]+url.substring(url.indexOf("/#")+1);
+      if (url.indexOf("/#") == 0) {
+        // url=window.location.href.split("#/")[0]+url;
+        url = window.location.href.split("#/")[0] + url.substring(url.indexOf("/#") + 1);
       }
       window.open(url);
     }
@@ -684,7 +689,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     // }
   };
 
-  blockMenuTreeDrawerOpen=(record)=>{
+  blockMenuTreeDrawerOpen = (record) => {
     this.setState({
       blockMenuTreeDrawerOpen: true,
       recordCode: record.code,
@@ -696,14 +701,14 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   renderExportButton = (title, type: ExportType, sourceId?: string) => {
-    const { pageNo, pageSize, serverKey, ltmplConfig,tableType } = this.props;
+    const { pageNo, pageSize, serverKey, ltmplConfig, tableType } = this.props;
 
     //let buttons = ltmplConfig?.buttons;
 
     const { queryKey } = this.state;
     const { translate } = this.context;
-    let exportModes:ExportMode[]=tableType =="report"?
-    ["all"]: ["current","page","all"];
+    let exportModes: ExportMode[] = tableType == "report" ?
+      ["all"] : ["current", "page", "all"];
 
     return (
       <Popover
@@ -732,8 +737,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             style={{
               // marginLeft: "5px",
             }}
-              //为了点击到没有导出模块，使组件不致销毁，丢失导出数据
-          >{type == "ltmpl-data-excel"?<ExportOutlined />:title}
+          //为了点击到没有导出模块，使组件不致销毁，丢失导出数据
+          >{type == "ltmpl-data-excel" ? <ExportOutlined /> : title}
           </Button>
         </Tooltip>
       </Popover>
@@ -802,7 +807,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   renderHeaderButtons = () => {
     let {
       hiddenColIds, viewModels, sortedColConfigs, disabledColIds, showL2Chart,
-      showL2ActTable,restatParams,
+      showL2ActTable, restatParams,
     } = this.state;
     const {
       ltmplConfig, sourceId, doCreate, doSearch, menuId,
@@ -830,7 +835,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           )}
           {buttons.includes("dtmplAdd") && doCreate && !readOnly ? (
             ltmplConfig.classAddConfigs &&
-            ltmplConfig.classAddConfigs.length > 0 ? (
+              ltmplConfig.classAddConfigs.length > 0 ? (
               <Popover
                 arrow={false}
                 content={this.getAddTmplButton(ltmplConfig.classAddConfigs)}
@@ -853,8 +858,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             ""
           )}
           {(buttons.includes("dtmplCustomAdd") || customCreatable) &&
-          doCreate &&
-          !readOnly ? (
+            doCreate &&
+            !readOnly ? (
             <Tooltip title={translate("${创建}")}>
               <Button onClick={() => doCreate(null, true)}>
                 <PlusCircleOutlined />
@@ -866,9 +871,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           {buttons.includes("importLtmplExcel") && !readOnly ? (
             <Tooltip title={translate("${导入}")}>
               <Button
-                href={`#${
-                  localStorage.getItem("version") === "v2" ? "/v2" : ""
-                }/${sourceId}/importer?menuId=${menuId}`}
+                href={`#${localStorage.getItem("version") === "v2" ? "/v2" : ""
+                  }/${sourceId}/importer?menuId=${menuId}`}
                 target={"_blank"}
               >
                 <ImportOutlined />
@@ -914,7 +918,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           )}
           {buttons.includes("reStat") && !readOnly ? (
             <Restat
-                value={restatParams}
+              value={restatParams}
               serverKey={serverKey}
               fields={ltmplConfig.reStatParams}
               sourceId={sourceId}
@@ -922,7 +926,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 this.actTableDoSearch(null);
                 this.setState({ restatParams: restatParams });
               }
-            }
+              }
             ></Restat>
           ) : (
             ""
@@ -1023,11 +1027,11 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
   checkBoxUseful = () => {
     const { ltmplConfig } = this.props;
-    let { buttons, jumps, actions,fileExports,customButtons } = ltmplConfig;
+    let { buttons, jumps, actions, fileExports, customButtons } = ltmplConfig;
     if (
       buttons.includes("batchDelete") ||
-      (actions && actions.length > 0) || (customButtons&& customButtons.length>0) ||
-      (jumps && jumps.length > 0) || (fileExports && fileExports.length>0)
+      (actions && actions.length > 0) || (customButtons && customButtons.length > 0) ||
+      (jumps && jumps.length > 0) || (fileExports && fileExports.length > 0)
     ) {
       return true;
     } else {
@@ -1036,40 +1040,40 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   actTableDoSearch = (data: object) => {
-    const {ltreeData}=this.state;
-    this.doSearch_(data,ltreeData);
+    const { ltreeData } = this.state;
+    this.doSearch_(data, ltreeData);
   }
 
-  doSearch_=async (criteriaData,ltreeData)=>{
+  doSearch_ = async (criteriaData, ltreeData) => {
     const { doSearch } = this.props;
 
     let new_serial_number = new Date().getTime();
     if (doSearch && new_serial_number - serial_number > 2000) {
       serial_number = new_serial_number;
-      await doSearch({ ...criteriaData, serial_number,...ltreeData });
+      await doSearch({ ...criteriaData, serial_number, ...ltreeData });
       //busyReminderTime=0;
-    // }else{
-    //   if(busyReminder){
-    //     if(busyReminderTime==1){
-    //       const { translate } = this.context;
-    //       message.warning(translate("${系统忙，请稍后再试}"));
-    //       busyReminderTime=0;
-    //     }else{
-    //       busyReminderTime=1;
-    //     }
+      // }else{
+      //   if(busyReminder){
+      //     if(busyReminderTime==1){
+      //       const { translate } = this.context;
+      //       message.warning(translate("${系统忙，请稍后再试}"));
+      //       busyReminderTime=0;
+      //     }else{
+      //       busyReminderTime=1;
+      //     }
       //}
-      }
+    }
   }
 
-  ltreeValueChange=async (v)=>{
-    let ltreeEntitySelect=this.getLtreeEntitySelectCriteria();
-    const {ltreeData}=this.state;
-    const {criteriaData}=this.props;
-    if(ltreeData && ltreeData["c_"+ltreeEntitySelect.id] != v ){
-      let ltreeData_={};
-      ltreeData_["c_"+ltreeEntitySelect.id]=v;
-     await this.doSearch_(criteriaData,ltreeData_);
-      this.setState({ltreeData:ltreeData_});
+  ltreeValueChange = async (v) => {
+    let ltreeEntitySelect = this.getLtreeEntitySelectCriteria();
+    const { ltreeData } = this.state;
+    const { criteriaData } = this.props;
+    if (ltreeData && ltreeData["c_" + ltreeEntitySelect.id] != v) {
+      let ltreeData_ = {};
+      ltreeData_["c_" + ltreeEntitySelect.id] = v;
+      await this.doSearch_(criteriaData, ltreeData_);
+      this.setState({ ltreeData: ltreeData_ });
     }
   }
 
@@ -1077,7 +1081,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   doSearchDirect = (data: object) => {
 
     let { doSearch } = this.props;
-    if (doSearch ) {
+    if (doSearch) {
       doSearch({ ...data, serial_number });
     }
   }
@@ -1088,17 +1092,17 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     if (new_serial_number - serial_number > 1500) {
       serial_number = new_serial_number;
       return true;
-    }else{
+    } else {
       return false;
     }
   }
 
   renderCriteriaForm = () => {
-    let { loading, selectedRows, selectedDatas,userCriteriaData } = this.state;
-    let { ltmplConfig,criteriaData, serverKey,sourceId } = this.props;
+    let { loading, selectedRows, selectedDatas, userCriteriaData } = this.state;
+    let { ltmplConfig, criteriaData, serverKey, sourceId } = this.props;
     return (
       <CriteriaForm
-          key={sourceId}
+        key={sourceId}
         serverKey={serverKey}
         loading={loading}
         selectedDatas={selectedDatas}
@@ -1125,12 +1129,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   //   return aggregateVO;
   // };
 
-  getLtreeEntitySelectCriteria=()=>{
-    let {ltmplConfig}=this.props
+  getLtreeEntitySelectCriteria = () => {
+    let { ltmplConfig } = this.props
 
-    if(ltmplConfig && ltmplConfig.criterias){
-      for(let c of ltmplConfig.criterias){
-        if(c?.extControlType=="ltree-entity-select" || c?.extControlType=="ltree-entity-select-value"){
+    if (ltmplConfig && ltmplConfig.criterias) {
+      for (let c of ltmplConfig.criterias) {
+        if (c?.extControlType == "ltree-entity-select" || c?.extControlType == "ltree-entity-select-value") {
           return c;
         }
       }
@@ -1138,17 +1142,56 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     return undefined;
   }
 
+  // 行内编辑start
+  editRowEdit = (code: string) => {
+    this.setState({ editings: [...this.state.editings, code] });
+  }
+
+  cancelRowEdit = (code: string) => {
+    this.setState({ editings: this.state.editings.filter(r => r !== code) });
+  }
+
+  // 单独提交
+  postLtmplData = async (dtmplData) => {
+    const { serverKey, sourceId } = this.props;
+    let res = await HcserviceV3.postLtmplData(
+      serverKey,
+      sourceId,
+      dtmplData,
+      message
+    );
+    if (res.status === "success") {
+      this.cancelRowEdit(dtmplData["唯一编码"]);
+      this.actTableDoSearch(undefined);
+    }
+  };
+
+  saveRowData = async (data: DtmplData) => {
+    const { code } = data;
+    let currentForm = this.formRef.current;
+    let dtmplData = { "唯一编码": code };
+    await currentForm.validateFields().then((values) => {
+      for (let key in values) {
+        if (values.hasOwnProperty(key) && key.startsWith(code)) {
+          dtmplData[key.split("_")[1]] = values[key];
+        }
+      }
+      this.postLtmplData(dtmplData);
+    });
+  }
+  // 行内编辑end
+
 
   renderContent = () => {
     let {
       queryKey, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable,
-        pageInfo,
+      pageInfo, editings
     } = this.state;
     let {
-      sourceId, ltmplConfig, funcMode,operatable,
+      sourceId, ltmplConfig, funcMode, operatable,
       title, collapsible,
       onChangePage, serverKey, criteriaData,
-      showView, doEdit, doRAction, customEditable, readOnly,tableType
+      showView, doEdit, doRAction, customEditable, readOnly, tableType
     } = this.props;
     const { translate } = this.context;
 
@@ -1162,15 +1205,18 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     let tableColumns = ColumnBuilder.buildTableColumns(
-        {ltmplConfig,operatable,
-      hiddenColIds, hiddenRowCodes, sortedColConfigs,showView,
+      {
+        ltmplConfig, operatable,
+        hiddenColIds, hiddenRowCodes, sortedColConfigs, showView,
         doEdit,
         doRAction, customEditable,
         serverKey, readOnly,
-        sourceId, translate,unHiden:this.unHiden,
-        onHide:this.onHide, doCustomButton:this.doCustomButton, doRowJump:this.doRowJump,
-          blockMenuTreeDrawerOpen:this.blockMenuTreeDrawerOpen,
-        doRowAction:this.doRowAction, doDeleteByCode:this.doDeleteByCode,sortColumns:criteriaData["sortColIds"]}
+        sourceId, translate, unHiden: this.unHiden,
+        onHide: this.onHide, doCustomButton: this.doCustomButton, doRowJump: this.doRowJump,
+        blockMenuTreeDrawerOpen: this.blockMenuTreeDrawerOpen,
+        doRowAction: this.doRowAction, doDeleteByCode: this.doDeleteByCode, sortColumns: criteriaData["sortColIds"],
+        editings, editRowEdit: this.editRowEdit, cancelRowEdit: this.cancelRowEdit, saveRowData: this.saveRowData
+      }
     );
 
     let { buttons } = ltmplConfig;
@@ -1195,7 +1241,46 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       sortColumnData.push(...criteriaData["sortColIds"]);
     }
 
-    let ltreeEntitySelect=this.getLtreeEntitySelectCriteria();
+    let ltreeEntitySelect = this.getLtreeEntitySelectCriteria();
+
+    // actTable渲染
+    const renderActTable = loading ? (
+      <Table loading={loading}></Table>
+    ) : (tableType == "report" ? <ReportTable
+      tableProps={{ scrollY: ltmplConfig.scrollY, clickDisplayTotal: !ltmplConfig.directShowTotal }}
+      serverKey={serverKey} hiddenColIds={hiddenColIds}
+      maxSelectedRows={this.checkBoxUseful() ? 1000 : -1}
+      columns={tableColumns}
+      selectedRows={selectedRows} queryKey={queryKey}
+      onChangeRowSelection={this.changeRowSelection}
+      leftFixedCols={ltmplConfig.leftFixedCols}
+    /> :
+      <QueryTable key={"querytable" + sourceId} sourceId={sourceId}
+        // queryTotal={this.queryTotal}
+        tableProps={{ scrollY: ltmplConfig.scrollY, clickDisplayTotal: !ltmplConfig.directShowTotal }}
+        serverKey={serverKey}
+        onChangePage={onChangePage}
+        viewModels={viewModels}
+        primaryColumn={ltmplConfig.primaryColumn}
+        defaultShowTotalCols={ltmplConfig.defaultShowTotalCols}
+        rowTotalCols={ltmplConfig.rowTotalCols}
+        columnConfigs={columnConfigs} summaryConfigs={ltmplConfig.totalColumnConfigs}
+        maxSelectedRows={this.checkBoxUseful() ? 10000 : -1}
+        selectedRows={selectedRows} columns={tableColumns}
+        hiddenRowCodes={hiddenRowCodes}
+        pageInfo={pageInfo}
+        queryKey={queryKey}
+        onChangeRowSelection={this.changeRowSelection}
+        subtotalXColumn={
+          ltmplConfig.subtotalXColumn == null ||
+            ltmplConfig.subtotalXColumn.length <= 0
+            ? null
+            : ltmplConfig.subtotalXColumn
+        }
+        groupIColumns={ltmplConfig.groupIColumns}
+        doSearch={this.actTableDoSearch}
+        sortColumnData={sortColumnData}
+      />);
 
     return (
       <>
@@ -1216,97 +1301,58 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           ""
         )}
         <div className="actTable">
-        <Row>
-          <Col span={24}>
-            {funcMode == "complete" || funcMode == "common" ? (
+          <Row>
+            <Col span={24}>
+              {funcMode == "complete" || funcMode == "common" ? (
                 collapsible ? null : (
-                    <span>
-                {ltmplConfig.header ? (
-                    <div
+                  <span>
+                    {ltmplConfig.header ? (
+                      <div
                         style={{ padding: "6px" }}
                         dangerouslySetInnerHTML={{ __html: ltmplConfig.header }}
-                    ></div>
-                ) : null}
-                      <h3 >
-                        <p className="act-table-title" style={{position:"relative",float: "left",marginBottom:"4px"}}> {!title
-                            ? translate("${" + ltmplConfig.title + "}")
-                            : typeof title == "string"
-                                ? translate("${" + title + "}")
-                                : title}</p>
-                        {/*<Space size={"large"} style={{marginLeft:50}}>*/}
-                        {/*{aggregateVO && aggregateVO.aggregates?*/}
-                        {/*    aggregateVO.aggregates.map(av=>{*/}
-                        {/*      return <Statistic title={av.fieldTitle} value={av.value} />*/}
-                        {/*    }):null*/}
-                        {/*}*/}
-                        {/*</Space>*/}
-                        <p className="fr" style={{marginBottom:"4px"}}>{this.renderHeaderButtons()}</p>
-                </h3>
-              </span>
+                      ></div>
+                    ) : null}
+                    <h3 >
+                      <p className="act-table-title" style={{ position: "relative", float: "left", marginBottom: "4px" }}> {!title
+                        ? translate("${" + ltmplConfig.title + "}")
+                        : typeof title == "string"
+                          ? translate("${" + title + "}")
+                          : title}</p>
+                      {/*<Space size={"large"} style={{marginLeft:50}}>*/}
+                      {/*{aggregateVO && aggregateVO.aggregates?*/}
+                      {/*    aggregateVO.aggregates.map(av=>{*/}
+                      {/*      return <Statistic title={av.fieldTitle} value={av.value} />*/}
+                      {/*    }):null*/}
+                      {/*}*/}
+                      {/*</Space>*/}
+                      <p className="fr" style={{ marginBottom: "4px" }}>{this.renderHeaderButtons()}</p>
+                    </h3>
+                  </span>
                 )
-            ) : null}
-          </Col>
-        </Row>
+              ) : null}
+            </Col>
+          </Row>
           {(<Row><Col span={24}><Layout hasSider style={{ backgroundColor: "#fff" }}>
             <Sider
-                width={ltreeEntitySelect?260:0}
-                theme={"light"}
-                style={{
-                  paddingRight: ltreeEntitySelect?'10px':"0px"
-                }}
+              width={ltreeEntitySelect ? 260 : 0}
+              theme={"light"}
+              style={{
+                paddingRight: ltreeEntitySelect ? '10px' : "0px"
+              }}
             >
-              {ltreeEntitySelect?
-               <EntryControl style={{width:"300px"}} onChange={this.ltreeValueChange} fieldConfig={ltreeEntitySelect}></EntryControl>
-              //     <NavigationTree fieldConfig={ltreeEntitySelect} />
-                  :null}
+              {ltreeEntitySelect ?
+                <EntryControl style={{ width: "300px" }} onChange={this.ltreeValueChange} fieldConfig={ltreeEntitySelect}></EntryControl>
+                //     <NavigationTree fieldConfig={ltreeEntitySelect} />
+                : null}
             </Sider>
             <Layout style={{ backgroundColor: "#fff" }}>
               <Content style={{ overflow: "initial" }}>
-
                 {displayCriteriaCard ? this.renderCriteriaForm() : null}
-
-                { loading ? (
-                    <Table loading={loading}></Table>
-                ) : (tableType =="report"?<ReportTable
-                  tableProps={{scrollY:ltmplConfig.scrollY,clickDisplayTotal:!ltmplConfig.directShowTotal}}
-                  serverKey={serverKey} hiddenColIds={hiddenColIds}
-                  maxSelectedRows={this.checkBoxUseful() ? 1000 : -1}
-                  columns={tableColumns}
-                  selectedRows={selectedRows}  queryKey={queryKey}
-                  onChangeRowSelection={this.changeRowSelection}
-                  leftFixedCols={ltmplConfig.leftFixedCols}
-              />:
-                <QueryTable key={"querytable"+sourceId} sourceId={sourceId}
-                    // queryTotal={this.queryTotal}
-
-                    tableProps={{scrollY:ltmplConfig.scrollY,clickDisplayTotal:!ltmplConfig.directShowTotal}}
-                    serverKey={serverKey}
-                    onChangePage={onChangePage}
-                    viewModels={viewModels}
-                    primaryColumn={ltmplConfig.primaryColumn}
-                    defaultShowTotalCols={ltmplConfig.defaultShowTotalCols}
-                    rowTotalCols={ltmplConfig.rowTotalCols}
-                    columnConfigs={columnConfigs} summaryConfigs={ltmplConfig.totalColumnConfigs}
-                    maxSelectedRows={this.checkBoxUseful() ? 10000 : -1}
-                    selectedRows={selectedRows} columns={tableColumns}
-                    hiddenRowCodes={hiddenRowCodes}
-                    pageInfo={pageInfo}
-                    queryKey={queryKey}
-                    onChangeRowSelection={this.changeRowSelection}
-                    subtotalXColumn={
-                      ltmplConfig.subtotalXColumn == null ||
-                      ltmplConfig.subtotalXColumn.length <= 0
-                          ? null
-                          : ltmplConfig.subtotalXColumn
-                    }
-                    groupIColumns={ltmplConfig.groupIColumns}
-                    doSearch={this.actTableDoSearch}
-                    sortColumnData={sortColumnData}
-                />) }
+                {buttons.includes("rowEdit") ? <AntdForm ref={this.formRef} component={false}>{renderActTable}</AntdForm> : renderActTable}
               </Content>
             </Layout>
           </Layout></Col></Row>
-                )}
+          )}
           {/*此处放页脚*/}
           {ltmplConfig.footer ? (
             <div
@@ -1375,7 +1421,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             }
             id={queryKey + ltmplConfig.id}
             className={`hoverable`}
-            styles={{header:{ background: "#f2f4f5" },body:{ padding: "6px" }}}
+            styles={{ header: { background: "#f2f4f5" }, body: { padding: "6px" } }}
             loading={loading}
             //暂时注释掉，后续要支持配置。
             extra={this.renderHeaderButtons()}