aldehyde 0.2.144 → 0.2.146

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -36,6 +36,7 @@ interface ModalEditorProps extends DtmplBaseProps {
 
 interface ModalEditorState {
   id?: string;
+  queryingCode?:string;
   dtmplConfig?: DtmplConfig;
   loading?: boolean;
   serial?: number;
@@ -70,6 +71,7 @@ export default class DtmplEditPage extends React.PureComponent<
   state = {
     id: "modelDtmplEdit" + Units.getRandomNum(6),
     dtmplConfig: undefined,
+    queryingCode:undefined,
     loading: true,
     serial: 1,
     dtmplData: undefined,
@@ -124,8 +126,16 @@ export default class DtmplEditPage extends React.PureComponent<
         addTmplId
       );
     }
-
-    await this.loadData(dtmplConfig);
+    // 直接复制
+    if(dtmplConfig?.entity && dtmplConfig?.entity?.code==code){
+      this.setState({
+        dtmplData: dtmplConfig.entity,
+        id: code,
+        loading: false,
+      });
+    }else{
+      await this.loadData(dtmplConfig);
+    }
     this.setState({
       dtmplConfig,
       loading: false,
@@ -165,9 +175,11 @@ export default class DtmplEditPage extends React.PureComponent<
     if (!code && codeSource) {
       code = await HcserviceV3.queryCode(sourceId, codeSource, serverKey);
     }
+
     if (code) {
       this.setState({
         loading: true,
+        queryingCode:code,
         dtmplData:undefined,
       });
 
@@ -178,10 +190,14 @@ export default class DtmplEditPage extends React.PureComponent<
         code
       );
 
+      if( (!this.state.queryingCode  || this.state.queryingCode==dtmplData_.code) &&
+          (!dtmplData_.sourceId  || (this.props.sourceId==dtmplData_.sourceId))){
+        this.setState({
+          dtmplData: dtmplData_,
+          id: code,
+        });
+      }
       this.setState({
-        dtmplData: dtmplData_,
-        id: code,
-        //  changedGroupData:new Map<number,DtmplData[]>(),
         loading: false,
       });
     } else if (defaultDtmplData) {

package/src/aldehyde/module/embed-dtmpl-edit-page.tsx

@@ -78,7 +78,17 @@ export default class EmbedDtmplEditPage extends React.PureComponent<EmbedDtmplEd
         }else{
             dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId,addTmplId);
         }
-        await this.loadData(dtmplConfig);
+
+        if(dtmplConfig?.entity && dtmplConfig?.entity?.code==code){
+            this.setState({
+                dtmplData: dtmplConfig.entity,
+                id: code,
+                loading: false,
+            });
+        }else{
+            await this.loadData(dtmplConfig);
+        }
+
         this.setState({
             dtmplConfig,
             loading: false,

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

@@ -23,7 +23,8 @@ import {
   EyeInvisibleOutlined,
   EyeOutlined,
   FormOutlined,
-  FundOutlined, KeyOutlined,
+  FundOutlined,
+  KeyOutlined,
   LineChartOutlined,
   MenuOutlined,
   PlusCircleOutlined,
@@ -38,7 +39,8 @@ import "./index.css";
 import {
   ActTableMode,
   ActTableViewModel,
-  AddOrUpdate, BuiltInButtonName,
+  AddOrUpdate,
+  BuiltInButtonName,
   ClassifiedAddConfig,
   ColumnConfig,
   DtmplData,
@@ -116,8 +118,8 @@ interface ActTableStat {
   viewModels?: ActTableViewModel[];
   showL2ActTable?: boolean;
   showL2Chart?: boolean;
-  recordCode?:string;
-  blockMenuTreeDrawerOpen?:boolean;
+  recordCode?: string;
+  blockMenuTreeDrawerOpen?: boolean;
 }
 
 class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
@@ -136,8 +138,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     disabledColIds: undefined,
     showL2ActTable: false,
     showL2Chart: false,
-    recordCode:undefined,
-    blockMenuTreeDrawerOpen:false,
+    recordCode: undefined,
+    blockMenuTreeDrawerOpen: false,
   };
 
   static contextType = LocaleContext;
@@ -166,6 +168,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       pageSize,
       serverKey,
     } = this.props;
+
     if (!ltmplConfig) {
       return;
     }
@@ -231,18 +234,22 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       });
     }
 
+    if(!queryKey.sourceId || queryKey.sourceId==this.props.sourceId){
+      this.setState({
+        disabledColIds,
+        hiddenColIds: hiddenColIds_,
+        hiddenRowCodes,
+        sortedColConfigs,
+        queryKey,
+        showL2Chart: false,
+        selectedRows: [],
+        selectedDatas: [],
+        viewModels:
+            this.state.viewModels.length > 0 ? this.state.viewModels : ["table"],
+      });
+    }
     this.setState({
-      disabledColIds,
-      hiddenColIds: hiddenColIds_,
-      hiddenRowCodes,
-      sortedColConfigs,
-      queryKey,
       loading: false,
-      showL2Chart: false,
-      selectedRows: [],
-      selectedDatas: [],
-      viewModels:
-        this.state.viewModels.length > 0 ? this.state.viewModels : ["table"],
     });
   };
 
@@ -262,7 +269,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       sourceId,
     } = this.props;
     const { translate } = this.context;
-    const { buttons,builtInButtons } = ltmplConfig;
+    const { buttons, builtInButtons } = ltmplConfig;
     let tableColumns = [];
     let s = 0;
     let colConfigs = sortedColConfigs ? sortedColConfigs : ltmplConfig.columns;
