@cloudbase/weda-ui 3.29.0 → 3.30.0

package/dist/web/components/form/location/components/LocationPC/location.PC.js

@@ -10,10 +10,10 @@ import MapView from '../../common/mapView';
 import SelectModal from '../../common/selectModal';
 import useLocationInfo from '../../common/useLocationInfo';
 import { propTypes, defaultProps } from '../../common/propsConfig';
-import { callDataSource } from '../../../../../utils/tcb';
 import Header from './Header';
 import { useRecycle } from '../../../../../utils/hooks/useRecycle';
 import { errorHandler } from '../../../../../utils/error';
+import { fetchLocationApiKey } from '../../common/fetchLocationApiKey';
 import './style';
 const { useState, useEffect, useRef } = React;
 export default function LocationPC(props) {
@@ -152,40 +152,30 @@ export default function LocationPC(props) {
     };
     useEffect(() => {
         // 调用API数据源方法
-        if (dataSource.name) {
-            callDataSource({
-                dataSourceName: dataSource.name,
-                methodName: 'getApiKey',
-            })
-                .then((res) => {
-                if (res.apiKey) {
-                    setAPIKEY(res.apiKey);
-                    setDataSourceStatus({
-                        status: true,
-                        message: '',
-                    });
-                    setApiKeyStatus({ status: true, message: '' });
-                }
-            })
-                .catch((error) => {
-                const { comErrorInfo } = errorHandler({
-                    code: 'WdLocation.DatasourceError',
-                    id,
-                    error,
-                });
-                events === null || events === void 0 ? void 0 : events.error({ error: comErrorInfo });
-                setDataSourceStatus({
-                    status: false,
-                    message: error,
-                });
-            });
-        }
-        else {
+        if (!dataSource.name) {
             setDataSourceStatus({
                 status: false,
                 message: '请在编辑器属性区配置地图APIs',
             });
+            return;
         }
+        fetchLocationApiKey(dataSource)
+            .then((apiKey) => {
+            if (apiKey) {
+                setAPIKEY(apiKey);
+                setDataSourceStatus({ status: true, message: '' });
+                setApiKeyStatus({ status: true, message: '' });
+            }
+        })
+            .catch((error) => {
+            const { comErrorInfo } = errorHandler({
+                code: 'WdLocation.DatasourceError',
+                id,
+                error,
+            });
+            events === null || events === void 0 ? void 0 : events.error({ error: comErrorInfo });
+            setDataSourceStatus({ status: false, message: error });
+        });
     }, [dataSource]);
     const getIsShowMap = () => {
         let status = showMap;

package/dist/web/components/index.d.ts

@@ -90,7 +90,6 @@ export { default as WdAd } from "./wd-ad";
 export { default as WdOfficialAccount } from "./wd-official-account";
 export { default as WdModal } from "./wd-modal";
 export { default as WdDrawer } from "./wd-drawer";
-export { default as Chart } from "./echart";
 export { default as WdButton } from "./wd-button";
 export { default as WdDivider } from "./wd-divider";
 export const WdTable: any;
@@ -155,4 +154,5 @@ export { default as WdStoreHome } from "./wd-store-home";
 export { default as WdStoreProduct } from "./wd-store-product";
 export { ConfigProvider } from "./wd-config-provider";
 export { default as FormDetail, default as WdFormDetail } from "./formdetail";
+export { default as Chart, default as ECharts } from "./echart";
 export { default as WdTagSelect, WdTag } from "./wd-tag";

package/dist/web/components/index.js

@@ -140,6 +140,8 @@ export { default as WdOfficialAccount } from './wd-official-account';
 export { default as WdModal } from './wd-modal';
 export { default as WdDrawer } from './wd-drawer';
 export { default as Chart } from './echart';
+// ECharts  新拖入的图表支持小程序端
+export { default as ECharts } from './echart';
 export { default as WdButton } from './wd-button';
 export { default as WdDivider } from './wd-divider';
 export const WdTable = loadable(() => import('./wd-table'), { fallback });

package/dist/web/components/wd-code-editor/wd-code-editor.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useEffect, useImperativeHandle, useMemo, useRef, useState, } from 'react';
+import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import CodeMirror from '@uiw/react-codemirror';
 import classNames from '../../utils/classnames';
 import { useConfig } from '../../utils/config-context';
@@ -12,21 +12,20 @@ import { useSetWidgetApi } from '../../utils/widget-api/use-set-widget-api';
 import { X_RUNTIME_DEFAULT } from '../../../configs/type-utils/x-runtime-default';
 import { loadLanguage, format } from './lang';
 import { themeData } from './theme';
+import { textToString } from '../../utils/platform';
 export const WdCodeEditor = React.forwardRef(function WdCodeEditor(props, ref) {
     const { name, placeholder, focus = X_RUNTIME_DEFAULT.focus, events, classRoot = 'code-editor', language = X_RUNTIME_DEFAULT.codeEditorLanguage, theme = X_RUNTIME_DEFAULT.codeEditorTheme, style, } = props;
     /** 兼容从 Form 获取属性，必须引入，自动挂载组件方法 */
     const [innerHandle, setInnerHandle] = useState({});
     const traitProps = { ...props, setInnerHandle, inputRef: ref };
     const { value: _value, onChange: onChangeForm, disabled, readOnly, validateErrorMsg, validateState, visible, } = useFormInputTrait(traitProps);
-    const value = _value !== null && _value !== void 0 ? _value : '';
+    const value = textToString(_value);
     const { classPrefix } = useConfig();
     const startWithOnProps = useMemo(() => filterPropsWithOn(props), [props]);
     const inputId = useMemo(() => getUuid(), []);
     const height = useMemo(() => {
         var _a;
-        const height = (style === null || style === void 0 ? void 0 : style.height)
-            ? `${(_a = String(style.height)) === null || _a === void 0 ? void 0 : _a.replace(/(\d+(?:\.\d+)?)(%|rem)/g, '$1')}`
-            : '200px';
+        const height = (style === null || style === void 0 ? void 0 : style.height) ? `${(_a = String(style.height)) === null || _a === void 0 ? void 0 : _a.replace(/(\d+(?:\.\d+)?)(%|rem)/g, '$1')}` : '200px';
         return height.includes('px') ? height : `${height}px`;
     }, [style === null || style === void 0 ? void 0 : style.height]);
     const size = useSize(props);

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

@@ -46,3 +46,19 @@ export declare function appCloudShowWedaToast(params: any): any;
  * 设置默认上传路径
  */
 export declare const getDefaultUploadPath: (uploadPath: any) => any;
+/**
+ * 开放APIs 查询 (apis v2)
+ * @param param.userAPIsID - APIs 连接器 ID
+ * @param param.path - 请求路径
+ * @param param.method - 请求方法，默认 'get'
+ * @param param.data - 请求数据（可选）
+ * @param param.headers - 请求头（可选）
+ * @param throwError - 是否抛出错误，默认 false
+ */
+export declare function getOpenApi(param: {
+    userAPIsID: string;
+    path: string;
+    method?: 'get' | 'post' | 'put' | 'delete' | 'patch';
+    data?: Record<string, unknown>;
+    headers?: Record<string, string>;
+}, throwError?: boolean): Promise<any>;

package/dist/web/utils/tcb.js

@@ -193,3 +193,35 @@ export const getDefaultUploadPath = (uploadPath) => {
     const _uploadPath = appName ? `${uploadPath}/${appName}` : uploadPath;
     return _uploadPath;
 };
+/**
+ * 开放APIs 查询 (apis v2)
+ * @param param.userAPIsID - APIs 连接器 ID
+ * @param param.path - 请求路径
+ * @param param.method - 请求方法，默认 'get'
+ * @param param.data - 请求数据（可选）
+ * @param param.headers - 请求头（可选）
+ * @param throwError - 是否抛出错误，默认 false
+ */
+export async function getOpenApi(param, throwError = false) {
+    var _a, _b, _c;
+    const { userAPIsID, path, method = 'get', data, headers } = param;
+    try {
+        const app = await ((_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.getCloudInstance());
+        if (!((_c = app === null || app === void 0 ? void 0 : app.apis) === null || _c === void 0 ? void 0 : _c[userAPIsID])) {
+            throw new Error(`APIs connector "${userAPIsID}" not found`);
+        }
+        const result = await app.apis[userAPIsID].request({
+            method,
+            path,
+            ...(data && { data }),
+            ...(headers && { headers }),
+        });
+        return result;
+    }
+    catch (error) {
+        errorHandler({ code: 'GetOpenApi', error });
+        if (throwError)
+            throw error;
+        return {};
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.29.0",
+  "version": "3.30.0",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -151,7 +151,7 @@
     "@babel/preset-env": "^7.22.15",
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.22.15",
-    "@cloudbase/cals": "^1.2.22",
+    "@cloudbase/cals": "^1.2.23",
     "@cloudbase/lowcode-cli": "^0.23.0",
     "@cloudbase/weda-cloud-sdk": "^1.0.108",
     "@commitlint/cli": "^16.0.2",