@weitutech/by-components 1.2.2 → 1.2.4

package/lib/by-components.common.js

@@ -96015,8 +96015,8 @@ var ByCascaderPanel_component = normalizeComponent(
 )
 
 /* harmony default export */ var ByCascaderPanel = (ByCascaderPanel_component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"8cd600e8-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/cascader-panel-pro/ByCascaderPanelPro.vue?vue&type=template&id=37aef47d
-var ByCascaderPanelProvue_type_template_id_37aef47d_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"8cd600e8-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/cascader-panel-pro/ByCascaderPanelPro.vue?vue&type=template&id=e4b10a08
+var ByCascaderPanelProvue_type_template_id_e4b10a08_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -96258,7 +96258,7 @@ var ByCascaderPanelProvue_type_template_id_37aef47d_render = function render() {
     staticClass: "empty-state"
   }, [_vm._v("暂无选中项")])], 1)])])])]);
 };
-var ByCascaderPanelProvue_type_template_id_37aef47d_staticRenderFns = [];
+var ByCascaderPanelProvue_type_template_id_e4b10a08_staticRenderFns = [];
 
 ;// ./src/components/cascader-panel-pro/cascaderStorePro.js
 
@@ -96488,6 +96488,44 @@ function findStoreNodeByPath(store, pathValues) {
  */
 
 class CascaderUtilsPro {
+  static isTreeLeafNode(node, cascaderProps) {
+    const childrenKey = cascaderProps && cascaderProps.children || 'children';
+    const children = node[childrenKey];
+    return !Array.isArray(children) || children.length === 0;
+  }
+
+  /**
+   * 将单个外部 value（含 __parent__ 前缀）同步到面板 selection
+   */
+  static addValueToSelection(store, selection, value, options, cascaderProps, prefix = '__parent__') {
+    if (!store || !selection || value == null || value === '') {
+      return;
+    }
+    const isParent = this.isParentNodeValue(value, prefix);
+    const actualValue = isParent ? this.extractParentNodeValue(value, prefix) : value;
+    const node = resolveStoreNodeByValue(store, actualValue);
+    if (node) {
+      if (node.isLeaf) {
+        selection.selectedLeafSet.add(node.value);
+      } else {
+        node.descendantLeafValues.forEach(leaf => selection.selectedLeafSet.add(leaf));
+      }
+      return;
+    }
+    let paths = isParent ? this.getLeafPathsByParentValue(actualValue, options, cascaderProps) : this.findPathsByValues([actualValue], options, cascaderProps);
+    if (paths.length === 0 && !isParent) {
+      paths = this.getLeafPathsByParentValue(actualValue, options, cascaderProps);
+    }
+    paths.forEach(path => {
+      const leafValue = path[path.length - 1];
+      const leafPath = getStoreLeafPath(store, leafValue);
+      if (leafPath) {
+        selection.selectedLeafSet.add(leafPath[leafPath.length - 1]);
+      } else {
+        selection.selectedLeafSet.add(leafValue);
+      }
+    });
+  }
   /**
    * 估算级联节点标签文本宽度（px）
    */
@@ -96750,16 +96788,13 @@ class CascaderUtilsPro {
 
         // 检查当前节点是否禁用
         const isCurrentDisabled = this.isItemDisabled(node, config);
-        if (!node[cascaderProps.children]) {
+        if (this.isTreeLeafNode(node, cascaderProps)) {
           // 只包含非禁用项且路径上没有禁选项的叶子节点
           if (!isCurrentDisabled && !this.isPathDisabled(tree, newPath, config, cascaderProps)) {
             paths.push(newPath);
           }
-        } else {
-          // 如果当前节点禁用，则其所有子节点都不可选
-          if (!isCurrentDisabled) {
-            traverse(node[cascaderProps.children], newPath);
-          }
+        } else if (!isCurrentDisabled) {
+          traverse(node[cascaderProps.children], newPath);
         }
       });
     };
@@ -97149,12 +97184,14 @@ class CascaderUtilsPro {
       for (const node of nodes) {
         const newPath = [...currentPath, node[cascaderProps.value]];
         if (node[cascaderProps.value] == parentValue) {
-          // 找到目标非叶子节点，获取其所有叶子节点路径
-          this.getAllLeafPaths([node], {}, cascaderProps).forEach(leafPath => {
-            // 将叶子节点路径与当前路径合并
-            const fullPath = [...currentPath, ...leafPath];
-            paths.push(fullPath);
-          });
+          if (this.isTreeLeafNode(node, cascaderProps)) {
+            paths.push(newPath);
+          } else {
+            this.getAllLeafPaths([node], {}, cascaderProps).forEach(leafPath => {
+              const fullPath = [...currentPath, ...leafPath];
+              paths.push(fullPath);
+            });
+          }
           return true;
         }
 
@@ -97188,8 +97225,10 @@ class CascaderUtilsPro {
         const leafPaths = this.getLeafPathsByParentValue(actualValue, options, cascaderProps);
         paths.push(...leafPaths);
       } else {
-        // 普通值，查找对应的路径
-        const valuePaths = this.findPathsByValues([value], options, cascaderProps);
+        let valuePaths = this.findPathsByValues([value], options, cascaderProps);
+        if (valuePaths.length === 0) {
+          valuePaths = this.getLeafPathsByParentValue(value, options, cascaderProps);
+        }
         paths.push(...valuePaths);
       }
     }
@@ -97208,15 +97247,10 @@ class CascaderUtilsPro {
     const findPath = (nodes, targetValues, currentPath = []) => {
       for (const option of nodes) {
         const newPath = [...currentPath, option[cascaderProps.value]];
-        if (targetValues.some(target => target == option[cascaderProps.value])) {
-          // 如果是叶子节点（没有children属性），添加到路径中
-          if (!option[cascaderProps.children]) {
-            paths.push(newPath);
-          }
+        if (targetValues.some(target => target == option[cascaderProps.value]) && this.isTreeLeafNode(option, cascaderProps)) {
+          paths.push(newPath);
         }
-
-        // 递归查找子节点
-        if (option[cascaderProps.children] && option[cascaderProps.children].length > 0) {
+        if (!this.isTreeLeafNode(option, cascaderProps)) {
           findPath(option[cascaderProps.children], targetValues, newPath);
         }
       }
@@ -97729,8 +97763,12 @@ class SelectionStatePro {
         rootValue = val.substring(prefix.length);
       }
       const node = resolveStoreNodeByValue(this.store, rootValue);
-      if (node && !node.isLeaf) {
-        node.descendantLeafValues.forEach(v => this.selectedLeafSet.add(v));
+      if (node) {
+        if (node.isLeaf) {
+          this.selectedLeafSet.add(node.value);
+        } else {
+          node.descendantLeafValues.forEach(v => this.selectedLeafSet.add(v));
+        }
       }
     });
     this._reconcileAllRoots();
@@ -98394,7 +98432,9 @@ var VirtualCascaderPanel_component = normalizeComponent(
       // 紧凑模式下稳定的空 value 引用，避免 watch 误触发清空
       searchDebounceTimer: null,
       searchLeafSetCache: null,
-      panelSyncTimer: null
+      panelSyncTimer: null,
+      // 外部 v-model 回显同步中，避免与用户操作冲突
+      isExternalSync: false
     };
   },
   computed: {
@@ -98529,6 +98569,8 @@ var VirtualCascaderPanel_component = normalizeComponent(
             } else {
               this.isAllSelected = this.selectedCount === this.totalCount;
             }
+          } else if (panel && panel.store && panel.selection && this.aggregationMode) {
+            this.isAllSelected = panel.selection.size() === panel.store.totalLeafCount && panel.store.totalLeafCount > 0;
           }
         } else {
           if (newVal.length > 1) {
@@ -98577,7 +98619,13 @@ var VirtualCascaderPanel_component = normalizeComponent(
         selection
       } = panel;
       if (this.aggregationMode) {
-        const items = CascaderUtilsPro.getAggregatedItemsFromSelection(store, selection, this.filteredOptions, this.cascaderProps);
+        let items = CascaderUtilsPro.getAggregatedItemsFromSelection(store, selection, this.filteredOptions, this.cascaderProps);
+        if (items.length === 0 && selection.size() > 0 && !selection.isCompactSelection()) {
+          const paths = selection.getCheckedPaths();
+          if (paths.length > 0) {
+            items = CascaderUtilsPro.getAggregatedSelectedItems(paths, this.filteredOptions, this.cascaderProps);
+          }
+        }
         this.selectedItems = items;
         this.selectedCount = items.length;
         this.isAllSelected = selection.size() === store.totalLeafCount && store.totalLeafCount > 0;
@@ -98598,18 +98646,18 @@ var VirtualCascaderPanel_component = normalizeComponent(
       this.updateSelectedItems();
       panel.bumpSelectionView();
     },
-    applyPanelSelectionChange() {
-      const panel = this.$refs.cascaderPanel;
-      if (!panel || !panel.store || !panel.selection) {
-        return;
-      }
-      const {
-        store,
-        selection
-      } = panel;
-      this.refreshSelectionDisplayFromPanel();
+    /**
+     * 用户操作（勾选/全选/清除/删除）统一提交：更新展示 + emit，标记内部更新防回显覆盖
+     */
+    commitUserSelectionChange() {
+      this.isInternalUpdate = true;
+      this.applyPanelSelectionChange();
+    },
+    /**
+     * 向父组件 emit 当前选中（仅用户操作路径调用，外部回显走 syncPanelFromExternalValue 不 emit）
+     */
+    emitSelectionToParent() {
       if (this.aggregationMode) {
-        this.isInternalUpdate = true;
         let emitValue = CascaderUtilsPro.getAggregatedEmitValues(this.selectedItems, this.parentNodePrefix);
         if (!this.isMultiple && emitValue.length > 0) {
           emitValue = emitValue[0];
@@ -98618,25 +98666,28 @@ var VirtualCascaderPanel_component = normalizeComponent(
         this.$emit('change', this.getSelectedData());
         return;
       }
-      if (selection.isCompactSelection()) {
-        this.isInternalUpdate = true;
+      const panel = this.$refs.cascaderPanel;
+      const isCompact = panel && panel.selection && panel.selection.isCompactSelection();
+      if (isCompact) {
         this.$emit('input', this.currentValue);
         this.$emit('change', this.getSelectedData());
         return;
       }
       this.$nextTick(() => {
-        this.isInternalUpdate = true;
         let emitValue = this.currentValue;
-        if (this.aggregationMode) {
-          emitValue = CascaderUtilsPro.getAggregatedEmitValues(this.selectedItems, this.parentNodePrefix);
-          if (!this.isMultiple && emitValue.length > 0) {
-            emitValue = emitValue[0];
-          }
-        }
         this.$emit('input', emitValue);
         this.$emit('change', this.getSelectedData());
       });
     },
+    applyPanelSelectionChange() {
+      const panel = this.$refs.cascaderPanel;
+      if (panel && panel.store && panel.selection) {
+        this.refreshSelectionDisplayFromPanel();
+      } else if (!this.aggregationMode) {
+        this.updateSelectedItems();
+      }
+      this.emitSelectionToParent();
+    },
     buildSelectedItemsFromValuesLazy(panel) {
       if (!panel || !panel.selection) {
         return [];
@@ -98651,18 +98702,26 @@ var VirtualCascaderPanel_component = normalizeComponent(
       if (!panel || !panel.selection || !panel.store) {
         return false;
       }
+      this.isExternalSync = true;
       if (!this.hasExternalValue()) {
-        panel.clearCheckedNodes();
+        if (panel.selection) {
+          panel.selection.clear();
+          panel.bumpSelectionView();
+        }
         this.selectedItems = [];
         this.selectedValues = [];
+        this.isExternalSync = false;
         return true;
       }
       panel.selection.clear();
-      this.applyExternalValueToPanelSelection(panel);
+      this.getExternalValueList().forEach(val => {
+        CascaderUtilsPro.addValueToSelection(panel.store, panel.selection, val, this.filteredOptions, this.cascaderProps, this.parentNodePrefix);
+      });
       panel.selection._reconcileAllRoots();
       panel.bumpSelectionView();
       this.refreshSelectionDisplayFromPanel();
       this.expandPanelToExternalValue(panel);
+      this.isExternalSync = false;
       return true;
     },
     hasExternalValue() {
@@ -98675,46 +98734,6 @@ var VirtualCascaderPanel_component = normalizeComponent(
       }
       return true;
     },
-    applyExternalValueToPanelSelection(panel) {
-      const {
-        store,
-        selection
-      } = panel;
-      const paths = this.resolveExternalValueToPaths();
-      paths.forEach(path => {
-        if (!Array.isArray(path) || path.length === 0) {
-          return;
-        }
-        const leafValue = path[path.length - 1];
-        const leafPath = getStoreLeafPath(store, leafValue);
-        if (leafPath) {
-          selection.selectedLeafSet.add(leafPath[leafPath.length - 1]);
-        }
-      });
-
-      // 直接按外部 value 再补一遍，避免 paths 解析遗漏（聚合父节点、异步 options 等）
-      this.getExternalValueList().forEach(val => {
-        if (this.aggregationMode && CascaderUtilsPro.isParentNodeValue(val, this.parentNodePrefix)) {
-          const actualValue = CascaderUtilsPro.extractParentNodeValue(val, this.parentNodePrefix);
-          const node = resolveStoreNodeByValue(store, actualValue);
-          if (node && !node.isLeaf) {
-            node.descendantLeafValues.forEach(leaf => selection.selectedLeafSet.add(leaf));
-          }
-          return;
-        }
-        const leafPath = getStoreLeafPath(store, val);
-        if (leafPath) {
-          selection.selectedLeafSet.add(leafPath[leafPath.length - 1]);
-          return;
-        }
-        const node = resolveStoreNodeByValue(store, val);
-        if (node && node.isLeaf) {
-          selection.selectedLeafSet.add(node.value);
-        } else if (node && !node.isLeaf) {
-          node.descendantLeafValues.forEach(leaf => selection.selectedLeafSet.add(leaf));
-        }
-      });
-    },
     getExternalValueList() {
       const val = this.value;
       if (val == null || val === '') {
@@ -98738,12 +98757,16 @@ var VirtualCascaderPanel_component = normalizeComponent(
       }
     },
     schedulePanelSyncFromExternalValue(retry = 0) {
+      if (this.isInternalUpdate || this.isExternalSync) {
+        return;
+      }
       this.clearPanelSyncTimer();
       this.$nextTick(() => {
         if (!this.hasExternalValue()) {
           const panel = this.$refs.cascaderPanel;
           if (panel && panel.selection) {
-            panel.clearCheckedNodes();
+            panel.selection.clear();
+            panel.bumpSelectionView();
           }
           this.selectedItems = [];
           this.selectedValues = [];
@@ -98984,7 +99007,7 @@ var VirtualCascaderPanel_component = normalizeComponent(
         const paths = [];
         panel.selection.selectedLeafSet.forEach(leaf => {
           if (searchLeafSet.has(leaf)) {
-            const path = panel.store.pathByLeafValue.get(leaf);
+            const path = getStoreLeafPath(panel.store, leaf);
             if (path) {
               paths.push(path);
             }
@@ -99024,9 +99047,9 @@ var VirtualCascaderPanel_component = normalizeComponent(
         this.$refs.searchCascaderPanel.expandPathValues([firstOption[valueKey]], true);
       }
     },
-    // 值变化处理
+    // 值变化处理（面板勾选）
     handleValueChange() {
-      this.applyPanelSelectionChange();
+      this.commitUserSelectionChange();
     },
     // 搜索模式值变化处理
     handleSearchValueChange() {
@@ -99047,7 +99070,7 @@ var VirtualCascaderPanel_component = normalizeComponent(
       });
       mainPanel.selection._reconcileAllRoots();
       mainPanel.bumpSelectionView();
-      this.applyPanelSelectionChange();
+      this.commitUserSelectionChange();
     },
     // 移除已选项
     removeItem(item, index) {
@@ -99075,7 +99098,7 @@ var VirtualCascaderPanel_component = normalizeComponent(
             panel.selection.toggleNode(node.id, false);
           }
         }
-        this.applyPanelSelectionChange();
+        this.commitUserSelectionChange();
         if (this.isShowSearch) {
           this.syncSearchPanelSelection();
         }
@@ -99101,32 +99124,35 @@ var VirtualCascaderPanel_component = normalizeComponent(
         this.$emit('input', emitValue);
       });
     },
+    clearPanelSelectionState(panel) {
+      if (!panel || !panel.selection) {
+        return;
+      }
+      panel.selection.clear();
+      panel.bumpSelectionView();
+    },
     // 全选/取消全选
     handleSelectAll() {
       if (!this.isMultiple) {
-        // 单选模式下不支持全选
         return;
       }
+      const panel = this.$refs.cascaderPanel;
+      const searchPanel = this.$refs.searchCascaderPanel;
       if (this.isAllSelected) {
-        const panel = this.$refs.cascaderPanel;
-        if (panel) {
-          panel.clearCheckedNodes();
-        } else {
-          this.selectedValues = [];
-          this.selectedItems = [];
-          this.searchSelectedValues = [];
-          this.applyPanelSelectionChange();
+        this.clearPanelSelectionState(panel);
+        this.clearPanelSelectionState(searchPanel);
+        this.selectedValues = [];
+        this.searchSelectedValues = [];
+      } else if (panel && panel.selection) {
+        panel.selection.selectAll();
+        panel.bumpSelectionView();
+        if (searchPanel && searchPanel.selection) {
+          this.syncSearchPanelSelection();
         }
       } else {
-        const panel = this.$refs.cascaderPanel;
-        if (panel) {
-          panel.selectAllLeaves();
-        } else {
-          this.selectedValues = CascaderUtilsPro.getAllLeafPaths(this.filteredOptions, this.disabledConfig, this.cascaderProps);
-          this.updateSelectedItems();
-          this.applyPanelSelectionChange();
-        }
+        this.selectedValues = CascaderUtilsPro.getAllLeafPaths(this.filteredOptions, this.disabledConfig, this.cascaderProps);
       }
+      this.commitUserSelectionChange();
     },
     // 获取选中的数据
     getSelectedData() {
@@ -99152,14 +99178,12 @@ var VirtualCascaderPanel_component = normalizeComponent(
     // 清空选择
     clearSelection() {
       const panel = this.$refs.cascaderPanel;
-      if (panel) {
-        panel.clearCheckedNodes();
-      } else {
-        this.selectedValues = [];
-        this.selectedItems = [];
-        this.searchSelectedValues = [];
-        this.applyPanelSelectionChange();
-      }
+      const searchPanel = this.$refs.searchCascaderPanel;
+      this.clearPanelSelectionState(panel);
+      this.clearPanelSelectionState(searchPanel);
+      this.selectedValues = [];
+      this.searchSelectedValues = [];
+      this.commitUserSelectionChange();
     },
     // 设置选择值
     setValue(values) {
@@ -99210,15 +99234,10 @@ var VirtualCascaderPanel_component = normalizeComponent(
       const findPath = (options, targetValues, currentPath = []) => {
         for (const option of options) {
           const newPath = [...currentPath, option[this.cascaderProps.value]];
-          if (targetValues.some(target => target == option[this.cascaderProps.value])) {
-            // 如果是叶子节点（没有children属性），添加到路径中
-            if (!option[this.cascaderProps.children]) {
-              paths.push(newPath);
-            }
+          if (targetValues.some(target => target == option[this.cascaderProps.value]) && CascaderUtilsPro.isTreeLeafNode(option, this.cascaderProps)) {
+            paths.push(newPath);
           }
-
-          // 递归查找子节点
-          if (option[this.cascaderProps.children] && option[this.cascaderProps.children].length > 0) {
+          if (!CascaderUtilsPro.isTreeLeafNode(option, this.cascaderProps)) {
             findPath(option[this.cascaderProps.children], targetValues, newPath);
           }
         }
@@ -99263,7 +99282,7 @@ var VirtualCascaderPanel_component = normalizeComponent(
           });
           panel.selection._reconcileAllRoots();
           panel.bumpSelectionView();
-          this.applyPanelSelectionChange();
+          this.commitUserSelectionChange();
         } else {
           const newSelectedValues = [...this.selectedValues];
           matchedPaths.forEach(path => {
@@ -99308,7 +99327,7 @@ var VirtualCascaderPanel_component = normalizeComponent(
           });
 
           // 检查是否为叶子节点且匹配且未禁用
-          const isLeafNode = !option[this.cascaderProps.children];
+          const isLeafNode = CascaderUtilsPro.isTreeLeafNode(option, this.cascaderProps);
           const isNotDisabled = !this.isItemDisabled(option);
           if (isMatched && isLeafNode && isNotDisabled) {
             // 如果是叶子节点、匹配且未禁用，添加到结果中
@@ -99361,8 +99380,8 @@ var VirtualCascaderPanel_component = normalizeComponent(
 ;
 var ByCascaderPanelPro_component = normalizeComponent(
   cascader_panel_pro_ByCascaderPanelProvue_type_script_lang_js,
-  ByCascaderPanelProvue_type_template_id_37aef47d_render,
-  ByCascaderPanelProvue_type_template_id_37aef47d_staticRenderFns,
+  ByCascaderPanelProvue_type_template_id_e4b10a08_render,
+  ByCascaderPanelProvue_type_template_id_e4b10a08_staticRenderFns,
   false,
   null,
   null,