aldehyde 0.2.160 → 0.2.163

package/src/aldehyde/detail/button/edit-button.tsx

@@ -0,0 +1,62 @@
+import React from "react";
+import { Button } from "antd";
+import { DoEditParam, DtmplData, LtmplConfig } from "../../tmpl/interface";
+import { EditOutlined } from "@ant-design/icons";
+import ActionUtils from "../../controls/action/utils";
+
+interface EditButtonProps {
+  serverKey?: string;
+  doEdit: (doEditParam: DoEditParam) => void;
+  data: DtmplData;
+  ltmplConfig: LtmplConfig;
+}
+
+const EditButton: React.FC<EditButtonProps> = (props) => {
+  const { doEdit, data, ltmplConfig } = props;
+  let button = undefined;
+  if (ltmplConfig.classEditConfigs) {
+    ltmplConfig.classEditConfigs.forEach((classEditConfig) => {
+      if (
+        !button &&
+        ActionUtils.isShow(classEditConfig.preposes, [data], undefined)
+      ) {
+        button = (
+          <Button
+            size="small"
+            type="dashed"
+            icon={<EditOutlined />}
+            onClick={() =>
+              doEdit({
+                code: data.code,
+                mode: "update",
+                dtmplSourceId: classEditConfig.id,
+              })
+            }
+          ></Button>
+        );
+      }
+    });
+  }
+
+  //   debugger
+  if (
+    !button &&
+    ActionUtils.isShow(
+      ltmplConfig.buttonEditAction?.preposes,
+      [data],
+      undefined
+    )
+  ) {
+    button = (
+      <Button
+        size="small"
+        type="dashed"
+        icon={<EditOutlined />}
+        onClick={() => doEdit({ code: data.code, mode: "update" })}
+      ></Button>
+    );
+  }
+
+  return button ? button : <></>;
+};
+export default EditButton;

package/src/aldehyde/detail/button/view-button.tsx

@@ -0,0 +1,61 @@
+import React from "react";
+import { Button } from "antd";
+import {DtmplData, LtmplConfig, ShowViewParam} from "../../tmpl/interface";
+import { AlignCenterOutlined } from "@ant-design/icons";
+import ActionUtils from "../../controls/action/utils";
+
+interface ViewButtonProps {
+  serverKey?: string;
+  showView: (showViewParam: ShowViewParam) => void;
+  data: DtmplData;
+  ltmplConfig: LtmplConfig;
+}
+
+const EditButton: React.FC<ViewButtonProps> = (props) => {
+  const { showView, data, ltmplConfig } = props;
+  let button = undefined;
+  if (ltmplConfig.classViewConfigs) {
+    ltmplConfig.classViewConfigs.forEach((classViewConfig) => {
+      if (
+        !button &&
+        ActionUtils.isShow(classViewConfig.preposes, [data], undefined)
+      ) {
+        button = (
+          <Button
+            size="small"
+            type="dashed"
+            icon={<AlignCenterOutlined />}
+            onClick={() =>
+                showView({
+                code: data.code,
+                dtmplSourceId: classViewConfig.id,
+              })
+            }
+          ></Button>
+        );
+      }
+    });
+  }
+
+  //   debugger
+  if (
+    !button &&
+    ActionUtils.isShow(
+      ltmplConfig.buttonViewAction?.preposes,
+      [data],
+      undefined
+    )
+  ) {
+    button = (
+      <Button
+        size="small"
+        type="dashed"
+        icon={<AlignCenterOutlined />}
+        onClick={() => showView({ code: data.code})}
+      ></Button>
+    );
+  }
+
+  return button ? button : <></>;
+};
+export default EditButton;

package/src/aldehyde/detail/view/act-dtmpl-view.tsx

@@ -29,6 +29,7 @@ export interface ActDtmplViewStat {
     snapshotOpen?: boolean;
     layout?: object;
     refreshCode?: string;
+    actionDtmplData?:DtmplData;
 }
 
 class ActDtmplView extends React.PureComponent<
@@ -54,17 +55,27 @@ class ActDtmplView extends React.PureComponent<
             wrapperCol: {span: 16},
         },
         refreshCode: undefined,
+        actionDtmplData:undefined,
     };
 
     async componentDidMount() {
-        const {sourceId, serverKey} = this.props;
+        const {sourceId,code, serverKey} = this.props;
         let dtmplConfig = await HCDataSource.requestViewDtmplConfig(
             serverKey,
             sourceId
         );
+        let actionDtmplData=undefined
+        if(dtmplConfig.viewActions && dtmplConfig?.viewActions.length>0){
+             actionDtmplData = await HcserviceV3.requestViewDtmplData(
+                serverKey,
+                sourceId,
+                code,null
+            );
+        }
 
         this.setState({
             dtmplConfig,
+            actionDtmplData,
         });
     }
 
