zmdms-webui 1.2.7 → 1.2.9

package/dist/es/table/useTableValidate.js

@@ -73,8 +73,12 @@ function tableValidate(dataSource, columns, restParams) {
                             columns.forEach(function (column, index) {
                                 var _a, _b;
                                 if (!isMerge) {
+                                    // 这里判断需要改动，只需要有rowSpan属性或者colSpan属性就有合并
                                     var mergeColumn = (_a = column === null || column === void 0 ? void 0 : column.onCell) === null || _a === void 0 ? void 0 : _a.call(column, {}, 1);
-                                    if (mergeColumn && (mergeColumn.rowSpan || mergeColumn.colSpan)) {
+                                    // if (mergeColumn && (mergeColumn?.rowSpan || mergeColumn?.colSpan)) {
+                                    if (mergeColumn &&
+                                        (Reflect.has(mergeColumn, "rowSpan") ||
+                                            Reflect.has(mergeColumn, "colSpan"))) {
                                         isMerge = true;
                                     }
                                 }
@@ -96,6 +100,7 @@ function tableValidate(dataSource, columns, restParams) {
                                             column.__title ||
                                             column.title,
                                         validate: column.validate,
+                                        // 错误发生的列
                                         index: childrenLen + (rowSelection ? 1 : 0) + (expandable ? 1 : 0),
                                     });
                                 }

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

@@ -17,6 +17,10 @@ interface ITreeSelectProps extends Omit<TreeSelectProps, "onChange"> {
      */
     searchType?: "all" | "lazy";
     lazySearchHandle?: (v: string, setExpandKeys?: any) => void;
+    /**
+     * 禁用的选项列表 一个dataKey列表
+     */
+    disabledValues?: string[];
 }
 interface TreeSelectComponent extends React__default.ForwardRefExoticComponent<ITreeSelectProps & React__default.RefAttributes<unknown>> {
     SHOW_ALL: typeof TreeSelect.SHOW_ALL;

package/dist/es/treeselect/treeSelect.js

@@ -1,6 +1,6 @@
 import { __rest, __assign } from '../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
-import { memo, forwardRef } from 'react';
+import { memo, forwardRef, useMemo } from 'react';
 import { TreeSelect as TreeSelect$1 } from 'antd';
 import { useBasicInfo, useAllDataHandle, useChange, useSearchHandle } from './hooks.js';
 
@@ -15,8 +15,8 @@ var DEFAULT_MAX_TAG_COUNT = 3;
  * treeDataSimpleMode treeData是否为简单格式 即树数据为平级 通过pId关联父子节点
  */
 var TreeSelect = function (props, ref) {
-    var onChange = props.onChange, isAllData = props.isAllData, dataHandle = props.dataHandle, searchType = props.searchType, lazySearchHandle = props.lazySearchHandle, resetProps = __rest(props, ["onChange", "isAllData", "dataHandle", "searchType", "lazySearchHandle"]);
-    var fieldNames = resetProps.fieldNames, treeNodeLabelProp = resetProps.treeNodeLabelProp, value = resetProps.value, treeData = resetProps.treeData, treeDataSimpleMode = resetProps.treeDataSimpleMode;
+    var onChange = props.onChange, isAllData = props.isAllData, dataHandle = props.dataHandle, searchType = props.searchType, lazySearchHandle = props.lazySearchHandle, disabledValues = props.disabledValues, treeData = props.treeData, resetProps = __rest(props, ["onChange", "isAllData", "dataHandle", "searchType", "lazySearchHandle", "disabledValues", "treeData"]);
+    var fieldNames = resetProps.fieldNames, treeNodeLabelProp = resetProps.treeNodeLabelProp, value = resetProps.value, treeDataSimpleMode = resetProps.treeDataSimpleMode;
     // 基础数据
     var _a = useBasicInfo({
         fieldNames: fieldNames,
@@ -47,11 +47,52 @@ var TreeSelect = function (props, ref) {
         childrenKey: childrenKey,
         titleKey: titleKey,
     }), searchValue = _b.searchValue, onLazySearchHandle = _b.onLazySearchHandle, filterTreeNode = _b.filterTreeNode, treeExpandedKeys = _b.treeExpandedKeys, onTreeExpand = _b.onTreeExpand;
+    var newTreeData = useMemo(function () {
+        if (!disabledValues) {
+            return treeData;
+        }
+        if (disabledValues.length === 0) {
+            return treeData;
+        }
+        // 如果数据是扁平模式
+        if (treeDataSimpleMode) {
+            return treeData === null || treeData === void 0 ? void 0 : treeData.map(function (item) {
+                if (valueKey && disabledValues.includes(item[valueKey])) {
+                    return __assign(__assign({}, item), { disabled: true, disableCheckbox: true });
+                }
+                return item;
+            });
+        }
+        function cloneAndDisableTree(tree, disabledIds) {
+            var _a;
+            // 递归函数，用于克隆树结构并添加禁用属性
+            function cloneNode(node) {
+                // 创建一个新节点作为克隆
+                var newNode = __assign({}, node);
+                // 如果有子节点，则递归克隆子节点
+                if (node === null || node === void 0 ? void 0 : node[childrenKey]) {
+                    newNode[childrenKey] = node[childrenKey].map(function (child) {
+                        return cloneNode(child);
+                    });
+                }
+                // 检查当前节点的ID是否在禁用列表中
+                if (disabledIds.includes(node[valueKey])) {
+                    // 如果在，则添加禁用属性
+                    newNode.disabled = true;
+                    newNode.disableCheckbox = true;
+                }
+                return newNode;
+            }
+            // 遍历原始树结构，对每个节点调用cloneNode进行克隆和修改
+            return (_a = tree === null || tree === void 0 ? void 0 : tree.map) === null || _a === void 0 ? void 0 : _a.call(tree, function (rootNode) { return cloneNode(rootNode); });
+        }
+        return cloneAndDisableTree(treeData, disabledValues);
+    }, [treeData, valueKey, childrenKey, treeDataSimpleMode, disabledValues]);
     return (jsx(TreeSelect$1, __assign({ onChange: onChangeHandle, 
         // 当多选模式或treeCheckable 定义回填的模式
         showCheckedStrategy: TreeSelect$1.SHOW_ALL, maxTagCount: DEFAULT_MAX_TAG_COUNT, searchValue: searchValue, onSearch: onLazySearchHandle, filterTreeNode: filterTreeNode, 
         // 节点展开逻辑
-        treeExpandedKeys: treeExpandedKeys, onTreeExpand: onTreeExpand, ref: ref }, resetProps)));
+        treeExpandedKeys: treeExpandedKeys, onTreeExpand: onTreeExpand, ref: ref, treeData: newTreeData }, resetProps)));
 };
 var MemoTreeSelect = memo(forwardRef(TreeSelect));
 MemoTreeSelect.displayName = "ZTXK_WEBUI_TreeSelect";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",