aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/controls/signature/index.tsx

@@ -1,226 +1,226 @@
-import React from "react";
-import { Button, Col, Image, Modal, Popconfirm, Row } from "antd";
-import { VEControlProps } from "../../tmpl/interface";
-import SignatureCanvas from "react-signature-canvas";
-import { HighlightOutlined } from "@ant-design/icons";
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-import { LocaleContext } from "../../locale/LocaleProvider";
-
-interface SignatureProps extends VEControlProps {}
-
-interface SignatureState {
-  modalOpen?: boolean;
-  molFileLoaded?: boolean;
-  trimmedDataURL?: any;
-}
-
-export default class Signature extends React.PureComponent<
-  SignatureProps,
-  SignatureState
-> {
-  static defaultProps = {
-    viewOrEdit: "view",
-  };
-
-  state = {
-    modalOpen: false,
-    molFileLoaded: false,
-    molFile: undefined,
-    trimmedDataURL: undefined,
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  componentDidMount() {
-    this.loadData();
-  }
-  signCanvas = undefined;
-
-  loadData = async () => {
-    const { value, serverKey } = this.props;
-    if (value) {
-      let val = JSON.parse(value);
-      let file;
-      if (val.valid == true) {
-        //此处要优化
-        if (/^image\/png;base64/.test(val.base.type)) {
-          file = await HcserviceV3.loadFileTxt(serverKey, val.base.path);
-        }
-      } else if (val.valid == "new") {
-        file = val.body;
-      } else {
-        file = undefined;
-      }
-      //console.log('file:', file);
-
-      this.setState({
-        trimmedDataURL: file,
-      });
-    }
-  };
-
-  saveMolfile = async () => {
-    let value = this.signCanvas.getTrimmedCanvas().toDataURL("image/png");
-    // let val=value.replace(/^data:image\/\w+;base64,/, "");
-    // let bytes = window.atob(val);
-    // // 处理异常,将ascii码小于0的转换为大于0
-    // let ab = new ArrayBuffer(bytes.length);
-    // // 生成视图（直接针对内存）：8位无符号整数，长度1个字节
-    // let ia = new Uint8Array(ab);
-    // for (let i = 0; i < bytes.length; i++) {
-    //     ia[i] = bytes.charCodeAt(i);
-    // }
-    // let b= new Blob([ia], {
-    //     type: 'image/png'
-    // });
-
-    //console.log('DataURL value:', value);
-    // let data =  this.signCanvas.toData();
-    // console.log('data data:', value);
-    this.triggerChange(value);
-    this.setState({
-      modalOpen: false,
-      trimmedDataURL: value,
-    });
-  };
-
-  triggerChange = (changedValue) => {
-    const { onChange } = this.props;
-    if (onChange) {
-      onChange(
-        JSON.stringify({
-          valid: "new",
-          body: changedValue,
-          suffix: "image/png;base64",
-          fileName: "signature.png",
-        })
-      );
-    }
-  };
-
-  showView = async () => {
-    this.signCanvas.clear();
-    this.signCanvas.fromDataURL(this.state.trimmedDataURL);
-    this.setState({
-      modalOpen: true,
-    });
-  };
-  onCancel = () => {
-    this.setState({
-      modalOpen: false,
-    });
-  };
-  onClear = () => {
-    this.signCanvas.clear();
-  };
-
-  render() {
-    const { id, disabled, viewOrEdit, value } = this.props;
-    const { molFile, trimmedDataURL } = this.state;
-    const { translate } = this.context;
-    return (
-      <span id={id}>
-        {trimmedDataURL ? (
-          <Image
-            width={90}
-            src={trimmedDataURL}
-            preview={{
-              src: trimmedDataURL,
-            }}
-          />
-        ) : (
-          ""
-        )}
-        {viewOrEdit == "edit" ? (
-          <Button onClick={this.showView}>
-            <HighlightOutlined />
-            {translate("${编辑}")}
-          </Button>
-        ) : (
-          ""
-        )}
-
-        <Modal
-          closable={false}
-          open={this.state.modalOpen}
-          forceRender={true}
-          centered
-          style={{
-            maxWidth: "calc(100vw - 62px)",
-            maxHeight: "calc(100vw - 50px)",
-          }}
-          width={900}
-          onCancel={() => {
-            this.onCancel();
-          }}
-          footer={
-            disabled
-              ? [
-                  <Button
-                    key={1}
-                    onClick={() => {
-                      this.onCancel();
-                    }}
-                  >
-                    {translate("${取消}")}
-                  </Button>,
-                ]
-              : [
-                  <Button
-                    key={1}
-                    onClick={() => {
-                      this.onClear();
-                    }}
-                  >
-                    {translate("${清除}")}
-                  </Button>,
-                  <Popconfirm
-                    key={2}
-                    placement="top"
-                    title={translate("${确定要取消本次编辑的数据吗}?")}
-                    onConfirm={this.onCancel}
-                    okText={translate("${确定}")}
-                    cancelText={translate("${取消}")}
-                  >
-                    <Button>{translate("${取消}")}</Button>
-                  </Popconfirm>,
-                  <Button
-                    key={3}
-                    onClick={() => {
-                      this.saveMolfile();
-                    }}
-                    type="primary"
-                  >
-                    {translate("${确定}")}
-                  </Button>,
-                ]
-          }
-          bodyStyle={{ width: "900px" }}
-        >
-          <Row
-            style={{
-              height: "430px",
-              border: "1px solid #00f",
-              maxWidth: "860px",
-              maxHeight: "calc(100vw - 80px)",
-            }}
-          >
-            <Col key={1} span={24} style={{ height: "400px" }}>
-              <SignatureCanvas
-                ref={(ref) => {
-                  this.signCanvas = ref;
-                }}
-                penColor="#000"
-                canvasProps={{
-                  width: 860,
-                  height: 400,
-                  className: "sigCanvas",
-                }}
-              ></SignatureCanvas>
-            </Col>
-          </Row>
-        </Modal>
-      </span>
-    );
-  }
-}
+import React from "react";
+import { Button, Col, Image, Modal, Popconfirm, Row } from "antd";
+import { VEControlProps } from "../../tmpl/interface";
+import SignatureCanvas from "react-signature-canvas";
+import { HighlightOutlined } from "@ant-design/icons";
+import HcserviceV3 from "../../tmpl/hcservice-v3";
+import { LocaleContext } from "../../locale/LocaleProvider";
+
+interface SignatureProps extends VEControlProps {}
+
+interface SignatureState {
+  modalOpen?: boolean;
+  molFileLoaded?: boolean;
+  trimmedDataURL?: any;
+}
+
+export default class Signature extends React.PureComponent<
+  SignatureProps,
+  SignatureState
+> {
+  static defaultProps = {
+    viewOrEdit: "view",
+  };
+
+  state = {
+    modalOpen: false,
+    molFileLoaded: false,
+    molFile: undefined,
+    trimmedDataURL: undefined,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  componentDidMount() {
+    this.loadData();
+  }
+  signCanvas = undefined;
+
+  loadData = async () => {
+    const { value, serverKey } = this.props;
+    if (value) {
+      let val = JSON.parse(value);
+      let file;
+      if (val.valid == true) {
+        //此处要优化
+        if (/^image\/png;base64/.test(val.base.type)) {
+          file = await HcserviceV3.loadFileTxt(serverKey, val.base.path);
+        }
+      } else if (val.valid == "new") {
+        file = val.body;
+      } else {
+        file = undefined;
+      }
+      //console.log('file:', file);
+
+      this.setState({
+        trimmedDataURL: file,
+      });
+    }
+  };
+
+  saveMolfile = async () => {
+    let value = this.signCanvas.getTrimmedCanvas().toDataURL("image/png");
+    // let val=value.replace(/^data:image\/\w+;base64,/, "");
+    // let bytes = window.atob(val);
+    // // 处理异常,将ascii码小于0的转换为大于0
+    // let ab = new ArrayBuffer(bytes.length);
+    // // 生成视图（直接针对内存）：8位无符号整数，长度1个字节
+    // let ia = new Uint8Array(ab);
+    // for (let i = 0; i < bytes.length; i++) {
+    //     ia[i] = bytes.charCodeAt(i);
+    // }
+    // let b= new Blob([ia], {
+    //     type: 'image/png'
+    // });
+
+    //console.log('DataURL value:', value);
+    // let data =  this.signCanvas.toData();
+    // console.log('data data:', value);
+    this.triggerChange(value);
+    this.setState({
+      modalOpen: false,
+      trimmedDataURL: value,
+    });
+  };
+
+  triggerChange = (changedValue) => {
+    const { onChange } = this.props;
+    if (onChange) {
+      onChange(
+        JSON.stringify({
+          valid: "new",
+          body: changedValue,
+          suffix: "image/png;base64",
+          fileName: "signature.png",
+        })
+      );
+    }
+  };
+
+  showView = async () => {
+    this.signCanvas.clear();
+    this.signCanvas.fromDataURL(this.state.trimmedDataURL);
+    this.setState({
+      modalOpen: true,
+    });
+  };
+  onCancel = () => {
+    this.setState({
+      modalOpen: false,
+    });
+  };
+  onClear = () => {
+    this.signCanvas.clear();
+  };
+
+  render() {
+    const { id, disabled, viewOrEdit, value } = this.props;
+    const { molFile, trimmedDataURL } = this.state;
+    const { translate } = this.context;
+    return (
+      <span id={id}>
+        {trimmedDataURL ? (
+          <Image
+            width={90}
+            src={trimmedDataURL}
+            preview={{
+              src: trimmedDataURL,
+            }}
+          />
+        ) : (
+          ""
+        )}
+        {viewOrEdit == "edit" ? (
+          <Button onClick={this.showView}>
+            <HighlightOutlined />
+            {translate("${编辑}")}
+          </Button>
+        ) : (
+          ""
+        )}
+
+        <Modal
+          closable={false}
+          open={this.state.modalOpen}
+          forceRender={true}
+          centered
+          style={{
+            maxWidth: "calc(100vw - 62px)",
+            maxHeight: "calc(100vw - 50px)",
+          }}
+          width={900}
+          onCancel={() => {
+            this.onCancel();
+          }}
+          footer={
+            disabled
+              ? [
+                  <Button
+                    key={1}
+                    onClick={() => {
+                      this.onCancel();
+                    }}
+                  >
+                    {translate("${取消}")}
+                  </Button>,
+                ]
+              : [
+                  <Button
+                    key={1}
+                    onClick={() => {
+                      this.onClear();
+                    }}
+                  >
+                    {translate("${清除}")}
+                  </Button>,
+                  <Popconfirm
+                    key={2}
+                    placement="top"
+                    title={translate("${确定要取消本次编辑的数据吗}?")}
+                    onConfirm={this.onCancel}
+                    okText={translate("${确定}")}
+                    cancelText={translate("${取消}")}
+                  >
+                    <Button>{translate("${取消}")}</Button>
+                  </Popconfirm>,
+                  <Button
+                    key={3}
+                    onClick={() => {
+                      this.saveMolfile();
+                    }}
+                    type="primary"
+                  >
+                    {translate("${确定}")}
+                  </Button>,
+                ]
+          }
+          bodyStyle={{ width: "900px" }}
+        >
+          <Row
+            style={{
+              height: "430px",
+              border: "1px solid #00f",
+              maxWidth: "860px",
+              maxHeight: "calc(100vw - 80px)",
+            }}
+          >
+            <Col key={1} span={24} style={{ height: "400px" }}>
+              <SignatureCanvas
+                ref={(ref) => {
+                  this.signCanvas = ref;
+                }}
+                penColor="#000"
+                canvasProps={{
+                  width: 860,
+                  height: 400,
+                  className: "sigCanvas",
+                }}
+              ></SignatureCanvas>
+            </Col>
+          </Row>
+        </Modal>
+      </span>
+    );
+  }
+}

package/src/aldehyde/controls/steps/index.tsx

@@ -1,59 +1,59 @@
-import React from "react";
-import { Select, Steps as AntdSteps } from "antd";
-import { VEControlProps } from "../../tmpl/interface";
-import HCDataSource from "../../tmpl/hc-data-source";
-import { useLocale } from "../../locale/useLocale";
-
-interface StepsProps extends VEControlProps {
-  options?: Array<object>;
-}
-
-const Steps: React.FC<StepsProps> = ({ viewOrEdit = "view", ...props }) => {
-  const { value, fieldConfig, onChange, options } = props;
-  const { translate } = useLocale();
-
-  let entryControl = undefined;
-
-  const changeValue = (value) => {
-    if (onChange) {
-      onChange(value);
-    }
-  };
-
-  let enumItems = HCDataSource.getEnums(fieldConfig.mstrucId);
-
-  if (enumItems === undefined)
-    console.error(`${fieldConfig.mstrucId} 枚举未找到`);
-
-  let currentIndex = undefined;
-  for (let i in enumItems) {
-    if (value == enumItems[i].value) {
-      currentIndex = parseInt(i);
-    }
-  }
-  let items = [];
-  Array.isArray(enumItems) &&
-    enumItems.map((item) => items.push({ title: item.title }));
-
-  if (fieldConfig.disabled || viewOrEdit == "view") {
-    entryControl = (
-      <AntdSteps items={items} current={currentIndex} size="small"></AntdSteps>
-    );
-  } else {
-    entryControl = (
-      <Select
-        placeholder={translate("${请选择}${" + fieldConfig.title + "}")}
-        notFoundContent={translate("${暂无选项}")}
-        allowClear={true}
-        showSearch
-        value={value}
-        onChange={changeValue}
-        options={options}
-      />
-    );
-  }
-
-  return entryControl;
-};
-
-export default Steps;
+import React from "react";
+import { Select, Steps as AntdSteps } from "antd";
+import { VEControlProps } from "../../tmpl/interface";
+import HCDataSource from "../../tmpl/hc-data-source";
+import { useLocale } from "../../locale/useLocale";
+
+interface StepsProps extends VEControlProps {
+  options?: Array<object>;
+}
+
+const Steps: React.FC<StepsProps> = ({ viewOrEdit = "view", ...props }) => {
+  const { value, fieldConfig, onChange, options } = props;
+  const { translate } = useLocale();
+
+  let entryControl = undefined;
+
+  const changeValue = (value) => {
+    if (onChange) {
+      onChange(value);
+    }
+  };
+
+  let enumItems = HCDataSource.getEnums(fieldConfig.mstrucId);
+
+  if (enumItems === undefined)
+    console.error(`${fieldConfig.mstrucId} 枚举未找到`);
+
+  let currentIndex = undefined;
+  for (let i in enumItems) {
+    if (value == enumItems[i].value) {
+      currentIndex = parseInt(i);
+    }
+  }
+  let items = [];
+  Array.isArray(enumItems) &&
+    enumItems.map((item) => items.push({ title: item.title }));
+
+  if (fieldConfig.disabled || viewOrEdit == "view") {
+    entryControl = (
+      <AntdSteps items={items} current={currentIndex} size="small"></AntdSteps>
+    );
+  } else {
+    entryControl = (
+      <Select
+        placeholder={translate("${请选择}${" + fieldConfig.title + "}")}
+        notFoundContent={translate("${暂无选项}")}
+        allowClear={true}
+        showSearch
+        value={value}
+        onChange={changeValue}
+        options={options}
+      />
+    );
+  }
+
+  return entryControl;
+};
+
+export default Steps;