aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/custom-page/custom-page-router.tsx

@@ -1,76 +1,76 @@
-import React from 'react';
-import DefCustomPage from "./def-custom-page";
-import {TmplInterface,ProgramConfig} from "../index";
-import Units from "../units";
-import withRouter from "../routable/withroute";
-
-export interface CustomPageRouterProps extends TmplInterface.RouterCompProps {
-
-};
-
-export interface CustomPageRouterStat {
-
-};
-
-/**
- * 返回的对象是自定义页面的名称映射到对应的自定义页面对象
- * 只有在这里定义后，对应的页面才可以被页面渲染
- * 对象的key即自定义页面的名称
- * value是自定义页面的对象类名（需要继承CustomPage类）
- */
-// export const CUSTOM_PAGE_MAP = {
-//     '/def'  : DefCustomPage,
-//     '/lab-overview':LabsOverview,
-//     '/lab-courses':LabsCourses,
-//     'labroom001':LabWelcome,
-// }
-
-/**
- * 自定义页面的路径映射
- */
- class CustomPageRouter extends React.PureComponent<CustomPageRouterProps, CustomPageRouterStat> {
-
-    goBackToLtmpl=()=>{
-        const { sourceId,} = this.props.match.params;
-        const {basePath}=this.props;
-        let url=`${basePath?basePath+'/':""}/${sourceId}/act-table?menuId=${this.getMenuId()}`;
-        let mainCode=this.getMainCode();
-        if(mainCode){
-            url=url+`&mainCode=${mainCode}`;
-        }
-        this.props.navigate(url);
-    }
-
-    getMainCode = () => {
-        const {searchParams} = this.props;
-        // let search = location.search;
-        // let mainCode = undefined;
-        // let criteriaData = Units.transQueryStrToParams(search);
-        // if (search.indexOf('mainCode') > 0) {
-        //     criteriaData = Units.transQueryStrToParams(search);
-        //     mainCode = criteriaData['mainCode'];
-        // }
-        return searchParams.get("mainCode");
-    }
-
-    getMenuId=()=>{
-        const {searchParams} = this.props;
-        //console.log("this.props.match.params",this.props);
-        // var searchParams = new URLSearchParams( location.search);
-        let menuId = searchParams.get('menuId');
-        return menuId;
-    }
-
-    render() {
-        // console.log("CustomPageRouter",this.props);
-        let pageName = this.props.params.pageName;
-        let search = this.props.location.search;
-        let criteriaData = Units.transQueryStrToParams(search,null);
-        let Page = ProgramConfig.getCustomPage("/" + pageName) || DefCustomPage;
-
-        //console.log("CustomPageRouter",{...this.props.match.params, ...criteriaData});
-        return React.createElement(Page, {...this.props.params,goBack:this.goBackToLtmpl, ...criteriaData});
-    }
-}
-
+import React from 'react';
+import DefCustomPage from "./def-custom-page";
+import {TmplInterface,ProgramConfig} from "../index";
+import Units from "../units";
+import withRouter from "../routable/withroute";
+
+export interface CustomPageRouterProps extends TmplInterface.RouterCompProps {
+
+};
+
+export interface CustomPageRouterStat {
+
+};
+
+/**
+ * 返回的对象是自定义页面的名称映射到对应的自定义页面对象
+ * 只有在这里定义后，对应的页面才可以被页面渲染
+ * 对象的key即自定义页面的名称
+ * value是自定义页面的对象类名（需要继承CustomPage类）
+ */
+// export const CUSTOM_PAGE_MAP = {
+//     '/def'  : DefCustomPage,
+//     '/lab-overview':LabsOverview,
+//     '/lab-courses':LabsCourses,
+//     'labroom001':LabWelcome,
+// }
+
+/**
+ * 自定义页面的路径映射
+ */
+ class CustomPageRouter extends React.PureComponent<CustomPageRouterProps, CustomPageRouterStat> {
+
+    goBackToLtmpl=()=>{
+        const { sourceId,} = this.props.match.params;
+        const {basePath}=this.props;
+        let url=`${basePath?basePath+'/':""}/${sourceId}/act-table?menuId=${this.getMenuId()}`;
+        let mainCode=this.getMainCode();
+        if(mainCode){
+            url=url+`&mainCode=${mainCode}`;
+        }
+        this.props.navigate(url);
+    }
+
+    getMainCode = () => {
+        const {searchParams} = this.props;
+        // let search = location.search;
+        // let mainCode = undefined;
+        // let criteriaData = Units.transQueryStrToParams(search);
+        // if (search.indexOf('mainCode') > 0) {
+        //     criteriaData = Units.transQueryStrToParams(search);
+        //     mainCode = criteriaData['mainCode'];
+        // }
+        return searchParams.get("mainCode");
+    }
+
+    getMenuId=()=>{
+        const {searchParams} = this.props;
+        //console.log("this.props.match.params",this.props);
+        // var searchParams = new URLSearchParams( location.search);
+        let menuId = searchParams.get('menuId');
+        return menuId;
+    }
+
+    render() {
+        // console.log("CustomPageRouter",this.props);
+        let pageName = this.props.params.pageName;
+        let search = this.props.location.search;
+        let criteriaData = Units.transQueryStrToParams(search,null);
+        let Page = ProgramConfig.getCustomPage("/" + pageName) || DefCustomPage;
+
+        //console.log("CustomPageRouter",{...this.props.match.params, ...criteriaData});
+        return React.createElement(Page, {...this.props.params,goBack:this.goBackToLtmpl, ...criteriaData});
+    }
+}
+
 export default withRouter(CustomPageRouter);

