@cloudbase/weda-ui 3.4.8 → 3.4.9

package/dist/web/utils/getModelParams.js

@@ -0,0 +1,32 @@
+import { getWhereList, getParseValue } from './platform';
+/**
+ * 兼容新旧查询条件协议
+ */
+export const convertWhere = (props) => {
+    let where;
+    try {
+        where = props.queryCondition || getWhereList(props.where);
+        where = getParseValue(where);
+    }
+    catch (e) { }
+    return Array.isArray(where) ? where : [];
+};
+/**
+ * 获取tcb查询条件
+ */
+export const getModelParams = (props) => {
+    const params = {};
+    try {
+        const where = convertWhere(props);
+        const { orderBy, orderType } = props || {};
+        if (orderBy && ['asc', 'desc'].includes(orderType)) {
+            params['orderBy'] = orderBy;
+            params['orderType'] = orderType;
+        }
+        if (Array.isArray(where) && where.length > 0) {
+            params['where'] = where;
+        }
+    }
+    catch (e) { }
+    return params;
+};

package/dist/web/utils/hooks/CreatePortal.js

@@ -1,6 +1,7 @@
-import React, { useRef } from 'react';
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { useRef } from 'react';
 import ReactDOM from 'react-dom';
 export function CreatePortal(props) {
     const container = useRef(document.querySelector('body'));
-    return (React.createElement(React.Fragment, null, ReactDOM.createPortal(React.createElement("div", { style: { zIndex: 1001, position: 'relative' } }, props.children), container.current)));
+    return (_jsx(_Fragment, { children: ReactDOM.createPortal(_jsx("div", { "data-testid": "portal-container", style: { zIndex: 1001, position: 'relative' }, className: props.className, children: props.children }), container.current) }));
 }

package/dist/web/utils/hooks/EnumHoc.js

@@ -1,4 +1,5 @@
-import React, { useState, useEffect } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useState, useEffect } from 'react';
 import { callWedaApi } from '../tcb';
 import { EnumContext } from './context';
 import isObjectEqual from '../isObjectEqual';
@@ -20,7 +21,7 @@ export function EnumHoc(props) {
         };
         fetch();
     }, [fields]);
-    return (React.createElement(EnumContext.Provider, { value: { enumOptions, loading, setFields } }, props.children));
+    return (_jsx(EnumContext.Provider, { value: { enumOptions, loading, setFields }, children: props.children }));
 }
 /**
  * 获取通用选项集

package/dist/web/utils/hooks/globalConnect.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { appCloudIsInWedaIde, appCloudGetDataSourceProfile, appCloudCallWedaApi, appCloudCallWorkFlow, appCloudShowWedaToast, appCloudGetWedaUserId, appCloudGetWedaRelatedRoles, } from '../tcb';
 import { GlobalContext } from './context';
 // eslint-disable-next-line  react/display-name
@@ -21,6 +21,5 @@ export const globalContextConnect = (WrappedComponent) => (props) => {
         },
         showToast,
     };
-    return (React.createElement(GlobalContext.Provider, { value: value },
-        React.createElement(WrappedComponent, { ...props })));
+    return (_jsx(GlobalContext.Provider, { value: value, children: _jsx(WrappedComponent, { ...props }) }));
 };

package/dist/web/utils/hooks/use-cloud-id-temp-url.js

@@ -1,13 +1,13 @@
 import useSWR from 'swr';
 import { getTempFileURL } from '../tcb';
-export function useTempUrl(fileId) {
-    const prefix = 'tcb:cloud-id:temp-url';
-    const key = `${prefix}:${fileId}`;
+export function useTempUrl(src) {
+    const prefix = 'tcb:temp-url';
+    const key = `${prefix}:${src}`;
     return useSWR(key, async () => {
-        if (!(fileId === null || fileId === void 0 ? void 0 : fileId.startsWith('cloud://'))) {
-            return fileId;
+        if (!(src === null || src === void 0 ? void 0 : src.startsWith('cloud://'))) {
+            return src;
         }
-        const tempUrl = await getTempFileURL(fileId);
+        const tempUrl = await getTempFileURL(src);
         return tempUrl;
     }, 
     // 8秒dedupe

package/dist/web/utils/hooks/useDataSource.js

@@ -0,0 +1,22 @@
+import { getDataSourceByName } from '../datasource';
+import { alertErrorMessage } from '../platform';
+import useSWR from 'swr';
+export const useDataSource = (...args) => {
+    return useSWR(() => {
+        const [datasourceName] = args;
+        if (!datasourceName) {
+            return null;
+        }
+        return args;
+    }, async () => {
+        const dataSource = await getDataSourceByName(...args);
+        return dataSource;
+    }, {
+        onError(err) {
+            console.error('getDataSourceProfileAsync err', err);
+            alertErrorMessage({
+                message: `获取数据源getDataSourceProfileAsync 出错: ${err}`,
+            });
+        },
+    });
+};

package/dist/web/utils/loading-fallback.js

@@ -1,2 +1,2 @@
-import * as React from 'react';
-export const fallback = React.createElement("div", null, "\u7EC4\u4EF6\u52A0\u8F7D\u4E2D...");
+import { jsx as _jsx } from "react/jsx-runtime";
+export const fallback = _jsx("div", { children: "\u7EC4\u4EF6\u52A0\u8F7D\u4E2D..." });

package/dist/web/utils/platform.js

@@ -356,3 +356,24 @@ export const isWebInMiniprogram = () => {
     return ((ua.match(/micromessenger/i) && ua.match(/miniprogram/i)) ||
         window['__wxjs_environment'] === 'miniprogram');
 };
+/**
+ * 判断访问终端
+ */
+export const browserEnv = () => {
+    let u = navigator.userAgent;
+    return {
+        android: u.indexOf('Android') > -1 || u.indexOf('Adr') > -1,
+        weixin: u.indexOf('MicroMessenger') > -1, //是否微信
+    };
+};
+/**
+ * 对象序列化
+ */
+export const getParseValue = (v) => {
+    let result = v;
+    try {
+        result = v && JSON.parse(JSON.stringify(v));
+    }
+    catch (e) { }
+    return result;
+};

