@apdesign/web-react 1.4.0 → 1.4.1

package/es/Button/index.d.ts

@@ -2,12 +2,12 @@ import React from 'react';
 import Group from './group';
 import { ButtonProps } from './interface';
 declare const ButtonComponent: React.ForwardRefExoticComponent<Partial<{
-    htmlType?: "button" | "reset" | "submit";
-} & import("./interface").BaseButtonProps & Omit<React.ButtonHTMLAttributes<any>, "className" | "onClick" | "type"> & {
+    htmlType?: "button" | "submit" | "reset";
+} & import("./interface").BaseButtonProps & Omit<React.ButtonHTMLAttributes<any>, "className" | "type" | "onClick"> & {
     href: string;
     target?: string;
     anchorProps?: React.HTMLProps<HTMLAnchorElement>;
-} & Omit<React.AnchorHTMLAttributes<any>, "className" | "onClick" | "type">> & React.RefAttributes<unknown>> & {
+} & Omit<React.AnchorHTMLAttributes<any>, "className" | "type" | "onClick">> & React.RefAttributes<unknown>> & {
     __BYTE_BUTTON: boolean;
     Group: typeof Group;
 };

package/es/TreeSelect/hook/useStateValue.js

@@ -166,7 +166,9 @@ var useStateValue = function (props, key2nodeProps, indeterminateKeys) {
     }, [props.onChange, props.labelInValue, props.multiple, props.treeCheckable, props.value]);
     var confirmSetValue = function () {
         var onChange = props.onChange, labelInValue = props.labelInValue;
-        setValue(__spreadArray([], __read(proxyValueCopy.current), false));
+        if (!('value' in props)) {
+            setValue(__spreadArray([], __read(proxyValueCopy.current), false));
+        }
         var tmp = proxyValueCopy.current.map(function (x) {
             return labelInValue ? { label: x.label, value: x.value } : x.value;
         });

package/es/TreeSelect/tree-list.js

@@ -144,10 +144,42 @@ function TreeList(props, ref) {
                         clipPath: 'polygon(12px 50%, 0% 0%, 100% 0%, 100% 100%, 0% 100%)',
                         whiteSpace: 'nowrap',
                     }, onClick: function () {
-                        handleCheck([nodeProps._key], {
+                        // 为了兼容严格勾选模式，这边改成先清空勾选，再由树组件内部触发勾选，才能准确获取子节点父节点勾选数据
+                        // onCheck 方法需要在 TreeContext 进行增加renderExtra的参数
+                        // props.onChange([], {
+                        //   checked: false,
+                        //   trigger: nodeProps,
+                        // });
+                        // requestAnimationFrame(() => {
+                        //   onCheck(true, nodeProps._key, e);
+                        //   confirmCheck();
+                        // });
+                        // 上面有点UI卡顿体验不好 方案二 手动获取所有勾选的key，自己构造handleCheck参数
+                        var treeCheckStrictly = props.treeCheckStrictly;
+                        var checkedKeys;
+                        var getAllCheckedKeys = function (node, keys) {
+                            if (keys === void 0) { keys = []; }
+                            if (Array.isArray(node.childrenData) && node.childrenData.length) {
+                                node.childrenData.forEach(function (child) {
+                                    getAllCheckedKeys(child, keys);
+                                });
+                            }
+                            else {
+                                keys.push(node._key);
+                            }
+                            return keys;
+                        };
+                        if (treeCheckStrictly) {
+                            checkedKeys = [nodeProps._key];
+                        }
+                        else {
+                            // 找到所有允许勾选的子节点
+                            checkedKeys = getAllCheckedKeys(nodeProps);
+                        }
+                        handleCheck(checkedKeys, {
                             checkedNodes: [],
                             checked: true,
-                            node: { props: nodeProps },
+                            node: { props: nodeProps }, // 不完整
                         });
                         confirmCheck();
                     } }, (_a = locale.Select) === null || _a === void 0 ? void 0 : _a.filterThisItemOnly), propsRenderExtra === null || propsRenderExtra === void 0 ? void 0 :

package/es/TreeSelect/tree-select.js

@@ -216,8 +216,10 @@ var TreeSelect = function (baseProps, ref) {
         tryUpdatePopupVisible(false);
     };
     var confirmCheck = function () {
+        var _a;
         confirmSetValue();
-        tryUpdatePopupVisible(false);
+        setPopupVisible(false);
+        (_a = props.onVisibleChange) === null || _a === void 0 ? void 0 : _a.call(props, false);
     };
     var handleRemoveCheckedItem = function (item, index, e) {
         e.stopPropagation();

package/es/index.d.ts

@@ -139,4 +139,4 @@ export type { WatermarkProps } from './Watermark/interface';
 export { default as Watermark } from './Watermark';
 export type { ImageProps, ImagePreviewProps, ImagePreviewActionProps, ImagePreviewGroupProps } from './Image/interface';
 export { default as Image } from './Image';
-export declare const version = "1.4.0";
+export declare const version = "1.4.1";

package/es/index.js

@@ -69,4 +69,4 @@ export { default as Upload } from './Upload';
 export { default as Mentions } from './Mentions';
 export { default as Watermark } from './Watermark';
 export { default as Image } from './Image';
-export var version = '1.4.0';
+export var version = '1.4.1';

package/lib/TreeSelect/hook/useStateValue.js

@@ -173,7 +173,9 @@ var useStateValue = function (props, key2nodeProps, indeterminateKeys) {
     }, [props.onChange, props.labelInValue, props.multiple, props.treeCheckable, props.value]);
     var confirmSetValue = function () {
         var onChange = props.onChange, labelInValue = props.labelInValue;
-        setValue(__spreadArray([], __read(proxyValueCopy.current), false));
+        if (!('value' in props)) {
+            setValue(__spreadArray([], __read(proxyValueCopy.current), false));
+        }
         var tmp = proxyValueCopy.current.map(function (x) {
             return labelInValue ? { label: x.label, value: x.value } : x.value;
         });

package/lib/TreeSelect/tree-list.js

@@ -168,10 +168,42 @@ function TreeList(props, ref) {
                         clipPath: 'polygon(12px 50%, 0% 0%, 100% 0%, 100% 100%, 0% 100%)',
                         whiteSpace: 'nowrap',
                     }, onClick: function () {
-                        handleCheck([nodeProps._key], {
+                        // 为了兼容严格勾选模式，这边改成先清空勾选，再由树组件内部触发勾选，才能准确获取子节点父节点勾选数据
+                        // onCheck 方法需要在 TreeContext 进行增加renderExtra的参数
+                        // props.onChange([], {
+                        //   checked: false,
+                        //   trigger: nodeProps,
+                        // });
+                        // requestAnimationFrame(() => {
+                        //   onCheck(true, nodeProps._key, e);
+                        //   confirmCheck();
+                        // });
+                        // 上面有点UI卡顿体验不好 方案二 手动获取所有勾选的key，自己构造handleCheck参数
+                        var treeCheckStrictly = props.treeCheckStrictly;
+                        var checkedKeys;
+                        var getAllCheckedKeys = function (node, keys) {
+                            if (keys === void 0) { keys = []; }
+                            if (Array.isArray(node.childrenData) && node.childrenData.length) {
+                                node.childrenData.forEach(function (child) {
+                                    getAllCheckedKeys(child, keys);
+                                });
+                            }
+                            else {
+                                keys.push(node._key);
+                            }
+                            return keys;
+                        };
+                        if (treeCheckStrictly) {
+                            checkedKeys = [nodeProps._key];
+                        }
+                        else {
+                            // 找到所有允许勾选的子节点
+                            checkedKeys = getAllCheckedKeys(nodeProps);
+                        }
+                        handleCheck(checkedKeys, {
                             checkedNodes: [],
                             checked: true,
-                            node: { props: nodeProps },
+                            node: { props: nodeProps }, // 不完整
                         });
                         confirmCheck();
                     } }, (_a = locale.Select) === null || _a === void 0 ? void 0 : _a.filterThisItemOnly), propsRenderExtra === null || propsRenderExtra === void 0 ? void 0 :

package/lib/TreeSelect/tree-select.js

@@ -240,8 +240,10 @@ var TreeSelect = function (baseProps, ref) {
         tryUpdatePopupVisible(false);
     };
     var confirmCheck = function () {
+        var _a;
         confirmSetValue();
-        tryUpdatePopupVisible(false);
+        setPopupVisible(false);
+        (_a = props.onVisibleChange) === null || _a === void 0 ? void 0 : _a.call(props, false);
     };
     var handleRemoveCheckedItem = function (item, index, e) {
         e.stopPropagation();

package/lib/index.d.ts

@@ -139,4 +139,4 @@ export type { WatermarkProps } from './Watermark/interface';
 export { default as Watermark } from './Watermark';
 export type { ImageProps, ImagePreviewProps, ImagePreviewActionProps, ImagePreviewGroupProps } from './Image/interface';
 export { default as Image } from './Image';
-export declare const version = "1.4.0";
+export declare const version = "1.4.1";

package/lib/index.js

@@ -147,4 +147,4 @@ var Watermark_1 = require("./Watermark");
 Object.defineProperty(exports, "Watermark", { enumerable: true, get: function () { return __importDefault(Watermark_1).default; } });
 var Image_1 = require("./Image");
 Object.defineProperty(exports, "Image", { enumerable: true, get: function () { return __importDefault(Image_1).default; } });
-exports.version = '1.4.0';
+exports.version = '1.4.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apdesign/web-react",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "AP Design React UI Library.",
   "module": "./es/index.js",
   "main": "./lib/index.js",