aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/controls/text/ellipsis-text.tsx

@@ -1,96 +1,96 @@
-import * as React from "react";
-import Units from "../../units";
-import { Button, Popover, Card } from "antd";
-import { LocaleContext } from "../../locale/LocaleProvider";
-
-interface EllipsisTextProps {
-  isHtml?: boolean;
-  value: string;
-  showMax?: number;
-}
-
-interface EllipsisTextState {}
-
-export default class EllipsisText extends React.PureComponent<
-  EllipsisTextProps,
-  EllipsisTextState
-> {
-  state = {};
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  static defaultProps = {
-    isHtml: false,
-    showMax: 30,
-  };
-
-  toString = (value) => {
-    if (value) {
-      return value.toString();
-    } else {
-      return value;
-    }
-  };
-
-  viewButton = (val:string) => {
-    const { value, isHtml } = this.props;
-    const { translate } = this.context;
-    //debugger
-    return (
-      <>
-        <Popover
-          overlayStyle={{ maxWidth:360 }}
-          placement="leftBottom"
-          // trigger="click"
-          content={
-            // <Card bodyStyle={{padding:'0px'}}>
-            <>
-              {isHtml ? (
-                <div
-                  style={{ padding: "6px" }}
-                  dangerouslySetInnerHTML={{ __html: value }}
-                ></div>
-              ) : (
-                <div  style={{ padding: "6px" }}>{value}</div>
-              )}
-            </>
-            // </Card>
-          }
-        >
-          {/*<Button type={"link"} size={"small"}>*/}
-          {/*  {translate("${查看}")}*/}
-          {/*</Button>{" "}*/}
-         { val}
-        </Popover>
-      </>
-    );
-  };
-
-  render() {
-    const { value, isHtml, showMax } = this.props;
-
-    //debugger
-    var text = this.toString(value);
-
-    if (isHtml) {
-      var re = new RegExp("<[^<>]+>", "g");
-      text = value?.replace(re, "");
-    }
-
-    let style = Units.getLongTextStyle(text?.substring(0, showMax));
-    return (
-      <>
-        {!text?<></> :
-            text.length <= showMax || showMax <= 0 ? (
-          <span  className="infoStyle" style={style}>
-            {text}
-          </span>
-        ) : (
-          <span className="infoStyle" style={style}>
-            {this.viewButton(text.substring(0, showMax)+"...")}
-          </span>
-        )}
-      </>
-    );
-  }
-}
+import * as React from "react";
+import Units from "../../units";
+import { Button, Popover, Card } from "antd";
+import { LocaleContext } from "../../locale/LocaleProvider";
+
+interface EllipsisTextProps {
+  isHtml?: boolean;
+  value: string;
+  showMax?: number;
+}
+
+interface EllipsisTextState {}
+
+export default class EllipsisText extends React.PureComponent<
+  EllipsisTextProps,
+  EllipsisTextState
+> {
+  state = {};
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  static defaultProps = {
+    isHtml: false,
+    showMax: 30,
+  };
+
+  toString = (value) => {
+    if (value) {
+      return value.toString();
+    } else {
+      return value;
+    }
+  };
+
+  viewButton = (val:string) => {
+    const { value, isHtml } = this.props;
+    const { translate } = this.context;
+    //debugger
+    return (
+      <>
+        <Popover
+          overlayStyle={{ maxWidth:360 }}
+          placement="leftBottom"
+          // trigger="click"
+          content={
+            // <Card bodyStyle={{padding:'0px'}}>
+            <>
+              {isHtml ? (
+                <div
+                  style={{ padding: "6px" }}
+                  dangerouslySetInnerHTML={{ __html: value }}
+                ></div>
+              ) : (
+                <div  style={{ padding: "6px" }}>{value}</div>
+              )}
+            </>
+            // </Card>
+          }
+        >
+          {/*<Button type={"link"} size={"small"}>*/}
+          {/*  {translate("${查看}")}*/}
+          {/*</Button>{" "}*/}
+         { val}
+        </Popover>
+      </>
+    );
+  };
+
+  render() {
+    const { value, isHtml, showMax } = this.props;
+
+    //debugger
+    var text = this.toString(value);
+
+    if (isHtml) {
+      var re = new RegExp("<[^<>]+>", "g");
+      text = value?.replace(re, "");
+    }
+
+    let style = Units.getLongTextStyle(text?.substring(0, showMax));
+    return (
+      <>
+        {!text?<></> :
+            text.length <= showMax || showMax <= 0 ? (
+          <span  className="infoStyle" style={style}>
+            {text}
+          </span>
+        ) : (
+          <span className="infoStyle" style={style}>
+            {this.viewButton(text.substring(0, showMax)+"...")}
+          </span>
+        )}
+      </>
+    );
+  }
+}

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