package/dist/web/utils/tcb.js

@@ -95,19 +95,6 @@ export async function getAppCustomNav() {
         return {};
     }
 }
-/*
-  获取数据源字段权限
-*/
-export const getDataSourceByName = async (dbName) => {
-    // dbName 为空时
-    if (!dbName)
-        return;
-    const datasource = await window.app.cloud.getDataSourceProfileAsync({
-        Name: dbName,
-        GetColumnAuth: true,
-    });
-    return datasource;
-};
 /*
   判断接口是否存在
 */

package/dist/web/utils/tool.js

@@ -118,3 +118,17 @@ export const filterPropsWithOn = (props) => {
         return acc;
     }, {});
 };
+/**
+ * 深拷贝
+ */
+export const deepClone = (obj) => {
+    const isObject = (args) => (typeof args === 'object' || typeof args === 'function') &&
+        typeof args !== null;
+    if (!isObject)
+        throw new Error('Not Reference Types');
+    const newObj = Array.isArray(obj) ? [...obj] : { ...obj };
+    Reflect.ownKeys(newObj).map((key) => {
+        newObj[key] = isObject(obj[key]) ? deepClone(obj[key]) : obj[key];
+    });
+    return newObj;
+};

package/dist/web/utils/widget-api/index.js

@@ -1,21 +1,53 @@
+import { useContext, useEffect, useMemo, useState,
+// useEffect,
+// useState,
+ } from 'react';
 // 查找父表单容器
 export function getParentForm($node) {
     let cur = $node;
     while (!ensureForm(cur)) {
         if (!cur)
             return null;
-        if (cur.parent) {
-            cur = cur.parent;
-        }
-        else {
-            cur = cur.getOwnerWidget();
-        }
+        cur = cur.parent;
     }
     return cur;
 }
 function ensureForm(comp) {
+    var _a, _b;
     if (!comp) {
         return true;
     }
-    return comp.getConfig && comp.getConfig().componentType === 'form';
+    const hadFormComponentTypeConfig = ((_b = (_a = comp.getConfig) === null || _a === void 0 ? void 0 : _a.call(comp)) === null || _b === void 0 ? void 0 : _b.componentType) === 'form';
+    if (hadFormComponentTypeConfig)
+        return true;
+    return false;
+}
+export function useWedaAppContext() {
+    // const [ctx, setCtx] = useState<{ ready?: boolean }>({});
+    // useEffect(() => {
+    //   // eslint-disable-next-line rulesdir/no-timer
+    //   const id = setTimeout(() => {
+    //     setCtx({ ready: true });
+    //   }, 1000);
+    //   return () => {
+    //     clearTimeout(id);
+    //   };
+    // });
+    // return ctx;
+    const { ready } = useContext(window.WedaAppContext);
+    const [finalReady, setFinalReady] = useState(ready);
+    useEffect(() => {
+        // eslint-disable-next-line rulesdir/no-timer
+        const id = setTimeout(() => {
+            setFinalReady(ready);
+        }, 0);
+        return () => {
+            if (id) {
+                clearTimeout(id);
+            }
+        };
+    }, [ready]);
+    return useMemo(() => {
+        return { ready: finalReady };
+    }, [finalReady]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.4.8",
+  "version": "3.4.9",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -21,8 +21,8 @@
     "build:cli": "tcb lowcode build",
     "build:analyze": "cross-env ANALYZER=1 tcb lowcode build",
     "test": "npm run test:jest",
-    "test:jest": "jest test --env=jsdom",
-    "test:watch": "jest test --env=jsdom --watch",
+    "test:jest": "jest test --env=jsdom --maxWorkers 2",
+    "test:watch": "npm run test:jest -- --watch",
     "prestart:e2e-server": "node ./tools/e2e-prepare.mjs",
     "start:e2e-server": "node ./lowcode-comps/e2e-server.js",
     "test:e2e-component": "npm run build-mp && npx cypress run --component",
@@ -63,9 +63,9 @@
   "dependencies": {
     "@antv/g6": "^4.8.5",
     "@loadable/component": "^5.15.2",
-    "@react-hookz/web": "^14.2.2",
+    "@react-hookz/web": "^14.7.1",
     "@sinclair/typebox": "^0.25.3",
-    "@storybook/addons": "^6.5.15",
+    "@storybook/addons": "^6.5.16",
     "@tcwd/style-wedatheme": "^1.0.4",
     "@use-gesture/react": "^10.2.14",
     "await-to-js": "3.0.0",
@@ -75,17 +75,20 @@
     "echarts": "^5.3.0",
     "jsonexport": "3.2.0",
     "kedao": "^0.1.24",
+    "lodash.get": "^4.4.2",
     "lodash.isequal": "^4.5.0",
+    "lodash.set": "^4.3.2",
     "moment": "^2.29.4",
     "object.fromentries": "^2.0.5",
     "prop-types": "^15.7.2",
+    "qrcode.react": "^3.1.0",
     "react-easy-swipe": "0.0.22",
     "react-error-boundary": "^3.1.4",
     "react-highlight-within-textarea": "3.1.1",
     "react-infinite-scroll-component": "6.1.0",
     "react-transition-group": "^4.4.5",
     "spark-md5": "^3.0.2",
-    "swr": "^2.0.3",
+    "swr": "^2.0.4",
     "tdesign-icons-react": "0.0.8",
     "tea-component": "^2.7.8",
     "uuid": "8.3.2",
@@ -115,31 +118,34 @@
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@shopify/semaphore": "^3.0.1",
     "@size-limit/preset-big-lib": "^7.0.8",
-    "@storybook/addon-a11y": "^6.5.13",
-    "@storybook/addon-actions": "^6.5.13",
-    "@storybook/addon-essentials": "^6.5.13",
-    "@storybook/addon-links": "^6.5.13",
-    "@storybook/addon-storyshots": "^6.5.13",
-    "@storybook/builder-webpack5": "^6.5.13",
-    "@storybook/manager-webpack5": "^6.5.13",
-    "@storybook/react": "^6.5.13",
-    "@swc/core": "^1.3.32",
+    "@storybook/addon-a11y": "^6.5.16",
+    "@storybook/addon-actions": "^6.5.16",
+    "@storybook/addon-essentials": "^6.5.16",
+    "@storybook/addon-links": "^6.5.16",
+    "@storybook/addon-storyshots": "^6.5.16",
+    "@storybook/builder-webpack5": "^6.5.16",
+    "@storybook/manager-webpack5": "^6.5.16",
+    "@storybook/react": "^6.5.16",
+    "@swc/core": "1.3.37",
     "@swc/jest": "^0.2.24",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.1.5",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/glob": "^8.0.0",
     "@types/jest": "^27.5.1",
+    "@types/lodash.get": "^4.4.7",
+    "@types/lodash.set": "^4.3.7",
     "@types/make-fetch-happen": "^10.0.0",
     "@types/resize-observer-browser": "^0.1.7",
     "@types/testing-library__jest-dom": "^5.14.5",
     "@typescript-eslint/eslint-plugin": "^5.44.0",
     "@typescript-eslint/parser": "^5.44.0",
+    "@welldone-software/why-did-you-render": "^7.0.1",
     "babel-loader": "^8.2.5",
     "babel-plugin-istanbul": "^6.1.1",
     "cross-env": "^7.0.3",
-    "cypress": "~10.3.0",
-    "cypress-image-diff-js": "^1.20.0",
+    "cypress": "~12.7.0",
+    "cypress-image-diff-js": "^1.23.0",
     "cypress-wait-until": "^1.7.2",
     "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
@@ -152,7 +158,7 @@
     "eslint-plugin-react": "^7.31.11",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-rulesdir": "^0.2.1",
-    "eslint-plugin-storybook": "^0.6.7",
+    "eslint-plugin-storybook": "^0.6.11",
     "fs-extra": "^10.1.0",
     "glob": "^8.0.3",
     "gulp": "^4.0.2",
@@ -163,7 +169,7 @@
     "identity-obj-proxy": "^3.0.0",
     "is-builtin-module": "^3.2.0",
     "jest": "^27.5.1",
-    "jest_workaround": "^0.1.14",
+    "jest_workaround": "0.1.14",
     "jest-canvas-mock": "^2.4.0",
     "jest-environment-jsdom": "^27",
     "jest-preview": "^0.2.6",
@@ -177,10 +183,10 @@
     "nano-staged": "^0.8.0",
     "pinst": "^3.0.0",
     "prettier": "^2.7.1",
-    "react": "^16",
-    "react-dom": "^16",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "react-scripts": "^5.0.1",
-    "react-test-renderer": "^16",
+    "react-test-renderer": "^17",
     "recast": "^0.21.5",
     "regenerator-runtime": "^0.13.9",
     "resize-observer-polyfill": "^1.5.1",
@@ -209,7 +215,7 @@
       "eslint --fix",
       "prettier --write"
     ],
-    "*.{json,html,wxml,wxss}": [
+    "*.{json,html,wxml,wxss,yaml,yml,mdx}": [
       "prettier -w"
     ]
   },
@@ -217,10 +223,11 @@
     {
       "path": [
         ".temp/dist/*.main.css",
-        ".temp/dist/*.main.js"
+        ".temp/dist/*.main.js",
+        "!.temp/dist/*.map"
       ],
       "webpack": false,
-      "limit": "500 KB"
+      "limit": "520 KB"
     }
   ],
   "nyc": {

package/dist/web/components/emptyContent/index.css

@@ -1,26 +0,0 @@
-.weda-list-view__empty {
-  width: 100%;
-  padding: 16px;
-}
-
-.weda-list-view__empty .weda-list-view__empty__content {
-  color: rgba(0, 0, 0, 0.9);
-  width: 100%;
-  height: 200px;
-  background-color: #f2f2f2;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-  font-size: 14px;
-  border-radius: 6px;
-}
-
-.weda-list-view__empty .weda-list-view__empty__content.table {
-  background-color: unset;
-  height: 140px;
-}
-
-.weda-list-view__empty .weda-list-view__empty__content.table.isH5 {
-  height: 548px;
-}

package/dist/web/components/flow/components/FlowModuleText/index.css

@@ -1,4 +0,0 @@
-.model-flow-module-title {
-  font-size: 16px;
-  font-weight: 700;
-}

package/dist/web/components/flow/modules/process/index.css

@@ -1,194 +0,0 @@
-.page-process__progress-card .wedatea2td-card__title {
-  margin-bottom: 6px;
-}
-.page-process__progress .approval-progress__row {
-  display: flex;
-  -webkit-align-items: center;
-  align-items: center;
-  font-size: 12px !important;
-}
-.page-process__progress .approval-progress__row--start {
-  -webkit-align-items: flex-start;
-  align-items: flex-start;
-}
-.page-process__progress .approval-progress {
-  padding-top: 4px;
-}
-.page-process__progress .approval-progress .approval-progress__item {
-  padding-bottom: 16px;
-  position: relative;
-  display: flex;
-}
-.page-process__progress .approval-progress .approval-progress__item:before {
-  border-left: 1px dashed rgba(36, 115, 242, 0.3);
-  width: 1px;
-  height: calc(100% - 18px);
-  position: absolute;
-  top: 22px;
-  left: 7px;
-  content: '';
-}
-.page-process__progress .approval-progress .approval-progress__item:last-child {
-  padding-bottom: 0;
-}
-.page-process__progress
-  .approval-progress
-  .approval-progress__item:last-child:before {
-  display: none;
-}
-.page-process__progress .approval-progress .approval-progress__dot {
-  width: 14px;
-  height: 14px;
-  background: rgba(36, 115, 242, 0.15);
-  -webkit-flex: none;
-  flex: none;
-  position: relative;
-  border-radius: 50%;
-  margin-right: 20px;
-  margin-top: 6px;
-}
-.page-process__progress .approval-progress .approval-progress__dot:before {
-  content: '';
-  width: 8px;
-  height: 8px;
-  position: absolute;
-  border-radius: 50%;
-  background: #2473f2;
-  left: 3px;
-  top: 3px;
-}
-.page-process__progress .approval-progress .approval-progress__dot.pending {
-  background: rgba(162, 172, 189, 0.15);
-}
-.page-process__progress
-  .approval-progress
-  .approval-progress__dot.pending:before {
-  background: #a2acbd;
-}
-.page-process__progress .approval-progress .approval-progress__dot.end {
-  background: rgba(162, 172, 189, 0.15);
-}
-.page-process__progress .approval-progress .approval-progress__dot.end:before {
-  background: #666;
-}
-.page-process__progress .approval-progress .approval-progress__dot.start {
-  background: rgba(36, 115, 242, 0.15);
-}
-.page-process__progress
-  .approval-progress
-  .approval-progress__dot.start:before {
-  background: #09bf5b;
-}
-.page-process__progress .approval-progress .approval-progress__content {
-  -webkit-flex: 1;
-  flex: 1;
-}
-.page-process__progress .approval-progress .approval-progress__dept,
-.page-process__progress .approval-progress .approval-progress__user {
-  font-size: 14px;
-  line-height: 24px;
-  min-width: 110px;
-  max-width: 450px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  margin-right: 8px;
-  cursor: pointer;
-}
-.page-process__progress .approval-progress .approval-progress__date {
-  margin-right: 8px;
-  min-width: 110px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  -webkit-flex: none;
-  flex: none;
-}
-.page-process__progress .approval-progress .approval-progress__user {
-  width: auto;
-}
-.page-process__progress .approval-progress__status {
-  min-width: 72px;
-  padding: 0 12px;
-  text-align: center;
-  line-height: 24px;
-  margin-left: 12px;
-  margin-top: 0 !important;
-}
-.page-process__progress .approval-progress .approval-progress__advice-item {
-  margin-bottom: 8px;
-}
-.page-process__progress.process-progress--mb
-  .approval-progress.approval-progress-mb {
-  padding-top: 8px;
-}
-.page-process__progress.process-progress--mb
-  .approval-progress.approval-progress-mb
-  .approval-progress__dept {
-  width: auto;
-  -webkit-flex: 1;
-  flex: 1;
-  white-space: break-spaces;
-}
-.page-process__progress.process-progress--mb
-  .approval-progress.approval-progress-mb
-  .approval-progress__advice-item {
-  margin-bottom: 4px;
-}
-.page-process__progress.process-progress--mb
-  .approval-progress.approval-progress-mb
-  .approval-progress__status.tea-tag {
-  min-width: 56px;
-  padding: 0 8px;
-  line-height: 20px;
-}
-.page-process__progress.process-progress--mb
-  .approval-progress.approval-progress-mb
-  .approval-progress__dot {
-  margin-right: 12px;
-}
-.cp-mobile-dialog.approval-progress__more--dialog
-  .approval-progress__more--btns {
-  padding: 0 20px 14px;
-  position: relative;
-}
-.cp-mobile-dialog.approval-progress__more--dialog
-  .approval-progress__more--btns:after {
-  content: '';
-  height: 1em;
-  width: 100%;
-  background: #f7f7fa;
-  position: absolute;
-  left: 0;
-}
-.cp-mobile-dialog.approval-progress__more--dialog
-  .approval-progress__more--btn {
-  text-align: center;
-  padding: 8px;
-  cursor: pointer;
-}
-.cp-mobile-dialog.approval-progress__more--dialog
-  .approval-progress__more--btn
-  + .approval-progress__more--btn {
-  border-top: 1px solid #e5e8ed;
-}
-.cp-mobile-dialog.approval-progress__more--dialog
-  .approval-progress__more--footer {
-  padding: 16px 20px;
-  text-align: center;
-  font-size: 14px;
-  cursor: pointer;
-}
-.cp-mobile-dialog.approval-progress__callback--dialog .apa-m-overlay__tit {
-  font-size: 14px;
-  color: #666;
-}
-.approval-progress__comment {
-  max-width: 500px;
-  word-wrap: break-word;
-}
-
-.approval-progress__comment-mb {
-  max-width: 300px;
-  word-wrap: break-word;
-}