@@ -293,7 +300,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       if (item.title === "序号") {
         column["width"] = item.colWidth ? item.colWidth : 50;
         column["title"] = translate("${序号}");
-        column["align"]='center';
+        column["align"] = "center";
         //item.fixed='left';
         column["render"] = (text, record, index) => <label>{index + 1}</label>;
         item["sorter"] = undefined;
@@ -387,19 +394,25 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             ) : (
               ""
             )}
-            {builtInButtons?.includes("blockAuthMenuTree") &&
-            !readOnly ? (
-                <Button
-                    size="small"
-                    type="dashed"
-                    icon={<KeyOutlined rotate={180} style={{color: '#f5222d', marginRight: '4px'}}/>}
-                    onClick={() => this.setState({
-                      blockMenuTreeDrawerOpen:true,
-                      recordCode:record.code
-                    }) }
-                ></Button>
+            {builtInButtons?.includes("blockAuthMenuTree") && !readOnly ? (
+              <Button
+                size="small"
+                type="dashed"
+                icon={
+                  <KeyOutlined
+                    rotate={180}
+                    style={{ color: "#f5222d", marginRight: "4px" }}
+                  />
+                }
+                onClick={() =>
+                  this.setState({
+                    blockMenuTreeDrawerOpen: true,
+                    recordCode: record.code,
+                  })
+                }
+              ></Button>
             ) : (
-                ""
+              ""
             )}
             {(buttons.includes("dtmplCustomEdit") || customEditable) &&
             doEdit &&
@@ -548,7 +561,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         column["title"] = translate("${" + item.title + "}");
         column["width"] = item.colWidth ? item.colWidth : 160;
         column["ellipsis"] = { showTitle: true };
-        column["align"]=item.valueAlign?item.valueAlign:"left";
+        column["align"] = item.valueAlign ? item.valueAlign : "left";
         if (
           ltmplConfig.leftFixedCols &&
           ltmplConfig.leftFixedCols >= currentDataColIndex
@@ -921,7 +934,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       serverKey,
       readOnly,
       pageNo,
-        pageSize
+      pageSize,
     } = this.props;
     const { translate } = this.context;
     let { buttons } = ltmplConfig;
@@ -990,8 +1003,10 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             <Popover
               content={
                 <ExportFrame //导出组件
-                    currentPage={{pageNo: pageNo ? pageNo : 1,
-                      pageSize: pageSize ? pageSize : ltmplConfig.defaultPageSize,}}
+                  currentPage={{
+                    pageNo: pageNo ? pageNo : 1,
+                    pageSize: pageSize ? pageSize : ltmplConfig.defaultPageSize,
+                  }}
                   serverKey={serverKey}
                   queryKey={queryKey}
                   title={translate("${" + ltmplConfig.title + "}")}
@@ -1312,6 +1327,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                   ? null
                   : ltmplConfig.subtotalYColumn
               }
+              groupIColumns={ltmplConfig.groupIColumns}
             />
           )}
           {/*此处放页脚*/}
@@ -1327,7 +1343,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   render() {
-    let { queryKey, loading,blockMenuTreeDrawerOpen,recordCode } = this.state;
+    let { queryKey, loading, blockMenuTreeDrawerOpen, recordCode } = this.state;
     let {
       sourceId,
       ltmplConfig,
@@ -1338,7 +1354,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     } = this.props;
     const { translate } = this.context;
 
-    if (!ltmplConfig || !sourceId ) {
+    if (!ltmplConfig || !sourceId) {
       return (
         <>
           <Card loading={loading}></Card>
@@ -1347,19 +1363,30 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       );
     }
 
+    debugger
     return (
       <>
         {" "}
         {collapsible ? (
           <CollapseCard
             initCollapse={initCollapse}
+            // title={
+            //   <>
+            //     {!title
+            //       ? translate("${" + ltmplConfig.title + "}")
+            //       : typeof title == "string"
+            //       ? translate("${" + title + "}")
+            //       : title}
+            // title={
+            //   <>
+            //     <>{!title
+            //         ?  ltmplConfig.title
+            //         : typeof title == "string"
+            //             ?  title
+            //             : title}</>
             title={
-              <>
-                {!title
-                  ? translate("${" + ltmplConfig.title + "}")
-                  : typeof title == "string"
-                  ? translate("${" + title + "}")
-                  : title}
+              <>{!title?ltmplConfig.title
+                       :  title}
                 <ToolTipBar
                   content={tip ? tip : ltmplConfig ? ltmplConfig.tip : null}
                 />
@@ -1378,15 +1405,20 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         ) : (
           <>{this.renderContent()}</>
         )}
-        <BlockMenuTreeDrawer onOk={()=>{
-          this.setState({
-            blockMenuTreeDrawerOpen:false
-          })
-        }} onCancel={()=>{
-          this.setState({
-            blockMenuTreeDrawerOpen:false
-          })
-        }} open={blockMenuTreeDrawerOpen} roleCode={recordCode}/>
+        <BlockMenuTreeDrawer
+          onOk={() => {
+            this.setState({
+              blockMenuTreeDrawerOpen: false,
+            });
+          }}
+          onCancel={() => {
+            this.setState({
+              blockMenuTreeDrawerOpen: false,
+            });
+          }}
+          open={blockMenuTreeDrawerOpen}
+          roleCode={recordCode}
+        />
       </>
     );
   }