package/src/aldehyde/custom-page/def-custom-page.tsx

@@ -1,17 +1,17 @@
-import React from "react";
-import { Typography } from "antd";
-import { useLocale } from "../locale/useLocale";
-const { Title } = Typography;
-
-const DefCustomPage = (props: { pageName: string }) => {
-  const { translate } = useLocale();
-  return (
-    <Typography>
-      <Title>{translate("${没有找到自定义页面}")}</Title>
-      <Title level={5}>url:/{props.pageName}</Title>
-      <Title level={5}>{translate("${请确认配置}")}</Title>
-    </Typography>
-  );
-};
-
-export default DefCustomPage;
+import React from "react";
+import { Typography } from "antd";
+import { useLocale } from "../locale/useLocale";
+const { Title } = Typography;
+
+const DefCustomPage = (props: { pageName: string }) => {
+  const { translate } = useLocale();
+  return (
+    <Typography>
+      <Title>{translate("${没有找到自定义页面}")}</Title>
+      <Title level={5}>url:/{props.pageName}</Title>
+      <Title level={5}>{translate("${请确认配置}")}</Title>
+    </Typography>
+  );
+};
+
+export default DefCustomPage;

package/src/aldehyde/custom-page/dtmpl-custom-edit-modal-page.tsx

@@ -1,87 +1,87 @@
-import React, { ReactNode } from "react";
-import { Button, Drawer, Modal, Popconfirm, Space } from "antd";
-import DefCustomPage from "./def-custom-page";
-import { ProgramConfig } from "../index";
-import { LocaleContext } from "../locale/LocaleProvider";
-
-interface DtmplCustomEditModalPageProps {
-  serverKey?: string;
-  height?: any;
-  width?: number;
-  bodyWidth?: number | string;
-  open: boolean;
-  onOk: () => void;
-  title?: ReactNode;
-  code?: string; //详情模板code，添加时code为null
-  mainCode?: string; //模块名称
-  sourceId: string;
-  customPath: string;
-}
-
-interface DtmplCustomEditModalPageState {}
-
-export default class DtmplCustomEditModalPage extends React.PureComponent<
-  DtmplCustomEditModalPageProps,
-  DtmplCustomEditModalPageState
-> {
-  state = {};
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  static defaultProps = {
-    height: "82vh",
-    width: "82vw",
-    bodyWidth: "100%",
-    forceRender: true,
-    style: { maxWidth: "calc(100vw - 60px)", maxHeight: "calc(100vh - 50px)" },
-  };
-
-  getFooter = () => {
-    const { onOk } = this.props;
-    const { translate } = this.context;
-    const footerButtons = [];
-    footerButtons.unshift(
-      <Button onClick={onOk} type={"primary"}>
-        {translate("${关闭}")}
-      </Button>
-    );
-    return footerButtons;
-  };
-
-  customPage = () => {
-    const { code, sourceId, open, mainCode, customPath, onOk } = this.props;
-    if (open) {
-      let Page = ProgramConfig.getCustomPage(customPath) || DefCustomPage;
-      return React.createElement(Page, {
-        code,
-        sourceId,
-        mainCode,
-        pageName: customPath,
-        onOk,
-      });
-    }
-  };
-
-  render() {
-    const { height, onOk, open, width, title, bodyWidth } = this.props;
-    const { translate } = this.context;
-
-    return (
-      <Modal
-        open={open}
-        width={width}
-        title={title}
-        closable={false}
-        bodyStyle={{ height: height, width: bodyWidth, overflow: "auto" }}
-        destroyOnClose={true}
-        centered
-        onCancel={onOk}
-        footer={[
-          <Button onClick={() => onOk()}>{translate("${关闭}")}</Button>,
-        ]}
-      >
-        {this.customPage()}
-      </Modal>
-    );
-  }
-}
+import React, { ReactNode } from "react";
+import { Button, Drawer, Modal, Popconfirm, Space } from "antd";
+import DefCustomPage from "./def-custom-page";
+import { ProgramConfig } from "../index";
+import { LocaleContext } from "../locale/LocaleProvider";
+
+interface DtmplCustomEditModalPageProps {
+  serverKey?: string;
+  height?: any;
+  width?: number;
+  bodyWidth?: number | string;
+  open: boolean;
+  onOk: () => void;
+  title?: ReactNode;
+  code?: string; //详情模板code，添加时code为null
+  mainCode?: string; //模块名称
+  sourceId: string;
+  customPath: string;
+}
+
+interface DtmplCustomEditModalPageState {}
+
+export default class DtmplCustomEditModalPage extends React.PureComponent<
+  DtmplCustomEditModalPageProps,
+  DtmplCustomEditModalPageState
+> {
+  state = {};
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  static defaultProps = {
+    height: "82vh",
+    width: "82vw",
+    bodyWidth: "100%",
+    forceRender: true,
+    style: { maxWidth: "calc(100vw - 60px)", maxHeight: "calc(100vh - 50px)" },
+  };
+
+  getFooter = () => {
+    const { onOk } = this.props;
+    const { translate } = this.context;
+    const footerButtons = [];
+    footerButtons.unshift(
+      <Button onClick={onOk} type={"primary"}>
+        {translate("${关闭}")}
+      </Button>
+    );
+    return footerButtons;
+  };
+
+  customPage = () => {
+    const { code, sourceId, open, mainCode, customPath, onOk } = this.props;
+    if (open) {
+      let Page = ProgramConfig.getCustomPage(customPath) || DefCustomPage;
+      return React.createElement(Page, {
+        code,
+        sourceId,
+        mainCode,
+        pageName: customPath,
+        onOk,
+      });
+    }
+  };
+
+  render() {
+    const { height, onOk, open, width, title, bodyWidth } = this.props;
+    const { translate } = this.context;
+
+    return (
+      <Modal
+        open={open}
+        width={width}
+        title={title}
+        closable={false}
+        bodyStyle={{ height: height, width: bodyWidth, overflow: "auto" }}
+        destroyOnClose={true}
+        centered
+        onCancel={onOk}
+        footer={[
+          <Button onClick={() => onOk()}>{translate("${关闭}")}</Button>,
+        ]}
+      >
+        {this.customPage()}
+      </Modal>
+    );
+  }
+}

