aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/detail/button/cquery-button-bar.tsx

@@ -1,144 +1,144 @@
-import React, { RefObject } from "react";
-import "./index.css";
-import {
-  ActionConfig,
-  ButtonName,
-  CQueryConfig,
-  DtmplConfig,
-  DtmplData,
-  TmplBase,
-} from "../../tmpl/interface";
-import { Affix, Button, Popconfirm, Popover, Space } from "antd";
-import { LeftOutlined, SaveOutlined } from "@ant-design/icons";
-import CquickButton from "../../controls/cquery/cquick-button";
-import { LocaleContext } from "../../locale/LocaleProvider";
-
-interface CqueryButtonBarProps {
-  serverKey?: string;
-  dtmplConfig: DtmplConfig;
-  mainCode: string;
-}
-
-interface CqueryButtonBarState {
-  // stateSerial:number
-}
-
-class CqueryButtonBar extends React.PureComponent<
-  CqueryButtonBarProps,
-  CqueryButtonBarState
-> {
-  state = {
-    // stateSerial:0,
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  calcOffsetBottom = (cQuerys: CQueryConfig[]) => {
-    if (cQuerys.length >= 3) {
-      return 120;
-    } else if (cQuerys.length == 2) {
-      return 86;
-    } else {
-      return 80;
-    }
-  };
-
-  //  async componentDidMount() {
-  //      console.log("SubmitButtonBar this.loadData()");
-  //
-  //      console.log("SubmitButtonBar this.loadData()1");
-  //          //  if(code!=preCode || (!code && preCode)){
-  //          //     await this.loadData();
-  //          // }else{
-  //          //      formRef.current.resetFields();
-  //          //  }
-  // }
-
-  // loadData = async () => {
-  //     console.log("SubmitButtonBar this.loadData()2");
-  //     this.setState({
-  //         stateSerial: this.state.stateSerial + 1,
-  //     })
-  // }
-
-  render() {
-    const {} = this.state;
-    const { dtmplConfig, mainCode, serverKey } = this.props;
-    const { translate } = this.context;
-
-    if (!dtmplConfig) {
-      return null;
-    }
-
-    const { buttons, cQuerys } = dtmplConfig;
-    const cardList: TmplBase[] = [];
-
-    let content;
-    if (cQuerys && cQuerys.length > 3) {
-      content = (
-        <div style={{ width: "100px" }} className="btns">
-          <Space direction="vertical">
-            {cQuerys.map((item, index) => {
-              if (index > 2) {
-                return (
-                  <CquickButton
-                    serverKey={serverKey}
-                    block={true}
-                    key={item.id}
-                    mainCode={mainCode}
-                    cQueryConfig={item}
-                  ></CquickButton>
-                );
-              }
-            })}
-          </Space>
-        </div>
-      );
-    }
-    //offsetBottom={this.calcOffsetBottom(cQuerys)}
-    return cQuerys && cQuerys.length > 0 && mainCode ? (
-      <Affix
-        style={{ position: "absolute", top: 180, right: 10, maxHeight: 90 }}
-        offsetTop={300}
-      >
-        <div className={"submitButtonBar"}>
-          <ul>
-            {cQuerys
-              ? cQuerys.map((item, index) => {
-                  if (index < 3) {
-                    return (
-                      <li key={index}>
-                        <CquickButton
-                          serverKey={serverKey}
-                          type={"text"}
-                          block={true}
-                          key={item.id}
-                          mainCode={mainCode}
-                          cQueryConfig={item}
-                        ></CquickButton>
-                      </li>
-                    );
-                  }
-                })
-              : ""}
-            {//处理后面的
-            cQuerys && cQuerys.length > 2 ? (
-              <Popover placement="leftTop" content={content} trigger="hover">
-                <Button block>
-                  <LeftOutlined />
-                  {translate("${更多}")}
-                </Button>
-              </Popover>
-            ) : (
-              ""
-            )}
-          </ul>
-        </div>
-      </Affix>
-    ) : (
-      ""
-    );
-  }
-}
-
-export default CqueryButtonBar;
+import React, { RefObject } from "react";
+import "./index.css";
+import {
+  ActionConfig,
+  ButtonName,
+  CQueryConfig,
+  DtmplConfig,
+  DtmplData,
+  TmplBase,
+} from "../../tmpl/interface";
+import { Affix, Button, Popconfirm, Popover, Space } from "antd";
+import { LeftOutlined, SaveOutlined } from "@ant-design/icons";
+import CquickButton from "../../controls/cquery/cquick-button";
+import { LocaleContext } from "../../locale/LocaleProvider";
+
+interface CqueryButtonBarProps {
+  serverKey?: string;
+  dtmplConfig: DtmplConfig;
+  mainCode: string;
+}
+
+interface CqueryButtonBarState {
+  // stateSerial:number
+}
+
+class CqueryButtonBar extends React.PureComponent<
+  CqueryButtonBarProps,
+  CqueryButtonBarState
+> {
+  state = {
+    // stateSerial:0,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  calcOffsetBottom = (cQuerys: CQueryConfig[]) => {
+    if (cQuerys.length >= 3) {
+      return 120;
+    } else if (cQuerys.length == 2) {
+      return 86;
+    } else {
+      return 80;
+    }
+  };
+
+  //  async componentDidMount() {
+  //      console.log("SubmitButtonBar this.loadData()");
+  //
+  //      console.log("SubmitButtonBar this.loadData()1");
+  //          //  if(code!=preCode || (!code && preCode)){
+  //          //     await this.loadData();
+  //          // }else{
+  //          //      formRef.current.resetFields();
+  //          //  }
+  // }
+
+  // loadData = async () => {
+  //     console.log("SubmitButtonBar this.loadData()2");
+  //     this.setState({
+  //         stateSerial: this.state.stateSerial + 1,
+  //     })
+  // }
+
+  render() {
+    const {} = this.state;
+    const { dtmplConfig, mainCode, serverKey } = this.props;
+    const { translate } = this.context;
+
+    if (!dtmplConfig) {
+      return null;
+    }
+
+    const { buttons, cQuerys } = dtmplConfig;
+    const cardList: TmplBase[] = [];
+
+    let content;
+    if (cQuerys && cQuerys.length > 3) {
+      content = (
+        <div style={{ width: "100px" }} className="btns">
+          <Space direction="vertical">
+            {cQuerys.map((item, index) => {
+              if (index > 2) {
+                return (
+                  <CquickButton
+                    serverKey={serverKey}
+                    block={true}
+                    key={item.id}
+                    mainCode={mainCode}
+                    cQueryConfig={item}
+                  ></CquickButton>
+                );
+              }
+            })}
+          </Space>
+        </div>
+      );
+    }
+    //offsetBottom={this.calcOffsetBottom(cQuerys)}
+    return cQuerys && cQuerys.length > 0 && mainCode ? (
+      <Affix
+        style={{ position: "absolute", top: 180, right: 10, maxHeight: 90 }}
+        offsetTop={300}
+      >
+        <div className={"submitButtonBar"}>
+          <ul>
+            {cQuerys
+              ? cQuerys.map((item, index) => {
+                  if (index < 3) {
+                    return (
+                      <li key={index}>
+                        <CquickButton
+                          serverKey={serverKey}
+                          type={"text"}
+                          block={true}
+                          key={item.id}
+                          mainCode={mainCode}
+                          cQueryConfig={item}
+                        ></CquickButton>
+                      </li>
+                    );
+                  }
+                })
+              : ""}
+            {//处理后面的
+            cQuerys && cQuerys.length > 2 ? (
+              <Popover placement="leftTop" content={content} trigger="hover">
+                <Button block>
+                  <LeftOutlined />
+                  {translate("${更多}")}
+                </Button>
+              </Popover>
+            ) : (
+              ""
+            )}
+          </ul>
+        </div>
+      </Affix>
+    ) : (
+      ""
+    );
+  }
+}
+
+export default CqueryButtonBar;

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

@@ -1,62 +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;
+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;