zmdms-webui 0.0.83 → 0.0.86

package/dist/es/footer/footer.js

@@ -1,6 +1,6 @@
 import { __assign } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { memo } from 'react';
+import React__default, { memo } from 'react';
 import classNames from '../node_modules/classnames/index.js';
 import ButtonCom from '../button/button.js';
 import Pagination from '../pagination/pagination.js';
@@ -26,7 +26,7 @@ var Footer = function (props) {
                         return (jsx(Pagination, { total: total, pageSize: pageSize, current: current, onChange: onChange, onShowSizeChange: onShowSizeChange, showTotal: function (total) { return "\u5171".concat(total, "\u6761"); }, showSizeChanger: true, pageSizeOptions: pageSizeOptions ? pageSizeOptions : defaultPageSizeOptions }, index));
                     }
                     if (render) {
-                        return render();
+                        return jsx(React__default.Fragment, { children: render() }, index);
                     }
                     return null;
                 }), children] }))) : null })));

package/dist/es/table/components/EnhanceBodyCell.js

@@ -37,9 +37,12 @@ var EnhanceCell = function (props) {
     if (typeof editable === "function" ? editable(record) : editable) {
         var _d = editableConfig || {
             type: "input",
-        }, type = _d.type, max = _d.max, min = _d.min, maxHandle = _d.maxHandle, minHandle = _d.minHandle, resetEditableConfigProps = __rest(_d, ["type", "max", "min", "maxHandle", "minHandle"]);
+        }, type = _d.type, max = _d.max, min = _d.min, maxHandle = _d.maxHandle, minHandle = _d.minHandle, disabled = _d.disabled, disabledHandle = _d.disabledHandle, resetEditableConfigProps = __rest(_d, ["type", "max", "min", "maxHandle", "minHandle", "disabled", "disabledHandle"]);
         var CurrentReactNode = null;
         var newChildren = children;
+        var resultDisabled = disabledHandle
+            ? disabledHandle(record)
+            : disabled;
         // 输入框处理
         if (type === "input") {
             CurrentReactNode = (jsx(MemoInput, __assign({ value: val, onChange: function (e) {
@@ -47,7 +50,7 @@ var EnhanceCell = function (props) {
                     if (isValidate) {
                         removeErrorClass();
                     }
-                }, onPressEnter: onSave, onBlur: onSave, ref: iptRef }, resetEditableConfigProps)));
+                }, onPressEnter: onSave, onBlur: onSave, ref: iptRef, disabled: resultDisabled }, resetEditableConfigProps)));
         }
         // 数字输入框处理
         if (type === "inputNumber") {
@@ -71,7 +74,7 @@ var EnhanceCell = function (props) {
                     if (isValidate) {
                         removeErrorClass();
                     }
-                }, onPressEnter: onSave, onBlur: onSave, ref: iptRef }, resetEditableConfigProps)));
+                }, onPressEnter: onSave, onBlur: onSave, ref: iptRef, disabled: resultDisabled }, resetEditableConfigProps)));
             // 显示的时候 展示转换的值
             try {
                 if (Array.isArray(newChildren)) {
@@ -84,7 +87,7 @@ var EnhanceCell = function (props) {
                 console.error(err);
             }
         }
-        return (jsx("td", __assign({ ref: tdRef }, resetProps, { children: editing ? (jsx("div", __assign({ className: "ztxk-table__enhance-cell" }, { children: CurrentReactNode }))) : (jsx("div", __assign({ className: "ztxk-table__enhance-cell-wrap", onClick: toggleEdit }, { children: newChildren }))) })));
+        return (jsx("td", __assign({ ref: tdRef }, resetProps, { children: editing ? (jsx("div", __assign({ className: "ztxk-table__enhance-cell" }, { children: CurrentReactNode }))) : (jsx("div", __assign({ className: "ztxk-table__enhance-cell-wrap ".concat(resultDisabled ? "ztxk-table__enhance-cell-wrap--disabled" : ""), onClick: resultDisabled ? undefined : toggleEdit }, { children: newChildren }))) })));
     }
     return (jsx("td", __assign({ ref: tdRef }, resetProps, { children: children })));
 };

package/dist/es/table/interface.d.ts

@@ -18,6 +18,10 @@ interface IEditableConfig extends Partial<IEditableConfigOtherProps> {
      * 最大值函数
      */
     minHandle?: (record: any) => any;
+    /**
+     * 禁用方法
+     */
+    disabledHandle?: (record: any) => boolean;
     /**
      * 可以传入对应的input inputNumber的所有相关属性
      */

package/dist/es/table/table.js

@@ -219,6 +219,7 @@ var Table = function (props) {
             },
         };
     });
+    console.log(newColumns, currentDynamicList);
     // 表格
     var SingleTable = (jsx(Table$1, __assign({ className: classes, bordered: bordered, dataSource: dataSource, columns: newColumns, components: componentsMemo, onRow: onRow, summary: getSummaryHandle, pagination: isInnerPagination
             ? pagination

package/dist/es/table/useDynamicListByColumns.js

@@ -70,10 +70,19 @@ function useDynamicListByColumns(columns, dynamicKey) {
     var _a = useState(function () {
         return getCurrentDynamicItems(dynamicKey, TABLE_DYNAMIC_KEY, defaultDynamicList);
     }), currentDynamicList = _a[0], setCurrentDynamicList = _a[1];
+    var currentDynamicListRef = useRef();
+    useEffect(function () {
+        currentDynamicListRef.current = currentDynamicList;
+    }, [currentDynamicList]);
     // columns发生变化时，更新数据默认配置
     useEffect(function () {
         var _a, _b;
         var defaultDynamicList = getDynamicList(dynamicKey, columns);
+        // 更新动态列配置信息
+        var newDynamicList = getCurrentDynamicItems(dynamicKey, TABLE_DYNAMIC_KEY, defaultDynamicList);
+        if (!isEqual(currentDynamicListRef.current, newDynamicList)) {
+            setCurrentDynamicList(newDynamicList);
+        }
         (_b = (_a = dynamicSettingRef === null || dynamicSettingRef === void 0 ? void 0 : dynamicSettingRef.current) === null || _a === void 0 ? void 0 : _a.setList) === null || _b === void 0 ? void 0 : _b.call(_a, function (preList) {
             if (isEqual(preList, defaultDynamicList)) {
                 return preList;