@@ -149,7 +160,7 @@ class ActDtmplView extends React.PureComponent<
             loading,
             layout,
             snapshotOpen,
-            refreshCode,
+            refreshCode,actionDtmplData,
         } = this.state;
         const {translate} = this.context;
 
@@ -192,6 +203,7 @@ class ActDtmplView extends React.PureComponent<
                                         iconType={"icon-title"}
                                         hiddenType={"disabled"}
                                         //serial={serial}
+                                        data={[actionDtmplData]}
                                         key={ac.id}
                                         formRef={this.formRef}
                                         actionConfig={ac}

package/src/aldehyde/{exportor → export}/export-frame.tsx

@@ -8,12 +8,16 @@ import { LocaleContext } from "../locale/LocaleProvider";
 const RadioGroup = Radio.Group;
 type ExportStatus = "ready" | "exporting" | "success" | "fail" | "stop";
 type ExportMode = "current" | "all";
+export  type ExportType="ltmpl-data-excel"|"ltmpl-data-filedata";
+
 interface ExportFrameProps {
   defaultExportMode?: string;
   serverKey?: string;
+  sourceId?:string;
   queryKey: QueryKey;
   currentPage?: PageInfo;
   title: string;
+  type:ExportType;
 }
 
 interface ExportFrameStat {
@@ -36,6 +40,7 @@ export default class ExportFrame extends React.PureComponent<
 > {
   static defaultProps = {
     defaultExportMode: "all",
+    type:"ltmpl-data-excel",
   };
 
   state = {
@@ -86,20 +91,19 @@ export default class ExportFrame extends React.PureComponent<
   }
 
   handleStart = () => {
-    const { queryKey, currentPage, title, serverKey } = this.props;
+    const { queryKey, currentPage, title, serverKey,type,sourceId } = this.props;
     const { startPageNo, endPageNo, exportMode } = this.state;
 
-
-
     this.setState({
       exportStatus: "ready",
     });
     const { getServiceLangStr } = this.context;
     Super.super({
-      url: `/v3/ltmp/data/exporter`,
+      url: `/v3/export/${type}`,
       serverKey,
       method: "GET",
       query: {
+        sourceId,
         language:getServiceLangStr(),
         scope: exportMode,
         withDetail: false,
@@ -127,7 +131,7 @@ export default class ExportFrame extends React.PureComponent<
     const { exportStatus } = this.state;
     Super.super(
       {
-        url: `/v3/exporter/status`,
+        url: `/v3/export/status`,
         serverKey,
         query: {
           interrupted: exportStatus == "stop",
@@ -180,7 +184,7 @@ export default class ExportFrame extends React.PureComponent<
     Units.downloadFile(
       Units.joinPath(
         Units.api(serverKey),
-        `/v3/exporter/excel?exportId=${exportId}&@token=${hydrocarbonToken}&@programToken=${Units.programCode(
+        `/v3/export/download?exportId=${exportId}&@token=${hydrocarbonToken}&@programToken=${Units.programCode(
           serverKey
         )}`
       ),

package/src/aldehyde/export/select-code-export-frame.tsx

@@ -0,0 +1,218 @@
+import React from "react";
+import { Button, Progress } from "antd";
+import "./export-frame.css";
+import Super from "../tmpl/superagent";
+import Units from "../units";
+import {ButtonConfig} from "../tmpl/interface";
+import { LocaleContext } from "../locale/LocaleProvider";
+interface SelectCodeExportFrameProps {
+  serverKey?: string;
+  fileExport:ButtonConfig;
+  codes: string[];
+  title?: string;
+}
+
+interface SelectCodeExportFrameStat {
+  interrupted?: boolean;
+  exportId?: string;
+  exportMode?: string;
+  percent?: number;
+  exportStatus?: string;
+  exportingMsg?: string;
+}
+
+export default class SelectCodeExportFrame extends React.PureComponent<
+    SelectCodeExportFrameProps,
+    SelectCodeExportFrameStat
+> {
+  static defaultProps = {
+
+  };
+
+  state = {
+    interrupted: false,
+    exportId: undefined,
+    percent: 0,
+    exportStatus: "ready",
+    exportingMsg: "",
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  componentWillUnmount() {
+    console.log("销毁");
+  }
+
+  timerID = undefined;
+  setInerval = (interval) => {
+    if (this.timerID) {
+      clearInterval(this.timerID);
+    }
+    this.timerID = interval;
+  };
+
+  shouldComponentUpdate(prevProps, prevState) {
+    if(prevProps && prevProps.codes && this.props.codes){
+      if(this.props.codes!=prevProps.codes){
+        this.setState({exportStatus:'ready',percent:0,exportingMsg:""})
+      }
+    }
+    return true;
+  }
+
+  handleStart = () => {
+    const { title, serverKey,codes,fileExport } = this.props;
+    const {  } = this.state;
+
+    this.setState({
+      exportStatus: "ready",
+    });
+    const { getServiceLangStr } = this.context;
+    Super.super({
+      url: `/v3/export/ltmpl-data-filedata`,
+      serverKey,
+      method: "GET",
+      query: {
+        language:getServiceLangStr(),
+        codes: codes,
+        sourceId:fileExport.id,
+      },
+    }).then((res) => {
+      if (res.exportId) {
+        this.setState({
+          exportId: res.exportId,
+          exportStatus: "exporting",
+        });
+        this.statusOut(res.exportId);
+        this.setInerval(setInterval(() => this.statusOut(res.exportId), 2000));
+      } else {
+        this.setState({
+          exportStatus: "fail",
+        });
+      }
+    });
+  };
+  statusOut = (exportId) => {
+    const { serverKey } = this.props;
+    const { exportStatus } = this.state;
+    Super.super(
+      {
+        url: `/v3/export/status`,
+        serverKey,
+        query: {
+          interrupted: exportStatus == "stop",
+          exportId,
+        },
+        method: "GET",
+      },
+      "",
+      "none"
+    ).then((res) => {
+      if (res.status == "error") {
+        clearInterval(this.timerID);
+        console.log(res.statusMsg, this.timerID);
+        this.setState({
+          exportingMsg: res.statusMsg,
+          exportStatus: "stop",
+          percent: 0,
+        });
+      } else if (res.breaked) {
+        clearInterval(this.timerID);
+        this.setState({
+          exportingMsg: "已终止",
+          exportStatus: "stop",
+          percent: 0,
+        });
+      } else {
+        this.setState({
+          exportingMsg: res.statusMsg,
+          percent: Math.floor((res.current / res.totalCount) * 100),
+        });
+      }
+
+      if (exportStatus == "stop") {
+        clearInterval(this.timerID);
+      }
+      if (res.completed === true) {
+        clearInterval(this.timerID);
+        this.setState({
+          exportStatus: "success",
+          exportingMsg: res.statusMsg,
+          percent: Math.floor((res.current / res.totalCount) * 100),
+        });
+      }
+    });
+  };
+  download = () => {
+    const { title, serverKey } = this.props;
+    const { exportId } = this.state;
+    const hydrocarbonToken = Units.hydrocarbonToken();
+    Units.downloadFile(
+      Units.joinPath(
+        Units.api(serverKey),
+        `/v3/export/download?exportId=${exportId}&@token=${hydrocarbonToken}&@programToken=${Units.programCode(
+          serverKey
+        )}`
+      ),
+      title
+    );
+  };
+
+  handleCancel = () => {
+    this.setState({
+      percent: 0,
+      exportStatus: "stop",
+      exportId: undefined,
+    });
+  };
+
+  render() {
+    const {  } = this.props;
+    const {
+      exportStatus,
+      percent,
+      exportingMsg,
+    } = this.state;
+    const { translate } = this.context;
+
+    return (
+      <div style={{ width: "400px" }} className="exportFrame">
+        <div>
+          {exportStatus == "ready" ? (
+              <>
+            <Button type="primary" onClick={this.handleStart}>
+              {translate("${开始导出}")}
+            </Button>
+              </>
+          ) : exportStatus == "exporting" ? (
+            <Button onClick={this.handleCancel}>
+              {translate("${取消导出}")}
+            </Button>
+          ) : (
+            <Button onClick={this.handleStart}>
+              {translate("${重新导出}")}
+            </Button>
+          )}
+          {exportStatus == "success" ? (
+            <Button
+              type="primary"
+              style={{ marginLeft: 10 }}
+              disabled={exportStatus != "success"}
+              onClick={this.download}
+            >
+              {translate("${下载文件}")}
+            </Button>
+          ) : (
+            ""
+          )}
+          {percent > 0 ? (
+            <Progress percent={percent} size="small" status="active" />
+          ) : (
+            ""
+          )}
+          <p>{translate("${"+exportingMsg+"}")}</p>
+        </div>
+      </div>
+    );
+  }
+}

package/src/aldehyde/form/criteria-form.tsx

@@ -25,6 +25,7 @@ import CquickButton from "../controls/cquery/cquick-button";
 import { useLocale } from "../locale/useLocale";
 import { SearchOutlined } from "@ant-design/icons";
 import { ProgramConfig } from "../index";
+import SelectCodeExport from "../controls/file-export/select-code-export";
 
 const { Panel } = Collapse;
 const FormItem = AntdForm.Item;
@@ -69,6 +70,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
   let {
     buttons,
     actions,
+      fileExports,
     jumps,
     cQuerys,
     criterias,
@@ -129,6 +131,38 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     }
   };
 
+  const renderFileExport = () => {
+    if (doAction && fileExports && fileExports.length > 0) {
+      return fileExports.map((fileExport) => {
+        let disabled = true;
+        if (selectedRows) {
+          if (selectedRows.length > 0 && fileExport.multible) {
+            disabled = false;
+          } else if (selectedRows.length == 1) {
+            disabled = false;
+          }
+        }
+        let codes=[];
+        if(selectedDatas){
+          selectedDatas.forEach(s=>{
+            codes.push(s.code);
+          })
+        }
+
+        return (
+            <SelectCodeExport
+                serverKey={serverKey}
+                hiddenType={"disabled"}
+                codes={codes}
+                key={fileExport.id}
+                fileExport={fileExport}
+                disabled={disabled}
+            ></SelectCodeExport>
+        );
+      });
+    }
+  };
+
   const renderUpdrill = () => {
     if (updrillButtonConfigs && updrillButtonConfigs.length > 0) {
       let i = 0;
@@ -402,6 +436,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
                   {renderJump()}
                   {renderCQuery()}
                   {renderUpdrill()}
+                  { renderFileExport()}
                 </Space>
               </Space>
             </Col>

package/src/aldehyde/hooks/useVarCssColor.ts

@@ -0,0 +1,6 @@
+export const useVarCssColor = (colors: string[]) => {
+  for (let i = 0; i < colors.length; i++) {
+    const color = colors[i];
+    document.documentElement.style.setProperty(`--color-${i}`, color);
+  }
+};

package/src/aldehyde/index.tsx

@@ -113,7 +113,7 @@ import DatePicker from "./controls/date-picker";
 import ModelStrucV3 from "./tmpl/model-struc-v3";
 
 import TmplConfigAnalysis from "./tmpl/tmpl-config-analysis";
-import BlockMenuAuthTree from "./tree/block-menu-auth-tree"
+import BlockMenuAuthTree from "./tree/block-menu-auth-tree";
 
 // locale
 import { LocaleProvider } from "./locale/LocaleProvider";
@@ -167,5 +167,5 @@ export {
   LocaleProvider,
   useLocale,
   antdLangMp,
-  TmplConfigAnalysis
+  TmplConfigAnalysis,
 };

package/src/aldehyde/layout/MainPage.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Layout ,Affix} from "antd";
+import { Layout, Affix } from "antd";
 import Footer from "./footer/index";
 import { BlockMenu } from "../tmpl/interface";
 import Header from "./header";
@@ -21,8 +21,8 @@ interface MainPageProps {
   footer?: any;
   sideBartitle?: any;
   sideBarLogo?: any;
-  leftHeader?:any;
-  leftCollapsedHeader?:any;
+  leftHeader?: any;
+  leftCollapsedHeader?: any;
 }
 
 interface MainPageState {
@@ -232,7 +232,7 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
   };
 
   render() {
-    const { footer, sideBarLogo,leftHeader,leftCollapsedHeader } = this.props;
+    const { footer, sideBarLogo, leftHeader, leftCollapsedHeader } = this.props;
     const {
       collapsed,
       currentL2MenuId,
@@ -281,7 +281,9 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
               }}
               collapsed={collapsed}
             >
-              <SideBar header={leftHeader} collapsedHeader={leftCollapsedHeader}
+              <SideBar
+                header={leftHeader}
+                collapsedHeader={leftCollapsedHeader}
                 title={translate("${" + sideBartitle + "}")}
                 logo={sideBarLogo}
                 blockMenu={this.findCurrentBlock()}
@@ -299,7 +301,7 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
                     }
               }
             >
-              <Header   toggle={this.toggle} {...this.state} />
+              <Header toggle={this.toggle} {...this.state} />
               <Content
                 style={{
                   margin: "24px 16px 0",

package/src/aldehyde/layout/menu/block.css

@@ -2,6 +2,6 @@
   color: var(--antd-color-primary) !important;
 }
 
-.ant-menu > .ant-menu-submenu-selected {
+.ant-menu:has(.menu-item) > .ant-menu-submenu-selected {
   background-color: var(--antd-color-primary) !important;
 }

package/src/aldehyde/layout/menu/block.tsx

@@ -165,6 +165,7 @@ class Block extends React.PureComponent<BlockProps, BlockState> {
           flex: 1,
           minWidth: 0,
         }}
+        className="block"
       />
     );
   }