@ecoding/components.antd 0.2.37 → 0.3.0

package/lib/core/multiple-upload/index.js

@@ -13,7 +13,6 @@ import { UploadOutlined, LinkOutlined, DeleteOutlined, EllipsisOutlined } from '
 import { buildURL } from '@ecoding/helper.url';
 import Toast from "../../core/toast";
 import Loading from "../../core/loading";
-import http from "../../helpers/http";
 const InfosRender = ({ infos, setInfos }) => {
     const remove = (i) => {
         const temp = infos.concat([]);
@@ -41,15 +40,12 @@ const SingleFileUpload = (props) => {
     const [infos, setInfos] = useState([]);
     const [open, setOpen] = useState(undefined);
     const timeout = useRef();
-    const r = http.getRequest();
     const action = useMemo(() => {
         if (typeof props.action === "string") {
-            return /^http|^\/\//i.test(props.action)
-                ? buildURL(props.action, props.actionParams)
-                : buildURL(`${r.domain}${props.action}`, props.actionParams);
+            return buildURL(props.action, props.actionParams);
         }
-        return props.action();
-    }, [props.actionParams]);
+        return buildURL(props.action(), props.actionParams);
+    }, [props.actionParams, props.action]);
     const handleChange = (info, type) => {
         var _a, _b;
         switch (info.file.status) {

package/lib/core/single-file-upload/index.js

@@ -12,18 +12,14 @@ import { Upload, message, Button, Input, Space } from "antd";
 import { UploadOutlined } from "@ant-design/icons";
 import { buildURL } from "@ecoding/helper.url";
 import Toast from "../../core/toast";
-import http from "../../helpers/http";
 const SingleFileUpload = (props) => {
-    const r = http.getRequest();
     const [fileUrl, setFileUrl] = useState('');
     const action = useMemo(() => {
         if (typeof props.action === "string") {
-            return /^http|^\/\//i.test(props.action)
-                ? buildURL(props.action, props.actionParams)
-                : buildURL(`${r.domain}${props.action}`, props.actionParams);
+            return buildURL(props.action, props.actionParams);
         }
-        return props.action();
-    }, [props.actionParams]);
+        return buildURL(props.action(), props.actionParams);
+    }, [props.actionParams, props.action]);
     const handleChange = (info) => {
         // props.onChange && props.onChange(info.file);
         switch (info.file.status) {

package/lib/core/single-img-upload/index.js

@@ -12,19 +12,15 @@ import { Upload, message, Space } from "antd";
 import { LoadingOutlined, PlusOutlined, DeleteOutlined } from "@ant-design/icons";
 import { buildURL } from "@ecoding/helper.url";
 import Toast from "../../core/toast";
-import http from "../../helpers/http";
 const ImgUpload = (props) => {
-    const r = http.getRequest();
     const [loading, setLoading] = useState(false);
     const [imageUrl, setImageUrl] = useState(props.value || "");
     const action = useMemo(() => {
         if (typeof props.action === "string") {
-            return /^http|^\/\//i.test(props.action)
-                ? buildURL(props.action, props.actionParams)
-                : buildURL(`${r.domain}${props.action}`, props.actionParams);
+            return buildURL(props.action, props.actionParams);
         }
-        return props.action();
-    }, [props.actionParams]);
+        return buildURL(props.action(), props.actionParams);
+    }, [props.actionParams, props.action]);
     const getBase64 = useCallback((imgFile) => {
         return new Promise((resolve) => {
             const reader = new FileReader();

package/lib/index.d.ts

@@ -18,5 +18,4 @@ export { default as FormList } from "./core/form.list";
 export { default as AsyncSelect } from "./core/async-select";
 export { default as AsyncTransfer } from "./core/async-transfer";
 export { default as TablePro } from "./core/table-pro";
-export { default as Quill } from "./core/quill";
 export { default as http } from "./helpers/http";

package/lib/index.js

@@ -18,5 +18,4 @@ export { default as FormList } from "./core/form.list";
 export { default as AsyncSelect } from "./core/async-select";
 export { default as AsyncTransfer } from "./core/async-transfer";
 export { default as TablePro } from "./core/table-pro";
-export { default as Quill } from "./core/quill";
 export { default as http } from "./helpers/http";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.2.37",
+    "version": "0.3.0",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -24,25 +24,24 @@
         "build": "rm -rf lib && tsc"
     },
     "peerDependencies": {
-        "@ecoding/helper.event": ">=0.0.2",
-        "@ecoding/helper.is": ">=0.0.4",
-        "@ecoding/helper.json": ">=0.0.5",
-        "@ecoding/helper.request.hook": ">=0.0.6",
-        "@ecoding/helper.url": ">=0.0.5",
-        "antd": ">=5.1.2",
+        "@ecoding/helper.event": "*",
+        "@ecoding/helper.is": "*",
+        "@ecoding/helper.json": "*",
+        "@ecoding/helper.request": "*",
+        "@ecoding/helper.request.hook": "*",
+        "@ecoding/helper.url": "*",
+        "antd": ">=5.8.4",
         "axios": ">=1.1.2"
     },
     "devDependencies": {
-        "@ecoding/helper.event": "^0.0.2",
-        "@ecoding/helper.is": "^0.0.4",
-        "@ecoding/helper.json": "^0.0.5",
-        "@ecoding/helper.request.hook": "^0.0.6",
-        "@ecoding/helper.url": "^0.0.5",
+        "@ecoding/helper.event": "*",
+        "@ecoding/helper.is": "*",
+        "@ecoding/helper.json": "*",
+        "@ecoding/helper.request": "*",
+        "@ecoding/helper.request.hook": "*",
+        "@ecoding/helper.url": "*",
         "antd": "^5.8.4",
         "axios": "^1.1.2"
     },
-    "dependencies": {
-        "react-quill": "^2.0.0"
-    },
-    "gitHead": "4168d23cb6d60d5e7c3e38794d26ea48a5758dbc"
+    "gitHead": "4f377d30d902349469ba97c8ee98c49b0d576c4a"
 }

package/lib/core/quill/index.d.ts

@@ -1,13 +0,0 @@
-import React from "react";
-interface IProps {
-    action?: string;
-    value?: string;
-    className?: string;
-    style?: any;
-    onChange?: any;
-    gif?: boolean;
-    size?: number;
-    disabled?: boolean;
-}
-declare const Quill: React.FC<IProps>;
-export default Quill;

package/lib/core/quill/index.js

@@ -1,137 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import React, { useMemo, useCallback, useState, useRef, lazy } from "react";
-import { Upload, message } from "antd";
-import Toast from "../../core/toast";
-import http from "../../helpers/http";
-const ReactQuill = lazy(() => import(/* webpackChunkName: "ReactQuill" */ /* webpackPrefetch: true */ "react-quill"));
-const Quill = (props) => {
-    const r = http.getRequest();
-    const upRef = useRef();
-    const quillRef = useRef();
-    const [urlParams, setUrlParams] = useState("");
-    const modules = useMemo(() => {
-        return {
-            toolbar: {
-                container: [
-                    ["bold", "italic", "underline", "strike"],
-                    ["blockquote", "code-block"],
-                    [{ header: 1 }, { header: 2 }],
-                    [{ list: "ordered" }, { list: "bullet" }],
-                    [{ script: "sub" }, { script: "super" }],
-                    [{ indent: "-1" }, { indent: "+1" }],
-                    [{ direction: "rtl" }],
-                    [{ size: ["small", false, "large", "huge"] }],
-                    [{ header: [1, 2, 3, 4, 5, 6, false] }],
-                    [{ color: [] }, { background: [] }],
-                    [{ font: [] }],
-                    [{ align: [] }],
-                    ["link", "image"],
-                    ["clean"]
-                ],
-                handlers: {
-                    image: (value) => {
-                        if (value) {
-                            // ref.current && upRef.current.upload.uploader.uploadFiles([file]);
-                            upRef.current && upRef.current.upload.uploader.fileInput.click();
-                        }
-                        else {
-                            quillRef.current.format("image", false);
-                        }
-                    }
-                }
-            }
-        };
-    }, []);
-    const getBase64 = useCallback((imgFile) => {
-        return new Promise((resolve) => {
-            const reader = new FileReader();
-            reader.addEventListener("load", () => resolve(reader.result));
-            reader.readAsDataURL(imgFile);
-        });
-    }, []);
-    const getImgwh = useCallback((base64) => {
-        return new Promise((resolve, reject) => {
-            const img = new Image();
-            img.onload = () => {
-                // 宽度固定
-                resolve({
-                    w: img.width,
-                    h: img.height
-                });
-            };
-            img.onerror = () => reject();
-            img.src = base64;
-        });
-    }, []);
-    const beforeUpload = useCallback((file) => {
-        return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
-            const ary = ["jpg", "jpeg", "png"];
-            if (props.gif) {
-                ary.push("gif");
-            }
-            const isLt2M = file.size / 1024 / 1024 < (props.size || 1);
-            if (!isLt2M) {
-                message.error(`图片大小必须小于${props.size} MB!`);
-                reject();
-            }
-            if (ary.indexOf(file.type.toLowerCase().replace(/image\//g, "")) === -1) {
-                message.error(`请上传 ${ary.join(",")} 格式的图片!`);
-                reject();
-            }
-            const base64 = yield getBase64(file);
-            const wh = yield getImgwh(base64);
-            setUrlParams(`height=${wh.h}`);
-            resolve();
-        }));
-    }, []);
-    const handleChange = (info) => {
-        switch (info.file.status) {
-            case "uploading":
-                break;
-            case "done":
-                const url = info.file.response.data && info.file.response.data[0].imageUrl;
-                // setImageUrl(url);
-                // 获取富文本组件实例
-                const quill = quillRef.current.getEditor();
-                // 获取光标所在位置
-                const length = quill.getSelection().index;
-                // 插入图片，res为服务器返回的图片链接地址
-                quill.insertEmbed(length, "image", url);
-                // 调整光标到最后
-                quill.setSelection(length + 1);
-                break;
-            case "error":
-                Toast.error({
-                    mask: true,
-                    title: info.file.response
-                        ? info.file.response.retDesc || info.file.response.desc || info.file.response.message
-                        : "服务出错，图片上传失败"
-                });
-                break;
-            default:
-                break;
-        }
-    };
-    const action = /^http|^\/\//i.test(props.action) ? `${props.action}?${urlParams}` : `${r.domain}${props.action}?${urlParams}`;
-    return (React.createElement(React.Suspense, { fallback: null },
-        React.createElement(ReactQuill, { onChange: props.onChange, defaultValue: props.value, ref: quillRef, modules: modules, theme: "snow", className: props.className, style: props.style }),
-        React.createElement("span", { style: { display: "none" } },
-            React.createElement(Upload, { ref: upRef, withCredentials: true, beforeUpload: beforeUpload, name: "file", listType: "picture-card", showUploadList: false, action: action, onChange: handleChange }))));
-};
-Quill.defaultProps = {
-    action: "/upload/img",
-    value: "",
-    gif: false,
-    size: 1,
-    className: "",
-    style: {}
-};
-export default Quill;