@cloudbase/weda-ui 3.4.1 → 3.4.2

package/dist/web/components/form/userOrgSelect/userTreeSelect.pc.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useState, useEffect } from 'react';
 import { renderDecorator } from '../renderDecorator';
 import { isInIde, filterStrList } from '../../../utils/platform';
 import classNames from 'classnames';
@@ -36,7 +36,7 @@ decorator, matchButtonWidth = false, modelOpen = false, dropDownStyle = defaultD
         errorStatus: false,
         errorMessage: null,
     });
-    const getDefaultUser = useCallback(async (defaultValue) => {
+    const getDefaultUser = async (defaultValue) => {
         var _a;
         try {
             setErrorInfo({ errorStatus: false, errorMessage: null });
@@ -86,7 +86,7 @@ decorator, matchButtonWidth = false, modelOpen = false, dropDownStyle = defaultD
         catch (e) {
             setErrorInfo({ errorStatus: true, errorMessage: e });
         }
-    }, [confirmValue, defaultValueType, events, request]);
+    };
     useEffect(() => {
         // 初始化数据
         const initOrgsData = async () => {
@@ -114,16 +114,14 @@ decorator, matchButtonWidth = false, modelOpen = false, dropDownStyle = defaultD
         setOpen(modelOpen);
     }, [modelOpen]);
     useEffect(() => {
-        if ((defaultValue &&
-            !isObjectEqual(prevDefaultRef.current !== defaultValue)) ||
-            (confirmValue &&
-                !isObjectEqual(prevConfirmRef.current !== confirmValue)) ||
+        if ((defaultValue && !isObjectEqual(prevDefaultRef.current, defaultValue)) ||
+            (confirmValue && !isObjectEqual(prevConfirmRef.current, confirmValue)) ||
             defaultValueType === 'loginUser') {
             getDefaultUser(defaultValue);
             prevDefaultRef.current = defaultValue;
             prevConfirmRef.current = confirmValue;
         }
-    }, [defaultValueType, confirmValue]);
+    }, [defaultValueType, confirmValue, defaultValue]);
     useEffect(() => {
         if (open) {
             setErrorInfo({ errorStatus: false, errorMessage: null });
@@ -134,14 +132,34 @@ decorator, matchButtonWidth = false, modelOpen = false, dropDownStyle = defaultD
             }
         }
     }, [open, orgsTreeData, curSelectData]);
-    const reset = (close, value = '') => {
+    useEffect(() => {
         var _a;
+        const userIdList = [];
+        const userList = curSelectData.map((d) => {
+            var _a;
+            const realUserId = removeMarkString([d === null || d === void 0 ? void 0 : d.value]).toString();
+            userIdList.push(realUserId);
+            return {
+                userId: realUserId,
+                content: (_a = d === null || d === void 0 ? void 0 : d.data) === null || _a === void 0 ? void 0 : _a.content,
+            };
+        });
+        onChange === null || onChange === void 0 ? void 0 : onChange(multiple ? userIdList : userIdList[0]);
+        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, multiple
+            ? {
+                value: userIdList.length > 0 ? userIdList : null,
+                data: userList.length > 0 ? userList : null,
+            }
+            : {
+                value: userIdList.length > 0 ? userIdList[0] : null,
+                data: userList.length > 0 ? userList[0] : null,
+            });
+    }, [curSelectData]);
+    const reset = (close) => {
         setSelectIds([]);
         setCurSelectData([]);
         setActiveIds([]);
         setErrorInfo({ errorStatus: false, errorMessage: null });
-        onChange === null || onChange === void 0 ? void 0 : onChange(value);
-        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value, data: null });
         close && setOpen(false);
     };
     // 外层组件类
@@ -173,7 +191,6 @@ decorator, matchButtonWidth = false, modelOpen = false, dropDownStyle = defaultD
         }
     };
     const onConfirm = () => {
-        var _a, _b;
         const nodeList = [];
         const idList = [];
         const selectItem = [];
@@ -185,7 +202,7 @@ decorator, matchButtonWidth = false, modelOpen = false, dropDownStyle = defaultD
                         nodeList.push(node);
                     idList.push((node === null || node === void 0 ? void 0 : node.userId) || selectId);
                     selectItem.push({
-                        value: node === null || node === void 0 ? void 0 : node.userId,
+                        value: (node === null || node === void 0 ? void 0 : node.userId) || selectId,
                         data: node,
                     });
                 }
@@ -195,21 +212,6 @@ decorator, matchButtonWidth = false, modelOpen = false, dropDownStyle = defaultD
         else {
             setCurSelectData([]);
         }
-        onChange === null || onChange === void 0 ? void 0 : onChange(multiple ? idList : (_a = selectItem[0]) === null || _a === void 0 ? void 0 : _a.value);
-        (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, multiple
-            ? {
-                value: idList,
-                data: nodeList.concat(curSelectData.length > 0
-                    ? curSelectData.map((item) => {
-                        var _a;
-                        return {
-                            id: item === null || item === void 0 ? void 0 : item.value,
-                            content: (_a = item === null || item === void 0 ? void 0 : item.data) === null || _a === void 0 ? void 0 : _a.content,
-                        };
-                    })
-                    : []),
-            }
-            : selectItem[0]);
         setOpen(false);
     };
     return renderDecorator(React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },

package/dist/web/components/listView/interface.d.ts

@@ -4,7 +4,7 @@ import React from 'react';
  */
 export interface IDataContainer {
     /**
-     * 数据源类型
+     * 数据源
      */
     dataSourceType: 'data-model' | 'connector' | 'custom-connector';
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -59,6 +59,7 @@
   "dependencies": {
     "@loadable/component": "^5.15.2",
     "@react-hookz/web": "^14.2.2",
+    "@sinclair/typebox": "^0.25.1",
     "@tcwd/style-wedatheme": "^1.0.4",
     "@use-gesture/react": "^10.2.14",
     "dayjs": "^1.10.7",
@@ -95,6 +96,7 @@
     "@cypress/skip-test": "^2.6.1",
     "@cypress/webpack-dev-server": "~2.0.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
+    "@shopify/semaphore": "^3.0.1",
     "@size-limit/preset-big-lib": "^7.0.8",
     "@storybook/addon-actions": "^6.5.9",
     "@storybook/addon-essentials": "^6.5.9",
@@ -107,7 +109,9 @@
     "@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/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.30.5",
@@ -129,12 +133,15 @@
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-rulesdir": "^0.2.1",
     "eslint-plugin-storybook": "^0.5.13",
+    "glob": "^8.0.3",
     "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.6",
+    "json-schema-to-ts": "^2.5.5",
+    "make-fetch-happen": "^11.0.1",
     "miniprogram-simulate": "^1.5.7",
     "mkdirp": "^1.0.4",
     "mochawesome": "^7.1.3",
@@ -147,6 +154,7 @@
     "react-dom": "^16",
     "react-scripts": "^5.0.1",
     "react-test-renderer": "^16",
+    "recast": "^0.21.5",
     "regenerator-runtime": "^0.13.9",
     "resize-observer-polyfill": "^1.5.1",
     "rimraf": "^3.0.2",
@@ -154,8 +162,10 @@
     "start-server-and-test": "^1.14.0",
     "swc-loader": "0.2.3",
     "swc-plugin-coverage-instrument": "^0.0.7",
+    "ts-branding": "^1.0.2",
     "ts-loader": "^9.3.1",
     "ts-node": "^10.9.1",
+    "type-fest": "^3.0.0",
     "typescript": "^4.7.4",
     "webpack": "^5.73.0",
     "webpack-cli": "^4.10.0",