@lingxiteam/ebe-utils 0.3.19 → 0.3.20

package/lib/pcpublic/src/components/pcfactory/src/Cascader/index.tsx

@@ -219,7 +219,7 @@ const MyCascader: React.FC<MyCascaderProps> = forwardRef((props, ref) => {
         let { isLeaf } = _item;
         if (isLeaf === undefined) {
           // children为非数组时且配置了展开事件时，视为需要异步加载
-          isLeaf = !Array.isArray(_children) && props.onClickOption ? false : _item.isLeaf;
+            isLeaf = !Array.isArray(_children) && props.onClickOption ? false : _item.isLeaf;
         }
 
         return {
@@ -284,7 +284,21 @@ const MyCascader: React.FC<MyCascaderProps> = forwardRef((props, ref) => {
       setChildOptions(data);
     },
   });
-
+  const handChange = (keys: any, selctOptions: any) => {
+    // 选中数据时清除搜索词
+    setSearchVal('');
+    setCompData(selctOptions);
+    if (onChange) {
+      onChange(keys, selctOptions);
+    }
+  };
+  const onDropdownVisibleChange = (visible: boolean) => {
+    setShowDropDown(visible);
+    if (!visible) {
+    // 关闭浮层重置搜索条件
+      setSearchVal('');
+    }
+  };
   return (
     <FormFields
       {...getFieldsProps(props)}
@@ -299,28 +313,21 @@ const MyCascader: React.FC<MyCascaderProps> = forwardRef((props, ref) => {
     >
       <Cascader
         dropdownClassName={classNames(dropdownClassName, `${prefixCls}-dropdown`)}
-        onDropdownVisibleChange={visible => {
-          setShowDropDown(visible);
-          if (!visible) {
-            // 关闭浮层重置搜索条件
-            setSearchVal('');
-          }
-        }}
-        {...(restProps as any)}
+        onDropdownVisibleChange={onDropdownVisibleChange}
+        {...restProps as any}
         value={value}
         options={options}
+        open={showDropDown}
         style={restCusStyles}
         multiple={multiple}
         displayRender={renderDisplay}
         notFoundContent={<EmptyComp getLocale={getLocale} dataState={dataState} clsName="pcfactory-empty-small" />}
         showSearch={
-          showSearch
-            ? {
-              matchInputWidth: popoverStyle !== 'auto',
-            }
-            : false
-        }
-        onSearch={words => {
+        showSearch ? {
+          matchInputWidth: popoverStyle !== 'auto',
+        } : false
+      }
+        onSearch={(words) => {
           setSearchVal(words);
           if (showSearch && props.onSearch) {
             props.onSearch(words, value, compData);
@@ -340,21 +347,16 @@ const MyCascader: React.FC<MyCascaderProps> = forwardRef((props, ref) => {
               currentRow.children = children;
               delete currentRow.zattrNbrValueMap;
               setSourceOptions(options);
+            } else {
+              currentRow.isLeaf = true; // 标记为叶子节点
+              onDropdownVisibleChange(false);
             }
           }
         }}
         className={classNames(className, cascaderClassName)}
-        onChange={(keys: any, selctOptions: any) => {
-          // 选中数据时清除搜索词
-          setSearchVal('');
-          setCompData(selctOptions);
-          if (onChange) {
-            onChange(keys, selctOptions);
-          }
-        }}
+        onChange={handChange}
       />
-    </FormFields>
-  );
+    </FormFields>);
 });
 
 export default MyCascader;

package/lib/pcpublic/yarn.lock

@@ -1458,10 +1458,10 @@
     "@babel/runtime" "7.23.2"
     rc-util "^4.10.0"
 
-"@lingxiteam/lcdp-ueditor-react@1.0.3-alpha.6":
-  version "1.0.3-alpha.6"
-  resolved "https://registry.npmmirror.com/@lingxiteam/lcdp-ueditor-react/-/lcdp-ueditor-react-1.0.3-alpha.6.tgz#10419b1098449ffef6a5b5c1e6451514060a8b8c"
-  integrity sha512-dPbL/IMcpElQEQNnW3ksd8+0NfHuPd7cRl9TxWdeV9k6cx+Hr667WKO3EWOVKogYP1ZKUqaqu8FF99b1ll7ADQ==
+"@lingxiteam/lcdp-ueditor-react@^1.0.3-alpha.8":
+  version "1.0.3-alpha.8"
+  resolved "http://npm.iwhalecloud.com:8081/repository/npm-taobao/@lingxiteam/lcdp-ueditor-react/-/lcdp-ueditor-react-1.0.3-alpha.8.tgz#176fb4fbb99d59dc4b3f8cf62510542fd1a3d41c"
+  integrity sha512-DS6hvJc+2jVx5ti24gb2qL3qZLxxRDNE0VnlOLCyJ7lADI/WUxTu6WLUUohMjIPGu+NJrP7gf69z1LYbh5j7bA==
   dependencies:
     "@babel/runtime" "7.23.2"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.3.19",
+  "version": "0.3.20",
   "description": "",
   "keywords": [],
   "author": "",
@@ -19,7 +19,7 @@
     "@babel/types": "^7.12.12",
     "cac": "^6.7.14",
     "fs-extra": "9.x",
-    "@lingxiteam/ebe": "0.3.19"
+    "@lingxiteam/ebe": "0.3.20"
   },
   "publishConfig": {
     "access": "public"