@cloudbase/weda-ui 3.1.3 → 3.1.4

package/dist/web/components/form/uploader/uploader.h5.js

@@ -10,7 +10,7 @@ const uploadPath = 'weda-uploader';
 /**
  * H5端
  */
-export function ImageUploaderH5({ title, maxUploadCount, maxSize = 10, acceptTypes, className, id, events, layout, defaultValue, single = false, requiredFlag = false, onChange, style, }) {
+export function ImageUploaderH5({ title, maxUploadCount, maxSize = 10, acceptTypes, className, id, events, layout, defaultValue, single = false, disabled = false, requiredFlag = false, onChange, style, }) {
     const cls = classNames({
         'weda-ui': true,
         'weui-cells': true,
@@ -123,24 +123,23 @@ export function ImageUploaderH5({ title, maxUploadCount, maxSize = 10, acceptTyp
                         React.createElement("div", { className: "weui-uploader__file-content" },
                             progress,
                             "%")))),
-                showAdd && (React.createElement("div", { className: "weui-uploader__input-box" },
-                    React.createElement("input", { id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: true, onChange: (e) => {
-                            const files = [...e.target.files];
-                            if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
-                                weui.alert('请上传不超过10M的图片');
-                                return false;
-                            }
-                            if (files.length > finalMaxImgCount) {
-                                // 防止一下子选择过多文件
-                                weui.alert(`最多只能上传${finalMaxImgCount}张图片，请重新选择`);
-                                return false;
-                            }
-                            if (fileIdList.length + files.length > finalMaxImgCount) {
-                                weui.alert(`最多只能上传${finalMaxImgCount}张图片`);
-                                return false;
-                            }
-                            files.forEach((f) => uploadToTcb(f));
-                        } })))))));
+                showAdd && (React.createElement("div", { className: "weui-uploader__input-box" }, !disabled && (React.createElement("input", { id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: true, onChange: (e) => {
+                        const files = [...e.target.files];
+                        if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
+                            weui.alert('请上传不超过10M的图片');
+                            return false;
+                        }
+                        if (files.length > finalMaxImgCount) {
+                            // 防止一下子选择过多文件
+                            weui.alert(`最多只能上传${finalMaxImgCount}张图片，请重新选择`);
+                            return false;
+                        }
+                        if (fileIdList.length + files.length > finalMaxImgCount) {
+                            weui.alert(`最多只能上传${finalMaxImgCount}张图片`);
+                            return false;
+                        }
+                        files.forEach((f) => uploadToTcb(f));
+                    } }))))))));
 }
 function SingleImage({ src, deleteBySrc }) {
     const [error, setError] = React.useState(false);

package/dist/web/components/form/uploader/uploader.pc.js

@@ -36,7 +36,7 @@ export function UploaderPC({ layout, className, id, style, title, tips, ...props
 }
 export function UploaderPCInner(props) {
     const { tips = '', btnTitle = '上传图片', maxUploadCount = 9, maxSize = 10, value: defaultValue, // 需要兼容 cloud:和https: 协议，需要兼容 字符串和字符串数组
-    acceptTypes = IMAGE_TYPES, uploadPath = 'weda-uploader', events = emptyObject, single = false, onChange, } = props;
+    acceptTypes = IMAGE_TYPES, uploadPath = 'weda-uploader', events = emptyObject, single = false, disabled = false, onChange, } = props;
     // 上传中
     const [uploading, setUploading] = React.useState(false);
     //上传进度
@@ -146,13 +146,16 @@ export function UploaderPCInner(props) {
                         "\u4E0A\u4F20",
                         progress,
                         "%..."))))),
-            React.createElement("div", { className: `${CLASS_PREFIX}__input-box` }, ((!single && fileIDList.length < maxUploadCount) ||
+            React.createElement("div", { className: `${CLASS_PREFIX}__input-box` }, disabled ? (React.createElement("li", { className: "_weda-fn-upload-result__item wedatea2td-disabled" },
+                React.createElement("div", { className: "_weda-fn-upload-result__status" },
+                    React.createElement("i", { className: "wedatea2td-icon wedatea2td-icon-plus", role: "img", "aria-label": "plus" }),
+                    React.createElement("span", { className: "wedatea2td-mt-1n wedatea2td-text-label wedatea2td-fz-reset" }, btnTitle)))) : (((!single && fileIDList.length < maxUploadCount) ||
                 (single && fileIDList.length < 1)) && ( // single 模式时，仅当数组为空时显示
             React.createElement(Upload, { ...extraProps, beforeUpload: beforeHandle },
                 React.createElement("li", { className: "_weda-fn-upload-result__item _weda-fn-upload-result__item--upload" },
                     React.createElement("div", { className: "_weda-fn-upload-result__status" },
                         React.createElement("i", { className: "wedatea2td-icon wedatea2td-icon-plus", role: "img", "aria-label": "plus" }),
-                        React.createElement("span", { className: "wedatea2td-mt-1n wedatea2td-text-label wedatea2td-fz-reset" }, btnTitle)))))))));
+                        React.createElement("span", { className: "wedatea2td-mt-1n wedatea2td-text-label wedatea2td-fz-reset" }, btnTitle))))))))));
 }
 export const TcbImage = (props) => {
     const { fileID, isZoom, ...rest } = props;

package/dist/web/components/richText/index.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { useSetState } from '../../utils/useSetState';
 import classNames from '../../utils/classnames';
 import Editor, { convertEditorStateToHTML } from 'kedao';
@@ -56,18 +56,18 @@ label, labelVisible, value: initialValue, readOnly, layout, requiredFlag, onChan
         const state = createStateFromContent(initialValue, {});
         setEditorState(state);
     }, []);