@@ -1,138 +1,138 @@
-import React from "react";
-import { Button, Upload as AntdUpload, message } from "antd";
-import { UploadOutlined } from "@ant-design/icons";
-import HcserviceV3 from "./../../tmpl/hcservice-v3";
-import { EControlProps, FileValue } from "../../tmpl/interface";
-import Super from "../../tmpl/superagent";
-import { UploadFile } from "antd/es/upload/interface";
-import Units from "../../units";
-import { LocaleContext } from "../../locale/LocaleProvider";
-interface UploadProps extends EControlProps {}
-
-interface UploadState {}
-
-export default class Upload extends React.PureComponent<
-  UploadProps,
-  UploadState
-> {
-  state = {};
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  // handleRemove=(info)=>{
-  //     Modal.confirm({
-  //         title: "删除提示",
-  //         content: "您确定删除此图片吗？",
-  //         okText: "确认",
-  //         cancelText: "取消",
-  //         onOk: () => {
-  //             let fileList = []
-  //             this.props.onChange(JSON.stringify({valid:'delete'}));
-  //         },
-  //         onCancel: () => {
-  //             return false;
-  //         }
-  //     });
-  //
-  //     return false;
-  // }
-  handleRemove = (info) => {
-    this.props.onChange(JSON.stringify({ valid: "delete" }));
-  };
-  handleChange = async (info) => {
-    console.log("file change:", info);
-
-    if (info.file.status == "done") {
-      let newFile: FileValue = {
-        valid: "new",
-        fileKey: info.file.response.fileKey,
-        fileName: info.file.originFileObj.name,
-      };
-      const { onChange } = this.props;
-      onChange(JSON.stringify(newFile));
-    }
-  };
-  // triggerChange = (changedValue) => {
-  //     onChange(changedValue);
-  //     if (onChange) {
-  //       onChange(changedValue);
-  //     }
-  //   }
-
-  beforeUpload = (file) => {
-    const { translate } = this.context;
-
-    const isLt5M = file.size / 1024 / 1024 < 40;
-    if (!isLt5M) {
-      message.error(translate("${超过40M限制 不允许上传~}"),5);
-      return false;
-    } else {
-      return true;
-    }
-  };
-
-  render() {
-    const { id, itemType, disabled, value, serverKey } = this.props;
-    const { translate } = this.context;
-
-    let fileList: UploadFile[] = [];
-    if (value) {
-      let value_1: FileValue = value;
-      if (typeof value_1 == "string") {
-        value_1 = JSON.parse(value);
-      }
-      if (value_1.valid === true) {
-        fileList.push({
-          uid: "-1",
-          name: value_1.base.fileName,
-          status: "done",
-          url:
-              encodeURI(Units.joinPath(
-              Units.joinPath(Units.api(), "/v3/files"),
-              value_1.base.path
-            )) +
-            `?@token=${Units.hydrocarbonToken()}&@programToken=${Units.programCode()}&disposition=attachment`,
-        });
-      } else if (value_1.valid == "new") {
-        fileList.push({
-          uid: "-2",
-          name: value_1.fileName,
-        });
-      }
-    }
-
-    return (
-      <div>
-        <AntdUpload
-          id={id}
-          maxCount={1}
-          accept={
-            itemType === "picture"
-              ? ".png, .jpg, .jpeg"
-              : itemType === "video"
-              ? ".mp4"
-              : undefined
-          }
-          listType={itemType == "picture" ? "picture" : "text"}
-          fileList={fileList.length == 0 ? undefined : fileList}
-          disabled={disabled}
-          name={"file"}
-          headers={Super.getHeaderObj()}
-          action={(file) => HcserviceV3.postFileAction(serverKey, file)}
-          beforeUpload={this.beforeUpload}
-          onChange={this.handleChange}
-          onRemove={this.handleRemove}
-        >
-          {fileList && fileList.length >= 1 ? (
-            ""
-          ) : (
-            <Button disabled={disabled}>
-              <UploadOutlined />{" "}
-              {disabled ? translate("${无需上传}") : translate("${点击上传}")}
-            </Button>
-          )}
-        </AntdUpload>
-      </div>
-    );
-  }
-}
+import React from "react";
+import { Button, Upload as AntdUpload, message } from "antd";
+import { UploadOutlined } from "@ant-design/icons";
+import HcserviceV3 from "./../../tmpl/hcservice-v3";
+import { EControlProps, FileValue } from "../../tmpl/interface";
+import Super from "../../tmpl/superagent";
+import { UploadFile } from "antd/es/upload/interface";
+import Units from "../../units";
+import { LocaleContext } from "../../locale/LocaleProvider";
+interface UploadProps extends EControlProps {}
+
+interface UploadState {}
+
+export default class Upload extends React.PureComponent<
+  UploadProps,
+  UploadState
+> {
+  state = {};
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  // handleRemove=(info)=>{
+  //     Modal.confirm({
+  //         title: "删除提示",
+  //         content: "您确定删除此图片吗？",
+  //         okText: "确认",
+  //         cancelText: "取消",
+  //         onOk: () => {
+  //             let fileList = []
+  //             this.props.onChange(JSON.stringify({valid:'delete'}));
+  //         },
+  //         onCancel: () => {
+  //             return false;
+  //         }
+  //     });
+  //
+  //     return false;
+  // }
+  handleRemove = (info) => {
+    this.props.onChange(JSON.stringify({ valid: "delete" }));
+  };
+  handleChange = async (info) => {
+    console.log("file change:", info);
+
+    if (info.file.status == "done") {
+      let newFile: FileValue = {
+        valid: "new",
+        fileKey: info.file.response.fileKey,
+        fileName: info.file.originFileObj.name,
+      };
+      const { onChange } = this.props;
+      onChange(JSON.stringify(newFile));
+    }
+  };
+  // triggerChange = (changedValue) => {
+  //     onChange(changedValue);
+  //     if (onChange) {
+  //       onChange(changedValue);
+  //     }
+  //   }
+
+  beforeUpload = (file) => {
+    const { translate } = this.context;
+
+    const isLt5M = file.size / 1024 / 1024 < 40;
+    if (!isLt5M) {
+      message.error(translate("${超过40M限制 不允许上传~}"),5);
+      return false;
+    } else {
+      return true;
+    }
+  };
+
+  render() {
+    const { id, itemType, disabled, value, serverKey } = this.props;
+    const { translate } = this.context;
+
+    let fileList: UploadFile[] = [];
+    if (value) {
+      let value_1: FileValue = value;
+      if (typeof value_1 == "string") {
+        value_1 = JSON.parse(value);
+      }
+      if (value_1.valid === true) {
+        fileList.push({
+          uid: "-1",
+          name: value_1.base.fileName,
+          status: "done",
+          url:
+              encodeURI(Units.joinPath(
+              Units.joinPath(Units.api(), "/v3/files"),
+              value_1.base.path
+            )) +
+            `?@token=${Units.hydrocarbonToken()}&@programToken=${Units.programCode()}&disposition=attachment`,
+        });
+      } else if (value_1.valid == "new") {
+        fileList.push({
+          uid: "-2",
+          name: value_1.fileName,
+        });
+      }
+    }
+
+    return (
+      <div>
+        <AntdUpload
+          id={id}
+          maxCount={1}
+          accept={
+            itemType === "picture"
+              ? ".png, .jpg, .jpeg"
+              : itemType === "video"
+              ? ".mp4"
+              : undefined
+          }
+          listType={itemType == "picture" ? "picture" : "text"}
+          fileList={fileList.length == 0 ? undefined : fileList}
+          disabled={disabled}
+          name={"file"}
+          headers={Super.getHeaderObj()}
+          action={(file) => HcserviceV3.postFileAction(serverKey, file)}
+          beforeUpload={this.beforeUpload}
+          onChange={this.handleChange}
+          onRemove={this.handleRemove}
+        >
+          {fileList && fileList.length >= 1 ? (
+            ""
+          ) : (
+            <Button disabled={disabled}>
+              <UploadOutlined />{" "}
+              {disabled ? translate("${无需上传}") : translate("${点击上传}")}
+            </Button>
+          )}
+        </AntdUpload>
+      </div>
+    );
+  }
+}