ztxkui 4.2.23-574 → 4.2.23-575

package/dist/UI/Table/EditTable.js

@@ -343,6 +343,25 @@ function useColumns(tableHandleRef) {
                 return React.createElement("div", null, "123123");
             },
         },
+        {
+            title: i18next.t('商品描述'),
+            width: 120,
+            dataIndex: 'productDesc',
+            key: 'productDesc',
+            // hideColumn: !isMaterialSupplementalInformation,
+            validate: {},
+            render: function (text, record, index) {
+                return (React.createElement(React.Fragment, null, true ? (React.createElement(React.Fragment, null,
+                    React.createElement(Input, { maxLength: 30, value: text, onBlur: function (e) {
+                            var _a, _b, _c;
+                            var realyIndex = (_b = (_a = tableHandleRef.current) === null || _a === void 0 ? void 0 : _a.getRealyIndex) === null || _b === void 0 ? void 0 : _b.call(_a, index);
+                            var newRecord = {
+                                productDesc: e.target.value,
+                            };
+                            (_c = tableHandleRef.current) === null || _c === void 0 ? void 0 : _c.onEditableSaveHandle(newRecord, index);
+                        }, suffix: React.createElement(React.Fragment, null, (record === null || record === void 0 ? void 0 : record.productDescIsRequired) === '1' && (React.createElement("span", { style: { color: 'red' } }, "*"))) }))) : null));
+            },
+        },
     ];
     useEffect(function () {
         setTimeout(function () {

package/dist/components/Table/table-menu.js

@@ -9,6 +9,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import i18next from 'ztxkutils/dist/i18next';
 import React, { useState, useEffect, isValidElement, useRef } from 'react';
 import { Menu, Item } from 'react-contexify';
@@ -41,6 +52,7 @@ var TableMenu = function (_a) {
                 (originItem === null || originItem === void 0 ? void 0 : originItem.validate) ||
                 (item === null || item === void 0 ? void 0 : item.required) ||
                 (originItem === null || originItem === void 0 ? void 0 : originItem.required),
+            required: (item === null || item === void 0 ? void 0 : item.required) || (originItem === null || originItem === void 0 ? void 0 : originItem.required),
         };
     });
     function onMenuItemClick(e) {
@@ -100,6 +112,23 @@ var TableMenu = function (_a) {
     function onCancel() {
         setVisible(false);
     }
+    /**
+     * 递归代理renderItem的返回值，将表单组件的onBlur替换为onChange
+     */
+    function proxyRenderElement(element) {
+        if (!isValidElement(element))
+            return element;
+        var _a = element.props, children = _a.children, onBlur = _a.onBlur, onChange = _a.onChange, restProps = __rest(_a, ["children", "onBlur", "onChange"]);
+        // 递归处理子元素
+        var newChildren = children != null
+            ? React.Children.map(children, proxyRenderElement)
+            : children;
+        // 有onBlur且无onChange时，将onBlur替换为onChange
+        if (typeof onBlur === 'function' && typeof onChange !== 'function') {
+            return React.cloneElement(element, __assign(__assign({}, restProps), { onChange: onBlur }), newChildren);
+        }
+        return React.cloneElement(element, restProps, newChildren);
+    }
     function renderItem(items) {
         return items.map(function (item) {
             var _a, _b;
@@ -119,8 +148,8 @@ var TableMenu = function (_a) {
             // 如果item.render 返回的不是ReactElement，那么就使用span来包裹
             // 做列合并时，render返回的是一个对象
             return (React.createElement(Descriptions.Item, { key: item.key, label: React.createElement("span", { style: { display: 'flex', alignItems: 'center' } },
-                    React.createElement("span", { style: { color: 'red' } }, item.validate ? '*' : ''),
-                    item.label) }, isValidElement(renderItem) ? (renderItem) : isValidElement(renderItem === null || renderItem === void 0 ? void 0 : renderItem.children) ? (renderItem === null || renderItem === void 0 ? void 0 : renderItem.children) : renderItem != null && typeof renderItem !== 'object' ? (
+                    React.createElement("span", { style: { color: 'red' } }, item.required ? '*' : ''),
+                    item.label) }, isValidElement(renderItem) ? (proxyRenderElement(renderItem)) : isValidElement(renderItem === null || renderItem === void 0 ? void 0 : renderItem.children) ? (proxyRenderElement(renderItem === null || renderItem === void 0 ? void 0 : renderItem.children)) : renderItem != null && typeof renderItem !== 'object' ? (
             // render返回了string或number，直接渲染该值
             renderItem) : (React.createElement("span", { title: currentRecord[item.key] }, currentRecord[item.key]))));
         });

package/package.json

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