ztxkui 4.3.2 → 4.3.3

package/dist/components/EnhanceSelect/index.js

@@ -237,9 +237,6 @@ function onMouseDownHandle(e) {
  */
 function EnhanceSelect(_a) {
     var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.timeout, timeout = _c === void 0 ? 60000 : _c, _d = _a.dataKey, dataKey = _d === void 0 ? 'id' : _d, componentKey = _a.componentKey, _e = _a.titleKey, titleKey = _e === void 0 ? 'name' : _e, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, onSearch = _a.onSearch, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _f = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _f === void 0 ? true : _f, transformData = _a.transformData, joinKey = _a.joinKey, _g = _a.joinStr, joinStr = _g === void 0 ? '-' : _g, lineFeedKey = _a.lineFeedKey, _h = _a.lineFeedStr, lineFeedStr = _h === void 0 ? '-' : _h, mustHasParams = _a.mustHasParams, disabledValues = _a.disabledValues, searchDeleteKeys = _a.searchDeleteKeys, isHandAddItem = _a.isHandAddItem, isPage = _a.isPage, _j = _a.currentSize, currentSize = _j === void 0 ? 30 : _j, isCopy = _a.isCopy, onFocus = _a.onFocus, isClickRequest = _a.isClickRequest, handleRef = _a.handleRef, isPaste = _a.isPaste, _k = _a.pasteRule, pasteRule = _k === void 0 ? defaultPasteRule : _k, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "timeout", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "onSearch", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "joinKey", "joinStr", "lineFeedKey", "lineFeedStr", "mustHasParams", "disabledValues", "searchDeleteKeys", "isHandAddItem", "isPage", "currentSize", "isCopy", "onFocus", "isClickRequest", "handleRef", "isPaste", "pasteRule"]);
-    // TODO: 注释动态设置open逻辑 start
-    // const currentClick = useRef<boolean>(true);
-    // TODO: 注释动态设置open逻辑 end
     // 下拉数据源
     var _l = useFetchState([]), selectList = _l[0], setSelectList = _l[1];
     // 手动添加的数据源
@@ -1006,9 +1003,20 @@ function EnhanceSelect(_a) {
     // 焦点事件
     var onFocusHandle = useCallback(function (e) {
         // console.log('焦点事件');
-        setIsOpen(true);
+        if (!clearClick.current) {
+            clearClick.current = false;
+            setIsOpen(true);
+        }
         onFocus && onFocus(e);
     }, [onFocus]);
+    // 清空事件
+    // TODO: 注释动态设置open逻辑 start
+    var clearClick = useRef(false);
+    // TODO: 注释动态设置open逻辑 end
+    var onClearHandle = useCallback(function () {
+        // 清空
+        clearClick.current = true;
+    }, []);
     // 选中时
     var onSelectHandle = useCallback(function (value, obj) {
         // console.log('选中数据事件');
@@ -1120,7 +1128,7 @@ function EnhanceSelect(_a) {
             }
         },
     }); });
-    return (React.createElement(Select, __assign({ defaultValue: showAll ? '' : undefined, allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : onSearchHandleInner, onChange: onChangeHandle, optionLabelProp: "title", loading: loading, onFocus: onFocusHandle, onSelect: onSelectHandle, onClick: onClickHandle, onMouseDown: onMouseDownHandle, 
+    return (React.createElement(Select, __assign({ defaultValue: showAll ? '' : undefined, allowClear: true, onClear: onClearHandle, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : onSearchHandleInner, onChange: onChangeHandle, optionLabelProp: "title", loading: loading, onFocus: onFocusHandle, onSelect: onSelectHandle, onClick: onClickHandle, onMouseDown: onMouseDownHandle, 
         // getPopupContainer={(trigger) => trigger || document.body}
         open: isOpen, onDropdownVisibleChange: function (visible) { return setIsOpen(visible); }, onPopupScroll: onPopupScrollHandle, dropdownRender: url && !remoteSearch && isCatch
             ? function (menu) { return (React.createElement(React.Fragment, null,

package/dist/components/Table/table-enhance-cell.js

@@ -95,6 +95,7 @@ var TableEnhanceCell = function (_a) {
         if (dataIndex) {
             // form?.setFieldsValue({ [dataIndex]: record[dataIndex] });
             // form?.setFieldValue(dataIndex, record[dataIndex]);
+            console.log(record[dataIndex]);
             setVal(record[dataIndex]);
         }
     }, [dataIndex, record]);
@@ -203,6 +204,8 @@ var TableEnhanceCell = function (_a) {
                     return result;
                 });
                 // onTableChange && onTableChange(resultTextList, index, record);
+                setVal(resultTextList[0][dataIndex]);
+                valueRef.current[dataIndex] = resultTextList[0][dataIndex];
                 onTableChange && onTableChange(resultTextList, innerIndex, record);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.3.2",
+  "version": "4.3.3",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",