zmdms-webui 3.2.4 → 3.2.6

package/dist/es/canvastable/hooks/useAutoHeight.js

@@ -49,8 +49,9 @@ function useCanvasTableAutoHeight(isAutoScrollY, marginBottom, canvasTableId, da
         }
         // 视口模式：根据页面位置计算高度
         // 构建表格选择器
+        // canvasTableId 直接赋值给 canvas-table-container 元素本身
         var tableSelector = canvasTableId
-            ? "#".concat(CSS.escape(canvasTableId), " .canvas-table-container")
+            ? "#".concat(CSS.escape(canvasTableId))
             : ".canvas-table-container";
         var calculateHeight = function () {
             // 查找CanvasTable元素

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -170,8 +170,96 @@ var DynamicDrawer = function (props, ref) {
     }, [setTempDynamicList, filterDynamicColumnsRef, isSearchFilterEnabled]);
     // 确认
     var onSureHandle = function () {
+        // 验证依赖关系
+        var validationResult = validateDependencies();
+        if (!validationResult.valid) {
+            myMessage.warning(validationResult.message);
+            return; // 阻止提交
+        }
         onSure && onSure(tempDynamicList);
     };
+    // 验证依赖关系
+    var validateDependencies = function () {
+        // 获取所有已勾选的主元素和子元素
+        var checkedKeys = new Set();
+        tempDynamicList.forEach(function (item) {
+            if (item.checked) {
+                checkedKeys.add(item.key);
+            }
+            if (item.children) {
+                item.children.forEach(function (child) {
+                    if (child.checked) {
+                        checkedKeys.add(child.key);
+                    }
+                });
+            }
+        });
+        // 构建依赖关系映射（包括主元素和子元素）
+        var dependenciesMap = {};
+        tempDynamicList.forEach(function (item) {
+            if (item.dimensionDependencies) {
+                dependenciesMap[item.key] = item.dimensionDependencies;
+            }
+            // 添加子元素的依赖
+            if (item.children) {
+                item.children.forEach(function (child) {
+                    if (child.dimensionDependencies) {
+                        dependenciesMap[child.key] = child.dimensionDependencies;
+                    }
+                });
+            }
+        });
+        // 检查每个已勾选项的依赖关系是否满足
+        var checkedKeysArray = Array.from(checkedKeys);
+        for (var _i = 0, checkedKeysArray_1 = checkedKeysArray; _i < checkedKeysArray_1.length; _i++) {
+            var checkedKey = checkedKeysArray_1[_i];
+            var deps = dependenciesMap[checkedKey];
+            if (!deps)
+                continue;
+            // 获取当前项的标签
+            var getItemLabel = function (key) {
+                var item = tempDynamicList.find(function (d) { return d.key === key; });
+                if (item)
+                    return String((item === null || item === void 0 ? void 0 : item.label) || key);
+                var label = key;
+                tempDynamicList.forEach(function (pItem) {
+                    if (pItem.children) {
+                        var child = pItem.children.find(function (c) { return c.key === key; });
+                        if (child) {
+                            label = String(child.label || key);
+                        }
+                    }
+                });
+                return label;
+            };
+            var currentLabel = getItemLabel(checkedKey);
+            // 检查 required 依赖（必须全部选中）
+            if (deps.required && deps.required.length > 0) {
+                var missingRequired = deps.required.filter(function (depKey) { return !checkedKeys.has(depKey); });
+                if (missingRequired.length > 0) {
+                    var missingLabels = missingRequired.map(getItemLabel).join("、");
+                    return {
+                        valid: false,
+                        message: "\u3010".concat(currentLabel, "\u3011\u9700\u8981\u4F9D\u8D56\u3010").concat(missingLabels, "\u3011\uFF0C\u8BF7\u5148\u52FE\u9009\u8FD9\u4E9B\u4F9D\u8D56\u9879\uFF01"),
+                    };
+                }
+            }
+            // 检查 anyOf 依赖（至少选中一个）
+            if (deps.anyOf && deps.anyOf.length > 0) {
+                var hasAnyOfSelected = deps.anyOf.some(function (depKey) {
+                    return checkedKeys.has(depKey);
+                });
+                if (!hasAnyOfSelected) {
+                    var anyOfLabels = deps.anyOf.map(getItemLabel).join("、");
+                    return {
+                        valid: false,
+                        message: "\u3010".concat(currentLabel, "\u3011\u9700\u8981\u81F3\u5C11\u4F9D\u8D56\u4EE5\u4E0B\u4E00\u9879\uFF1A\u3010").concat(anyOfLabels, "\u3011\uFF0C\u8BF7\u5148\u52FE\u9009\u5176\u4E2D\u4E00\u9879\uFF01"),
+                    };
+                }
+            }
+        }
+        return { valid: true };
+    };
     var onCheckboxChange = function (checkedValues) {
         // 1. 找出本次变化的项（新增或移除的）
         var prevCheckedKeys = new Set(checkedValues.filter(function (key) {
@@ -239,141 +327,9 @@ var DynamicDrawer = function (props, ref) {
             myMessage.warning("所选项存在互斥关系，不能同时勾选！");
             return; // 拦截本次勾选
         }
-        // 4. 处理依赖关系：自动勾选依赖项
-        var finalCheckedValues = __spreadArray([], checkedValues, true);
-        // 构建依赖关系映射（包括主元素和子元素）
-        var dependenciesMap = {};
-        tempDynamicList.forEach(function (item) {
-            if (item.dimensionDependencies) {
-                dependenciesMap[item.key] = item.dimensionDependencies;
-            }
-            // 添加子元素的依赖
-            if (item.children) {
-                item.children.forEach(function (child) {
-                    if (child.dimensionDependencies) {
-                        dependenciesMap[child.key] = child.dimensionDependencies;
-                    }
-                });
-            }
-        });
-        // 如果本次是勾选操作（isChecked = true），检查并自动添加依赖项
-        if (isChecked && changedKey && dependenciesMap[changedKey]) {
-            var deps = dependenciesMap[changedKey];
-            var autoCheckKeys_1 = [];
-            var childrenCheckedKeys_1 = {}; // 记录需要勾选的子元素 { parentIndex: [childKeys] }
-            // 处理 required 依赖（必须全部选中）
-            if (deps.required && deps.required.length > 0) {
-                deps.required.forEach(function (depKey) {
-                    // 检查依赖项是否在主列表中
-                    var depInMain = tempDynamicList.find(function (d) { return d.key === depKey; });
-                    if (depInMain && !finalCheckedValues.includes(depKey)) {
-                        autoCheckKeys_1.push(depKey);
-                    }
-                    else if (!depInMain) {
-                        // 依赖项可能在子元素中，查找并记录
-                        tempDynamicList.forEach(function (item, pIndex) {
-                            if (item.children) {
-                                var child = item.children.find(function (c) { return c.key === depKey; });
-                                if (child && !child.checked) {
-                                    if (!childrenCheckedKeys_1[pIndex]) {
-                                        childrenCheckedKeys_1[pIndex] = [];
-                                    }
-                                    childrenCheckedKeys_1[pIndex].push(depKey);
-                                    autoCheckKeys_1.push(depKey);
-                                }
-                            }
-                        });
-                    }
-                });
-            }
-            // 处理 anyOf 依赖（至少选中一个）
-            if (deps.anyOf && deps.anyOf.length > 0) {
-                // 检查 anyOf 中是否已经有被选中的（包括主列表和子元素）
-                var hasAnyOfSelected = deps.anyOf.some(function (depKey) {
-                    var inMain = finalCheckedValues.includes(depKey);
-                    if (inMain)
-                        return true;
-                    // 检查子元素
-                    var foundInChild = false;
-                    tempDynamicList.forEach(function (item) {
-                        if (item.children) {
-                            var child = item.children.find(function (c) { return c.key === depKey; });
-                            if (child && child.checked) {
-                                foundInChild = true;
-                            }
-                        }
-                    });
-                    return foundInChild;
-                });
-                // 如果没有任何一个被选中，自动选中第一个
-                if (!hasAnyOfSelected && deps.anyOf[0]) {
-                    var depKey_1 = deps.anyOf[0];
-                    var depInMain = tempDynamicList.find(function (d) { return d.key === depKey_1; });
-                    if (depInMain && !finalCheckedValues.includes(depKey_1)) {
-                        autoCheckKeys_1.push(depKey_1);
-                    }
-                    else {
-                        // 查找子元素
-                        tempDynamicList.forEach(function (item, pIndex) {
-                            if (item.children) {
-                                var child = item.children.find(function (c) { return c.key === depKey_1; });
-                                if (child && !child.checked) {
-                                    if (!childrenCheckedKeys_1[pIndex]) {
-                                        childrenCheckedKeys_1[pIndex] = [];
-                                    }
-                                    childrenCheckedKeys_1[pIndex].push(depKey_1);
-                                    autoCheckKeys_1.push(depKey_1);
-                                }
-                            }
-                        });
-                    }
-                }
-            }
-            // 添加自动勾选的主元素
-            autoCheckKeys_1.forEach(function (key) {
-                if (!finalCheckedValues.includes(key)) {
-                    finalCheckedValues.push(key);
-                }
-            });
-            // 提示用户
-            if (autoCheckKeys_1.length > 0) {
-                var depLabels = autoCheckKeys_1
-                    .map(function (key) {
-                    // 先在主列表中查找
-                    var item = tempDynamicList.find(function (d) { return d.key === key; });
-                    if (item)
-                        return (item === null || item === void 0 ? void 0 : item.label) || key;
-                    // 在子元素中查找
-                    var label = key;
-                    tempDynamicList.forEach(function (pItem) {
-                        if (pItem.children) {
-                            var child = pItem.children.find(function (c) { return c.key === key; });
-                            if (child) {
-                                label = child.label || key;
-                            }
-                        }
-                    });
-                    return label;
-                })
-                    .join("、");
-                myMessage.success("\u5DF2\u81EA\u52A8\u52FE\u9009\u4F9D\u8D56\u9879\uFF1A".concat(depLabels));
-            }
-            // 6. 更新子元素的选中状态（针对依赖项）
-            if (Object.keys(childrenCheckedKeys_1).length > 0) {
-                tempDynamicList.forEach(function (item, pIndex) {
-                    if (item.children && childrenCheckedKeys_1[pIndex]) {
-                        item.children.forEach(function (child) {
-                            if (childrenCheckedKeys_1[pIndex].includes(child.key)) {
-                                child.checked = true;
-                            }
-                        });
-                    }
-                });
-            }
-        }
-        // 5. 正常更新，包括联动子元素
+        // 4. 正常更新，包括联动子元素
         var newDynamicList = tempDynamicList.map(function (item) {
-            var isItemChecked = finalCheckedValues.includes(item.key);
+            var isItemChecked = checkedValues.includes(item.key);
             var newItem = __assign(__assign({}, item), { checked: isItemChecked });
             // 如果当前变化的是这个主元素，并且它有子元素，联动子元素
             if (item.key === changedKey &&
@@ -442,14 +398,14 @@ var DynamicDrawer = function (props, ref) {
         var finalCheckedValues = __spreadArray([], checkedValues, true);
         if (isChecked && changedKey && dependenciesMap[changedKey]) {
             var deps = dependenciesMap[changedKey];
-            var autoCheckKeys_2 = [];
+            var autoCheckKeys_1 = [];
             // 处理 required 依赖（必须全部选中）
             if (deps.required && deps.required.length > 0) {
                 deps.required.forEach(function (depKey) {
                     // 检查依赖项是否在当前子列表或主列表中
                     var depInChildren = changeCList.find(function (c) { return c.key === depKey; });
                     if (depInChildren && !finalCheckedValues.includes(depKey)) {
-                        autoCheckKeys_2.push(depKey);
+                        autoCheckKeys_1.push(depKey);
                     }
                     else if (!depInChildren) {
                         // 依赖项在主列表中，需要检查主列表
@@ -471,13 +427,13 @@ var DynamicDrawer = function (props, ref) {
                         (depInMain && depInMain.checked));
                 });
                 if (!hasAnyOfSelected && deps.anyOf[0]) {
-                    var depKey_2 = deps.anyOf[0];
-                    var depInChildren = changeCList.find(function (c) { return c.key === depKey_2; });
-                    if (depInChildren && !finalCheckedValues.includes(depKey_2)) {
-                        autoCheckKeys_2.push(depKey_2);
+                    var depKey_1 = deps.anyOf[0];
+                    var depInChildren = changeCList.find(function (c) { return c.key === depKey_1; });
+                    if (depInChildren && !finalCheckedValues.includes(depKey_1)) {
+                        autoCheckKeys_1.push(depKey_1);
                     }
                     else {
-                        var depInMain = newDynamicList.find(function (d) { return d.key === depKey_2; });
+                        var depInMain = newDynamicList.find(function (d) { return d.key === depKey_1; });
                         if (depInMain && !depInMain.checked) {
                             depInMain.checked = true;
                             var depLabel = depInMain.label || depInMain.key;
@@ -487,13 +443,13 @@ var DynamicDrawer = function (props, ref) {
                 }
             }
             // 添加自动勾选的子项
-            if (autoCheckKeys_2.length > 0) {
-                autoCheckKeys_2.forEach(function (key) {
+            if (autoCheckKeys_1.length > 0) {
+                autoCheckKeys_1.forEach(function (key) {
                     if (!finalCheckedValues.includes(key)) {
                         finalCheckedValues.push(key);
                     }
                 });
-                var depLabels = autoCheckKeys_2
+                var depLabels = autoCheckKeys_1
                     .map(function (key) {
                     var item = changeCList.find(function (c) { return c.key === key; });
                     return (item === null || item === void 0 ? void 0 : item.label) || key;

package/package.json

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