zmdms-webui 3.2.2 → 3.2.4

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -41,7 +41,6 @@ var DynamicDrawer = function (props, ref) {
     var isSearchFilterEnabled = getFinalValue(enableSearchFilter, isSearchFilter);
     // 自定义配置是否增加模板配置功能
     var isTemplateSettingEnabled = getFinalValue(enableTemplateSetting, isTemplateSetting);
-    console.log(isSearchFilterEnabled, isTemplateSettingEnabled);
     // 根据外部传入的list 和本地存储信息 生成一个内部的currentDynamicList
     // 这个currentDynamicList 是可以是负责显示最终结果的
     // tempDynamicList 是操作时的临时变量 可能操作后不点击确认 直接点击取消 那么需要重置到之前的状态
@@ -201,7 +200,7 @@ var DynamicDrawer = function (props, ref) {
                 }
             }
         }
-        // 2. 构建互斥关系映射
+        // 2. 构建互斥关系映射（包括主元素和子元素）
         var exclusiveMap = {};
         tempDynamicList.forEach(function (item) {
             var key = item.key;
@@ -210,6 +209,17 @@ var DynamicDrawer = function (props, ref) {
                 .map(function (k) { return k.trim(); })
                 .filter(Boolean);
             exclusiveMap[key] = new Set(__spreadArray([key], exclusiveKeys, true));
+            // 添加子元素的互斥关系
+            if (item.children) {
+                item.children.forEach(function (child) {
+                    var childKey = child.key;
+                    var childExclusiveKeys = (child.dimensionExclusive || "")
+                        .split(",")
+                        .map(function (k) { return k.trim(); })
+                        .filter(Boolean);
+                    exclusiveMap[childKey] = new Set(__spreadArray([childKey], childExclusiveKeys, true));
+                });
+            }
         });
         // 3. 检查本次勾选是否有互斥
         var hasConflict = false;
@@ -231,52 +241,135 @@ var DynamicDrawer = function (props, ref) {
         }
         // 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) {
-                    if (!finalCheckedValues.includes(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 中是否已经有被选中的
+                // 检查 anyOf 中是否已经有被选中的（包括主列表和子元素）
                 var hasAnyOfSelected = deps.anyOf.some(function (depKey) {
-                    return finalCheckedValues.includes(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]) {
-                    autoCheckKeys_1.push(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) {
-                autoCheckKeys_1.forEach(function (key) {
-                    if (!finalCheckedValues.includes(key)) {
-                        finalCheckedValues.push(key);
-                    }
-                });
-                // 提示用户
                 var depLabels = autoCheckKeys_1
                     .map(function (key) {
+                    // 先在主列表中查找
                     var item = tempDynamicList.find(function (d) { return d.key === key; });
-                    return (item === null || item === void 0 ? void 0 : item.label) || 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. 正常更新，包括联动子元素
         var newDynamicList = tempDynamicList.map(function (item) {
@@ -303,19 +396,118 @@ var DynamicDrawer = function (props, ref) {
         var changeCList = ((_b = (_a = newDynamicList[pIndex].children) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, function (item) { return (__assign({}, item)); })) ||
             [] ||
             [];
-        // 更新子元素的选中状态
-        changeCList.forEach(function (item) {
-            if (!checkedValues.find(function (value) { return value === item.key; })) {
-                item.checked = false;
+        // 1. 找出本次变化的子元素
+        var prevCheckedKeys = new Set(checkedValues.filter(function (key) {
+            var item = changeCList.find(function (d) { return d.key === key; });
+            return item && item.checked;
+        }));
+        var currentCheckedKeys = new Set(checkedValues);
+        var changedKey = null;
+        var isChecked = false;
+        for (var _i = 0, checkedValues_2 = checkedValues; _i < checkedValues_2.length; _i++) {
+            var key = checkedValues_2[_i];
+            if (!prevCheckedKeys.has(key)) {
+                changedKey = key;
+                isChecked = true;
+                break;
             }
-            else {
-                item.checked = true;
+        }
+        if (!changedKey) {
+            for (var _c = 0, changeCList_1 = changeCList; _c < changeCList_1.length; _c++) {
+                var item = changeCList_1[_c];
+                if (item.checked && !currentCheckedKeys.has(item.key)) {
+                    changedKey = item.key;
+                    isChecked = false;
+                    break;
+                }
+            }
+        }
+        // 2. 构建完整的依赖关系映射（包括所有主元素和子元素）
+        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;
+                    }
+                });
+            }
+        });
+        // 3. 如果本次是勾选操作，检查并自动添加依赖项
+        var finalCheckedValues = __spreadArray([], checkedValues, true);
+        if (isChecked && changedKey && dependenciesMap[changedKey]) {
+            var deps = dependenciesMap[changedKey];
+            var autoCheckKeys_2 = [];
+            // 处理 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);
+                    }
+                    else if (!depInChildren) {
+                        // 依赖项在主列表中，需要检查主列表
+                        var depInMain = newDynamicList.find(function (d) { return d.key === depKey; });
+                        if (depInMain && !depInMain.checked) {
+                            depInMain.checked = true;
+                            var depLabel = depInMain.label || depInMain.key;
+                            myMessage.success("\u5DF2\u81EA\u52A8\u52FE\u9009\u4F9D\u8D56\u9879\uFF1A".concat(depLabel));
+                        }
+                    }
+                });
             }
+            // 处理 anyOf 依赖（至少选中一个）
+            if (deps.anyOf && deps.anyOf.length > 0) {
+                var hasAnyOfSelected = deps.anyOf.some(function (depKey) {
+                    var depInChildren = changeCList.find(function (c) { return c.key === depKey; });
+                    var depInMain = newDynamicList.find(function (d) { return d.key === depKey; });
+                    return ((depInChildren && finalCheckedValues.includes(depKey)) ||
+                        (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);
+                    }
+                    else {
+                        var depInMain = newDynamicList.find(function (d) { return d.key === depKey_2; });
+                        if (depInMain && !depInMain.checked) {
+                            depInMain.checked = true;
+                            var depLabel = depInMain.label || depInMain.key;
+                            myMessage.success("\u5DF2\u81EA\u52A8\u52FE\u9009\u4F9D\u8D56\u9879\uFF1A".concat(depLabel));
+                        }
+                    }
+                }
+            }
+            // 添加自动勾选的子项
+            if (autoCheckKeys_2.length > 0) {
+                autoCheckKeys_2.forEach(function (key) {
+                    if (!finalCheckedValues.includes(key)) {
+                        finalCheckedValues.push(key);
+                    }
+                });
+                var depLabels = autoCheckKeys_2
+                    .map(function (key) {
+                    var item = changeCList.find(function (c) { return c.key === key; });
+                    return (item === null || item === void 0 ? void 0 : item.label) || key;
+                })
+                    .join("、");
+                myMessage.success("\u5DF2\u81EA\u52A8\u52FE\u9009\u4F9D\u8D56\u9879\uFF1A".concat(depLabels));
+            }
+        }
+        // 4. 更新子元素的选中状态
+        changeCList.forEach(function (item) {
+            item.checked = finalCheckedValues.includes(item.key);
         });
         newDynamicList[pIndex].children = changeCList;
-        // 联动父元素
-        // const allChildrenChecked =
-        //   changeCList.length > 0 && changeCList.every((child) => child.checked);
+        // 5. 联动父元素
         var someChildrenChecked = changeCList.some(function (child) { return child.checked; });
         if (someChildrenChecked) {
             // 只要有子元素选中，父元素就应该是 checked = true

package/dist/es/dynamicsetting/useDynamic.js

@@ -19,6 +19,7 @@ function recursionDynamicItems(list, currentDynamicList) {
             currentData.dimensionPriority = result.dimensionPriority;
             currentData.dimensionGroup = result.dimensionGroup;
             currentData.dimensionExclusive = result.dimensionExclusive;
+            currentData.dimensionDependencies = result.dimensionDependencies;
             // 判断是否是多级表头，这里的逻辑处理是为了兼容
             // 后面改造成多级表头的情况
             if (item.children) {

package/package.json

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