package/src/aldehyde/detail/button/bottom-submit-button-bar.tsx

@@ -1,90 +1,90 @@
-import React from "react";
-import "./index.css";
-import { TmplBase } from "../../../aldehyde/tmpl/interface";
-import { Button, Card, Col, Row, Space } from "antd";
-import { SaveOutlined } from "@ant-design/icons";
-import Action from "../../controls/action";
-import { SubmitButtonProps } from "./submit-button-bar";
-import { LocaleContext } from "../../locale/LocaleProvider";
-
-interface BottomSubmitButtonBarProps extends SubmitButtonProps {}
-
-interface BottomSubmitButtonState {
-  // stateSerial:number
-}
-
-class BottomSubmitButtonBar extends React.PureComponent<
-  BottomSubmitButtonBarProps,
-  BottomSubmitButtonState
-> {
-  state = {
-    // stateSerial:0,
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  render() {
-    const {} = this.state;
-    const {
-      dtmplConfig,
-      position,
-      doSubmit,
-      formRef,
-      serial,
-      serverKey,
-      dtmplData,
-    } = this.props;
-    const { buttons, actions } = dtmplConfig;
-    const { translate } = this.context;
-
-    return (
-      <Card bordered={false}>
-        <Row
-          align={"middle"}
-          justify={
-            position == "bottomLeft"
-              ? "start"
-              : position == "bottomRight"
-              ? "end"
-              : "center"
-          }
-        >
-          <Space>
-            {buttons.includes("dtmplSave") ? (
-              <Col>
-                <Button
-                  onClick={() => doSubmit()}
-                  type="primary"
-                  icon={<SaveOutlined />}
-                  key="btn"
-                  block
-                >
-                  {translate("${保存}")}
-                </Button>
-              </Col>
-            ) : null}
-            {actions
-              ? actions.map((item, index) => {
-                  return (
-                    <Col>
-                      <Action
-                        serverKey={serverKey}
-                        serial={serial}
-                        key={item.id}
-                        data={[dtmplData]}
-                        formRef={formRef}
-                        actionConfig={item}
-                        doAction={doSubmit}
-                      ></Action>
-                    </Col>
-                  );
-                })
-              : ""}
-          </Space>
-        </Row>
-      </Card>
-    );
-  }
-}
-
-export default BottomSubmitButtonBar;
+import React from "react";
+import "./index.css";
+import { TmplBase } from "../../../aldehyde/tmpl/interface";
+import { Button, Card, Col, Row, Space } from "antd";
+import { SaveOutlined } from "@ant-design/icons";
+import Action from "../../controls/action";
+import { SubmitButtonProps } from "./submit-button-bar";
+import { LocaleContext } from "../../locale/LocaleProvider";
+
+interface BottomSubmitButtonBarProps extends SubmitButtonProps {}
+
+interface BottomSubmitButtonState {
+  // stateSerial:number
+}
+
+class BottomSubmitButtonBar extends React.PureComponent<
+  BottomSubmitButtonBarProps,
+  BottomSubmitButtonState
+> {
+  state = {
+    // stateSerial:0,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  render() {
+    const {} = this.state;
+    const {
+      dtmplConfig,
+      position,
+      doSubmit,
+      formRef,
+      serial,
+      serverKey,
+      dtmplData,
+    } = this.props;
+    const { buttons, actions } = dtmplConfig;
+    const { translate } = this.context;
+
+    return (
+      <Card bordered={false}>
+        <Row
+          align={"middle"}
+          justify={
+            position == "bottomLeft"
+              ? "start"
+              : position == "bottomRight"
+              ? "end"
+              : "center"
+          }
+        >
+          <Space>
+            {buttons.includes("dtmplSave") ? (
+              <Col>
+                <Button
+                  onClick={() => doSubmit()}
+                  type="primary"
+                  icon={<SaveOutlined />}
+                  key="btn"
+                  block
+                >
+                  {translate("${保存}")}
+                </Button>
+              </Col>
+            ) : null}
+            {actions
+              ? actions.map((item, index) => {
+                  return (
+                    <Col>
+                      <Action
+                        serverKey={serverKey}
+                        serial={serial}
+                        key={item.id}
+                        data={[dtmplData]}
+                        formRef={formRef}
+                        actionConfig={item}
+                        doAction={doSubmit}
+                      ></Action>
+                    </Col>
+                  );
+                })
+              : ""}
+          </Space>
+        </Row>
+      </Card>
+    );
+  }
+}
+
+export default BottomSubmitButtonBar;