ztxkui 4.2.23-345-beta → 4.2.23-346-beta

package/dist/components/Input/InputModal.js

@@ -41,10 +41,14 @@ var InputModal = function (_a) {
             setModalValue(props.value);
         }
     };
+    var close = function () {
+        setVisible(false);
+        isDoubleClick.current = false;
+    };
     var handleSure = function () {
         onChange && onChange(modalValue);
         onBlur && onBlur(modalValue);
-        setVisible(false);
+        close();
     };
     var handleClear = function () {
         setModalValue('');
@@ -56,7 +60,7 @@ var InputModal = function (_a) {
     };
     return (React.createElement(React.Fragment, null,
         React.createElement(Input, __assign({}, props, { onBlur: handleBlur, onDoubleClick: handleDoubleClick, onChange: function (e) { return onChange && onChange(e.target.value); } })),
-        React.createElement(Modal, { title: isModalDisabled ? '内容' : '请输入内容', visible: visible, loading: false, destroyOnClose: true, onCancel: function () { return setVisible(false); }, footer: isModalDisabled ? undefined : (React.createElement(React.Fragment, null,
+        React.createElement(Modal, { title: isModalDisabled ? '内容' : '请输入内容', visible: visible, loading: false, destroyOnClose: true, onCancel: close, footer: isModalDisabled ? undefined : (React.createElement(React.Fragment, null,
                 React.createElement(Button, { onClick: handleClear }, "\u6E05\u7A7A\u5185\u5BB9"),
                 React.createElement(Button, { type: "primary", onClick: handleSure }, "\u786E\u8BA4"))) },
             React.createElement(Input.TextArea, { value: modalValue, readOnly: isModalDisabled, autoFocus: true, autoSize: { minRows: 10, maxRows: 50 }, onChange: function (e) { return setModalValue(e.target.value); } }))));

package/dist/components/Table/hooks/useColumns.js

@@ -449,20 +449,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
             _newColumns.push(_column);
         }
         // 添加render字段
-        if (!_column.render) {
-            _column.render = function (text, record, index) {
-                var value = text;
-                if (text == null || text === '')
-                    return '— —';
-                else if (_column.dateFormat)
-                    return dayjs(text).format(_column.dateFormat);
-                if (_column.precision)
-                    value = exactRound(text, _column.precision);
-                if (_column.thousand)
-                    value = toThousand(value);
-                return value;
-            };
-        }
+        appendRender(_column);
         // 添加表头提示信息
         if (_column.headTooltip) {
             _column.title = (React.createElement(TableHeadTooltip, { headTooltip: _column.headTooltip }, _column.title));
@@ -596,6 +583,32 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
         _newColumns: _newColumns,
         _dynamicColumns: _dynamicColumns,
     };
+    function appendRender(_column) {
+        if (!_column.render) {
+            if (_column.children) {
+                _column.children.forEach(function (item) {
+                    appendRender(item);
+                });
+            }
+            else {
+                _column.render = returnRender(_column);
+            }
+        }
+        function returnRender(_column) {
+            return function (text, record, index) {
+                var value = text;
+                if (text == null || text === '')
+                    return '— —';
+                else if (_column.dateFormat)
+                    return dayjs(text).format(_column.dateFormat);
+                if (_column.precision)
+                    value = exactRound(text, _column.precision);
+                if (_column.thousand)
+                    value = toThousand(value);
+                return value;
+            };
+        }
+    }
 }
 function useColumns(props) {
     var columns = props.columns, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, delIconText = props.delIconText, showDynamicHandle = props.showDynamicHandle, onEditableSave = props.onEditableSave, configInfo = props.configInfo, copyByKey = props.copyByKey, onTableChange = props.onTableChange, currentPage = props.currentPage, currentDataSource = props.currentDataSource, preDataSource = props.preDataSource, rowKey = props.rowKey, dataSourceRef = props.dataSourceRef, expandableChildrenColumnName = props.expandableChildrenColumnName, customSortHandle = props.customSortHandle, customOrder = props.customOrder, setCustomOrder = props.setCustomOrder, isSort = props.isSort, onFillDownChangeRef = props.onFillDownChangeRef, isHasFilterRef = props.isHasFilterRef, filterSearchValuesRef = props.filterSearchValuesRef, diffData = props.diffData;

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

@@ -96,11 +96,11 @@ var TableEnhanceCell = function (_a) {
     var getRealyIndex = useCallback(function () {
         var newRecords = dataSource ? dataSource() : [];
         var rowKeyIndex = newRecords.findIndex(function (newRecord) {
-            if (typeof rowKey === 'string') {
-                return (newRecord === null || newRecord === void 0 ? void 0 : newRecord[rowKey]) === (record === null || record === void 0 ? void 0 : record[rowKey]);
+            if (typeof rowKey === 'function') {
+                return rowKey(newRecord) === rowKey(record);
             }
             else {
-                return rowKey(newRecord) === rowKey(record);
+                return (newRecord === null || newRecord === void 0 ? void 0 : newRecord[rowKey]) === (record === null || record === void 0 ? void 0 : record[rowKey]);
             }
         });
         if (rowKeyIndex !== -1 && isHasFilterRef.current) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.23-345-beta",
+  "version": "4.2.23-346-beta",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",