-    const extendControls = [
-        {
-            key: 'richtext-uploader',
-            type: 'component',
-            component: (React.createElement(CustomUploader, { acceptTypes: acceptTypes, maxSize: maxSize, cloudPath: cloudPath, onChange: (url) => {
-                    const state = ContentUtils.insertMedias(latestEditorState.current, [
-                        { type: 'IMAGE', url },
-                    ]);
-                    setEditorState(state);
-                } })),
-        },
-    ];
+    const extendControls = useMemo(() => {
+        return [
+            {
+                key: 'richtext-uploader',
+                type: 'component',
+                component: (React.createElement(CustomUploader, { acceptTypes: acceptTypes, maxSize: maxSize, cloudPath: cloudPath, onChange: (url) => {
+                        const state = ContentUtils.insertMedias(latestEditorState.current, [{ type: 'IMAGE', url }]);
+                        setEditorState(state);
+                    } })),
+            },
+        ];
+    }, [setEditorState, acceptTypes, maxSize, cloudPath, ContentUtils]);
     // 修改img显示逻辑
     const blockRenderFn = (contentBlock, { editor, editorState }) => {
         var _a;
@@ -263,7 +263,7 @@ export const RichTextImg = ({ contentState, block }) => {
         React.createElement("div", { className: "bf-media" },
             React.createElement("div", { draggable: "true", className: "bf-image", style: { float: 'left' } },
                 React.createElement("div", { style: { position: 'relative', display: 'inline-block' } },
-                    React.createElement("img", { src: src, key: url + Math.random(), style: { maxWidth: '100%', width }, onError: () => {
+                    React.createElement("img", { src: src, style: { maxWidth: '100%', width }, onError: () => {
                             setSrc(defaultBase64);
                             setWidth('80px');
                         } }),

package/dist/web/utils/tcb.d.ts

@@ -11,7 +11,11 @@ export function getTempFileURL(data: any): Promise<any>;
 /**
  * 云函数获取数据
  */
-export function callDataSource(param: any): Promise<any>;
+export function callDataSource(param: any, throwError?: boolean): Promise<any>;
+/**
+ * 云函数获取连接器数据
+ */
+export function callConnector(param: any, throwError?: boolean): Promise<any>;
 /**
  * 云API：获取用户自定义导航内容
  *  param

package/dist/web/utils/tcb.js

@@ -34,19 +34,42 @@ export async function getTempFileURL(data) {
 /**
  * 云函数获取数据
  */
-export async function callDataSource(param) {
+export async function callDataSource(param, throwError = false) {
     var _a, _b, _c;
-    const { params, dataSourceName, methodName } = param;
+    const { dataSourceName, methodName, params } = param;
     try {
         const res = await ((_c = (_b = (_a = window === null || window === void 0 ? void 0 : window.app) === null || _a === void 0 ? void 0 : _a.cloud) === null || _b === void 0 ? void 0 : _b.callDataSource) === null || _c === void 0 ? void 0 : _c.call(_b, {
+            dataSourceName,
+            methodName,
             params,
+        }));
+        return res;
+    }
+    catch (error) {
+        console.error('callDataSource: ', error);
+        if (throwError)
+            throw error;
+        return {};
+    }
+}
+/**
+ * 云函数获取连接器数据
+ */
+export async function callConnector(param, throwError = false) {
+    var _a, _b, _c;
+    const { dataSourceName, methodName, params } = param;
+    try {
+        const res = await ((_c = (_b = (_a = window === null || window === void 0 ? void 0 : window.app) === null || _a === void 0 ? void 0 : _a.cloud) === null || _b === void 0 ? void 0 : _b.callConnector) === null || _c === void 0 ? void 0 : _c.call(_b, {
             dataSourceName,
             methodName,
+            params,
         }));
         return res;
     }
     catch (error) {
-        console.error('错误', error);
+        console.error('callConnector: ', error);
+        if (throwError)
+            throw error;
         return {};
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -22,9 +22,9 @@
     "test": "npm run test:jest",
     "test:jest": "jest test --env=jsdom",
     "test:watch": "jest test --env=jsdom --watch",
-    "test:e2e": "npx cypress run-ct",
+    "test:e2e": "npx cypress run --component",
     "test:all": "npm run test && npm run test:e2e",
-    "e2e": "npx cypress open-ct",
+    "e2e": "npx cypress open --component",
     "pretest:all": "rimraf .nyc_output || true",
     "posttest:all": "npm run report:combined",
     "mkdir:reports": "mkdir reports || true",
@@ -81,69 +81,72 @@
     "react": ">=16.8.0"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.17.2",
-    "@babel/preset-react": "^7.17.2",
-    "@babel/preset-typescript": "^7.17.2",
-    "@cloudbase/lowcode-cli": "^0.14.0",
+    "@babel/preset-env": "^7.18.6",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/preset-typescript": "^7.18.6",
+    "@cloudbase/lowcode-cli": "^0.14.4",
     "@commitlint/cli": "^16.0.2",
     "@commitlint/config-conventional": "^17.0.0",
-    "@craco/craco": "^6.4.3",
-    "@cypress/code-coverage": "^3.9.12",
-    "@cypress/react": "^5.12.5",
-    "@cypress/webpack-dev-server": "~1.8.4",
+    "@craco/craco": "^7.0.0-alpha.7",
+    "@cypress/code-coverage": "^3.10.0",
+    "@cypress/react": "^6.0.0",
+    "@cypress/webpack-dev-server": "~2.0.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@size-limit/preset-big-lib": "^7.0.8",
-    "@storybook/addon-actions": "^6.4.9",
-    "@storybook/addon-essentials": "^6.4.9",
-    "@storybook/addon-links": "^6.4.9",
-    "@storybook/addon-storyshots": "^6.4.9",
-    "@storybook/react": "^6.4.9",
+    "@storybook/addon-actions": "^6.5.9",
+    "@storybook/addon-essentials": "^6.5.9",
+    "@storybook/addon-links": "^6.5.9",
+    "@storybook/addon-storyshots": "^6.5.9",
+    "@storybook/builder-webpack5": "^6.5.9",
+    "@storybook/manager-webpack5": "^6.5.9",
+    "@storybook/react": "^6.5.9",
     "@swc-node/jest": "^1.5.2",
-    "@testing-library/jest-dom": "^5.16.1",
-    "@testing-library/react": "^12.1.2",
-    "@testing-library/react-hooks": "^7.0.2",
+    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/react": "^12.1.5",
+    "@testing-library/react-hooks": "^8.0.1",
     "@types/jest": "^27.5.1",
     "@types/resize-observer-browser": "^0.1.7",
-    "@typescript-eslint/eslint-plugin": "^5.25.0",
-    "@typescript-eslint/parser": "^5.25.0",
+    "@typescript-eslint/eslint-plugin": "^5.30.5",
+    "@typescript-eslint/parser": "^5.30.5",
     "babel-loader": "^8.2.5",
     "babel-plugin-istanbul": "^6.1.1",
     "cross-env": "^7.0.3",
-    "cypress": "~9.6.1",
-    "eslint": "^8.15.0",
+    "cypress": "~10.3.0",
+    "eslint": "^8.19.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-tencent": "^1.0.4",
-    "eslint-import-resolver-typescript": "^2.7.1",
+    "eslint-import-resolver-typescript": "^3.2.4",
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^26.2.2",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.30.0",
+    "eslint-plugin-jest": "^26.5.3",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-rulesdir": "^0.2.1",
+    "eslint-plugin-storybook": "^0.5.13",
     "husky": "^8.0.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^27.5.1",
     "jest-canvas-mock": "^2.4.0",
     "jest-environment-jsdom": "^27",
-    "jest-preview": "^0.2.5",
+    "jest-preview": "^0.2.6",
     "miniprogram-simulate": "^1.5.7",
     "nano-staged": "^0.8.0",
     "pinst": "^3.0.0",
-    "prettier": "^2.6.2",
+    "prettier": "^2.7.1",
     "react": "^16",
     "react-dom": "^16",
-    "react-scripts": "^4.0.3",
+    "react-scripts": "^5.0.1",
     "react-test-renderer": "^16",
     "regenerator-runtime": "^0.13.9",
     "rimraf": "^3.0.2",
     "size-limit": "^7.0.8",
-    "swc-loader": "0.1.15",
-    "swc-plugin-coverage-instrument": "^0.0.6",
-    "ts-loader": "^8.2.0",
-    "typescript": "^4.6.4",
+    "swc-loader": "0.2.3",
+    "swc-plugin-coverage-instrument": "^0.0.7",
+    "ts-loader": "^9.3.1",
+    "typescript": "^4.7.4",
     "webpack": "^5.73.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "^4.9.0",
+    "webpack-cli": "^4.10.0",
+    "webpack-dev-server": "^4.9.3",
     "zx": "^5.2.0"
   },
   "nano-staged": {